diff --git a/java/build/org/apache/derbyBuild/ClassSizeCrawler.java b/java/build/org/apache/derbyBuild/ClassSizeCrawler.java
index 5c9e11938c..b4e23aa8db 100644
--- a/java/build/org/apache/derbyBuild/ClassSizeCrawler.java
+++ b/java/build/org/apache/derbyBuild/ClassSizeCrawler.java
@@ -195,6 +195,7 @@ public static void main( String[] arg)
             out.print( "package org.apache.derby.iapi.services.cache;\n" +
                        "class ClassSizeCatalogImpl extends ClassSizeCatalog\n" +
                        "{\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                        "    public ClassSizeCatalogImpl()\n" +
                        "    {\n");
             for( Enumeration e = classSizes.keys();
@@ -224,11 +225,13 @@ public static void main( String[] arg)
 
     private ClassSizeCrawler( Class[] interfaceList,
                               int interfaceCount,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
                               Hashtable<String, int[]> classSizes)
     {
         this.interfaceList = interfaceList;
         this.classSizes = classSizes;
         this.interfaceCount = interfaceCount;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         verbose = Boolean.parseBoolean( System.getProperty( "verbose", "false"));
     }
 
@@ -262,6 +265,7 @@ private void crawl( File curDir, StringBuffer className)
                 // Strip off the ".class" suffix
                 String s = filenames[fileIdx].substring( 0, filenames[fileIdx].length() - 6);
                 className.append( s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
                 Class<?> targetClass = null;
                 String targetClassName = className.toString();
                 try
diff --git a/java/build/org/apache/derbyBuild/ElementFacade.java b/java/build/org/apache/derbyBuild/ElementFacade.java
index 30ae0be7d1..d8a63029d6 100644
--- a/java/build/org/apache/derbyBuild/ElementFacade.java
+++ b/java/build/org/apache/derbyBuild/ElementFacade.java
@@ -85,6 +85,7 @@ public String getTextByTagName(String tag) throws Exception {
     public List<String> getTextListByTagName(String tag) throws Exception {
         NodeList matchingTags = root.getElementsByTagName(tag);
         final int length = matchingTags.getLength();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
         ArrayList<String> tagValues = new ArrayList<String>();
         for (int i = 0; i < length; ++i) {
             tagValues.add(matchingTags.item(i).getFirstChild().getNodeValue());
diff --git a/java/build/org/apache/derbyBuild/GeneratorBase.java b/java/build/org/apache/derbyBuild/GeneratorBase.java
index 47b74b2d4e..a693e4a246 100644
--- a/java/build/org/apache/derbyBuild/GeneratorBase.java
+++ b/java/build/org/apache/derbyBuild/GeneratorBase.java
@@ -162,6 +162,7 @@ public void setOutputFileName(String outputFileName) throws Exception {
      * Ant mutator to set the id of the release
      */
     public void setReleaseId(String releaseID) throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4864
         this.releaseID = releaseID;
     }
 
@@ -178,6 +179,7 @@ public void setReleaseId(String releaseID) throws Exception {
     protected void buildDelta(Element parent)
             throws Exception {
         String deltaStatement =
+//IC see: https://issues.apache.org/jira/browse/DERBY-4864
                 "These notes describe the difference between Apache Derby release " +
                 releaseID + " and the preceding release " +
                 previousReleaseID + ".";
@@ -289,6 +291,7 @@ public static Element createHeader(Element parent, int headerLevel,
         Element header = doc.createElement(makeHeaderTag(headerLevel));
         Element anchor = doc.createElement(ANCHOR);
         Element block = doc.createElement(DIVISION);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5181
 
         parent.appendChild(header);
         anchor.setAttribute(NAME, text);
@@ -307,6 +310,7 @@ public static Element createHeader(Element parent, int headerLevel,
      * @throws DOMException 
      */
     private static Element wrapTextContentInDiv(Element node)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6044
             throws DOMException {
         Document doc = node.getOwnerDocument();
         Element div = doc.createElement(DIVISION);
@@ -555,6 +559,7 @@ public static Element createTable(Element parent, int borderWidth,
         parent.appendChild(table);
         table.setAttribute(BORDER, Integer.toString(borderWidth));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6044
         for (String headerText : columnHeadings) {
             Element headingColumn = insertColumnHeader(headingRow);
             headingColumn.setTextContent(headerText);
@@ -587,6 +592,7 @@ protected void fixWidthOfFirstColumn(Element table)
      */
     public static Element insertRow(Element table)
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6044
         return insertTableElement(table, ROW);
     }
 
@@ -598,6 +604,7 @@ public static Element insertRow(Element table)
      */
     public static Element insertColumn(Element row)
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6044
         return insertTableElement(row, COLUMN);
     }
 
diff --git a/java/build/org/apache/derbyBuild/JarDriftTest.java b/java/build/org/apache/derbyBuild/JarDriftTest.java
index 26a3e32b5e..2529c51a41 100644
--- a/java/build/org/apache/derbyBuild/JarDriftTest.java
+++ b/java/build/org/apache/derbyBuild/JarDriftTest.java
@@ -179,6 +179,7 @@ protected static String sanityState() throws Exception {
         // sanity=[false|true] except for some header/timestamp info).
         String fs = File.separator;
         String sanityFileName = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 topOfTree + fs + "generated" + fs + "java" + fs + "org.apache.derby.commons" + fs +
                 "org" + fs + "apache" + fs + "derby" + fs + "shared" + fs + "common" + fs +
                 "sanity" + fs + "state.properties";
diff --git a/java/build/org/apache/derbyBuild/JiraConnector.java b/java/build/org/apache/derbyBuild/JiraConnector.java
index fede36e1aa..5a86b1a934 100644
--- a/java/build/org/apache/derbyBuild/JiraConnector.java
+++ b/java/build/org/apache/derbyBuild/JiraConnector.java
@@ -71,6 +71,7 @@ public class JiraConnector {
 
 	public static void main(String[] args) {
 		try{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4014
 			if (args.length > 0 && args[0].equals("all"))
 				// don't use this too often it is hard on Apache infrastructure.
 				refreshJiraIssues(allJiraListFileName, jira_allBugsSource);
diff --git a/java/build/org/apache/derbyBuild/JiraIssue.java b/java/build/org/apache/derbyBuild/JiraIssue.java
index 73a7f95e50..425c32176d 100644
--- a/java/build/org/apache/derbyBuild/JiraIssue.java
+++ b/java/build/org/apache/derbyBuild/JiraIssue.java
@@ -71,6 +71,7 @@ public JiraIssue(String key, String title, List fixVersions,
     public static List createJiraIssueList(String source)
             throws IOException {
         ArrayList<JiraIssue> jiraIssues = new ArrayList<JiraIssue>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
 
         BufferedReader in = new BufferedReader(new FileReader(source));
         String line;
@@ -79,6 +80,7 @@ public static List createJiraIssueList(String source)
             System.out.println(line);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
         ArrayList<String> comments = new ArrayList<String>();
         int state = STATE_ADD_KEY;
         String key = null;
@@ -164,6 +166,7 @@ public long getReleaseNoteAttachmentID() {
      * @return true iff this issue has a release note attached
      */
     public boolean hasReleaseNote() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         return (releaseNoteAttachmentID != NO_RELEASE_NOTE &&
                 releaseNoteAttachmentID != MISSING_RELEASE_NOTE);
     }
@@ -181,6 +184,7 @@ public boolean hasMissingReleaseNote() {
      * @return true iff issue has version as fixVersion
      */
     public boolean isFixedIn(String version) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         return fixVersions.contains(version);
     }
 
@@ -188,6 +192,7 @@ public boolean isFixedIn(String version) {
      * @return URL for this Jira issue
      */
     public String getJiraAddress() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4593
         return "https://issues.apache.org/jira/browse/DERBY-" + key;
     }
 
@@ -195,6 +200,7 @@ public String getJiraAddress() {
      * @return Full URL to the latest release note
      */
     public String getReleaseNoteAddress() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         return ATTACHMENT_BASE +
                 releaseNoteAttachmentID + "/" + ATTACHMENT_NAME;
     }
diff --git a/java/build/org/apache/derbyBuild/MessageBuilder.java b/java/build/org/apache/derbyBuild/MessageBuilder.java
index bccfa735a2..8dcf6dce78 100644
--- a/java/build/org/apache/derbyBuild/MessageBuilder.java
+++ b/java/build/org/apache/derbyBuild/MessageBuilder.java
@@ -84,6 +84,7 @@ public class MessageBuilder extends Task
         "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
         "<!DOCTYPE reference PUBLIC \"-//OASIS//DTD DITA Reference//EN\"\n" +
         " \"../dtd/reference.dtd\">\n";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2110
 
     public static final String APACHE_LICENSE =
         "Licensed to the Apache Software Foundation (ASF) under one or more\n" +
@@ -100,6 +101,7 @@ public class MessageBuilder extends Task
         "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  \n" +
         "See the License for the specific language governing permissions and  \n" +
         "limitations under the License.\n";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3547
 
     private static  final   String  REF_GUIDE_NOTES =
         "<!-- \n" +
@@ -109,6 +111,7 @@ public class MessageBuilder extends Task
         "<!-- \n" +
         "NOTE: this file is generated by the MessageBuilder task as part of a\n" +
         "Derby build. Please do not hand-edit this file. Instead, please edit\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2110
         "the corresponding text in messages.xml and/or MessageBuilder.\n" +
         "-->\n";
     
@@ -160,8 +163,10 @@ public  XMLWriter()
          */
         public  XMLWriter(PrintWriter printWriter)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3547
             _vacuous = false;
             _pw = printWriter;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
             _tagStack = new ArrayList<String>();
         }
 
@@ -173,6 +178,7 @@ public  XMLWriter(PrintWriter printWriter)
         public  XMLWriter( File file )
             throws IOException
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3547
             this(new PrintWriter(file));
         }
 
@@ -214,6 +220,7 @@ public void    writeEmptyTag( String tag, String attributes )
             if ( _vacuous ) { return; }
 
             indent( );
+//IC see: https://issues.apache.org/jira/browse/DERBY-2110
             if ( attributes.length() >0)
                 _pw.println( "<" + tag + " " + attributes + "/>");
             else
@@ -244,6 +251,7 @@ public void    beginTag( String tag, String attributes )
             if ( _vacuous ) { return; }
 
             indent();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2110
             if (attributes.length() > 0)
                 _pw.println( "<" + tag + " " + attributes + ">");
             else
@@ -293,6 +301,7 @@ public void    writeTextElement( String tag, String attributes, String text )
             if ( _vacuous ) { return; }
 
             indent();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2110
             if ( attributes.length() > 0 )
                 _pw.print( "<" + tag + " " + attributes + ">");
             else
@@ -388,6 +397,7 @@ public  void    execute()
         }
         catch (Exception e)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5885
             throw new BuildException( "Could not generate English properties from message descriptors: " + e.getMessage(), e );
         }
         finally
@@ -522,10 +532,12 @@ private void    processFamily( PrintWriter propertiesPW, XMLWriter ditaWriter, E
         ditaWriter.beginTag( "table" );
         {
             ditaWriter.writeTextElement( "title", title );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5640
             ditaWriter.writeTextElement( "desc", "This table lists the SQLStates and message text for the " + title + " exceptions." );
             
             ditaWriter.beginTag( "tgroup", "cols=\"2\"" );
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5202
                 ditaWriter.writeEmptyTag( "colspec", "colname=\"col1\" colnum=\"1\" colwidth=\"1*\"" );
                 ditaWriter.writeEmptyTag( "colspec", "colname=\"col2\" colnum=\"2\" colwidth=\"7.5*\"" );
 
@@ -569,6 +581,7 @@ private void    processMessage( PrintWriter propertiesPW, XMLWriter ditaWriter,
         String        rawText = squeezeText( getFirstChild( message, "text" ) );
         String        propertyText = escapePropertiesText( rawText );
         int             parameterCount = countParameters( rawText );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5878
         String[]     comments = getOptionalSubElements( message, "comment" );
         String[]     args = getOptionalSubElements( message, "arg" );
 
@@ -577,6 +590,7 @@ private void    processMessage( PrintWriter propertiesPW, XMLWriter ditaWriter,
             throw new Exception( name + " has " + parameterCount + " parameters but " + args.length + " nested args." );
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2110
         String displayText;
         if (rawText.indexOf('\'')>=0)
         {
@@ -595,8 +609,10 @@ private void    processMessage( PrintWriter propertiesPW, XMLWriter ditaWriter,
         }
         ditaWriter.endTag();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5878
         propertiesPW.println( "" );
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5878
         if ( comments.length != 0 )
         {
             for ( int i = 0; i < comments.length; i++ )
@@ -612,6 +628,7 @@ private void    processMessage( PrintWriter propertiesPW, XMLWriter ditaWriter,
             propertiesPW.println( "#" );
             for ( int i = 0; i < args.length; i++ )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5878
                 propertiesPW.println( "#    {" + i + "} = " + args[ i ] );
             }
             propertiesPW.println( "#" );
@@ -639,6 +656,7 @@ private String  getSQLState( String name )
     private String[]    getOptionalSubElements( Element message, String subElementTag )
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5878
         NodeList   options = message.getElementsByTagName( subElementTag );
         int             count = options.getLength();
         String[]    retval = new String[ count ];
@@ -690,10 +708,12 @@ private String  plugInArgs( String message, String[] rawArgs )
         int             count = rawArgs.length;
         String[]    cookedArgs = new String[ count ];
         MessageFormat format = new MessageFormat(message);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5420
 
         // add xml angle brackets around the args
         for ( int i = 0; i < count; i++ )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2110
             cookedArgs[ i ] = "<varname>&lt;" + rawArgs[ i ] + "&gt;</varname>";
             format.setFormatByArgumentIndex(i, null); // use plain string format
         }
@@ -805,6 +825,7 @@ private static String escapePropertiesText( java.lang.String input )
      */
     private static String escapeTextWithAQuote( java.lang.String input )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2110
         String output = input.replaceAll( "\'", "\'\'" );
         
         return output;
diff --git a/java/build/org/apache/derbyBuild/MessageBundleTest.java b/java/build/org/apache/derbyBuild/MessageBundleTest.java
index 42a08f022a..15ef861a97 100644
--- a/java/build/org/apache/derbyBuild/MessageBundleTest.java
+++ b/java/build/org/apache/derbyBuild/MessageBundleTest.java
@@ -49,6 +49,7 @@ public class MessageBundleTest {
      * </p>
      */
     public MessageBundleTest()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1458
     {}
     
     public static void main(String [] args) throws Exception
@@ -63,6 +64,7 @@ public static void main(String [] args) throws Exception
             e.printStackTrace();
         }
         if (failbuild) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4341
             throw new Exception("Message check failed. \n" +
                 "See error in build output or call ant runmessagecheck.");
     }    
@@ -89,6 +91,7 @@ public static void main(String [] args) throws Exception
     }
     
     static void loadClassIds(Class idclass, HashSet<String> set)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
             throws Exception {
         Field[] fields = idclass.getFields();
         
@@ -111,6 +114,7 @@ static void loadClassIds(Class idclass, HashSet<String> set)
             
             if ( ! set.add(id) )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1458
                 failbuild=true;
                 System.err.println("ERROR: The id " + id + 
                     " was found twice in " + idclass.getName());
@@ -144,6 +148,7 @@ static void loadMessageBundle(int index) {
             String key = (String)keys.nextElement();                
 
             if ( ! messageBundleIds.add(key) ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1458
                 failbuild=true;
                 System.err.println("ERROR: the key " + key +
                     " exists twice in messages_en.properties");
@@ -168,6 +173,8 @@ public void testSQLStateOrphanedIds() throws Exception {
                 // XSAX1: shared SQLState explains; not exposed to users. 
                 // 01004: automatically assigned by java.sql.DataTruncation and
                 //        never used to generate a message
+//IC see: https://issues.apache.org/jira/browse/DERBY-3902
+//IC see: https://issues.apache.org/jira/browse/DERBY-1567
                 if (!(sqlStateId.equalsIgnoreCase("XCL32.S") ||
                       sqlStateId.equalsIgnoreCase("XSAX1")   ||
                       sqlStateId.equalsIgnoreCase("01004"))) {
@@ -195,6 +202,7 @@ public void testMessageIdOrphanedIds() throws Exception {
             if ( ! messageBundleIds.contains(sqlStateId) ) {
                 // Don't fail out on the first one, we want to catch
                 // all of them.  Just note there was a failure and continue
+//IC see: https://issues.apache.org/jira/browse/DERBY-1458
                 failbuild=true;
                 System.err.println("ERROR: Message id " + sqlStateId +
                     " in MessageId.java was not found in" +
@@ -223,6 +231,7 @@ public void testMessageBundleOrphanedMessages() throws Exception {
             
             // Don't fail out on the first one, we want to catch
             // all of them.  Just note there was a failure and continue
+//IC see: https://issues.apache.org/jira/browse/DERBY-1458
             failbuild=true;
             System.err.println("WARNING: Message id " + msgid + 
                 " in messages_en.properties is not " +
diff --git a/java/build/org/apache/derbyBuild/MessageVetter.java b/java/build/org/apache/derbyBuild/MessageVetter.java
index e39d64d95b..a44c5a06a7 100644
--- a/java/build/org/apache/derbyBuild/MessageVetter.java
+++ b/java/build/org/apache/derbyBuild/MessageVetter.java
@@ -98,6 +98,7 @@ public boolean accept(File pathname) {
         // needs quoting.
         LONE_QUOTE_ALLOWED.add("DRDA_Usage8.I");
         LONE_QUOTE_ALLOWED.add("DRDA_Usage11.I");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5944
         LONE_QUOTE_ALLOWED.add("PE_HelpText");
     }
 
@@ -116,6 +117,7 @@ public boolean accept(File pathname) {
     private MessageVetter(File file) throws IOException {
         this.file = file;
         properties = new Properties();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5480
         FileInputStream in = new FileInputStream(file);
         try {
             properties.load(in);
diff --git a/java/build/org/apache/derbyBuild/ODBCMetadataGenerator.java b/java/build/org/apache/derbyBuild/ODBCMetadataGenerator.java
index 000c533557..2e8a1b75cb 100644
--- a/java/build/org/apache/derbyBuild/ODBCMetadataGenerator.java
+++ b/java/build/org/apache/derbyBuild/ODBCMetadataGenerator.java
@@ -193,8 +193,10 @@ public static void main(String [] args) throws IOException {
 	private void initChanges() {
 
 		changeMap = new HashMap<String, Byte>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
 
 		changeMap.put("getProcedures", COL_RENAME_CHANGE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		changeMap.put("getProcedureColumns",
 			(byte)(COL_RENAME_CHANGE
@@ -242,6 +244,7 @@ public void generateODBCQueries(InputStream is)
 
 		// Note: We use ISO-8859-1 because property files are
 		// defined to be that encoding.
+//IC see: https://issues.apache.org/jira/browse/DERBY-675
 		LineNumberReader reader =
 			new LineNumberReader(new InputStreamReader(is, "ISO-8859-1"));
 
@@ -367,6 +370,7 @@ private void generateODBCQuery(StringBuffer queryText)
 
 		// Get a list of the column definitions in the subquery, for
 		// use by subsequent operations.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
 		ArrayList<String> colDefs = new ArrayList<String>();
 		pos = getSelectColDefinitions(queryText, colDefs);
 
@@ -759,6 +763,7 @@ else if (queryName.equals("getTypeInfo")) {
 	 *	clause, for later use by the calling method.
 	 */
 	private int getSelectColDefinitions(StringBuffer queryText,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
 		ArrayList<String> colDefList)
 	{
 
@@ -942,6 +947,7 @@ private String getCastInfoForCol(String queryName,
 	{
 
 		if (queryName.equals("getTypeInfo")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-137
 			if (colName.equals("DATA_TYPE") ||
 				colName.equals("CASE_SENSITIVE") ||
 				colName.equals("UNSIGNED_ATTRIBUTE") ||
@@ -956,6 +962,7 @@ private String getCastInfoForCol(String queryName,
 		else if (queryName.equals("getColumns")) {
 			if (colName.equals("DECIMAL_DIGITS") ||
 				colName.equals("NULLABLE") ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-137
 				colName.equals("DATA_TYPE") ||
 				colName.equals("NUM_PREC_RADIX") ||
 				colName.equals("SQL_DATA_TYPE") ||
@@ -964,6 +971,7 @@ else if (queryName.equals("getColumns")) {
 				return "SMALLINT";
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-137
 		else if (queryName.equals("getProcedureColumns")) {
 			if (colName.equals("DATA_TYPE")) {
 				return "SMALLINT";
@@ -1013,6 +1021,7 @@ else if (queryName.equals("getIndexInfo")) {
 	 *	leaves the received column list unchanged.
 	 */
 	private void markNewColPosition(String queryName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
 		ArrayList<String> selectColDefs)
 	{
 
@@ -1256,6 +1265,7 @@ private	boolean	isBoolean( String colName )
 	 */
 	private boolean stmtNeedsChange(String queryName, byte changeType) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4893
 		Byte changeByte = changeMap.get(queryName);
 		if (changeByte == null)
 		// No entry means change is not needed.
diff --git a/java/build/org/apache/derbyBuild/ReleaseNoteReader.java b/java/build/org/apache/derbyBuild/ReleaseNoteReader.java
index e8f0f3fd41..8adc50d32c 100644
--- a/java/build/org/apache/derbyBuild/ReleaseNoteReader.java
+++ b/java/build/org/apache/derbyBuild/ReleaseNoteReader.java
@@ -102,6 +102,7 @@ public  static void main( String[] args )
         Element                         details = me.getReleaseNoteDetails( doc );
 
         me.forbidBlockQuotes( doc );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5181
 
         // if you get this far, then everything worked
 
@@ -147,6 +148,7 @@ public Element   getReleaseNoteSummary( Document releaseNote )
         //
         Element     root = releaseNote.getDocumentElement();
         Element     summaryParagraph = GeneratorBase.getFirstChild( root, GeneratorBase.PARAGRAPH );
+//IC see: https://issues.apache.org/jira/browse/DERBY-3598
 
         return summaryParagraph;
     }
@@ -161,6 +163,7 @@ public Element   getReleaseNoteDetails( Document releaseNote )
     {
         Element     root = releaseNote.getDocumentElement();
         Element     details = GeneratorBase.getFirstChild( root, GeneratorBase.BODY );
+//IC see: https://issues.apache.org/jira/browse/DERBY-3598
 
         return details;
     }
@@ -172,6 +175,7 @@ public Element   getReleaseNoteDetails( Document releaseNote )
      */
     private void    forbidBlockQuotes( Document releaseNote )   throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5181
         Element     root = releaseNote.getDocumentElement();
         String          errorMessage = "For accessibility reasons, blockquotes are not allowed. Please remove the blockquote tags.";
 
diff --git a/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java b/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
index da7beb265c..f9649c3361 100644
--- a/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
+++ b/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
@@ -87,6 +87,7 @@ public class ReleaseNotesGenerator extends GeneratorBase {
     private static  final   String  USAGE =
         "Usage:\n" +
         "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         "  java org.apache.derbyBuild.ReleaseNotesGenerator SUMMARY BUG_LIST OUTPUT_PAMPHLET\n" +
         "\n" +
         "    where\n" +
@@ -99,6 +100,7 @@ public class ReleaseNotesGenerator extends GeneratorBase {
         "individual JIRAs. Before running this program, make sure that you can\n" +
         "ping issues.apache.org.\n" +
         "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         "The ReleaseNoteGenerator assumes that the JIRA report contains\n" +
         "key, title, fix versions and attachment id elements for each Derby\n" +
         "issue. For each issue in with an attachment id element the\n" +
@@ -182,10 +184,12 @@ public void execute() throws BuildException {
             beginOutput();
             buildOverview();
             buildNewFeatures();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
             parseBugsList();
             buildFixedBugsList();
             buildReleaseNoteIssuesList();
             buildEnvironment();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4864
             buildReleaseVerification();
             replaceVariables();
             printOutput();
@@ -212,6 +216,7 @@ public void execute() throws BuildException {
      * Start the RELEASE_NOTES html docment.
      */
     private void beginOutput() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4864
         String titleText = "Release Notes for Apache Derby " + releaseID;
         Element html = outputDoc.createElement(HTML);
         Element title = createTextElement(outputDoc, "title", titleText);
@@ -222,6 +227,7 @@ private void beginOutput() throws Exception {
         // See http://www.w3.org/TR/WCAG10/#gl-abbreviated-and-foreign
         //
         html.setAttribute( "lang", "en" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5181
 
         outputDoc.appendChild(html);
         html.appendChild(title);
@@ -242,6 +248,7 @@ private void beginOutput() throws Exception {
                 ISSUES_SECTION, ISSUES_SECTION);
         createSection(body, MAIN_SECTION_LEVEL, toc,
                 BUILD_ENVIRONMENT_SECTION, BUILD_ENVIRONMENT_SECTION);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4864
         createSection(body, MAIN_SECTION_LEVEL, toc,
                 RELEASE_VERIFICATION_SECTION, RELEASE_VERIFICATION_SECTION);
     }
@@ -258,6 +265,7 @@ private void beginOutput() throws Exception {
      */
     private void buildOverview() throws Exception {
         // copy the details out of the summary file into the overview section
+//IC see: https://issues.apache.org/jira/browse/DERBY-3598
         cloneChildren(summary.getElementByTagName(SUM_OVERVIEW),
                 getSection(outputDoc, MAIN_SECTION_LEVEL, OVERVIEW_SECTION));
     }
@@ -273,6 +281,7 @@ private void buildOverview() throws Exception {
      */
     private void buildNewFeatures() throws Exception {
         // copy the details out of the summary file into the overview section
+//IC see: https://issues.apache.org/jira/browse/DERBY-3598
         cloneChildren(summary.getElementByTagName(SUM_NEW_FEATURES),
                 getSection(outputDoc, MAIN_SECTION_LEVEL,
                 NEW_FEATURES_SECTION));
@@ -285,6 +294,7 @@ private void buildNewFeatures() throws Exception {
     //////////////////////////////////
 
     private void parseBugsList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
             throws Exception {
         bugList = JiraIssue.createJiraIssueList(bugListFileName);
         // Parse the file for the release version and the previous version to
@@ -317,6 +327,7 @@ private void parseBugsList()
     private void buildFixedBugsList()
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3598
         Element bugListSection = getSection(outputDoc, MAIN_SECTION_LEVEL,
                 BUG_FIXES_SECTION );
 
@@ -333,7 +344,9 @@ private void buildFixedBugsList()
         // If we don't fix the width of the first column, the string
         // "DERBY-XXXX" is often broken up at the hyphen by some browsers.
         fixWidthOfFirstColumn(table);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6044
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         for ( Iterator i=bugList.iterator(); i.hasNext(); ) {
             JiraIssue issue = (JiraIssue) i.next();
             //println("Fixed: "+ issue.getKey());
@@ -359,6 +372,7 @@ private void buildFixedBugsList()
      * Build the Issues section.
      */
     private void buildReleaseNoteIssuesList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3598
         throws Exception {
         Element issuesSection = getSection(outputDoc, MAIN_SECTION_LEVEL,
                 ISSUES_SECTION);
@@ -367,11 +381,13 @@ private void buildReleaseNoteIssuesList()
             "), Derby release " + releaseID + " introduces the following " +
             "new features " +
             "and incompatibilities. These merit your special attention.";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6941
         String noDetailedReleaseNotes = "No issues required detailed release notes.";
         boolean deltaStatementPrinted = false;
 
         Element toc = createList(issuesSection);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         for (Iterator i=bugList.iterator(); i.hasNext(); ) {
             JiraIssue issue = (JiraIssue) i.next();
             if (issue.hasReleaseNote()) {
@@ -392,6 +408,7 @@ private void buildReleaseNoteIssuesList()
                             getReleaseNoteDetails(releaseNote);
                 } catch (Throwable t) {
                     errors.add(formatError("Unable to read or parse " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4593
                             "release note for DERBY-" +
                             issue.getKey(), t));
                     missingReleaseNotes.add(issue);
@@ -400,6 +417,7 @@ private void buildReleaseNoteIssuesList()
 
                 String key = "Note for DERBY-" + issue.getKey();
                 //println("Release note: "+issue.getKey()+" - "+issue.getTitle());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5204
                 Element paragraph = outputDoc.createElement(SPAN);
                 paragraph.appendChild(outputDoc.createTextNode(key + ": "));
                 cloneChildren(summaryText, paragraph);
@@ -407,10 +425,12 @@ private void buildReleaseNoteIssuesList()
                 Element issueSection = createSection(issuesSection,
                         ISSUE_DETAIL_LEVEL, toc, key, paragraph);
                 cloneChildren(details, issueSection);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
             } else if (issue.hasMissingReleaseNote()) {
                 missingReleaseNotes.add(issue);
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6941
         if (!deltaStatementPrinted) { addParagraph(issuesSection, noDetailedReleaseNotes); }
     }
 
@@ -458,6 +478,7 @@ private void buildEnvironment()
      */
     private void buildReleaseVerification() throws Exception {
         // copy the details out of the summary file into the release verification section
+//IC see: https://issues.apache.org/jira/browse/DERBY-4864
         cloneChildren(summary.getElementByTagName(SUM_RELEASE_VERIFICATION),
                 getSection(outputDoc, MAIN_SECTION_LEVEL, RELEASE_VERIFICATION_SECTION));
     }
@@ -473,6 +494,7 @@ private void buildReleaseVerification() throws Exception {
      * Print missing release notes
      */
     private void printMissingReleaseNotes() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3598
         if (missingReleaseNotes.isEmpty()) {
             return;
         }
@@ -499,12 +521,14 @@ private boolean    parseArgs( String[] args )
         throws Exception
     {
         if ( (args == null) || (args.length != 3) ) { return false; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4593
 
         int     idx = 0;
 
         setSummaryFileName( args[ idx++ ] );
         setBugListFileName( args[ idx++ ] );
         setOutputFileName( args[ idx++ ] );
+//IC see: https://issues.apache.org/jira/browse/DERBY-3598
 
         return true;
     }
diff --git a/java/build/org/apache/derbyBuild/ReleaseNotesTransformer.java b/java/build/org/apache/derbyBuild/ReleaseNotesTransformer.java
index d16240ba20..d2db3df462 100644
--- a/java/build/org/apache/derbyBuild/ReleaseNotesTransformer.java
+++ b/java/build/org/apache/derbyBuild/ReleaseNotesTransformer.java
@@ -67,6 +67,7 @@ public class ReleaseNotesTransformer extends Task
         "  (the \"License\"); you may not use this file except in compliance with\n" +
         "  the License.  You may obtain a copy of the License at\n" +
         "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-7010
         "      https://www.apache.org/licenses/LICENSE-2.0\n" +
         "\n" +
         "  Unless required by applicable law or agreed to in writing, software\n" +
@@ -80,17 +81,20 @@ public class ReleaseNotesTransformer extends Task
         "<body>\n" +
         "\n" +
         "    <h1>Distributions</h1>\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-7010
         "    <p>Use the links below to download a distribution of Apache Derby. You should <b>always</b> <a href=\"#Verifying+Releases\">verify the integrity</a>\n" +
         "       of distribution files downloaded from a mirror.</p>\n" +
         "\n" +
         "<p>You are currently using <strong>[preferred]</strong>. If you encounter a\n" +
         "problem with this mirror, then please select another.  If all\n" +
         "mirrors are failing, there are backup mirrors at the end of the list.\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-7010
         "See <a href=\"https://www.apache.org/mirrors/\">status</a> of mirrors.\n" +
         "</p>\n" +
         "\n" +
         "<form action=\"[location]\" method=\"get\" id=\"SelectMirror\">\n" +
         "Other mirrors: <select name=\"Preferred\">\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6875
         "[if-any http] [for http]\n" +
         "<option value=\"[http]\">[http]</option>\n" +
         "[end] [end]\n" +
@@ -112,6 +116,7 @@ public class ReleaseNotesTransformer extends Task
         "      <li>lib-debug distribution - contains jar files for Derby with source line numbers.</li>\n" +
         "      <li>src distribution - contains the Derby source tree at the point which the binaries were built.</li>\n" +
         "    </ul>\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-7010
         "    <p> <a href=\"[preferred]/db/derby/db-derby-{0}/db-derby-{0}-bin.zip\">db-derby-{0}-bin.zip</a> [<a href=\"https://www.apache.org/dist/db/derby/db-derby-{0}/db-derby-{0}-bin.zip.asc\">PGP</a>] [<a href=\"https://www.apache.org/dist/db/derby/db-derby-{0}/db-derby-{0}-bin.zip.sha512\">SHA-512</a>]<br/>\n" +
         "    <a href=\"[preferred]/db/derby/db-derby-{0}/db-derby-{0}-bin.tar.gz\">db-derby-{0}-bin.tar.gz</a> [<a href=\"https://www.apache.org/dist/db/derby/db-derby-{0}/db-derby-{0}-bin.tar.gz.asc\">PGP</a>] [<a href=\"https://www.apache.org/dist/db/derby/db-derby-{0}/db-derby-{0}-bin.tar.gz.sha512\">SHA-512</a>]</p>\n" +
         "    \n" +
@@ -188,6 +193,7 @@ public void setOutputFileName(String outputFileName) throws Exception
      */
     public void setCliXconfFileName(String cliXconfFileName) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4855
         _cliXconfFileName = cliXconfFileName;
         _cliXconfFile = new File(_cliXconfFileName);
 
@@ -214,6 +220,7 @@ public void execute() throws BuildException
             printOutput();
             postProcess();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4855
             wireIntoBuild();
         }
         catch (Throwable t) {
@@ -409,6 +416,7 @@ private void normalizeText( File inputFile, File outputFile ) throws Exception
         rawString = fullReplaceToken( rawString, "<hr>", "<hr/>" );
 
         // Forrest doesn't like square brackets and swallows the bracketed content
+//IC see: https://issues.apache.org/jira/browse/DERBY-5009
         rawString = rawString.replace( '[', '(' );
         rawString = rawString.replace( ']', ')' );
 
@@ -490,6 +498,7 @@ private void postProcess()
      * </p>
      */
     private void wireIntoBuild()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4855
         throws Exception
     {
         String contents = readFileIntoString( _cliXconfFile );
diff --git a/java/build/org/apache/derbyBuild/SecurityPolicyGenerator.java b/java/build/org/apache/derbyBuild/SecurityPolicyGenerator.java
index 8e08bc611d..b6ec7c4798 100644
--- a/java/build/org/apache/derbyBuild/SecurityPolicyGenerator.java
+++ b/java/build/org/apache/derbyBuild/SecurityPolicyGenerator.java
@@ -531,6 +531,7 @@ public void deletePermission(String permission)
             writer.print("grant");
             if (actualName.length() > 0)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3547
                 writer.print(" ");
                 if (isPrincipal)
                 {
diff --git a/java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java b/java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java
index bccf8bbf1e..a1481f0270 100644
--- a/java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java
+++ b/java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java
@@ -51,6 +51,7 @@ public String getName() {
 
     @Override
     public Set<Taglet.Location> getAllowedLocations() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
         return allowedSet;
      }
 
@@ -69,6 +70,7 @@ public boolean isInlineTag() {
      */
     public String toString(DocTree tag) {
         return "<tr><td>" + ROWNAME + "</td>"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
           + "<td>" + getText(tag) + "</td></tr></table>\n";
     }
 
diff --git a/java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java b/java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java
index 401059634a..f56982c7bd 100644
--- a/java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java
+++ b/java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java
@@ -63,6 +63,7 @@ public String toString(DocTree tag) {
      */
     public String toString(List<? extends DocTree> tags, Element element)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
         if ((tags == null) || (tags.size() == 0)) { return null; }
         
         String result = "";
diff --git a/java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java b/java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java
index ed12037c6d..1ac50d5649 100644
--- a/java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java
+++ b/java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java
@@ -58,6 +58,7 @@ public boolean isInlineTag() {
      */
     public String toString(DocTree tag) {
         return "\n<dt><table cellpadding=2 cellspacing=2><tr><td>" + ROWNAME + "</td>"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
           + "<td>" + DiskLayoutTaglet.getText(tag) + "</td></tr>\n";
     }
 
diff --git a/java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java b/java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java
index 1553a92b02..d59a23ffc1 100644
--- a/java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java
+++ b/java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java
@@ -58,6 +58,7 @@ public boolean isInlineTag() {
      */
     public String toString(DocTree tag) {
         return "<tr><td>" + ROWNAME + "</td>"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
           + "<td>" + DiskLayoutTaglet.getText(tag) + "</td></tr>\n";
     }
 
diff --git a/java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java b/java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java
index a4627dbb36..29e79aa926 100644
--- a/java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java
+++ b/java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java
@@ -58,6 +58,7 @@ public boolean isInlineTag() {
      */
     public String toString(DocTree tag) {
         return "<tr><td>" + ROWNAME + "</td>"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
           + "<td>" + DiskLayoutTaglet.getText(tag) + "</td></tr>\n";
     }
 
diff --git a/java/build/org/apache/derbyBuild/maintversion2props.java b/java/build/org/apache/derbyBuild/maintversion2props.java
index 3a87564f96..7c6957d070 100644
--- a/java/build/org/apache/derbyBuild/maintversion2props.java
+++ b/java/build/org/apache/derbyBuild/maintversion2props.java
@@ -44,6 +44,8 @@ public static void main(String[] args) throws Exception
         Properties p = new Properties();
         p.load(is);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-7020
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	    String maint = "";
         maint = p.getProperty("derby.version.maint");
         if (maint == null)
diff --git a/java/build/org/apache/derbyBuild/propertyconfig.java b/java/build/org/apache/derbyBuild/propertyconfig.java
index 0eb0419102..c103fd9ab6 100644
--- a/java/build/org/apache/derbyBuild/propertyconfig.java
+++ b/java/build/org/apache/derbyBuild/propertyconfig.java
@@ -313,6 +313,7 @@ private static void process(Properties moduleList, String config,
 		FileOutputStream os = new FileOutputStream(outputfile);
 		try
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3132
 			outputProp.store(os,
 							header.
 							concat("# config is ").concat(config).
diff --git a/java/build/org/apache/derbyBuild/splitmessages.java b/java/build/org/apache/derbyBuild/splitmessages.java
index b29c085f10..44abea8fe7 100644
--- a/java/build/org/apache/derbyBuild/splitmessages.java
+++ b/java/build/org/apache/derbyBuild/splitmessages.java
@@ -57,10 +57,14 @@ public class splitmessages
     static
     {
         // Add message ids that don't start with XJ here
+//IC see: https://issues.apache.org/jira/browse/DERBY-841
         clientMessageIds.add(SQLState.NO_CURRENT_CONNECTION);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1115
         clientMessageIds.add(SQLState.NOT_IMPLEMENTED);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1149
         clientMessageIds.add(SQLState.CANNOT_CLOSE_ACTIVE_CONNECTION);
         clientMessageIds.add(SQLState.XACT_SAVEPOINT_RELEASE_ROLLBACK_FAIL);
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
         clientMessageIds.add(SQLState.UNSUPPORTED_ENCODING);
         clientMessageIds.add(SQLState.LANG_FORMAT_EXCEPTION);
         clientMessageIds.add(SQLState.LANG_DATA_TYPE_GET_MISMATCH);
@@ -68,12 +72,17 @@ public class splitmessages
         clientMessageIds.add(SQLState.LANG_DATE_SYNTAX_EXCEPTION);
         clientMessageIds.add(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE);
         clientMessageIds.add(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
         clientMessageIds.add(SQLState.LANG_STATEMENT_CLOSED_NO_REASON);
         clientMessageIds.add(SQLState.LANG_INVALID_COLUMN_POSITION);
         clientMessageIds.add(SQLState.INVALID_COLUMN_NAME);
         clientMessageIds.add(SQLState.HOLDABLE_RESULT_SET_NOT_AVAILABLE);
         clientMessageIds.add(SQLState.LANG_NULL_INTO_NON_NULL);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1185
         clientMessageIds.add(SQLState.JDBC_METHOD_NOT_IMPLEMENTED);
+//IC see: https://issues.apache.org/jira/browse/DERBY-924
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
+//IC see: https://issues.apache.org/jira/browse/DERBY-970
         clientMessageIds.add(SQLState.JDBC_METHOD_NOT_SUPPORTED_BY_SERVER);
         clientMessageIds.add(SQLState.DRDA_NO_AUTOCOMMIT_UNDER_XA);
         clientMessageIds.add(SQLState.DRDA_INVALID_XA_STATE_ON_COMMIT_OR_ROLLBACK);
@@ -84,12 +93,17 @@ public class splitmessages
         clientMessageIds.add(SQLState.NUMBER_OF_ROWS_TOO_LARGE_FOR_INT);
         clientMessageIds.add(SQLState.NOGETCONN_ON_CLOSED_POOLED_CONNECTION);
         clientMessageIds.add(SQLState.LOB_METHOD_ON_CLOSED_CONNECTION);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1266
         clientMessageIds.add(SQLState.QUERY_NOT_QUALIFIED_FOR_UPDATABLE_RESULTSET);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1364
         clientMessageIds.add(SQLState.MULTIPLE_RESULTS_ON_EXECUTE_QUERY);
         clientMessageIds.add(SQLState.USE_EXECUTE_UPDATE_WITH_NO_RESULTS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-843
+//IC see: https://issues.apache.org/jira/browse/DERBY-1198
         clientMessageIds.add(SQLState.LANG_INVALID_CALL_TO_EXECUTE_UPDATE);
         clientMessageIds.add(SQLState.LANG_CANT_INVALIDATE_OPEN_RESULT_SET);
         clientMessageIds.add(SQLState.YEAR_EXCEEDS_MAXIMUM);
+//IC see: https://issues.apache.org/jira/browse/DERBY-842
         clientMessageIds.add(SQLState.LANG_INVALID_PARAM_POSITION);
         clientMessageIds.add(SQLState.LANG_MISSING_PARMS);
         clientMessageIds.add(SQLState.LANG_NO_CURRENT_ROW);
@@ -102,14 +116,21 @@ public class splitmessages
         clientMessageIds.add(SQLState.LANG_INVALID_CALL_STATEMENT);
         clientMessageIds.add(SQLState.LANG_INVALID_SQL_IN_BATCH);
         clientMessageIds.add(SQLState.LANG_RESULT_SET_NOT_OPEN);
+//IC see: https://issues.apache.org/jira/browse/DERBY-845
         clientMessageIds.add(SQLState.CANT_CONVERT_UNICODE_TO_EBCDIC);
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
         clientMessageIds.add(SQLState.SECMECH_NOT_SUPPORTED);
         clientMessageIds.add(SQLState.DRDA_COMMAND_NOT_IMPLEMENTED);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1393
         clientMessageIds.add(SQLState.DATA_TYPE_NOT_SUPPORTED);
+//IC see: https://issues.apache.org/jira/browse/DERBY-850
         clientMessageIds.add(SQLState.JDBC_DRIVER_REGISTER);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1266
         clientMessageIds.add(SQLState.NO_CURRENT_ROW);
+//IC see: https://issues.apache.org/jira/browse/DERBY-847
         clientMessageIds.add(SQLState.LANG_IDENTIFIER_TOO_LONG);
         clientMessageIds.add(SQLState.DRDA_CURSOR_NOT_OPEN);
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
         clientMessageIds.add(SQLState.PROPERTY_UNSUPPORTED_CHANGE);
         clientMessageIds.add(SQLState.NET_INVALID_JDBC_TYPE_FOR_PARAM);
         clientMessageIds.add(SQLState.UNRECOGNIZED_JAVA_SQL_TYPE);
@@ -118,18 +139,25 @@ public class splitmessages
         clientMessageIds.add(SQLState.NET_SQLCDTA_INVALID_FOR_PKGID);
         clientMessageIds.add(SQLState.NET_PGNAMCSN_INVALID_AT_SQLAM);
         clientMessageIds.add(SQLState.NET_VCM_VCS_LENGTHS_INVALID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
         clientMessageIds.add(SQLState.LANG_STRING_TOO_LONG);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
         clientMessageIds.add(SQLState.INVALID_COLUMN_ARRAY_LENGTH);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2498
         clientMessageIds.add(SQLState.PROPERTY_INVALID_VALUE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2769
         clientMessageIds.add(SQLState.LANG_SUBSTR_START_ADDING_LEN_OUT_OF_RANGE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4777
         clientMessageIds.add(SQLState.LANG_CURSOR_NOT_FOUND);
     };
+//IC see: https://issues.apache.org/jira/browse/DERBY-5474
 
 	public static void main(String[] args) throws Exception {
 
 		Properties p = new Properties();
         int idx = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		File engineClassesDir = new File(args[idx++]);
 		File clientClassesDir = new File(args[idx++]);
 		File localesDir = new File(args[idx++]);
@@ -143,6 +171,7 @@ public static void main(String[] args) throws Exception {
 
 		boolean addBase = "_en".equals(locale);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         File localizedEngineMessagesDir = new File(localesDir, LOCALE_STUB + locale);
         localizedEngineMessagesDir.mkdir();
 
@@ -160,6 +189,7 @@ public static void main(String[] args) throws Exception {
         Properties clientProps = new Properties();
 
         String clientPropsFileName = "clientmessages" + locale + ".properties";
+//IC see: https://issues.apache.org/jira/browse/DERBY-838
 
 		for (Enumeration e = p.keys(); e.hasMoreElements(); ) {
 			String key = (String) e.nextElement();
@@ -176,6 +206,7 @@ public static void main(String[] args) throws Exception {
 		for (int i = 0; i < 50; i++) {
 			if (c[i].size() == 0)
 				continue;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 			OutputStream fos = new BufferedOutputStream
               (
 				new FileOutputStream
@@ -190,7 +221,10 @@ public static void main(String[] args) throws Exception {
 			if (addBase) {
 				// add duplicate english file as the base
 				fos = new BufferedOutputStream(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 					new FileOutputStream(new File(engineClassesDir, "m"+i+"_en.properties")), 16 * 1024);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3132
+//IC see: https://issues.apache.org/jira/browse/DERBY-3132
 				c[i].store(fos, (String) null);
 				fos.flush();
 				fos.close();
@@ -204,7 +238,9 @@ public static void main(String[] args) throws Exception {
         // Save the client messages (the combination of what was already
         // there and what we added from the engine properties file) into
         // the Derby locales directory
+//IC see: https://issues.apache.org/jira/browse/DERBY-838
         OutputStream clientOutStream = new BufferedOutputStream(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             new FileOutputStream(new File(clientClassesDir, clientPropsFileName)), 
             16 * 1024);
 
@@ -216,9 +252,12 @@ public static void main(String[] args) throws Exception {
         {
             // Save the English messages as the base
             clientOutStream = new BufferedOutputStream(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 new FileOutputStream(new File(clientClassesDir, "clientmessages.properties")), 
                 16 * 1024);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3132
+//IC see: https://issues.apache.org/jira/browse/DERBY-3132
             clientProps.store(clientOutStream, (String)null);
             clientOutStream.flush();
             clientOutStream.close();            
@@ -240,8 +279,10 @@ static boolean isClientMessage(String messageId)
         // Look for message ids that we assume are likely to be used
         // on the client.  These ones don't need to be explicitly added
         // to clientMessageIds
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
         if ( messageId.startsWith("XJ") || messageId.startsWith("J")  ||
              messageId.startsWith("XN") || messageId.startsWith("58") ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
              messageId.startsWith("57") || messageId.startsWith("08") ||
              messageId.startsWith( "XBD" ) )
         {
diff --git a/java/build/org/apache/derbyPreBuild/ReleaseProperties.java b/java/build/org/apache/derbyPreBuild/ReleaseProperties.java
index e6808ec426..e6464b888f 100644
--- a/java/build/org/apache/derbyPreBuild/ReleaseProperties.java
+++ b/java/build/org/apache/derbyPreBuild/ReleaseProperties.java
@@ -60,6 +60,7 @@ public class ReleaseProperties extends Task
     /////////////////////////////////////////////////////////////////////////
     private static final String LS = System.getProperty("line.separator");
     private static final String APACHE_LICENSE_HEADER =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5979
         "# Licensed to the Apache Software Foundation (ASF) under one or more" + LS +
         "# contributor license agreements.  See the NOTICE file distributed with" + LS +
         "# this work for additional information regarding copyright ownership." + LS +
@@ -146,6 +147,7 @@ public  void    execute()
             int     drdaMaintID = readDRDAMaintID( target );
             
             VersionID versionID = new VersionID( _releaseID );
+//IC see: https://issues.apache.org/jira/browse/DERBY-2573
             if ( _bump ) { versionID.bump(); }
             
             int major = versionID.getMajor();
@@ -157,10 +159,12 @@ public  void    execute()
 
             propertiesPW.println( APACHE_LICENSE_HEADER );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5463
             propertiesPW.println( DRDA_MAINT + "=" + drdaMaintID );
             propertiesPW.println( "maint=" + encodeFixpackAndPoint( versionID ) );
             propertiesPW.println( "major=" + major );
             propertiesPW.println( "minor=" + minor );
+//IC see: https://issues.apache.org/jira/browse/DERBY-2573
             propertiesPW.println( "eversion=" + versionID.getBranchName() );
             propertiesPW.println( "beta=" + versionID.isBeta() );
             propertiesPW.println( "copyright.comment=Copyright 1997, " + currentYear + " The Apache Software Foundation or its licensors, as applicable." );
@@ -247,6 +251,7 @@ private void    finishWriting( FileWriter fw, PrintWriter pw )
      * </p>
      */
     private int readDRDAMaintID( File inputFile )
+//IC see: https://issues.apache.org/jira/browse/DERBY-5463
         throws Exception
     {
         if ( !inputFile.exists() ) { return DRDA_MAINT_ID_DEFAULT; }
@@ -308,6 +313,7 @@ public VersionID( String text )
         public String toString()
         {
             StringBuffer buffer = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2573
 
             buffer.append( _major ); buffer.append( '.' );
             buffer.append( _minor ); buffer.append( '.' );
diff --git a/java/demo/nserverdemo/NsSample.java b/java/demo/nserverdemo/NsSample.java
index 265dc83047..72e34305e5 100644
--- a/java/demo/nserverdemo/NsSample.java
+++ b/java/demo/nserverdemo/NsSample.java
@@ -41,6 +41,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  The program:
 
  1.	starts the Derby Network Server
+//IC see: https://issues.apache.org/jira/browse/DERBY-6459
  2. creates the database if not already created
  3. checks to see if the schema is already created, and if not,
  4. creates the schema which includes the table SAMPLETBL and corresponding indexes.
@@ -83,6 +84,7 @@ public class NsSample {
 	private static final String DERBY_CLIENT_URL= "jdbc:derby://localhost:"+NETWORKSERVER_PORT+"/NSSampledb;create=true;";
 
         // Default to using the Derby Client JDBC Driver for database connections
+//IC see: https://issues.apache.org/jira/browse/DERBY-247
         String url = DERBY_CLIENT_URL;
         String jdbcDriver = DERBY_CLIENT_DRIVER;
 
@@ -153,12 +155,14 @@ comment out the next block of code (i.e. until the comment line 'End - network s
 		Properties properties = new java.util.Properties();
 
 		// The user and password properties are a must, required by JCC
+//IC see: https://issues.apache.org/jira/browse/DERBY-4276
 		properties.setProperty("user","derbyuser");
 		properties.setProperty("password","pass");
 
 		// Get database connection via DriverManager api
 		try	{
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-247
 			conn =  (Connection) DriverManager.getConnection(url, properties);
 		} catch(Exception e) {
 			pw.println("[NsSample] Connection request unsuccessful, exception thrown was: ");
@@ -191,6 +195,7 @@ comment out the next block of code (i.e. until the comment line 'End - network s
 		   Please be aware of the database URL for obtaining a client connection
 		 */
 		for (int i=1; i<NUM_CLIENT_THREADS; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-247
 			clientThreads[i] = new NsSampleClientThread(i+1,url,properties,pw);
 			clientThreads[i].start();
 
diff --git a/java/demo/nserverdemo/SimpleNetworkClientSample.java b/java/demo/nserverdemo/SimpleNetworkClientSample.java
index 9f18b20f1b..c15591b983 100644
--- a/java/demo/nserverdemo/SimpleNetworkClientSample.java
+++ b/java/demo/nserverdemo/SimpleNetworkClientSample.java
@@ -2,6 +2,7 @@
 
    Derby - Class SimpleNetworkClientSample
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -78,6 +79,7 @@ public class SimpleNetworkClientSample
         private static final String DERBY_CLIENT_URL= "jdbc:derby://localhost:"+ NETWORKSERVER_PORT+"/"+DBNAME+";create=true";
 
         // Default to using the Derby Client JDBC Driver for database connections
+//IC see: https://issues.apache.org/jira/browse/DERBY-247
         String url = DERBY_CLIENT_URL;
         String jdbcDataSource = DERBY_CLIENT_DS;
 
@@ -161,8 +163,10 @@ public Connection getClientDataSourceConn(javax.sql.DataSource ds)
 	public javax.sql.DataSource getClientDataSource(String database, String user, String
 									  password) throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Class<?> nsDataSource = Class.forName(jdbcDataSource);
 		DataSource ds = (DataSource) nsDataSource.getConstructor().newInstance();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		// can also include Derby URL attributes along with the database name
 		Class[] methodParams = new Class[] {String.class};
@@ -188,6 +192,7 @@ public javax.sql.DataSource getClientDataSource(String database, String user, St
 		// port on which Network Server is listening
 		methodParams = new Class[] {int.class};
 		Method portnumber = nsDataSource.getMethod("setPortNumber", methodParams);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		args = new Object[] {1527};
 		portnumber.invoke(ds, args);
 
@@ -209,11 +214,13 @@ public Connection getClientDriverManagerConnection()
 		Properties properties = new java.util.Properties();
 
 		// The user and password properties are a must, required by JCC
+//IC see: https://issues.apache.org/jira/browse/DERBY-4276
 		properties.setProperty("user","derbyuser");
 		properties.setProperty("password","pass");
 
 		// Get database connection  via DriverManager api
 		Connection conn = DriverManager.getConnection(url,properties); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-247
 
 		return conn;
 	}
diff --git a/java/demo/nserverdemo/SimpleNetworkServerSample.java b/java/demo/nserverdemo/SimpleNetworkServerSample.java
index ddbe2927aa..a3ede07f5e 100644
--- a/java/demo/nserverdemo/SimpleNetworkServerSample.java
+++ b/java/demo/nserverdemo/SimpleNetworkServerSample.java
@@ -2,6 +2,7 @@
 
    Derby - Class SimpleNetworkServerSample
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -78,6 +79,7 @@ public static void main (String[] args)
 			startNetworkServer();
 
 			/*
+//IC see: https://issues.apache.org/jira/browse/DERBY-6459
 			  Can now spawn threads to do many things with
 			  embedded connections but allow others to connect via
 			  Network Server. But for sample purposes, an embedded connection
@@ -183,6 +185,7 @@ private static void startWithProperty() throws Exception
 		System.setProperty("derby.drda.startNetworkServer","true");
 
 		// Booting Derby
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
         clazz.getConstructor().newInstance();
 	}
@@ -313,6 +316,7 @@ private static String ijUsage()
 
 		String ijUsage = "\nWhile my app is busy with embedded work, ";
 		ijUsage += "ij might connect like this:\n\n";
+//IC see: https://issues.apache.org/jira/browse/DERBY-247
 		ijUsage +=  "\t$ java -Dij.user=me -Dij.password=pw -Dij.protocol=jdbc:derby://localhost:1527/ org.apache.derby.tools.ij\n";
 		ijUsage += "\tij> connect '" + DBNAME + "';\n\n";
 
diff --git a/java/demo/simple/SimpleApp.java b/java/demo/simple/SimpleApp.java
index 0c24271a41..03b0ae2ca1 100644
--- a/java/demo/simple/SimpleApp.java
+++ b/java/demo/simple/SimpleApp.java
@@ -2,6 +2,7 @@
 
    Derby - Class SimpleApp
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -128,7 +129,9 @@ void go(String[] args)
          * in an array list for convenience.
          */
         Connection conn = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<Statement> statements = new ArrayList<Statement>(); // list of Statements, PreparedStatements
+//IC see: https://issues.apache.org/jira/browse/DERBY-6459
         PreparedStatement psInsert;
         PreparedStatement psUpdate;
         Statement s;
@@ -314,6 +317,8 @@ void go(String[] args)
 
             if (framework.equals("embedded"))
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3187
+//IC see: https://issues.apache.org/jira/browse/DERBY-2216
                 try
                 {
                     // the shutdown=true attribute shuts down Derby
diff --git a/java/demo/toursdb/insertMaps.java b/java/demo/toursdb/insertMaps.java
index 4dbfac9e30..ede4d8445c 100644
--- a/java/demo/toursdb/insertMaps.java
+++ b/java/demo/toursdb/insertMaps.java
@@ -42,10 +42,12 @@ public class insertMaps {
 	public static void main(String[] args) throws Exception {
 
 		System.out.println("Loading the Derby jdbc driver...");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(CSdriver);
         clazz.getConstructor().newInstance();
 	
 		System.out.println("Getting Derby database connection...");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5438
 		Connection connCS = DriverManager.getConnection(dbURLCS);
 		System.out.println("Successfully got the Derby database connection...");
 
@@ -55,6 +57,7 @@ public static void main(String[] args) throws Exception {
 		connCS.close();
 
 		// Shut down the database cleanly before exiting.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5437
 		try {
 			DriverManager.getConnection(dbURLCS + ";shutdown=true");
 		} catch (SQLException sqle) {
diff --git a/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/ApacheServerLogVTI.java b/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/ApacheServerLogVTI.java
index 4e56bab5a2..9cc6a66a47 100644
--- a/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/ApacheServerLogVTI.java
+++ b/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/ApacheServerLogVTI.java
@@ -65,6 +65,7 @@ public  class   ApacheServerLogVTI  extends XmlVTI
      * </p>
      */
     public  ApacheServerLogVTI( InputStream is )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6256
         throws Exception
     {        
         super
@@ -86,6 +87,7 @@ public  ApacheServerLogVTI( InputStream is )
     public  static  ApacheServerLogVTI  apacheNaturalLogFile( String xmlResourceName )
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6482
         return new ApacheServerLogVTI( new FileInputStream( xmlResourceName ) );
     }
     
@@ -104,6 +106,7 @@ public  static  ApacheServerLogVTI  apacheNaturalLogFile( String xmlResourceName
     public String getRawColumn(int columnIndex) throws SQLException
     {
         String  columnValue = super.getRawColumn( columnIndex );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
 
         if ( "-".equals( columnValue ) ) { return null; }
         else { return columnValue; }
diff --git a/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/DerbyJiraReportVTI.java b/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/DerbyJiraReportVTI.java
index 78bf908aa3..f027dc208e 100644
--- a/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/DerbyJiraReportVTI.java
+++ b/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/DerbyJiraReportVTI.java
@@ -65,6 +65,7 @@ public  class   DerbyJiraReportVTI  extends XmlVTI
      */
     public  DerbyJiraReportVTI( InputStream is )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6256
         super
             (
              is,
@@ -84,6 +85,7 @@ public  DerbyJiraReportVTI( InputStream is )
     public  static  DerbyJiraReportVTI  apacheNaturalJiraReport( String xmlResourceName )
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6482
         return new DerbyJiraReportVTI( new FileInputStream( xmlResourceName ) );
     }
     
@@ -103,6 +105,7 @@ public String getString( int columnIndex ) throws SQLException
     {
         String  rawValue = super.getString( columnIndex );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         if ( !"key".equals( getColumnName( columnIndex ) ) )
         { return rawValue; }
         else
diff --git a/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/PropertyFileVTI.java b/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/PropertyFileVTI.java
index ba3283d395..4f285b4142 100644
--- a/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/PropertyFileVTI.java
+++ b/java/demo/vtis/java/org/apache/derbyDemo/vtis/example/PropertyFileVTI.java
@@ -106,6 +106,7 @@ protected  String[]  parseRow( ) throws SQLException
         String[]    newRow = new String[ COLUMN_NAMES.length ];
         String      nextLine = null;
         String      oldLine = "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3129
 
         while( true )
         {
@@ -144,9 +145,11 @@ else if ( nextLine.length() == 0 )
         int         equalsIdx = nextLine.indexOf( '=' );
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3129
             if ( equalsIdx >= 0 )
             {
                 newRow[ PROPERTY_KEY ] = nextLine.substring( 0, equalsIdx );
+//IC see: https://issues.apache.org/jira/browse/DERBY-3129
                 newRow[ PROPERTY_VALUE ] = nextLine.substring( equalsIdx + 1, nextLine.length() );
             }
             else
diff --git a/java/demo/workingwithderby/WwdClientExample.java b/java/demo/workingwithderby/WwdClientExample.java
index c70367b206..f8e1864920 100644
--- a/java/demo/workingwithderby/WwdClientExample.java
+++ b/java/demo/workingwithderby/WwdClientExample.java
@@ -126,6 +126,7 @@ public static void main(String[] args)
             /*       Catch all exceptions and pass them to 
              *       the Throwable.printStackTrace method  */
             System.out.println(" . . . exception thrown:");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1997
             e.printStackTrace(System.out);
          }
          System.out.println("Getting Started With Derby JDBC program ending.");
diff --git a/java/demo/workingwithderby/WwdEmbedded.java b/java/demo/workingwithderby/WwdEmbedded.java
index f9a600b7fd..7f6e80368a 100644
--- a/java/demo/workingwithderby/WwdEmbedded.java
+++ b/java/demo/workingwithderby/WwdEmbedded.java
@@ -1,5 +1,6 @@
 /*
      Derby - WwdEmbedded.java
+//IC see: https://issues.apache.org/jira/browse/DERBY-2839
 
        Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
@@ -130,6 +131,7 @@ public static void main(String[] args)
             /*       Catch all exceptions and pass them to 
              *       the Throwable.printStackTrace method  */
             System.out.println(" . . . exception thrown:");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1997
             e.printStackTrace(System.out);
          }
          System.out.println("Getting Started With Derby JDBC program ending.");
diff --git a/java/demo/workingwithderby/WwdUtils.java b/java/demo/workingwithderby/WwdUtils.java
index c11292eef8..a410baa4b8 100644
--- a/java/demo/workingwithderby/WwdUtils.java
+++ b/java/demo/workingwithderby/WwdUtils.java
@@ -1,5 +1,6 @@
 /*
      Derby - WwdUtils.java - utilitity methods used by WwdEmbedded.java
+//IC see: https://issues.apache.org/jira/browse/DERBY-1596
 
         Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
@@ -82,4 +83,4 @@ public static void main  (String[] args) {
       } while (! answer.equals("exit")) ;
    }
 
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.client/org/apache/derby/client/BasicClientDataSource.java b/java/org.apache.derby.client/org/apache/derby/client/BasicClientDataSource.java
index 40f770eaaa..4b92cc7a0c 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/BasicClientDataSource.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/BasicClientDataSource.java
@@ -113,6 +113,7 @@ public class BasicClientDataSource
     private final static long serialVersionUID = 1894299584216955554L;
     public final static String className__ =
             "org.apache.derby.client.BasicClientDataSource";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
     // ---------------------------- traceLevel -------------------------------
     //
@@ -1492,6 +1493,7 @@ public Connection getConnection(String user, String password)
     private Connection getConnectionX(LogWriter dncLogWriter,
                                       String user, String password)
             throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return ClientAutoloadedDriver.getFactory().newNetConnection(
                 dncLogWriter, user, password, this, -1, false);
 
@@ -1616,6 +1618,7 @@ private static PooledConnection getPooledConnectionX(
             String user,
             String password) throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             return ClientAutoloadedDriver.getFactory().newClientPooledConnection(ds,
                     dncLogWriter, user, password);
     }
@@ -1664,6 +1667,7 @@ private static XAConnection getXAConnectionX(LogWriter dncLogWriter,
         BasicClientDataSource ds, String user, String password)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return ClientAutoloadedDriver.getFactory().newClientXAConnection(ds,
                 dncLogWriter, user, password);
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/ClientConnectionPoolDataSourceInterface.java b/java/org.apache.derby.client/org/apache/derby/client/ClientConnectionPoolDataSourceInterface.java
index e383ba5d88..4c92d444cf 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/ClientConnectionPoolDataSourceInterface.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/ClientConnectionPoolDataSourceInterface.java
@@ -27,6 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Specifies Derby extensions to the {@code java.sqlx.ConnectionPoolDataSource}.
  */
 public interface ClientConnectionPoolDataSourceInterface
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     extends ClientDataSourceInterface, ConnectionPoolDataSource {
     /**
      * Returns the maximum number of JDBC prepared statements a connection is
diff --git a/java/org.apache.derby.client/org/apache/derby/client/ClientDataSourceFactory.java b/java/org.apache.derby.client/org/apache/derby/client/ClientDataSourceFactory.java
index 4c7a23b12a..f2d5f7f89f 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/ClientDataSourceFactory.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/ClientDataSourceFactory.java
@@ -89,6 +89,7 @@ public ClientDataSourceFactory() {}
      * @throws Exception if recreating the object fails
      */
     public Object getObjectInstance(Object refObj,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                     Name name,
                                     Context nameContext,
                                     Hashtable environment) throws Exception {
@@ -101,11 +102,13 @@ public Object getObjectInstance(Object refObj,
             if (className != null &&
                     className.startsWith("org.apache.derby.jdbc.Client")) {
                 // Create the proper data source object shell.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Class<?> clazz = Class.forName(className);
                 ds = clazz.getConstructor().newInstance();
 
                 // Fill in the data source object shell with values from the
                 // jndi reference.
+//IC see: https://issues.apache.org/jira/browse/DERBY-446
                 ClientDataSourceFactory.setBeanProperties(ds, ref);
             }
         }
@@ -142,6 +145,7 @@ private static void setBeanProperties(Object ds, Reference ref)
 
             String methodName = "set"
                     + propertyName.substring(0, 1).toUpperCase(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             Locale.ENGLISH)
                     + propertyName.substring(1);
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/ClientPooledConnection.java b/java/org.apache.derby.client/org/apache/derby/client/ClientPooledConnection.java
index bb7b3facbd..5da3d59077 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/ClientPooledConnection.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/ClientPooledConnection.java
@@ -54,6 +54,7 @@ public class ClientPooledConnection implements PooledConnection {
     /** List of {@code ConnectionEventListener}s. Never {@code null}. */
     private ArrayList<ConnectionEventListener> listeners_ =
             new ArrayList<ConnectionEventListener>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
     /**
      * The number of iterators going through the list of connection event
@@ -89,6 +90,7 @@ public class ClientPooledConnection implements PooledConnection {
      * the listeners fired in the same thread add or remove listeners.
      */
     private final CopyOnWriteArrayList<StatementEventListener>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             statementEventListeners =
                     new CopyOnWriteArrayList<StatementEventListener>();
 
@@ -106,6 +108,7 @@ public class ClientPooledConnection implements PooledConnection {
      *      in the database, or problems communicating with the database
      */
     public ClientPooledConnection(BasicClientDataSource ds,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                   LogWriter logWriter,
                                   String user,
                                   String password) throws SQLException {
@@ -114,6 +117,7 @@ public ClientPooledConnection(BasicClientDataSource ds,
         if (ds.maxStatementsToPool() <= 0) {
             this.statementCache = null;
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3329
             this.statementCache =
                     new JDBCStatementCache(ds.maxStatementsToPool());
         }
@@ -126,14 +130,18 @@ public ClientPooledConnection(BasicClientDataSource ds,
             //PooledConnection which will then raise the events
             //on the listeners
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             physicalConnection_ =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             ClientAutoloadedDriver.getFactory().newNetConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
                     logWriter_,
                     user,
                     password,
                     ds,
                     -1,
                     false,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     ClientPooledConnection.this);
         } catch (SqlException se) {
             throw se.getSQLException();
@@ -155,10 +163,12 @@ public ClientPooledConnection(BasicClientDataSource ds,
      *      in the database, or problems communicating with the database
      */
     public ClientPooledConnection(BasicClientDataSource ds,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                   LogWriter logWriter,
                                   String user,
                                   String password,
                                   int rmId) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3329
         logWriter_ = logWriter;
         rmId_ = rmId;
 
@@ -171,12 +181,15 @@ public ClientPooledConnection(BasicClientDataSource ds,
         }
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             netXAPhysicalConnection_ = new NetXAConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
                     logWriter,
                     user,
                     password,
                     ds,
                     rmId,
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
                     true,
                     this);
         } catch ( SqlException se ) {
@@ -204,6 +217,7 @@ protected void finalize() throws Throwable {
             logWriter_.traceEntry(this, "finalize");
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         try {
             close();
         } finally {
@@ -222,6 +236,7 @@ protected void finalize() throws Throwable {
      *      occurs.
      */
     public synchronized void close() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (logWriter_ != null) {
@@ -270,6 +285,7 @@ public synchronized Connection getConnection() throws SQLException {
                 // to reset the connection state to the default on 
                 // PooledConnection.getConnection() otherwise the 
                 // isolation level and holdability was not correct and out of sync with the server.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3581
                 physicalConnection_.reset(logWriter_);
             }
             else {
@@ -282,6 +298,7 @@ public synchronized Connection getConnection() throws SQLException {
             }
             return logicalConnection_;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-796
         catch (SqlException se)
         {
             throw se.getSQLException();
@@ -324,8 +341,10 @@ private void createLogicalConnection() throws SqlException {
             logicalConnection_.closeWithoutRecyclingToPool();
         }
         if (this.statementCache == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             logicalConnection_ = ClientAutoloadedDriver.getFactory().newLogicalConnection(
                                                         physicalConnection_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
                                                         this);
         } else {
             logicalConnection_ = ClientAutoloadedDriver.getFactory().
@@ -335,6 +354,7 @@ private void createLogicalConnection() throws SqlException {
     }
 
     public synchronized void addConnectionEventListener(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3309
                                             ConnectionEventListener listener) {
         if (logWriter_ != null) {
             logWriter_.traceEntry(this, "addConnectionEventListener", listener);
@@ -351,6 +371,7 @@ public synchronized void addConnectionEventListener(
             // we were able to synchronize on this, that someone is us. Clone
             // the list of listeners in order to prevent invalidation of the
             // iterator.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             listeners_ = new ArrayList<ConnectionEventListener>(listeners_);
         }
         listeners_.add(listener);
@@ -366,6 +387,7 @@ public synchronized void removeConnectionEventListener(
             // we were able to synchronize on this, that someone is us. Clone
             // the list of listeners in order to prevent invalidation of the
             // iterator.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             listeners_ = new ArrayList<ConnectionEventListener>(listeners_);
         }
         listeners_.remove(listener);
@@ -385,6 +407,7 @@ public synchronized void recycleConnection() {
         // Null out the reference to the logical connection that is currently
         // being closed.
         this.logicalConnection_ = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3379
 
         fireConnectionEventListeners(null);
     }
@@ -399,6 +422,7 @@ public synchronized void recycleConnection() {
      */
     public void informListeners(SqlException exception) {
         // only report fatal error  
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (exception.getErrorCode() < ExceptionSeverity.SESSION_SEVERITY)
             return;
 
@@ -421,6 +445,7 @@ private void fireConnectionEventListeners(SqlException exception) {
                 new ConnectionEvent(this) :
                 new ConnectionEvent(this, exception.getSQLException());
             eventIterators++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-796
             try {
                 for (Iterator it = listeners_.iterator(); it.hasNext(); ) {
                     final ConnectionEventListener listener =
@@ -459,6 +484,7 @@ public synchronized void nullLogicalConnection() {
      * error occurred events
      */
     public void addStatementEventListener(StatementEventListener listener) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         if (logWriter_ != null) {
             logWriter_.traceEntry(this, "addStatementEventListener", listener);
         }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/ClientXAConnection.java b/java/org.apache.derby.client/org/apache/derby/client/ClientXAConnection.java
index daf4da751d..51d2c0ec4e 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/ClientXAConnection.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/ClientXAConnection.java
@@ -46,8 +46,10 @@ public class ClientXAConnection extends ClientPooledConnection implements XAConn
     private NetXAConnection controlCon_ = null;
 
     public ClientXAConnection(BasicClientDataSource ds,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
                               LogWriter logWtr,
                               String userId,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                               String password) throws SQLException {
         super(ds, logWtr, userId, password, getUnigueRmId());
 
@@ -57,6 +59,7 @@ public ClientXAConnection(BasicClientDataSource ds,
         // Note: conApp will be set after this call
         logicalCon_ = super.getConnection();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         netXares_ = new NetXAResource(this, netXAPhysicalConnection_);
         xares_ = netXares_;
     }
@@ -88,6 +91,7 @@ public XAResource getXAResource() throws SQLException {
             logWriter_.traceExit(this, "getXAResource", xares_);
         }
         // DERBY-2532
+//IC see: https://issues.apache.org/jira/browse/DERBY-2532
         if (super.physicalConnection_ == null) {
             throw new SqlException(logWriter_,
                     new ClientMessageId(SQLState.NO_CURRENT_CONNECTION)
diff --git a/java/org.apache.derby.client/org/apache/derby/client/ClientXADataSourceInterface.java b/java/org.apache.derby.client/org/apache/derby/client/ClientXADataSourceInterface.java
index ae08c5a59f..5f1203b665 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/ClientXADataSourceInterface.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/ClientXADataSourceInterface.java
@@ -31,9 +31,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public interface ClientXADataSourceInterface
     extends ClientDataSourceInterface, XADataSource {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     /** Added by Java 9 */
     public default ShardingKeyBuilder createShardingKeyBuilder()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
         throws SQLException
     {
         throw new java.sql.SQLFeatureNotSupportedException();
diff --git a/java/org.apache.derby.client/org/apache/derby/client/ClientXid.java b/java/org.apache.derby.client/org/apache/derby/client/ClientXid.java
index 6736396e1b..db7580178b 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/ClientXid.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/ClientXid.java
@@ -178,6 +178,7 @@ public byte[] getGlobalTransactionId() {
     // return fields of Xid
     //
     public byte[] getData() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return data_.clone();
     }
 
@@ -197,6 +198,7 @@ public int hashCode() {
     }
 
     public boolean equals(Object obj) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (obj == null) {
             return false;
         }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/Agent.java b/java/org.apache.derby.client/org/apache/derby/client/am/Agent.java
index 7be42a67f0..d0e558a493 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/Agent.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/Agent.java
@@ -30,12 +30,14 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public abstract class Agent {
     SqlException accumulatedReadExceptions_ = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     private boolean enableBatchedExceptionTracking_;
     private int batchedExceptionLabelIndex_;
     private boolean[] batchedExceptionGenerated_;
 
     ClientConnection connection_; // made friendly for lobs only, refactor !!
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     SectionManager sectionManager_ = null;
 
@@ -66,6 +68,7 @@ void checkForDeferredExceptions() throws SqlException {
      * @exception SqlException if the type is not supported
      */
     void checkForSupportedDataType(int dataType) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         // JDBC 4.0 javadoc for setObject() says:
         //
@@ -79,9 +82,11 @@ void checkForSupportedDataType(int dataType) throws SqlException {
         // (sort of) JAVA_OBJECT.
 
         switch (dataType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case Types.ARRAY:
         case Types.DATALINK:
         case Types.DISTINCT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
         case Types.NCHAR:
         case Types.NCLOB:
         case Types.NVARCHAR:
@@ -100,6 +105,7 @@ void checkForSupportedDataType(int dataType) throws SqlException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void accumulateDeferredException(SqlException e) {
         if (deferredException_ == null) {
             deferredException_ = e;
@@ -124,7 +130,9 @@ private void resetAgent(LogWriter logWriter) {
         deferredException_ = null;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void resetAgent(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientConnection connection,
         LogWriter logWriter,
         int loginTimeout,
@@ -140,6 +148,7 @@ void resetAgent(
     //-------------------- entry points ------------------------------------------
 
     public final boolean loggingEnabled() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return logWriter_ != null;
     }
 
@@ -233,6 +242,7 @@ public final void flow(ClientStatement statement) throws SqlException {
         beginReadChain(statement);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final void flowBatch(ClientStatement statement, int batchSize)
             throws SqlException {
         endBatchedWriteChain();
@@ -259,6 +269,7 @@ public void close() throws SqlException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final void disconnectEvent() {
         // closes client-side resources associated with database connection
         try {
@@ -274,6 +285,7 @@ public void beginWriteChain(ClientStatement statement) throws SqlException {
         connection_.writeTransactionStart(statement);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final void beginBatchedWriteChain(ClientStatement statement)
             throws SqlException {
         beginWriteChain(statement);
@@ -286,6 +298,7 @@ private final void endBatchedWriteChain() {
     }
 
     protected void beginReadChain(ClientStatement statement)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         connection_.readTransactionStart();
     }
@@ -306,9 +319,11 @@ public void endReadChain() throws SqlException {
         checkForExceptions();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final void endBatchedReadChain(long[] updateCounts,
                                    SqlException accumulatedExceptions)
             throws BatchUpdateException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         disableBatchedExceptionTracking();
         for (int i = 0; i < batchedExceptionGenerated_.length; i++) {
@@ -324,6 +339,7 @@ final void endBatchedReadChain(long[] updateCounts,
             }
         }
         if (accumulatedExceptions != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             throw ClientAutoloadedDriver.getFactory().newBatchUpdateException(logWriter_,
                 new ClientMessageId(SQLState.BATCH_NON_ATOMIC_FAILURE),
                 null, updateCounts, accumulatedExceptions);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/AsciiStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/AsciiStream.java
index 7ec970b564..57399e9847 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/AsciiStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/AsciiStream.java
@@ -25,12 +25,15 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.io.Reader;
 import java.io.StringReader;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class AsciiStream extends InputStream {
     private Reader reader_;
     private String materializedString_;
     private int charsRead_ = 0;
     
     AsciiStream(String materializedString){
+//IC see: https://issues.apache.org/jira/browse/DERBY-525
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         this(materializedString,new StringReader(materializedString));
     }
     
@@ -44,6 +47,8 @@ public int read() throws IOException {
         ++charsRead_;
         if (oneChar != -1) // if not eos
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-525
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if(oneChar <= 0x00ff)
             return oneChar;
         else
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/BlobLocatorInputStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/BlobLocatorInputStream.java
index a519137bce..dd552e07bd 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/BlobLocatorInputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/BlobLocatorInputStream.java
@@ -41,6 +41,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * this.  A more efficient skip implementation should also be
  * straight-forward.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class BlobLocatorInputStream extends InputStream
 {
 
@@ -55,7 +56,9 @@ class BlobLocatorInputStream extends InputStream
      * @throws SqlException if an error occurs when obtaining the
      *         length of the <code>Blob</code>.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     BlobLocatorInputStream(ClientConnection connection, ClientBlob blob)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         throws SqlException
     {        
         if (SanityManager.DEBUG) {
@@ -88,20 +91,25 @@ class BlobLocatorInputStream extends InputStream
      * @throws SqlException if an error occurs when obtaining the
      *         length of the <code>Blob</code>.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     BlobLocatorInputStream(ClientConnection connection, ClientBlob blob,
                                   long position, long length) 
         throws SqlException
     {    
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
             SanityManager.ASSERT(blob.isLocator());
         }
         this.connection = connection;
         this.blob = blob;
         this.currentPos = position;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
         if (length != -1) {//verify if length is -1
             this.maxPos = Math.min(blob.sqlLength(), position + length - 1);
         }
         else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             this.maxPos = -1;
         }
     }
@@ -119,6 +127,7 @@ public int read() throws IOException
             return -1;
         } else {
             // convert byte in range [-128,127] to int in range [0,255]
+//IC see: https://issues.apache.org/jira/browse/DERBY-3226
             return bytes[0] & 0xff;
         }
     }
@@ -161,6 +170,7 @@ private byte[] readBytes(int len) throws IOException
             int actualLength = -1;
             //check if maxPos has been set and calculate actualLength
             //based on that.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             if(maxPos != -1) {
                 //maxPos has been set. use maxPos to calculate the
                 //actual length based on the value set for maxPos.
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/BlobLocatorOutputStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/BlobLocatorOutputStream.java
index 290aecce95..aff97089b4 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/BlobLocatorOutputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/BlobLocatorOutputStream.java
@@ -37,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * buffering of data is done.  Hence, for efficiency #write(byte[])
  * should be used instead of #write(int).  
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class BlobLocatorOutputStream extends OutputStream {
     
     /**
@@ -50,11 +51,14 @@ class BlobLocatorOutputStream extends OutputStream {
      * @param pos the position in the <code>BLOB</code> value at which
      *        to start writing; the first position is 1
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     BlobLocatorOutputStream(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientConnection connection,
         ClientBlob blob,
         long pos) throws SqlException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(blob.isLocator());
         }
@@ -95,6 +99,7 @@ public void write(byte[] b) throws IOException
      */
     public void write(byte[] b, int off, int len) throws IOException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         if (len == 0) return;
         if ((off < 0) || (off > b.length) || (len < 0) || 
             (off+len > b.length) || (off+len < 0)) {
@@ -120,8 +125,10 @@ public void write(byte[] b, int off, int len) throws IOException
     private void writeBytes(byte[] b) throws IOException
     {
         try {         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             blob.setBytesX(currentPos, b, 0, b.length);
             currentPos += b.length;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         } catch (SqlException ex) {
             IOException ioEx= new IOException();
             ioEx.initCause(ex);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/BlobOutputStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/BlobOutputStream.java
index b62ffc4365..21ee10bf7c 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/BlobOutputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/BlobOutputStream.java
@@ -26,6 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.io.OutputStream;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class BlobOutputStream extends OutputStream {
     private ClientBlob blob_;
     private long offset_;
@@ -35,6 +36,7 @@ class BlobOutputStream extends OutputStream {
         offset_ = offset;
         
         /*
+//IC see: https://issues.apache.org/jira/browse/DERBY-796
             offset_=1 while blob_.binaryString_.length - blob_.dataOffset_ = 0
             for a empty Blob hence check for offset_-1
          */
@@ -58,6 +60,7 @@ public void write(byte b[], int off, int len) throws IOException {
         } else if (len == 0) {
             return;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         writeX(b, off, len);
     }
 
@@ -72,6 +75,7 @@ private void writeX(byte b[], int off, int len)
                 = b[off + i];
         }
         blob_.binaryStream_ 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             = new ByteArrayInputStream(blob_.binaryString_);
         blob_.setSqlLength(blob_.binaryString_.length - blob_.dataOffset_);
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ByteArrayCombinerStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/ByteArrayCombinerStream.java
index 7bc51375de..b3339dfb65 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ByteArrayCombinerStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ByteArrayCombinerStream.java
@@ -74,6 +74,7 @@ public class ByteArrayCombinerStream
      */
     public ByteArrayCombinerStream(ArrayList<byte[]> arraysIn, long length) {
         // Don't allow negative length.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         if (length < 0) {
             throw new IllegalArgumentException("Length cannot be negative: " +
                     length);
@@ -84,6 +85,7 @@ public ByteArrayCombinerStream(ArrayList<byte[]> arraysIn, long length) {
             // Copy references to the byte arrays to a new ArrayList.
             int arrayCount = arraysIn.size();
             byte[] tmpArray;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             arrays = new ArrayList<byte[]>(arrayCount);
             // Truncate data if there are more bytes then specified.
             // Done to simplify boundary checking in the read-methods.
@@ -112,6 +114,7 @@ public ByteArrayCombinerStream(ArrayList<byte[]> arraysIn, long length) {
             arrays = null;
         }
         // If we don't have enough data, throw exception.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         if (tmpRemaining > 0) {
             throw new IllegalArgumentException("Not enough data, " + 
                     tmpRemaining + " bytes short of specified length " +
@@ -166,6 +169,7 @@ public int read(byte[] buf, int offset, int length)
         } else {
             int toRead = 0;
             while (curArray != null && read < length) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
                 toRead = Math.min(curArray.length - off, length - read);
                 System.arraycopy(curArray, off, buf, offset + read, toRead);
                 read += toRead;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/CachingLogicalConnection.java b/java/org.apache.derby.client/org/apache/derby/client/am/CachingLogicalConnection.java
index f669a99f4d..39cd24e7c5 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/CachingLogicalConnection.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/CachingLogicalConnection.java
@@ -66,7 +66,9 @@ public CachingLogicalConnection(ClientConnection physicalConnection,
 
     public synchronized void close()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
         if (this.cacheInteractor != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
             this.cacheInteractor.closeOpenLogicalStatements();
             // Nullify reference to cache interactor to allow it to be GC'ed.
             // It should not be used again when, logical connection is closed.
@@ -115,6 +117,7 @@ public synchronized PreparedStatement prepareStatement(
                                                 int[] columnIndexes)
             throws SQLException {
         checkForNullPhysicalConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         PreparedStatement ps = null;
         if (columnIndexes != null && columnIndexes.length > 1) {
             // This should probably be extended to use a separate type of
@@ -136,6 +139,7 @@ public synchronized PreparedStatement prepareStatement(
             int generatedKeys = ClientStatement.RETURN_GENERATED_KEYS;
             // If indexes is null or empty, don't return autogenerated keys.
             if (columnIndexes == null || columnIndexes.length == 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 generatedKeys = ClientStatement.NO_GENERATED_KEYS;
             }
             ps = cacheInteractor.prepareStatement(sql, generatedKeys);
@@ -169,6 +173,7 @@ public synchronized PreparedStatement prepareStatement(
             int generatedKeys = ClientStatement.RETURN_GENERATED_KEYS;
             // If names is null or empty, don't return autogenerated keys.
             if (columnNames == null || columnNames.length == 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 generatedKeys = ClientStatement.NO_GENERATED_KEYS;
             }
             ps = cacheInteractor.prepareStatement(sql, generatedKeys);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/CallableLocatorProcedures.java b/java/org.apache.derby.client/org/apache/derby/client/am/CallableLocatorProcedures.java
index 51f79d810f..fde0184cb8 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/CallableLocatorProcedures.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/CallableLocatorProcedures.java
@@ -91,6 +91,7 @@ class CallableLocatorProcedures
      *
      * @param conn the connection to be used to prepare calls.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     CallableLocatorProcedures(ClientConnection conn)
     {
         this.connection = conn;
@@ -109,15 +110,18 @@ int blobCreateLocator() throws SqlException
         //is available is cached in the boolean
         //isLocatorSupportAvailable. If this is false
         //we can return -1
+//IC see: https://issues.apache.org/jira/browse/DERBY-2587
         if (!isLocatorSupportAvailable) {
             return INVALID_LOCATOR;
         }
         
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
             if (blobCreateLocatorCall == null ||
                     !blobCreateLocatorCall.openOnClient_) {
                 blobCreateLocatorCall = connection.prepareCallX
                         ("? = CALL SYSIBM.BLOBCREATELOCATOR()",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         ResultSet.TYPE_FORWARD_ONLY,
                         ResultSet.CONCUR_READ_ONLY,
                         connection.holdability());
@@ -165,10 +169,12 @@ int blobCreateLocator() throws SqlException
      */
     void blobReleaseLocator(int locator) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (blobReleaseLocatorCall == null ||
                 !blobReleaseLocatorCall.openOnClient_) {
             blobReleaseLocatorCall = connection.prepareCallX
                 ("CALL SYSIBM.BLOBRELEASELOCATOR(?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -177,6 +183,7 @@ void blobReleaseLocator(int locator) throws SqlException
         }
 
         blobReleaseLocatorCall.setIntX(1, locator);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             blobReleaseLocatorCall.executeX();
         } catch (SqlException sqle) {
@@ -201,10 +208,12 @@ long blobGetPositionFromLocator(int locator,
                                     int searchLocator, 
                                     long fromPosition) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (blobGetPositionFromLocatorCall == null ||
                 !blobGetPositionFromLocatorCall.openOnClient_) {
             blobGetPositionFromLocatorCall = connection.prepareCallX
                 ("? = CALL SYSIBM.BLOBGETPOSITIONFROMLOCATOR(?, ?, ?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -217,6 +226,7 @@ long blobGetPositionFromLocator(int locator,
         blobGetPositionFromLocatorCall.setIntX(2, locator);
         blobGetPositionFromLocatorCall.setIntX(3, searchLocator);
         blobGetPositionFromLocatorCall.setLongX(4, fromPosition);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             blobGetPositionFromLocatorCall.executeX();
         } catch (SqlException sqle) {
@@ -327,10 +337,12 @@ private long blobGetPositionFromBytes(int locator,
                                           int offset,
                                           int length) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (blobGetPositionFromBytesCall == null ||
                 !blobGetPositionFromBytesCall.openOnClient_) {
             blobGetPositionFromBytesCall = connection.prepareCallX
                 ("? = CALL SYSIBM.BLOBGETPOSITIONFROMBYTES(?, ?, ?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -352,6 +364,7 @@ private long blobGetPositionFromBytes(int locator,
         blobGetPositionFromBytesCall.setIntX(2, locator);
         blobGetPositionFromBytesCall.setBytesX(3, bytesToBeCompared);
         blobGetPositionFromBytesCall.setLongX(4, fromPosition);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             blobGetPositionFromBytesCall.executeX();
         } catch (SqlException sqle) {
@@ -371,9 +384,11 @@ private long blobGetPositionFromBytes(int locator,
      */
     long blobGetLength(int sourceLocator) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (blobGetLengthCall == null || !blobGetLengthCall.openOnClient_) {
             blobGetLengthCall = connection.prepareCallX
                 ("? = CALL SYSIBM.BLOBGETLENGTH(?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -383,6 +398,7 @@ long blobGetLength(int sourceLocator) throws SqlException
         }
 
         blobGetLengthCall.setIntX(2, sourceLocator);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             blobGetLengthCall.executeX();
         } catch (SqlException sqle) {
@@ -420,9 +436,11 @@ byte[] blobGetBytes(int sourceLocator, long fromPosition, int forLength)
     {
         if (forLength == 0) return new byte[0];
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (blobGetBytesCall == null || !blobGetBytesCall.openOnClient_) {
             blobGetBytesCall = connection.prepareCallX
                 ("? = CALL SYSIBM.BLOBGETBYTES(?, ?, ?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -437,6 +455,7 @@ byte[] blobGetBytes(int sourceLocator, long fromPosition, int forLength)
             blobGetBytesCall.setIntX(2, sourceLocator);
             blobGetBytesCall.setLongX(3, fromPosition + gotSoFar);
             blobGetBytesCall.setIntX(4, forLength - gotSoFar);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
             try {
                 blobGetBytesCall.executeX();
             } catch (SqlException sqle) {
@@ -493,9 +512,11 @@ void blobSetBytes(int sourceLocator,
                       int forLength, 
                       byte[] bytes) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (blobSetBytesCall == null || !blobSetBytesCall.openOnClient_) {
             blobSetBytesCall = connection.prepareCallX
                 ("CALL SYSIBM.BLOBSETBYTES(?, ?, ?, ?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -523,6 +544,7 @@ void blobSetBytes(int sourceLocator,
             blobSetBytesCall.setLongX(2, fromPosition + sentSoFar);
             blobSetBytesCall.setIntX(3, numBytesThisRound);
             blobSetBytesCall.setBytesX(4, bytesToBeSent);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
             try {
                 blobSetBytesCall.executeX();
             } catch (SqlException sqle) {
@@ -548,9 +570,11 @@ void blobSetBytes(int sourceLocator,
      */
     void blobTruncate(int sourceLocator, long length) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (blobTruncateCall == null || !blobTruncateCall.openOnClient_) {
             blobTruncateCall = connection.prepareCallX
                 ("CALL SYSIBM.BLOBTRUNCATE(?, ?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -560,6 +584,7 @@ void blobTruncate(int sourceLocator, long length) throws SqlException
 
         blobTruncateCall.setIntX(1, sourceLocator);
         blobTruncateCall.setLongX(2, length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             blobTruncateCall.executeX();
         } catch (SqlException sqle) {
@@ -581,15 +606,20 @@ int clobCreateLocator() throws SqlException
         //is available is cached in the boolean
         //isLocatorSupportAvailable. If this is false
         //we can return -1
+//IC see: https://issues.apache.org/jira/browse/DERBY-2587
         if (!isLocatorSupportAvailable) {
             return INVALID_LOCATOR;
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2587
+//IC see: https://issues.apache.org/jira/browse/DERBY-2587
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
             if (clobCreateLocatorCall == null ||
                     !clobCreateLocatorCall.openOnClient_) {
                 clobCreateLocatorCall = connection.prepareCallX
                         ("? = CALL SYSIBM.CLOBCREATELOCATOR()",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         ResultSet.TYPE_FORWARD_ONLY,
                         ResultSet.CONCUR_READ_ONLY,
                         ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -637,10 +667,12 @@ int clobCreateLocator() throws SqlException
      */
     void clobReleaseLocator(int locator) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (clobReleaseLocatorCall == null ||
                 !clobReleaseLocatorCall.openOnClient_) {
             clobReleaseLocatorCall = connection.prepareCallX
                 ("CALL SYSIBM.CLOBRELEASELOCATOR(?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -649,6 +681,7 @@ void clobReleaseLocator(int locator) throws SqlException
         }
 
         clobReleaseLocatorCall.setIntX(1, locator);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             clobReleaseLocatorCall.executeX();
         } catch (SqlException sqle) {
@@ -755,10 +788,12 @@ private long clobGetPositionFromString(int locator,
                                            int offset,
                                            int length) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (clobGetPositionFromStringCall == null ||
                 !clobGetPositionFromStringCall.openOnClient_) {
             clobGetPositionFromStringCall = connection.prepareCallX
                 ("? = CALL SYSIBM.CLOBGETPOSITIONFROMSTRING(?, ?, ?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -777,8 +812,10 @@ private long clobGetPositionFromString(int locator,
         }
 
         clobGetPositionFromStringCall.setIntX(2, locator);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
         clobGetPositionFromStringCall.setStringX(3, stringToBeCompared);
         clobGetPositionFromStringCall.setLongX(4, fromPosition);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             clobGetPositionFromStringCall.executeX();
         } catch (SqlException sqle) {
@@ -804,10 +841,12 @@ long clobGetPositionFromLocator(int locator,
                                     int searchLocator, 
                                     long fromPosition) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (clobGetPositionFromLocatorCall == null ||
                 !clobGetPositionFromLocatorCall.openOnClient_) {
             clobGetPositionFromLocatorCall = connection.prepareCallX
                 ("? = CALL SYSIBM.CLOBGETPOSITIONFROMLOCATOR(?, ?, ?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -820,6 +859,7 @@ long clobGetPositionFromLocator(int locator,
         clobGetPositionFromLocatorCall.setIntX(2, locator);
         clobGetPositionFromLocatorCall.setIntX(3, searchLocator);
         clobGetPositionFromLocatorCall.setLongX(4, fromPosition);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             clobGetPositionFromLocatorCall.executeX();
         } catch (SqlException sqle) {
@@ -838,9 +878,11 @@ long clobGetPositionFromLocator(int locator,
      */
     long clobGetLength(int sourceLocator) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (clobGetLengthCall == null || !clobGetLengthCall.openOnClient_) {
             clobGetLengthCall = connection.prepareCallX
                 ("? = CALL SYSIBM.CLOBGETLENGTH(?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -850,6 +892,7 @@ long clobGetLength(int sourceLocator) throws SqlException
         }
 
         clobGetLengthCall.setIntX(2, sourceLocator);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             clobGetLengthCall.executeX();
         } catch (SqlException sqle) {
@@ -886,11 +929,14 @@ String clobGetSubString(int sourceLocator, long fromPosition, int forLength)
         throws SqlException
     {
         if (forLength == 0) return "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2495
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (clobGetSubStringCall == null ||
                 !clobGetSubStringCall.openOnClient_) {
             clobGetSubStringCall = connection.prepareCallX
                 ("? = CALL SYSIBM.CLOBGETSUBSTRING(?, ?, ?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -906,6 +952,7 @@ String clobGetSubString(int sourceLocator, long fromPosition, int forLength)
             clobGetSubStringCall.setIntX(2, sourceLocator);
             clobGetSubStringCall.setLongX(3, fromPosition + gotSoFar);
             clobGetSubStringCall.setIntX(4, forLength - gotSoFar);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
             try {
                 clobGetSubStringCall.executeX();
             } catch (SqlException sqle) {
@@ -963,9 +1010,11 @@ void clobSetString(int sourceLocator,
                        int forLength, 
                        String string) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (clobSetStringCall == null || !clobSetStringCall.openOnClient_) {
             clobSetStringCall = connection.prepareCallX
                 ("CALL SYSIBM.CLOBSETSTRING(?, ?, ?, ?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -989,6 +1038,7 @@ void clobSetString(int sourceLocator,
             clobSetStringCall.setLongX(2, fromPosition + sentSoFar);
             clobSetStringCall.setIntX(3, numCharsThisRound);
             clobSetStringCall.setStringX(4, stringToBeSent);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
             try {
                 clobSetStringCall.executeX();
             } catch (SqlException sqle) {
@@ -1014,9 +1064,11 @@ void clobSetString(int sourceLocator,
      */
     void clobTruncate(int sourceLocator, long length) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         if (clobTruncateCall == null || !clobTruncateCall.openOnClient_) {
             clobTruncateCall = connection.prepareCallX
                 ("CALL SYSIBM.CLOBTRUNCATE(?, ?)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  ResultSet.TYPE_FORWARD_ONLY,
                  ResultSet.CONCUR_READ_ONLY,
                  ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -1047,6 +1099,7 @@ void clobTruncate(int sourceLocator, long length) throws SqlException
      */
     private SqlException handleInvalidLocator(SqlException sqle)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2770
         SqlException ex = sqle;
         while (ex != null) {
             if (ex.getSQLState().compareTo
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientBlob.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientBlob.java
index 6db834da9b..47dcca2cfc 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientBlob.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientBlob.java
@@ -38,6 +38,7 @@ public class ClientBlob extends Lob implements Blob {
 
     // Only used for input purposes.  For output, each getBinaryStream call
     // must generate an independent stream.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     InputStream binaryStream_ = null;
     int dataOffset_;
     
@@ -52,11 +53,13 @@ public ClientBlob(byte[] binaryString,
         
         binaryString_ = binaryString;
         dataType_ |= BINARY_STRING;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         setSqlLength(binaryString.length - dataOffset);
         dataOffset_ = dataOffset;
     }
 
     // CTOR for input:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientBlob(Agent agent,
                 InputStream binaryStream,
                 int length) {
@@ -66,6 +69,7 @@ public ClientBlob(byte[] binaryString,
         
         binaryStream_ = binaryStream;
         dataType_ |= BINARY_STREAM;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         setSqlLength(length);
     }
 
@@ -89,11 +93,13 @@ public ClientBlob(byte[] binaryString,
      * @param agent
      * @param binaryStream the stream to get data from
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientBlob(Agent agent, InputStream binaryStream) {
         
         super(agent,
               isLayerBStreamingPossible(agent));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         binaryStream_ = binaryStream;
         dataType_ |= BINARY_STREAM;
     }
@@ -106,6 +112,7 @@ public ClientBlob(byte[] binaryString,
      */
     public ClientBlob(Agent agent, int locator)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         super(agent, false);
         locator_ = locator;
         dataType_ |= LOCATOR;
@@ -117,6 +124,7 @@ public long length() throws SQLException {
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (agent_.connection_) {
@@ -124,6 +132,7 @@ public long length() throws SQLException {
                     agent_.logWriter_.traceEntry(this, "length");
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
                 checkForClosedConnection();
                 long retVal = super.sqlLength();
 
@@ -147,6 +156,7 @@ public long length() throws SQLException {
      * @throws org.apache.derby.client.am.SqlException
      * @return length of Blob in bytes
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
     long getLocatorLength() throws SqlException
     {
         return agent_.connection_.locatorProcedureCall()
@@ -188,8 +198,10 @@ public byte[] getBytes(long pos, int length) throws SQLException {
                 }
                 if (pos <= 0) {
                     throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         new ClientMessageId(SQLState.BLOB_BAD_POSITION), pos);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
                 if (pos > sqlLength() + 1) {
                     throw new SqlException(agent_.logWriter_, 
                         new ClientMessageId(SQLState.BLOB_POSITION_TOO_LARGE), 
@@ -219,7 +231,9 @@ private byte[] getBytesX(long pos, int length) throws SqlException {
         long actualLength;
         // actual length is the lesser of the number of bytes requested
         // and the number of bytes available from pos to the end
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         actualLength = Math.min(sqlLength() - pos + 1, (long) length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         byte[] retVal; 
         if (isLocator()) {
             retVal = agent_.connection_.locatorProcedureCall()
@@ -237,12 +251,14 @@ public InputStream getBinaryStream() throws SQLException {
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (agent_.connection_) {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "getBinaryStream");
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 InputStream retVal = getBinaryStreamX();
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "getBinaryStream", retVal);
@@ -256,6 +272,7 @@ public InputStream getBinaryStream() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     InputStream getBinaryStreamX() throws SqlException {
         checkForClosedConnection();
 
@@ -267,9 +284,11 @@ InputStream getBinaryStreamX() throws SqlException {
             //UpdateSensitive stream which wraps inside it a 
             //Buffered Locator stream. The wrapper watches out 
             //for updates.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             return new UpdateSensitiveBlobLocatorInputStream
                     (agent_.connection_, this);
         } else {  // binary string
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return new ByteArrayInputStream(binaryString_, dataOffset_,
                                            binaryString_.length - dataOffset_);
         }
@@ -279,6 +298,7 @@ public long position(byte[] pattern, long start) throws SQLException {
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (agent_.connection_) {
@@ -309,6 +329,7 @@ public long position(byte[] pattern, long start) throws SQLException {
     private long positionX(byte[] pattern, long start) throws SqlException {
         checkForClosedConnection();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         if (isLocator()) {
             return agent_.connection_.locatorProcedureCall()
                 .blobGetPositionFromBytes(locator_, pattern, start);
@@ -321,6 +342,7 @@ public long position(Blob pattern, long start) throws SQLException {
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (agent_.connection_) {
@@ -333,6 +355,8 @@ public long position(Blob pattern, long start) throws SQLException {
                 }
                 if (start < 1) {
                     throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         new ClientMessageId(SQLState.BLOB_BAD_POSITION), start);
                 }
                 long pos = positionX(pattern, start);
@@ -352,7 +376,9 @@ private long positionX(Blob pattern, long start) throws SqlException {
         checkForClosedConnection();
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
             if (isLocator()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if ((pattern instanceof ClientBlob)
                     && ((ClientBlob )pattern).isLocator()) {
                     // Send locator for pattern to server
@@ -373,7 +399,9 @@ private long positionX(Blob pattern, long start) throws SqlException {
                                   pattern.getBytes(1L, (int )pattern.length()),
                                   start);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
             throw new SqlException(e);
         }
     }
@@ -385,6 +413,7 @@ public int setBytes(long pos, byte[] bytes) throws SQLException {
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (agent_.connection_) {
@@ -428,14 +457,17 @@ public int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLExcep
     }
 
     int setBytesX(long pos, byte[] bytes, int offset, int len)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         /*
+//IC see: https://issues.apache.org/jira/browse/DERBY-796
             Check if position is less than 0 and if true
             raise an exception
          */
         
         if (pos <= 0L) {
             throw new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     new ClientMessageId(SQLState.BLOB_BAD_POSITION), pos);
         }
         
@@ -447,6 +479,7 @@ int setBytesX(long pos, byte[] bytes, int offset, int len)
         
         if (pos  >= Integer.MAX_VALUE) {
             throw new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     new ClientMessageId(SQLState.BLOB_POSITION_TOO_LARGE), pos);
         }
         
@@ -473,7 +506,9 @@ int setBytesX(long pos, byte[] bytes, int offset, int len)
         }   
         
         final int length = Math.min((bytes.length - offset), len);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4738
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         if (isLocator()) {  
             byte[] ba = bytes;
             if ((offset > 0) || (length < bytes.length)) { 
@@ -491,6 +526,7 @@ int setBytesX(long pos, byte[] bytes, int offset, int len)
             //modified. Increment the
             //updateCount to reflect the
             //change.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             incrementUpdateCount();
         } else {
             if ((binaryString_.length - dataOffset_ - (int)pos + 1) < length) {
@@ -503,7 +539,9 @@ int setBytesX(long pos, byte[] bytes, int offset, int len)
             System.arraycopy(bytes, offset, 
                              binaryString_, (int) pos + dataOffset_ - 1, 
                              length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             binaryStream_ = new ByteArrayInputStream(binaryString_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
             setSqlLength(binaryString_.length - dataOffset_);
         }
         return length;
@@ -512,7 +550,9 @@ int setBytesX(long pos, byte[] bytes, int offset, int len)
     public OutputStream setBinaryStream(long pos) throws SQLException {
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             synchronized (agent_.connection_) {
                 if (agent_.loggingEnabled()) {
@@ -521,6 +561,7 @@ public OutputStream setBinaryStream(long pos) throws SQLException {
                 if (pos < 1) {
                     throw new SqlException(agent_.logWriter_,
                             new ClientMessageId(SQLState.BLOB_BAD_POSITION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                             pos);
                 }
                 
@@ -548,6 +589,14 @@ public OutputStream setBinaryStream(long pos) throws SQLException {
     public void truncate(long len) throws SQLException {
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
         checkValidity();
         try
         {
@@ -555,14 +604,17 @@ public void truncate(long len) throws SQLException {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, " truncate", (int) len);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
                 if (len < 0 || len > sqlLength()) {
                     throw new SqlException(agent_.logWriter_,
                         new ClientMessageId(SQLState.INVALID_API_PARAMETER),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         len, "len", "Blob.truncate()");
                 }
                 if (len == this.sqlLength()) {
                     return;
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
                 if (isLocator()) {
                     agent_.connection_.locatorProcedureCall()
                         .blobTruncate(locator_, len);
@@ -571,6 +623,7 @@ public void truncate(long len) throws SQLException {
                     //updated Increment the
                     //update count to reflect
                     //the change.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
                     incrementUpdateCount();
                 } else {
                     long newLength = (int) len + dataOffset_;
@@ -579,7 +632,9 @@ public void truncate(long len) throws SQLException {
                                      newbuf, 0, (int) newLength);
                     binaryString_ = newbuf;
                     binaryStream_ 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         = new ByteArrayInputStream(binaryString_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
                     setSqlLength(binaryString_.length - dataOffset_);
                 }
             }
@@ -602,6 +657,7 @@ public void truncate(long len) throws SQLException {
      * the Blob's resources
      */
     public void free()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1180
         throws SQLException {
         
         //calling free() on a already freed object is treated as a no-op
@@ -610,6 +666,7 @@ public void free()
         //now that free has been called the Blob object is no longer
         //valid
         isValid_ = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {            
             synchronized (agent_.connection_) {
                 if (agent_.loggingEnabled()) {
@@ -653,6 +710,7 @@ public InputStream getBinaryStream(long pos, long length)
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         try {
             synchronized (agent_.connection_) {
                 if (agent_.loggingEnabled()) {
@@ -668,12 +726,14 @@ public InputStream getBinaryStream(long pos, long length)
                     //that wraps inside it a Buffered InputStream.
                     //The wrapper watches out for updates to the
                     //underlying Blob.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
                     retVal = new UpdateSensitiveBlobLocatorInputStream
                                                       (agent_.connection_,
                                                        this,
                                                        pos,
                                                        length);
                 } else {  // binary string
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     retVal = new ByteArrayInputStream
                         (binaryString_, 
                          (int)(dataOffset_ + pos - 1), 
@@ -736,6 +796,7 @@ private boolean isSubString(byte[] pattern, int index) {
      */
     protected void materializeStream() throws SqlException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         binaryStream_ = super.materializeStream(binaryStream_, "java.sql.Blob");
     }
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientCallableStatement.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientCallableStatement.java
index 3ae55067e6..92a18e2539 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientCallableStatement.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientCallableStatement.java
@@ -45,6 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.Map;
 
 public class ClientCallableStatement extends ClientPreparedStatement
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     implements PreparedStatement, CallableStatement,
                PreparedStatementCallbackInterface {
     //---------------------navigational members-----------------------------------
@@ -100,9 +101,11 @@ public void reset(boolean fullReset) throws SqlException {
      * @throws SqlException on error
      */
     public ClientCallableStatement(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                              ClientConnection connection,
                              String sql,
                              int type, int concurrency, int holdability,
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
                              ClientPooledConnection cpc) throws SqlException {
         super(agent,
               connection,
@@ -118,6 +121,7 @@ public ClientCallableStatement(Agent agent,
     }
 
     public void resetCallableStatement(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                        ClientConnection connection,
                                        String sql,
                                        int type, int concurrency, int holdability) throws SqlException {
@@ -154,6 +158,7 @@ public void clearParameters() throws SQLException {
     }
 
     public void registerOutParameter(int parameterIndex, int jdbcType) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -177,6 +182,8 @@ void registerOutParameterX(int parameterIndex, int jdbcType) throws SqlException
     }
 
     public void registerOutParameter(int parameterIndex, int jdbcType, int scale) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -195,6 +202,7 @@ public void registerOutParameter(int parameterIndex, int jdbcType, int scale) th
 
     private void registerOutParameterX(int parameterIndex, int jdbcType, int scale) throws SqlException {
         super.checkForValidParameterIndex(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
         agent_.checkForSupportedDataType( jdbcType );
         checkForValidScale(scale);
         outputRegistered_ = true; // this variable is only used by Batch
@@ -204,9 +212,12 @@ private void registerOutParameterX(int parameterIndex, int jdbcType, int scale)
 
     /** Derby ignores the typeName argument because UDTs don't need it */
     public void registerOutParameter(int parameterIndex, int jdbcType, String typeName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1184
+//IC see: https://issues.apache.org/jira/browse/DERBY-447
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceEntry(this, "registerOutParameter", parameterIndex, jdbcType, typeName);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         registerOutParameter( parameterIndex, jdbcType );
     }
 
@@ -346,6 +357,7 @@ public long getLong(int parameterIndex) throws SQLException {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "getLong", parameterIndex);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2495
                 long result = getLongX(parameterIndex);
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "getLong", result);
@@ -359,6 +371,7 @@ public long getLong(int parameterIndex) throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2495
     long getLongX(int parameterIndex) throws SqlException {
         super.checkForClosedStatement();
         checkGetterPreconditions(parameterIndex);
@@ -416,6 +429,7 @@ public double getDouble(int parameterIndex) throws SQLException {
 
     /** @deprecated */
     public BigDecimal getBigDecimal(int parameterIndex, int scale)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SQLException, ArithmeticException {
         try
         {
@@ -425,6 +439,7 @@ public BigDecimal getBigDecimal(int parameterIndex, int scale)
                 }
                 super.checkForClosedStatement();
                 checkForValidScale(scale);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 BigDecimal result;
                 checkGetterPreconditions(parameterIndex);
                 setWasNull(parameterIndex);
@@ -452,6 +467,7 @@ public BigDecimal getBigDecimal(int parameterIndex) throws SQLException {
                     agent_.logWriter_.traceEntry(this, "getBigDecimal", parameterIndex);
                 }
                 super.checkForClosedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 BigDecimal result;
                 checkGetterPreconditions(parameterIndex);
                 setWasNull(parameterIndex);
@@ -578,6 +594,7 @@ public Timestamp getTimestamp(int parameterIndex) throws SQLException {
     }
 
     public String getString(int parameterIndex) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -612,6 +629,7 @@ public byte[] getBytes(int parameterIndex) throws SQLException {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "getBytes", parameterIndex);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2495
                 byte[] result = getBytesX(parameterIndex);
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "getBytes", result);
@@ -625,6 +643,7 @@ public byte[] getBytes(int parameterIndex) throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2495
     byte[] getBytesX(final int parameterIndex) throws SqlException 
     {
         super.checkForClosedStatement();
@@ -643,6 +662,7 @@ public Blob getBlob(int parameterIndex) throws SQLException {
                 super.checkForClosedStatement();
                 checkGetterPreconditions(parameterIndex);
                 setWasNull(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 Blob result = wasNullX() ? null :
                     singletonRowData_.getBlob(parameterIndex);
 
@@ -665,6 +685,7 @@ public Clob getClob(int parameterIndex) throws SQLException {
                 super.checkForClosedStatement();
                 checkGetterPreconditions(parameterIndex);
                 setWasNull(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 Clob result = wasNullX() ? null :
                     singletonRowData_.getClob(parameterIndex);
 
@@ -690,6 +711,7 @@ public Array getArray(int parameterIndex) throws SQLException {
                 super.checkForClosedStatement();
                 checkGetterPreconditions(parameterIndex);
                 setWasNull(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 Array result = wasNullX() ? null :
                     singletonRowData_.getArray(parameterIndex);
 
@@ -719,6 +741,7 @@ public Ref getRef(int parameterIndex) throws SQLException {
                 super.checkForClosedStatement();
                 checkGetterPreconditions(parameterIndex);
                 setWasNull(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 Ref result = wasNullX() ? null :
                     singletonRowData_.getRef(parameterIndex);
 
@@ -794,6 +817,7 @@ public void registerOutParameter(String parameterName, int sqlType) throws SQLEx
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceEntry(this, "registerOutParameter", parameterName, sqlType);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-400
         throw jdbcMethodNotImplemented();
     }
 
@@ -882,6 +906,7 @@ public void setDouble(String parameterName, double x) throws SQLException {
     }
 
     public void setBigDecimal(String parameterName, BigDecimal x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SQLException {
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceEntry(this, "setBigDecimal", parameterName, x);
@@ -914,10 +939,12 @@ public void setTime(String parameterName, Time x) throws SQLException {
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceEntry(this, "setTime", parameterName, x);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-400
         throw jdbcMethodNotImplemented();
     }
 
     public void setTimestamp(String parameterName, Timestamp x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SQLException {
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceEntry(this, "setTimestamp", parameterName, x);
@@ -963,6 +990,7 @@ public void setObject(String parameterName, Object x) throws SQLException {
     }
 
     public void setCharacterStream(String parameterName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                    Reader reader,
                                    int length) throws SQLException {
         if (agent_.loggingEnabled()) {
@@ -1137,6 +1165,7 @@ public Array getArray(String parameterName) throws SQLException {
     }
 
     public Date getDate(String parameterName, Calendar calendar)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SQLException {
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceEntry(this, "getDate", parameterName, calendar);
@@ -1170,6 +1199,7 @@ public URL getURL(String parameterName) throws SQLException {
     //-------------------------- JDBC 4.0 methods --------------------------------
     
     public Reader getCharacterStream(int parameterIndex)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1147
         throws SQLException {
         try {
             synchronized (connection_) {
@@ -1195,6 +1225,7 @@ public Reader getCharacterStream(int parameterIndex)
     }
 
     public final void setAsciiStream(String parameterName, InputStream x, long length)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             throws SQLException {
         throw SQLExceptionFactory.notImplemented("setAsciiStream(String,InputStream,long)");
     }
@@ -1401,6 +1432,7 @@ private SQLException    mismatchException( String targetTypeName, int parameterI
     public <T> T getObject(String parameterName, Class<T> type)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         throw jdbcMethodNotImplemented();
     }
 
@@ -1422,6 +1454,7 @@ public void completeExecuteCall(Sqlca sqlca, Cursor singletonParams) // no resul
         
         for ( int i = 0; i < cursorParamCount; i++ )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             if ( parameterMetaData_.sqlxParmmode_[ i ] ==
                  ClientParameterMetaData.parameterModeInOut )
             {
@@ -1440,8 +1473,10 @@ public void completeExecuteCall(Sqlca sqlca, Cursor singletonParams) // no resul
                 //
                 // special case to coerce Integer to Short for SMALLINT
                 //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if ( parameterMetaData_.types_[ i ] == ClientTypes.SMALLINT )
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     if (returnArg instanceof Integer)
                     {
                         returnArg = ((Integer) returnArg).shortValue();
@@ -1461,6 +1496,7 @@ public void completeExecuteCall(Sqlca sqlca, Cursor singletonParams) // no resul
      * @return name of java.sql interface
      */
     protected String getJdbcStatementInterfaceName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1364
         return "java.sql.CallableStatement";
     }
 
@@ -1470,12 +1506,14 @@ private void checkGetterPreconditions(int parameterIndex) throws SqlException {
     }
 
     private void checkForValidOutParameter(int parameterIndex) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (parameterMetaData_ == null ||
             parameterMetaData_.sqlxParmmode_[parameterIndex - 1] <
                 ClientParameterMetaData.parameterModeInOut) {
 
             throw new SqlException(agent_.logWriter_, 
                 new ClientMessageId(SQLState.PARAM_NOT_OUT_OR_INOUT), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 parameterIndex);
         }
     }
@@ -1488,8 +1526,10 @@ private void setWasNull(int parameterIndex) {
         }
     }
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     SQLException jdbcMethodNotImplemented() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             super.checkForClosedStatement();
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientCallableStatement42.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientCallableStatement42.java
index 9911024e94..e165f3f4ee 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientCallableStatement42.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientCallableStatement42.java
@@ -46,6 +46,7 @@ public class ClientCallableStatement42 extends ClientCallableStatement
      * @throws SqlException on error
      */
     public ClientCallableStatement42(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientConnection connection,
         String sql,
         int type, int concurrency, int holdability,
@@ -56,6 +57,7 @@ public ClientCallableStatement42(Agent agent,
     public  void registerOutParameter( int parameterIndex, SQLType sqlType )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry( this, "registerOutParameter", parameterIndex, sqlType );
@@ -132,6 +134,7 @@ public  void registerOutParameter( String parameterName,  SQLType sqlType, Strin
     }
 
     public  void setObject
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ( int parameterIndex, Object x, SQLType sqlType )
         throws SQLException
     {
@@ -146,11 +149,13 @@ public  void registerOutParameter( String parameterName,  SQLType sqlType, Strin
     }
     
     public void setObject
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ( int parameterIndex, Object x, SQLType sqlType, int scaleOrLength )
         throws SQLException
     {
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 agent_.logWriter_.traceEntry( this, "setObject", parameterIndex, x, sqlType, scaleOrLength );
             }
             
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientClob.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientClob.java
index c31bf6e345..9af5d9b6c1 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientClob.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientClob.java
@@ -69,6 +69,7 @@ public ClientClob(Agent agent, String string) {
     // CTOR for output, when a btc isn't available; the encoding is
     public ClientClob(Agent agent,
                 byte[] unconvertedBytes,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                 Charset charset,
                 int dataOffset) throws SqlException {
 
@@ -89,6 +90,8 @@ public ClientClob(Agent agent,
                 dataOffset,
                 unconvertedBytes.length - dataOffset,
                 charset);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         setSqlLength(string_.length());
         dataType_ |= STRING;
     }
@@ -96,6 +99,7 @@ public ClientClob(Agent agent,
     // CTOR for ascii/unicode stream input
     //"ISO-8859-1", "UTF-8", or "UnicodeBigUnmarked"
     public ClientClob(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 InputStream inputStream,
                 Charset encoding,
                 int length) {
@@ -104,6 +108,7 @@ public ClientClob(Agent agent,
              false);
 
         setSqlLength(length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
 
         if (encoding.equals(Cursor.ISO_8859_1)) {
             asciiStream_ = inputStream;
@@ -115,6 +120,7 @@ public ClientClob(Agent agent,
             characterStream_ =
                     new InputStreamReader(inputStream, Cursor.UTF_16BE);
             dataType_ |= CHARACTER_STREAM;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
             setSqlLength(length / 2);
         }
     }
@@ -132,6 +138,7 @@ public ClientClob(Agent agent,
      * @param encoding encoding to use for characters. Only "ISO-8859-1" is
      *      allowed.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
     ClientClob(Agent agent, InputStream inputStream, Charset encoding)
             throws SqlException {
 
@@ -142,6 +149,10 @@ public ClientClob(Agent agent,
             asciiStream_ = inputStream;
             dataType_ |= ASCII_STREAM;
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.UNSUPPORTED_ENCODING),
                 encoding + " InputStream", "String/Clob");
@@ -151,10 +162,12 @@ public ClientClob(Agent agent,
     // CTOR for character stream input
     // THE ENCODING IS ASSUMED TO BE "UTF-16BE"
     ClientClob(Agent agent, Reader reader, int length) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         this(agent,
              false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         setSqlLength(length);
         characterStream_ = reader;
         dataType_ |= CHARACTER_STREAM;
@@ -169,6 +182,7 @@ public ClientClob(Agent agent,
      */
     public ClientClob(Agent agent, int locator)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
         super(agent, false);
         locator_ = locator;
         dataType_ |= LOCATOR;
@@ -185,6 +199,7 @@ public ClientClob(Agent agent, int locator)
      * @param reader the data to insert
      */
     ClientClob(Agent agent, Reader reader) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         this(agent,
              isLayerBStreamingPossible( agent ) );
@@ -217,6 +232,7 @@ public long length() throws SQLException {
                 }
 
                 long length = super.sqlLength();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
 
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "length", length);
@@ -270,6 +286,7 @@ public String getSubString(long pos, int length) throws SQLException {
 
                 if ( pos <= 0 ) {
                     throw new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         new ClientMessageId(SQLState.BLOB_BAD_POSITION), pos);
                 }
 
@@ -279,6 +296,7 @@ public String getSubString(long pos, int length) throws SQLException {
                         length);
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
                 if (pos > sqlLength() + 1) {
                     throw new SqlException(agent_.logWriter_,
                         new ClientMessageId(SQLState.BLOB_POSITION_TOO_LARGE),
@@ -300,11 +318,13 @@ public String getSubString(long pos, int length) throws SQLException {
 
     private String getSubStringX(long pos, int length) throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         checkForClosedConnection();
         // actual length is the lesser of the length requested
         // and the number of characters available from pos to the end
         long actualLength = Math.min(this.sqlLength() - pos + 1, (long) length);
         //Check to see if the Clob object is locator enabled.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
         if (isLocator()) {
             //The Clob object is locator enabled. Hence call the stored
             //procedure CLOBGETLENGTH to determine the length of the Clob.
@@ -331,6 +351,7 @@ public Reader getCharacterStream() throws SQLException {
                     agent_.logWriter_.traceEntry(this, "getCharacterStream");
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 Reader retVal = getCharacterStreamX();
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "getCharacterStream", retVal);
@@ -344,6 +365,7 @@ public Reader getCharacterStream() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     Reader getCharacterStreamX() throws SqlException {
         checkForClosedConnection();
 
@@ -353,6 +375,7 @@ Reader getCharacterStreamX() throws SqlException {
             //update sensitive Reader that wraps inside it a
             //Buffered Locator Reader. The wrapper class
             //watches out for updates.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             return new UpdateSensitiveClobLocatorReader
                     (agent_.connection_, this);
         }
@@ -361,6 +384,7 @@ else if (isCharacterStream())  // this Lob is used for input
             return characterStream_;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return new StringReader(string_);
     }
 
@@ -370,6 +394,7 @@ public InputStream getAsciiStream() throws SQLException {
         //the Clob object has been freed by calling free() on it
         checkValidity();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (agent_.connection_) {
@@ -377,6 +402,7 @@ public InputStream getAsciiStream() throws SQLException {
                     agent_.logWriter_.traceEntry(this, "getAsciiStream");
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 InputStream retVal = getAsciiStreamX();
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "getAsciiStream", retVal);
@@ -390,6 +416,7 @@ public InputStream getAsciiStream() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     InputStream getAsciiStreamX() throws SqlException {
         checkForClosedConnection();
 
@@ -403,10 +430,12 @@ else if(isLocator()) { // Check to see if this Lob is locator enabled
             //it a Buffered Locator enabled InputStream. The
             //wrapper watches out for updates to the underlying
             //Clob.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             return new UpdateSensitiveClobLocatorInputStream
                     (agent_.connection_,this);
         }
         else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return new AsciiStream(string_, new StringReader(string_));
         }
     }
@@ -417,6 +446,7 @@ public long position(String searchstr, long start) throws SQLException {
         //the Clob object has been freed by calling free() on it
         checkValidity();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (agent_.connection_) {
@@ -427,10 +457,14 @@ public long position(String searchstr, long start) throws SQLException {
                             start);
                 }
                 if (searchstr == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
                     throw new SqlException(agent_.logWriter_,
                         new ClientMessageId(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR));
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1516
+//IC see: https://issues.apache.org/jira/browse/DERBY-1516
                 if (start < 1) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
                     throw new SqlException(agent_.logWriter_,
                         new ClientMessageId(SQLState.BLOB_BAD_POSITION),
                             start);
@@ -452,10 +486,13 @@ public long position(String searchstr, long start) throws SQLException {
     private long positionX(String searchstr, long start) throws SqlException {
         checkForClosedConnection();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
         long index = -1;
         if (start <= 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.INVALID_API_PARAMETER),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 start, "start", "Clob.position()");
         }
 
@@ -482,6 +519,7 @@ public long position(Clob searchstr, long start) throws SQLException {
         //the Clob object has been freed by calling free() on it
         checkValidity();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (agent_.connection_) {
@@ -489,10 +527,12 @@ public long position(Clob searchstr, long start) throws SQLException {
                     agent_.logWriter_.traceEntry(this,
                             "position(Clob, long)",
                             searchstr,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                             start);
                 }
                 if (start < 1) {
                     throw new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         new ClientMessageId(SQLState.BLOB_BAD_POSITION), start);
                 }
 
@@ -517,14 +557,18 @@ private long positionX(Clob searchstr, long start) throws SqlException {
         checkForClosedConnection();
 
         if (start <= 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.INVALID_API_PARAMETER),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 start, "start", "Clob.position()");
         }
 
         // if the searchstr is longer than the source, no match
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
         long index;
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
             if (searchstr.length() > sqlLength()) {
                 return -1;
             }
@@ -534,8 +578,10 @@ private long positionX(Clob searchstr, long start) throws SqlException {
                 //Locator support is available. Hence call
                 //CLOBGETPOSITIONFROMLOCATOR to determine the position
                 //of the given Clob inside the LOB.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
                 index = agent_.connection_.locatorProcedureCall()
                     .clobGetPositionFromLocator(locator_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         ((ClientClob)searchstr).getLocator(),
                         start);
             } else {
@@ -545,10 +591,12 @@ private long positionX(Clob searchstr, long start) throws SqlException {
                                         (int) start - 1);
                 //increase the index by one since String positions are
                 //0-based and Clob positions are 1-based
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
                 if (index != -1) {
                     index++;
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (SQLException e) {
             throw new SqlException(e);
         }
@@ -563,6 +611,7 @@ public int setString(long pos, String str) throws SQLException {
         //the Clob object has been freed by calling free() on it
         checkValidity();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (agent_.connection_) {
@@ -608,16 +657,20 @@ public int setString(long pos, String str, int offset, int len) throws SQLExcept
     }
 
     int setStringX(long pos, String str, int offset, int len)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         if ((int) pos <= 0 ) {
             throw new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 new ClientMessageId(SQLState.BLOB_BAD_POSITION), pos);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         if ( pos - 1 > sqlLength()) {
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.BLOB_POSITION_TOO_LARGE), pos);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2769
         if (str == null) {
             throw new SqlException(agent_.logWriter_,
                     new ClientMessageId(
@@ -630,6 +683,7 @@ int setStringX(long pos, String str, int offset, int len)
         
         if ((offset < 0) || offset >= str.length() ) {
             throw new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 new ClientMessageId(SQLState.BLOB_INVALID_OFFSET), offset);
         }
 
@@ -638,6 +692,7 @@ int setStringX(long pos, String str, int offset, int len)
                 new ClientMessageId(SQLState.BLOB_NONPOSITIVE_LENGTH), len);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2769
         if (offset + len > str.length()) {
             throw new SqlException(agent_.logWriter_,
                     new ClientMessageId(
@@ -652,6 +707,7 @@ int setStringX(long pos, String str, int offset, int len)
         int length = 0;
         length = Math.min((str.length() - offset), len);
         //check if the Clob object is locator enabled
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
         if (isLocator()) {
             //The Clob is locator enabled. Call the CLOBSETSTRING
             //stored procedure to set the given string in the Clob.
@@ -664,10 +720,12 @@ int setStringX(long pos, String str, int offset, int len)
             //The Clob value has been
             //updated. Increment the
             //update count.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             incrementUpdateCount();
         }
         else {
             //The Clob is not locator enabled.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             reInitForNonLocator(
                 string_.substring(0, (int) pos - 1)
                     .concat(str.substring(offset, offset + length)));
@@ -688,15 +746,19 @@ public OutputStream setAsciiStream(long pos) throws SQLException {
                     agent_.logWriter_.traceEntry(this, "setAsciiStream", (int) pos);
                 }
                 OutputStream outStream = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
                 if(isLocator()) { // Check to see if the Lob is locator enabled
                     //The Lob is locator enabled. Return an instance of the
                     //Locator enabled Clob specific OutputStream implementation.
                     outStream = new ClobLocatorOutputStream
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             (this, pos);
                 }
                 else {
                     //The Lob is not locator enabled.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
                     outStream = new
                             ClobOutputStream(this, pos);
                 }
@@ -724,8 +786,10 @@ public Writer setCharacterStream(long pos) throws SQLException {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "setCharacterStream", (int) pos);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 Writer writer = null;
                 //Check to see if this Clob is locator enabled.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
                 if (isLocator()) {
                     //return an instance of the locator enabled implementation
                     //of the writer interface
@@ -752,6 +816,17 @@ public void truncate(long len) throws SQLException {
         //call checkValidity to exit by throwing a SQLException if
         //the Clob object has been freed by calling free() on it
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
 
         try
         {
@@ -762,10 +837,14 @@ public void truncate(long len) throws SQLException {
                 if (len < 0 ) {
                     throw new SqlException(agent_.logWriter_,
                         new ClientMessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         len);
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
                 if ( len > sqlLength()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
                     throw new SqlException(agent_.logWriter_,
                         new ClientMessageId(SQLState.BLOB_LENGTH_TOO_LONG),
                         len);
@@ -776,6 +855,7 @@ public void truncate(long len) throws SQLException {
                 }
 
                 //check whether the Lob is locator enabled.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
                 if (isLocator()) {
                     //The Lob is locator enabled then call the stored
                     //procedure CLOBTRUNCATE to truncate this Lob.
@@ -784,10 +864,12 @@ public void truncate(long len) throws SQLException {
                     // The Clob value has been modified.
                     // Increment the update count and update the length.
                     incrementUpdateCount();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3978
                     setSqlLength(len);
                 }
                 else {
                     //The Lob is not locator enabled.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                     reInitForNonLocator(string_.substring(0, (int) len));
                 }
             }
@@ -818,6 +900,7 @@ public void free()
         //valid
         isValid_ = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
         try {
             synchronized (agent_.connection_) {
                 if (agent_.loggingEnabled()) {
@@ -832,6 +915,7 @@ public void free()
             throw se.getSQLException();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
         if(isString()) {
             string_ = null;
             utf8String_ = null;
@@ -883,6 +967,7 @@ public Reader getCharacterStream(long pos, long length)
         //call checkValidity to exit by throwing a SQLException if
         //the Clob object has been freed by calling free() on it
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2444
 
         synchronized (agent_.connection_) {
             if (agent_.loggingEnabled()) {
@@ -890,6 +975,7 @@ public Reader getCharacterStream(long pos, long length)
                     (int) pos, length);
             }
             checkPosAndLength(pos, length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
             Reader retVal = null;
             //check if the Lob is locator enabled.
             if(isLocator()) {
@@ -904,6 +990,7 @@ public Reader getCharacterStream(long pos, long length)
                 //   length fall within the boundaries of the
                 //   Clob object.
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
                     retVal = new UpdateSensitiveClobLocatorReader
                             (agent_.connection_, this,
                             pos, length);
@@ -921,6 +1008,7 @@ public Reader getCharacterStream(long pos, long length)
                 catch(SqlException sqle) {
                     throw sqle.getSQLException();
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 retVal = new StringReader(retVal_str);
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "getCharacterStream", retVal);
@@ -967,6 +1055,7 @@ public int getUTF8Length() {
             return utf8String_.length;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
         utf8String_ = string_.getBytes(Cursor.UTF_8);
         return utf8String_.length;
     }
@@ -983,11 +1072,15 @@ public int getUTF8Length() {
     // much since this code is only for talking to very old servers. Suppress
     // the deprecation warnings for now.
     @SuppressWarnings("deprecation")
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     void reInitForNonLocator(String newString) {
         string_ = newString;
         asciiStream_ = new java.io.StringBufferInputStream(string_);
         unicodeStream_ = new java.io.StringBufferInputStream(string_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         characterStream_ = new StringReader(string_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         setSqlLength(string_.length());
     }
 
@@ -998,7 +1091,9 @@ void reInitForNonLocator(String newString) {
      * @throws SqlException on error
      */
     protected void materializeStream()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3107
         unicodeStream_ = super.materializeStream(isAsciiStream() ?
                                                         asciiStream_ :
                                                         unicodeStream_,
@@ -1007,6 +1102,7 @@ protected void materializeStream()
     }
 
     /*---------------------------------------------------------------------
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
       Methods used in the locator implementation.
      ----------------------------------------------------------------------*/
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientConnection.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientConnection.java
index 9460bc1c71..7abfdcb915 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientConnection.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientConnection.java
@@ -49,6 +49,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.sanity.SanityManager;
 
 public abstract class ClientConnection
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     implements Connection, ConnectionCallbackInterface
 {
     //---------------------navigational members-----------------------------------
@@ -65,6 +66,7 @@ public abstract class ClientConnection
         
     // In Connection.markStatementsClosed() method, this list is traversed to get a
     // list of open statements, which are marked closed and removed from the list.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final WeakHashMap<ClientStatement, Void> openStatements_ =
             new WeakHashMap<ClientStatement, Void>();
 
@@ -74,6 +76,7 @@ public abstract class ClientConnection
     //     after both commit and rollback
     // (2) result set will be unpositioned on server after both commit and rollback.
     // If they depend on both commit and rollback, they need to get on CommitAndRollbackListeners_.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     final WeakHashMap<UnitOfWorkListener, Void> CommitAndRollbackListeners_ =
             new WeakHashMap<UnitOfWorkListener, Void>();
 
@@ -108,6 +111,7 @@ public abstract class ClientConnection
 
     //prepared statements associated with isolation level change are stored 
     // in isolationLevelPreparedStmts
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final private HashMap<String, ClientPreparedStatement>
         isolationLevelPreparedStmts = 
             new HashMap<String, ClientPreparedStatement>();
@@ -192,6 +196,7 @@ public abstract class ClientConnection
     public int portNumber_;
     private int clientSSLMode_ = BasicClientDataSource.SSL_OFF;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     Hashtable<String, String> clientCursorNameCache_ =
             new Hashtable<String, String>();
 
@@ -219,9 +224,13 @@ protected ClientConnection(
             String user,
             String password,
             boolean isXAConn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             BasicClientDataSource dataSource)
             throws SqlException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3723
+//IC see: https://issues.apache.org/jira/browse/DERBY-3723
         this.user_ = user;
         isXAConnection_ = isXAConn;
         initConnection(logWriter, dataSource);
@@ -244,6 +253,7 @@ private void initConnection(
         // "setConnectionAttributes" method.  
         databaseName_ = dataSource.getDatabaseName();
         String connAtrrs = dataSource.getConnectionAttributes();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         if (dataSource.getCreateDatabase() != null) // can be "create" or null
         {
             if (connAtrrs == null)
@@ -283,6 +293,8 @@ private void initConnection(
     protected ClientConnection(
             LogWriter logWriter,
             boolean isXAConn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             BasicClientDataSource dataSource)
             throws SqlException {
 
@@ -293,6 +305,7 @@ protected ClientConnection(
         isXAConnection_ = isXAConn;
 
         user_ = ClientDataSourceInterface.propertyDefault_user;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
 
         // Extract common properties.
         databaseName_ = dataSource.getDatabaseName();
@@ -306,6 +319,8 @@ protected ClientConnection(
 
         clientSSLMode_ = 
             BasicClientDataSource.getSSLModeFromString(dataSource.getSsl());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         agent_ = newAgent_(logWriter,
                 loginTimeout_,
@@ -316,6 +331,7 @@ protected ClientConnection(
 
     // This is a callback method, called by subsystem - NetConnection
     protected void resetConnection(LogWriter logWriter)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3581
             throws SqlException {
         // Transaction isolation level is handled in completeReset.
         // clearWarningsX() will re-initialize the following properties
@@ -326,10 +342,12 @@ protected void resetConnection(LogWriter logWriter)
         encryptionManager_ = null;
 
         // DERBY-3723: Reset schema to user name.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3723
         currentSchemaName_ = this.user_;
         autoCommit_ = true;
         inUnitOfWork_ = false;
         holdability = ResultSet.HOLD_CURSORS_OVER_COMMIT;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 
         this.agent_.resetAgent(
                 this, logWriter, loginTimeout_, serverNameIP_, portNumber_);
@@ -341,6 +359,7 @@ protected ClientConnection(LogWriter logWriter,
                          String serverName,
                          int portNumber,
                          String databaseName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                          Properties properties) throws SqlException {
         if (logWriter != null) {
             logWriter.traceConnectEntry(serverName, portNumber, databaseName, properties);
@@ -349,6 +368,7 @@ protected ClientConnection(LogWriter logWriter,
         databaseName_ = databaseName;
 
         // Extract common properties.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         user_ = BasicClientDataSource.getUser(properties);
         retrieveMessageText_ =
             BasicClientDataSource.getRetrieveMessageText(properties);
@@ -403,6 +423,7 @@ protected void finalize() throws Throwable {
 
     // ---------------------------jdbc 1------------------------------------------
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public Statement createStatement() throws SQLException {
         try
         {
@@ -425,6 +446,7 @@ synchronized public Statement createStatement() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public PreparedStatement prepareStatement(String sql)
             throws SQLException {
         try
@@ -450,6 +472,7 @@ synchronized public PreparedStatement prepareStatement(String sql)
     }
 
     // For internal use only.  Use by updatable result set code.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized ClientPreparedStatement preparePositionedUpdateStatement (
             String sql,
             Section querySection) throws SqlException {
@@ -472,8 +495,10 @@ synchronized ClientPreparedStatement preparePositionedUpdateStatement (
         return preparedStatement;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public CallableStatement prepareCall(String sql)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
@@ -497,23 +522,28 @@ synchronized public CallableStatement prepareCall(String sql)
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized ClientPreparedStatement prepareDynamicCatalogQuery(String sql)
             throws SqlException {
         ClientPreparedStatement ps = newPreparedStatement_(
             sql,
             ResultSet.TYPE_FORWARD_ONLY,
             ResultSet.CONCUR_READ_ONLY,
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
             holdability(),
             Statement.NO_GENERATED_KEYS,
             null,
             null);
         ps.isCatalogQuery_ = true;
         ps.prepare();
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
         openStatements_.put(ps, null);
         return ps;
     }
 
     public String nativeSQL(String sql) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
@@ -532,6 +562,7 @@ public String nativeSQL(String sql) throws SQLException {
 
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized String nativeSQLX(String sql) throws SqlException {
         checkForClosedConnection();
         if (sql == null) {
@@ -555,6 +586,7 @@ synchronized String nativeSQLX(String sql) throws SqlException {
     // primary usage is distinction between local and global trans. envs.;
     protected abstract boolean allowLocalCommitRollback_() throws SqlException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
     synchronized public void setAutoCommit(boolean autoCommit) throws SQLException {
         try
         {
@@ -609,6 +641,7 @@ synchronized public void commit() throws SQLException {
                 agent_.logWriter_.traceEntry(this, "commit");
             }
             checkForClosedConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 
             // the following XA State check must be in commit instead of commitX since
             // external application call commit, the SqlException should be thrown
@@ -675,6 +708,7 @@ public boolean willAutoCommitGenerateFlow() throws SqlException {
         if (! allowLocalCommitRollback_()) {
             return false;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-213
         return true;
     }
 
@@ -685,8 +719,10 @@ void writeAutoCommit() throws SqlException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void writeCommit() throws SqlException {
         if (isXAConnection_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1192
             writeXACommit_ ();
         } else {
             writeLocalCommit_();
@@ -700,14 +736,17 @@ void readAutoCommit() throws SqlException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readCommit() throws SqlException {
         if (isXAConnection_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1192
             readXACommit_ ();
         } else {
             readLocalCommit_();
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
     synchronized public void rollback() throws SQLException {
         try
         {
@@ -715,6 +754,7 @@ synchronized public void rollback() throws SQLException {
                 agent_.logWriter_.traceEntry(this, "rollback");
             }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
             if ( !isAborting() ) { checkForClosedConnection(); }
             checkForInvalidXAStateOnCommitOrRollback();
 
@@ -760,6 +800,7 @@ protected void flowRollback() throws SqlException {
 
     private void writeRollback() throws SqlException {
         if (isXAConnection_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1192
             writeXARollback_ ();
         } else {
             writeLocalRollback_();
@@ -774,6 +815,7 @@ private void readRollback() throws SqlException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
     synchronized public void close() throws SQLException {
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceEntry(this, "close");
@@ -809,6 +851,7 @@ public boolean transactionInProgress() {
 
     // This is a no-op if the connection is already closed.
     private void closeX() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         if (!open_ && !isAborting()) {
             return;
         }
@@ -817,6 +860,7 @@ private void closeX() throws SQLException {
 
     // Close physical socket or attachment even if connection is marked close.
     // Used by ClientPooledConnection.close().
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
     synchronized public void closeResources() throws SQLException {
         if (open_ || (!open_ && availableForReuse_)) {
             availableForReuse_ = false;
@@ -839,8 +883,10 @@ private void closeResourcesX() throws SQLException {
         SQLException accumulatedExceptions = null;
 
         //Close prepared statements associated with isolation level change
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         for (ClientPreparedStatement ps :
                  isolationLevelPreparedStmts.values()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6053
             try {
                 ps.close();
             } catch (SQLException se) {
@@ -862,11 +908,14 @@ private void closeResourcesX() throws SQLException {
             flowClose();
         } catch (SqlException e) {
             accumulatedExceptions =
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                     Utils.accumulateSQLException(
                         e.getSQLException(), accumulatedExceptions);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
         markClosed(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         aborting_ = false;
         try {
             agent_.close();
@@ -880,6 +929,7 @@ private void closeResourcesX() throws SQLException {
 
     // Just like closeX except the socket is not pulled.
     // Physical resources are not closed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized void closeForReuse(boolean statementPooling)
             throws SqlException {
         if (!open_) {
@@ -893,6 +943,7 @@ synchronized void closeForReuse(boolean statementPooling)
             accumulatedExceptions = e;
         }
         if (open_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
             markClosedForReuse(statementPooling);
         }
         if (accumulatedExceptions != null) {
@@ -924,6 +975,7 @@ private void markClosed(boolean statementPooling)
     {
         open_ = false;
         inUnitOfWork_ = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
         if (!statementPooling) {
             markStatementsClosed();
         }
@@ -938,6 +990,7 @@ private void markClosedForReuse(boolean statementPooling) {
     }
 
     private void markStatementsClosed() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         Set<ClientStatement> keySet = openStatements_.keySet();
         for (Iterator<ClientStatement> i = keySet.iterator(); i.hasNext();) {
             ClientStatement stmt = i.next();
@@ -1039,6 +1092,7 @@ private void setTransactionIsolationX(int level)
             throws SqlException {
         String levelString = null;
         switch (level) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientConnection.TRANSACTION_REPEATABLE_READ:
             levelString = DERBY_TRANSACTION_REPEATABLE_READ;
             break;
@@ -1058,10 +1112,12 @@ private void setTransactionIsolationX(int level)
         default:
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId (SQLState.UNIMPLEMENTED_ISOLATION_LEVEL),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 level);
         }
         //If we do not already have a prepared statement for the requested
         // isolation level change, then create one
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement ps =
             (ClientPreparedStatement)isolationLevelPreparedStmts.
             get(levelString);
@@ -1086,7 +1142,9 @@ private void setTransactionIsolationX(int level)
         // The server has now implicitly committed the
         // transaction so we have to clean up locally.
         completeLocalCommit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-638
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
         if (SanityManager.DEBUG && supportsSessionDataCaching()) {
             SanityManager.ASSERT(isolation_ == level);
         }
@@ -1135,11 +1193,13 @@ public int getTransactionIsolationX() throws SQLException {
         // Store the current auto-commit value and use it to restore 
         // at the end of this method.
         boolean currentAutoCommit = autoCommit_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ResultSet rs = null;
         try
         {
             checkForClosedConnection();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
             if (isolation_ != TRANSACTION_UNKNOWN) {
                 if (SanityManager.DEBUG) {
                     SanityManager.ASSERT(supportsSessionDataCaching(),
@@ -1197,10 +1257,12 @@ public int getTransactionIsolationX() throws SQLException {
             // cached isolation level to TRANSACTION_UNKNOWN which will trigger
             // a refresh from the server.
             if (getTransactionIsolationPrepStmt == null  || 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                     !getTransactionIsolationPrepStmt.openOnClient_) {
             	getTransactionIsolationPrepStmt =
                         prepareStatementX(
                                 "VALUES CURRENT ISOLATION",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                 ResultSet.TYPE_FORWARD_ONLY,
                                 ResultSet.CONCUR_READ_ONLY,
                                 holdability(),
@@ -1214,6 +1276,7 @@ public int getTransactionIsolationX() throws SQLException {
             String isolationStr = rs.getString(1);
 
             int isolation = translateIsolation(isolationStr);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
             if (isolation_ == TRANSACTION_UNKNOWN &&
                     supportsSessionDataCaching()) {
                 // isolation_ will be TRANSACTION_UNKNOWN if the connection has
@@ -1233,6 +1296,8 @@ public int getTransactionIsolationX() throws SQLException {
                         (isolation_ == TRANSACTION_UNKNOWN),
                         "isolation_ modified when caching is not supported");
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             rs.close();
             // So... of we did not have an active transaction before
             // the query, we pretend to still not have an open
@@ -1248,6 +1313,7 @@ public int getTransactionIsolationX() throws SQLException {
         }
         finally {
             // Restore auto-commit value
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             autoCommit_ = currentAutoCommit;
             if(rs != null)
                 rs.close();
@@ -1270,6 +1336,7 @@ public int getTransactionID(){
      * @throws java.sql.SQLException on error
      */
     public String getCurrentSchemaName() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
         try {
             checkForClosedConnection();
         } catch (SqlException se) {
@@ -1280,6 +1347,7 @@ public String getCurrentSchemaName() throws SQLException {
                agent_.logWriter_.traceEntry(this,
                   "getCurrentSchemaName() executes query");
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Statement s = createStatement();
             ResultSet rs = s.executeQuery("VALUES CURRENT SCHEMA");
             rs.next();
@@ -1305,6 +1373,7 @@ public String getCurrentSchemaName() throws SQLException {
      */
     private int translateIsolation(String isolationStr) {
         if(isolationStr.compareTo(DERBY_TRANSACTION_REPEATABLE_READ) == 0)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return ClientConnection.TRANSACTION_REPEATABLE_READ;
         else if (isolationStr.compareTo(DERBY_TRANSACTION_SERIALIZABLE) == 0)
             return ClientConnection.TRANSACTION_SERIALIZABLE;
@@ -1320,20 +1389,24 @@ public SQLWarning getWarnings() throws SQLException {
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceExit(this, "getWarnings", warnings_);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         try {
             checkForClosedConnection();
         } catch (SqlException se) {
             throw se.getSQLException();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-860
         return warnings_ == null ? null : warnings_.getSQLWarning();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
     synchronized public void clearWarnings() throws SQLException {
         try
         {
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "clearWarnings");
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
             checkForClosedConnection();
             clearWarningsX();
         }
@@ -1354,6 +1427,7 @@ private void clearWarningsX() throws SqlException {
     // Advanced features:
 
     public DatabaseMetaData getMetaData() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             checkForClosedConnection();
@@ -1431,6 +1505,7 @@ public String getCatalog() throws SQLException {
 
     //--------------------------JDBC 2.0-----------------------------
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public Statement createStatement(int resultSetType,
                                                            int resultSetConcurrency) throws SQLException {
         try
@@ -1455,6 +1530,7 @@ synchronized public Statement createStatement(int resultSetType,
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public PreparedStatement prepareStatement(String sql,
                                                                     int resultSetType,
                                                                     int resultSetConcurrency) throws SQLException {
@@ -1463,6 +1539,7 @@ synchronized public PreparedStatement prepareStatement(String sql,
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "prepareStatement", sql, resultSetType, resultSetConcurrency);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientPreparedStatement ps = prepareStatementX(sql,
                     resultSetType,
                     resultSetConcurrency,
@@ -1480,6 +1557,7 @@ synchronized public PreparedStatement prepareStatement(String sql,
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public CallableStatement prepareCall(String sql,
                                                                int resultSetType,
                                                                int resultSetConcurrency) throws SQLException {
@@ -1489,6 +1567,7 @@ synchronized public CallableStatement prepareCall(String sql,
                 agent_.logWriter_.traceEntry(this, "prepareCall", sql, resultSetType, resultSetConcurrency);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientCallableStatement cs = prepareCallX(
                 sql,
                 resultSetType,
@@ -1506,7 +1585,9 @@ synchronized public CallableStatement prepareCall(String sql,
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized ClientCallableStatement prepareMessageProc(String sql)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         checkForClosedConnection();
 
@@ -1530,12 +1611,14 @@ private int downgradeResultSetType(int resultSetType) {
     }
 
     public Map<String, Class<?>> getTypeMap() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getTypeMap");
             }
             checkForClosedConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Map<String, Class<?>> map = Collections.emptyMap();
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceExit(this, "getTypeMap", map);
@@ -1548,6 +1631,7 @@ public Map<String, Class<?>> getTypeMap() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     synchronized public void setTypeMap(Map map) throws SQLException {
         try
         {
@@ -1555,6 +1639,7 @@ synchronized public void setTypeMap(Map map) throws SQLException {
                 agent_.logWriter_.traceEntry(this, "setTypeMap", map);
             }
             checkForClosedConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
             if (map == null) {
                 throw new SqlException(agent_.logWriter_,
                         new ClientMessageId (SQLState.INVALID_API_PARAMETER),
@@ -1586,10 +1671,13 @@ synchronized public void setHoldability(int holdability) throws SQLException {
             // commits, as the engine does not support it.
             if (this.isXAConnection_ && this.xaState_ == XA_T1_ASSOCIATED)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
                 if (holdability == ResultSet.HOLD_CURSORS_OVER_COMMIT)
                     throw new SqlException(agent_.logWriter_, 
                             new ClientMessageId(SQLState.CANNOT_HOLD_CURSOR_XA));
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
             this.holdability = holdability;
             
        }
@@ -1604,6 +1692,8 @@ public int getHoldability() throws SQLException {
         {
             checkForClosedConnection();
             if (agent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
                 agent_.logWriter_.traceExit(this, "getHoldability", holdability());
             }
             return holdability();
@@ -1618,7 +1708,9 @@ public int getHoldability() throws SQLException {
     // generated name used internally for unnamed savepoints
     private static final String
             dncGeneratedSavepointNamePrefix__ = "DNC_GENENERATED_NAME_";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public Savepoint setSavepoint() throws SQLException {
         try
         {
@@ -1635,6 +1727,7 @@ synchronized public Savepoint setSavepoint() throws SQLException {
             if ((++dncGeneratedSavepointId_) < 0) {
                 dncGeneratedSavepointId_ = 1; // restart from 1 when overflow.
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Object s = setSavepointX(
                 new ClientSavepoint(agent_, dncGeneratedSavepointId_));
 
@@ -1646,6 +1739,7 @@ synchronized public Savepoint setSavepoint() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public Savepoint setSavepoint(String name)
             throws SQLException {
         try
@@ -1664,6 +1758,7 @@ synchronized public Savepoint setSavepoint(String name)
                         new ClientMessageId (SQLState.NO_SAVEPOINT_WHEN_AUTO));
             }
             // create a named savepoint.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Object s = setSavepointX(new ClientSavepoint(agent_, name));
             return (ClientSavepoint) s;
         }
@@ -1674,6 +1769,7 @@ synchronized public Savepoint setSavepoint(String name)
     }
 
     private ClientSavepoint setSavepointX(ClientSavepoint savepoint)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SQLException {
         // Construct and flow a savepoint statement to server.
         ClientStatement stmt = null;
@@ -1682,10 +1778,13 @@ private ClientSavepoint setSavepointX(ClientSavepoint savepoint)
                 ResultSet.TYPE_FORWARD_ONLY,
                 ResultSet.CONCUR_READ_ONLY,
                 holdability());
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
 
             String savepointName;
             try {
                 savepointName = savepoint.getSavepointName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
             } catch (SQLException e) {
                 // generate the name for an un-named savepoint.
                 savepointName = dncGeneratedSavepointNamePrefix__ +
@@ -1709,6 +1808,7 @@ private ClientSavepoint setSavepointX(ClientSavepoint savepoint)
         return savepoint;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public void rollback(Savepoint savepoint) throws SQLException {
         try
         {
@@ -1720,6 +1820,7 @@ synchronized public void rollback(Savepoint savepoint) throws SQLException {
             if (savepoint == null) // Throw exception if savepoint is null
             {
                 throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                         new ClientMessageId (SQLState.XACT_SAVEPOINT_RELEASE_ROLLBACK_FAIL));
             } else if (autoCommit_) // Throw exception if auto-commit is on
             {
@@ -1728,6 +1829,7 @@ synchronized public void rollback(Savepoint savepoint) throws SQLException {
             } 
             // Only allow to rollback to a savepoint from the connection that create the savepoint.
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (this != ((ClientSavepoint) savepoint).agent_.connection_) {
                     throw new SqlException(agent_.logWriter_,
                             new ClientMessageId (SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
@@ -1772,6 +1874,7 @@ synchronized public void rollback(Savepoint savepoint) throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public void releaseSavepoint(Savepoint savepoint)
             throws SQLException {
         try
@@ -1792,6 +1895,7 @@ synchronized public void releaseSavepoint(Savepoint savepoint)
             } 
             // Only allow to release a savepoint from the connection that create the savepoint.
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (this != ((ClientSavepoint) savepoint).agent_.connection_) {
                     throw new SqlException(agent_.logWriter_, new ClientMessageId 
                             (SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
@@ -1800,6 +1904,7 @@ synchronized public void releaseSavepoint(Savepoint savepoint)
                 // savepoint is not an instance of am.Savepoint
                 throw new SqlException(
                     agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     new ClientMessageId(
                         SQLState.SAVEPOINT_NOT_CREATED_BY_CONNECTION));
             }
@@ -1810,6 +1915,12 @@ synchronized public void releaseSavepoint(Savepoint savepoint)
                 stmt = (ClientStatement) createStatementX(
                         ResultSet.TYPE_FORWARD_ONLY,
                         ResultSet.CONCUR_READ_ONLY,
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
                         holdability());
                 String savepointName;
                 try {
@@ -1839,6 +1950,7 @@ synchronized public void releaseSavepoint(Savepoint savepoint)
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public Statement createStatement(int resultSetType,
                                                            int resultSetConcurrency,
                                                            int resultSetHoldability) throws SQLException {
@@ -1848,6 +1960,7 @@ synchronized public Statement createStatement(int resultSetType,
                 agent_.logWriter_.traceEntry(this, "createStatement", resultSetType, resultSetConcurrency, resultSetHoldability);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientStatement s = createStatementX(
                 resultSetType,
                 resultSetConcurrency,
@@ -1880,6 +1993,7 @@ private ClientStatement createStatementX(int resultSetType,
         // engine and handled there.
         if (this.isXAConnection_ && this.xaState_ == XA_T1_ASSOCIATED)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
             if (resultSetHoldability == ResultSet.HOLD_CURSORS_OVER_COMMIT) {
                 resultSetHoldability = ResultSet.CLOSE_CURSORS_AT_COMMIT;
                 accumulateWarning(new SqlWarning(agent_.logWriter_, 
@@ -1887,12 +2001,14 @@ private ClientStatement createStatementX(int resultSetType,
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientStatement s = newStatement_(
             resultSetType,
             resultSetConcurrency,
             resultSetHoldability);
 
         s.cursorAttributesToSendOnPrepare_ = s.cacheCursorAttributesToSendOnPrepare();
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
         openStatements_.put(s, null);
         return s;
     }
@@ -1906,15 +2022,18 @@ protected void resetStatement(ClientStatement s) throws SqlException {
         s.cursorAttributesToSendOnPrepare_ = cursorAttributesToSendOnPrepare;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public PreparedStatement prepareStatement(String sql,
                                                                     int resultSetType,
                                                                     int resultSetConcurrency,
                                                                     int resultSetHoldability) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "prepareStatement", sql, resultSetType, resultSetConcurrency, resultSetHoldability);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientPreparedStatement ps = prepareStatementX(sql,
                     resultSetType,
                     resultSetConcurrency,
@@ -1933,6 +2052,7 @@ synchronized public PreparedStatement prepareStatement(String sql,
     }
 
     // used by DBMD
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientPreparedStatement prepareStatementX(String sql,
                                         int resultSetType,
                                         int resultSetConcurrency,
@@ -1943,6 +2063,7 @@ ClientPreparedStatement prepareStatementX(String sql,
         checkForClosedConnection();
         resultSetType = downgradeResultSetType(resultSetType);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement ps = newPreparedStatement_(
             sql,
             resultSetType,
@@ -1954,6 +2075,11 @@ ClientPreparedStatement prepareStatementX(String sql,
 
         ps.cursorAttributesToSendOnPrepare_ = ps.cacheCursorAttributesToSendOnPrepare();
         ps.prepare();
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
+//IC see: https://issues.apache.org/jira/browse/DERBY-557
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
+//IC see: https://issues.apache.org/jira/browse/DERBY-557
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
         openStatements_.put(ps,null);
         return ps;
     }
@@ -1962,24 +2088,29 @@ ClientPreparedStatement prepareStatementX(String sql,
     // right thing to do here... because if property on the dataSource changes, we may have
     // to send different attributes, i.e. SENSITIVE DYNAMIC, instead of SENSITIVE STATIC.
     protected void resetPrepareStatement(ClientPreparedStatement ps)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         String cursorAttributesToSendOnPrepare = ps.cursorAttributesToSendOnPrepare_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
         resetPreparedStatement_(ps, ps.sql_, ps.resultSetType_, ps.resultSetConcurrency_, ps.resultSetHoldability_, ps.autoGeneratedKeys_, ps.generatedKeysColumnNames_,
                 ps.generatedKeysColumnIndexes_);
         ps.cursorAttributesToSendOnPrepare_ = cursorAttributesToSendOnPrepare;
         ps.prepare();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public CallableStatement prepareCall(String sql,
                                                                int resultSetType,
                                                                int resultSetConcurrency,
                                                                int resultSetHoldability) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "prepareCall", sql, resultSetType, resultSetConcurrency, resultSetHoldability);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientCallableStatement cs = prepareCallX(
                 sql,
                 resultSetType,
@@ -1997,6 +2128,7 @@ synchronized public CallableStatement prepareCall(String sql,
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientCallableStatement prepareCallX(String sql,
                                            int resultSetType,
                                            int resultSetConcurrency,
@@ -2010,6 +2142,9 @@ ClientCallableStatement prepareCallX(String sql,
             resultSetHoldability);
         cs.cursorAttributesToSendOnPrepare_ = cs.cacheCursorAttributesToSendOnPrepare();
         cs.prepare();
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
+//IC see: https://issues.apache.org/jira/browse/DERBY-557
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
         openStatements_.put(cs,null);
         return cs;
     }
@@ -2032,8 +2167,14 @@ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
             ClientPreparedStatement ps = prepareStatementX(sql,
                     ResultSet.TYPE_FORWARD_ONLY,
                     ResultSet.CONCUR_READ_ONLY,
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
                     holdability(),
                     autoGeneratedKeys,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
                     null, null);
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceExit(this, "prepareStatement", ps);
@@ -2055,6 +2196,7 @@ public PreparedStatement prepareStatement(String sql, int columnIndexes[])
             }
             int genKeys = (columnIndexes == null ||
                     columnIndexes.length == 0
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     ? ClientStatement.NO_GENERATED_KEYS:
                 ClientStatement.RETURN_GENERATED_KEYS);
             ClientPreparedStatement ps = prepareStatementX(sql,
@@ -2075,6 +2217,8 @@ public PreparedStatement prepareStatement(String sql, int columnIndexes[])
     }
 
     public PreparedStatement prepareStatement(String sql, String columnNames[])
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SQLException {
         try
         {
@@ -2083,13 +2227,19 @@ public PreparedStatement prepareStatement(String sql, String columnNames[])
             }
             int genKeys = (columnNames == null ||
                     columnNames.length == 0
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     ? ClientStatement.NO_GENERATED_KEYS:
                 ClientStatement.RETURN_GENERATED_KEYS);
             ClientPreparedStatement ps = prepareStatementX(sql,
                     ResultSet.TYPE_FORWARD_ONLY,
                     ResultSet.CONCUR_READ_ONLY,
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
                     holdability(),
                     genKeys,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
                     columnNames, null);
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceExit(this, "prepareStatement", ps);
@@ -2128,6 +2278,7 @@ protected abstract void resetStatement_(ClientStatement statement,
 
 
     protected abstract ClientPreparedStatement
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         newPositionedUpdatePreparedStatement_
             (String sql,
              Section section) throws SqlException;
@@ -2138,6 +2289,7 @@ protected abstract ClientPreparedStatement newPreparedStatement_(String sql,
                                                                int holdability,
                                                                int autoGeneratedKeys,
                                                                String[] columnNames, int[] columnIndexes) throws SqlException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
 
     protected abstract void resetPreparedStatement_(ClientPreparedStatement ps,
                                                     String sql,
@@ -2145,6 +2297,7 @@ protected abstract void resetPreparedStatement_(ClientPreparedStatement ps,
                                                     int resultSetConcurrency,
                                                     int resultSetHoldability,
                                                     int autoGeneratedKeys,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
                                                     String[] columnNames,
                                                     int[] columnIndexes) throws SqlException;
 
@@ -2168,6 +2321,7 @@ public final void completeConnect() throws SqlException {
         databaseMetaData_ = newDatabaseMetaData_();
 
         agent_.sectionManager_ =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 newSectionManager(
                         agent_);
         if (agent_.loggingEnabled()) {
@@ -2197,8 +2351,10 @@ public final void completeConnect() throws SqlException {
     
     protected abstract void writeXATransactionStart(ClientStatement statement)
                                                 throws SqlException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1192
 
     public void completeLocalCommit() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Set<UnitOfWorkListener> keySet = CommitAndRollbackListeners_.keySet();
         for (Iterator<UnitOfWorkListener> i = keySet.iterator(); i.hasNext();) {
             i.next().completeLocalCommit(i);
@@ -2215,6 +2371,7 @@ public void completeLocalCommit() {
     // This is a client-side only operation.
     // This method will only throw an exception on bug check.
     public void completeLocalRollback() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Set<UnitOfWorkListener> keySet = CommitAndRollbackListeners_.keySet();
         for (Iterator<UnitOfWorkListener> i = keySet.iterator(); i.hasNext();) {
             i.next().completeLocalRollback(i);
@@ -2230,6 +2387,7 @@ public void completeLocalRollback() {
      *
      */
     private void completeSpecificRollback(UnitOfWorkListener uwl) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Set<UnitOfWorkListener> keySet = CommitAndRollbackListeners_.keySet();
         for (Iterator<UnitOfWorkListener> i = keySet.iterator(); i.hasNext();) {
             UnitOfWorkListener listener = i.next();
@@ -2251,7 +2409,9 @@ private void completeSpecificRollback(UnitOfWorkListener uwl) {
     protected abstract void readXARollback_() throws SqlException;
 
     public void writeTransactionStart(ClientStatement statement)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1192
         if (isXAConnection_) {
             writeXATransactionStart (statement);
         }
@@ -2301,6 +2461,7 @@ public void completeSqlca(Sqlca sqlca) {
     }
 
     public void completePiggyBackIsolation(int pbIsolation) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(supportsSessionDataCaching());
         }
@@ -2322,6 +2483,7 @@ public void completeInitialPiggyBackIsolation(int pbIsolation) {
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(
                     pbIsolation == 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         Connection.TRANSACTION_READ_UNCOMMITTED ||
                     pbIsolation ==
                         Connection.TRANSACTION_READ_COMMITTED ||
@@ -2355,6 +2517,7 @@ public void completeInitialPiggyBackSchema(String pbSchema) {
     // can this be called in a unit of work
     // can this be called from within a stored procedure
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-3581
     synchronized public void reset(LogWriter logWriter)
             throws SqlException {
         if (logWriter != null) {
@@ -2373,6 +2536,7 @@ synchronized public void reset(LogWriter logWriter)
 
     synchronized public void lightReset() throws SqlException {
         if (!open_ && !availableForReuse_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             return;
         }
         open_ = true;
@@ -2380,6 +2544,7 @@ synchronized public void lightReset() throws SqlException {
     }
 
     abstract protected void reset_(LogWriter logWriter) throws SqlException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3581
 
     /**
      * <p>
@@ -2416,6 +2581,7 @@ protected void completeReset(boolean isDeferredReset,
         // Iterate through the physical statements and re-enable them for reuse.
 
         if (closeStatementsOnClose) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             for (ClientStatement stmt : openStatements_.keySet()) {
                 stmt.reset(closeStatementsOnClose);
             }
@@ -2458,6 +2624,7 @@ protected void completeReset(boolean isDeferredReset,
      *
      * @return object with prepared statements for calling locator procedures
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2495
     CallableLocatorProcedures locatorProcedureCall() 
     {
         if (lobProcs == null) {
@@ -2473,6 +2640,7 @@ protected void checkForClosedConnection() throws SqlException {
         if (!open_) {
             agent_.checkForDeferredExceptions();
             throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     new ClientMessageId (SQLState.NO_CURRENT_CONNECTION));
         } else {
             agent_.checkForDeferredExceptions();
@@ -2499,6 +2667,7 @@ private void accumulateWarning(SqlWarning e) {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void accumulate440WarningForMessageProcFailure(SqlWarning e) {
         if (!accumulated440ForMessageProcFailure_) {
             accumulateWarning(e);
@@ -2524,9 +2693,12 @@ public int getServerVersion() {
      * global (XA) transaction the holdability is CLOSE_CURSORS_AT_COMMIT.
      * Otherwise return the holdability set by the user.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
     final int holdability()
     {
         if (this.isXAConnection_ && this.xaState_ == XA_T1_ASSOCIATED)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
             return ResultSet.CLOSE_CURSORS_AT_COMMIT;
         return holdability;
     }
@@ -2542,6 +2714,7 @@ final int holdability()
      */
     
     public Clob createClob() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2587
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceEntry(this, "createClob");
         }
@@ -2558,9 +2731,11 @@ public Clob createClob() throws SQLException {
 
         //Stores the Clob instance that is returned.
         ClientClob clob = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         //Call the CLOBCREATELOCATOR stored procedure
         //that will return a locator value.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2587
         try {
             locator = locatorProcedureCall().clobCreateLocator();
         }
@@ -2576,6 +2751,7 @@ public Clob createClob() throws SQLException {
         //the Lob implementations are completed then this code can be enabled.
         if (locator != INVALID_LOCATOR) {
             //A valid locator value has been obtained.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             clob = new ClientClob(this.agent_, locator);
         }
         else {
@@ -2618,6 +2794,7 @@ public Blob createBlob() throws SQLException {
         
         //Stores the Blob instance that is returned.
         ClientBlob blob = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         //Call the BLOBCREATELOCATOR stored procedure
         //that will return a locator value.
@@ -2631,8 +2808,11 @@ public Blob createBlob() throws SQLException {
         //If the locator value is -1 it means that we do not
         //have locator support on the server.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
         if (locator != INVALID_LOCATOR) {
             //A valid locator value has been obtained.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             blob = new ClientBlob(this.agent_, locator);
         } 
         else {
@@ -2673,6 +2853,7 @@ protected  void    beginAborting()
      */
     public String   getSchema() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         return getCurrentSchemaName();
     }
     
@@ -2689,10 +2870,12 @@ public void   setSchema(  String schemaName ) throws SQLException
 
         // nothing to do if the current schema name is cached and is the same
         // as the new schema name
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         if ( ( currentSchemaName_ != null) && (currentSchemaName_.equals( schemaName )) )
         { return; }
 
         PreparedStatement   ps = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         try {
             ps = prepareStatement( "set schema ?" );
@@ -2708,6 +2891,7 @@ public void   setSchema(  String schemaName ) throws SQLException
     public  void    abort( Executor executor )  throws SQLException
     {
         // NOP if called on a closed connection.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         if ( !open_ ) { return; }
         // Null executor not allowed.
         if ( executor == null )
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientDatabaseMetaData.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientDatabaseMetaData.java
index aade721cec..6db57a7c6d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientDatabaseMetaData.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientDatabaseMetaData.java
@@ -68,6 +68,7 @@ public abstract class ClientDatabaseMetaData implements DatabaseMetaData {
     private boolean metaDataInfoIsCached_ = false;
 
     ProductLevel productLevel_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     /** The JDBC major version supported by the server. */
     private final int serverJdbcMajorVersion;
@@ -119,6 +120,7 @@ public abstract class ClientDatabaseMetaData implements DatabaseMetaData {
     //---------------------constructors/finalizer---------------------------------
 
     protected ClientDatabaseMetaData(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                      ClientConnection connection,
                                      ProductLevel productLevel) {
         agent_ = agent;
@@ -128,6 +130,9 @@ protected ClientDatabaseMetaData(Agent agent,
         if (connection.isXAConnection()) {
             connection.xaHostVersion_ = productLevel_.versionLevel_;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-924
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
+//IC see: https://issues.apache.org/jira/browse/DERBY-970
         if (productLevel_.lessThan(10, 2, 0)) {
             serverJdbcMajorVersion = 3;
             serverJdbcMinorVersion = 0;
@@ -939,6 +944,7 @@ public boolean supportsSavepoints() throws SQLException {
     abstract public String getURL_() throws SqlException;
 
     public String getURL() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             checkForClosedConnection();
@@ -1073,6 +1079,7 @@ public boolean supportsCorrelatedSubqueries() throws SQLException {
     //
     public ResultSet getProcedures(String catalog,
                                             String schemaPattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                             String procedureNamePattern) throws SQLException {
         try
         {
@@ -1095,6 +1102,7 @@ private ClientResultSet getProceduresX(String catalog,
                                      String procedureNamePattern) throws SqlException {
         checkForClosedConnectionX();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs =
             prepareMetaDataQuery("SYSIBM.SQLPROCEDURES(?,?,?,?)");
 
@@ -1117,6 +1125,7 @@ private ClientResultSet getProceduresX(String catalog,
     public ResultSet getProcedureColumns(String catalog,
                                                   String schemaPattern,
                                                   String procedureNamePattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                                   String columnNamePattern) throws SQLException {
         try
         {
@@ -1140,6 +1149,7 @@ private ClientResultSet getProcedureColumnsX(String catalog,
                                            String columnNamePattern) throws SqlException {
         checkForClosedConnectionX();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs =
             prepareMetaDataQuery("SYSIBM.SQLPROCEDURECOLS(?,?,?,?,?)");
 
@@ -1218,6 +1228,7 @@ private ClientResultSet getFunctionsX(String catalog,
         checkForClosedConnectionX();
         checkServerJdbcVersionX("getFunctions(String,String,String)", 4, 0); 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs =
             prepareMetaDataQuery("SYSIBM.SQLFUNCTIONS(?,?,?,?)");
 
@@ -1258,6 +1269,7 @@ private ClientResultSet getFunctionsX(String catalog,
      * @see #getFunctionColumnsX(String, String, String,String)
      */
     public ResultSet
+//IC see: https://issues.apache.org/jira/browse/DERBY-1530
         getFunctionColumns(String catalog,
                               String schemaPattern,
                               String functionNamePattern,
@@ -1269,6 +1281,7 @@ private ClientResultSet getFunctionsX(String catalog,
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.
                         traceEntry(this, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1530
                                    "getFunctionColumns", 
                                    catalog, schemaPattern, 
                                    functionNamePattern, parameterNamePattern);
@@ -1306,6 +1319,7 @@ private ClientResultSet getFunctionColumnsX(String catalog,
         checkServerJdbcVersionX("getFunctionColumns"+
                                 "(String,String,String,String)", 4, 0);
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs =
             prepareMetaDataQuery("SYSIBM.SQLFUNCTIONPARAMS(?,?,?,?,?)");
 
@@ -1328,6 +1342,7 @@ private ClientResultSet getFunctionColumnsX(String catalog,
     public ResultSet getTables(String catalog,
                                         String schemaPattern,
                                         String tableNamePattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                         String types[]) throws SQLException {
         try
         {
@@ -1354,6 +1369,7 @@ private ClientResultSet getTablesX(String catalog,
             throw new SqlException(se);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs =
             prepareMetaDataQuery("SYSIBM.SQLTABLES(?,?,?,?,?)");
 
@@ -1375,9 +1391,11 @@ private ClientResultSet getTablesX(String catalog,
             cs.setStringX(3, tableNamePattern);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
         String tableTypes = "";
         int i = 0;
         if (types == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             cs.setNullX(4, Types.VARCHAR);
         } else if (types.length == 1 && (types[0].trim()).equals("%")) {
             cs.setStringX(4, types[0]);
@@ -1392,6 +1410,7 @@ private ClientResultSet getTablesX(String catalog,
             cs.setStringX(4, tableTypes);
         }
         cs.setStringX(5, getOptions());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
         return executeCatalogQuery(cs);
     }
 
@@ -1404,6 +1423,7 @@ private ClientResultSet getTablesX(String catalog,
     //              Options     varchar(4000))
     //
     public ResultSet getSchemas() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -1426,6 +1446,7 @@ private ClientResultSet getSchemasX() throws SqlException {
             throw new SqlException(se);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLTABLES('', '', '', '', 'GETSCHEMAS=1')");
         return (ClientResultSet) cs.executeQueryX();
@@ -1434,6 +1455,7 @@ private ClientResultSet getSchemasX() throws SqlException {
 
     // DERBY does not have the notion of a catalog, so we return a result set with no rows.
     public ResultSet getCatalogs() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -1452,6 +1474,7 @@ public ResultSet getCatalogs() throws SQLException {
     private ClientResultSet getCatalogsX() throws SqlException {
         checkForClosedConnectionX();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLTABLES('', '', '', '', 'GETCATALOGS=1')");
         return (ClientResultSet) cs.executeQueryX();
@@ -1465,6 +1488,7 @@ private ClientResultSet getCatalogsX() throws SqlException {
     //              TableType   varchar(4000),
     //              Options     varchar(4000))
     public ResultSet getTableTypes() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -1483,6 +1507,7 @@ public ResultSet getTableTypes() throws SQLException {
     private ClientResultSet getTableTypesX() throws SqlException {
         checkForClosedConnectionX();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = null;
         cs = prepareMetaDataQuery("SYSIBM.SQLTABLES(?,?,?,?,?)");
 
@@ -1512,6 +1537,7 @@ private ClientResultSet getTableTypesX() throws SqlException {
     public ResultSet getColumns(String catalog,
                                          String schemaPattern,
                                          String tableNamePattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                          String columnNamePattern) throws SQLException {
         try
         {
@@ -1535,6 +1561,7 @@ private ClientResultSet getColumnsX(String catalog,
                                   String columnNamePattern) throws SqlException {
         checkForClosedConnectionX();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLCOLUMNS(?,?,?,?,?)");
 
@@ -1558,6 +1585,7 @@ private ClientResultSet getColumnsX(String catalog,
     public ResultSet getColumnPrivileges(String catalog,
                                                   String schema,
                                                   String table,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                                   String columnNamePattern) throws SQLException {
         try
         {
@@ -1578,6 +1606,7 @@ private ClientResultSet getColumnPrivilegesX(String catalog,
                                            String schema,
                                            String table,
                                            String columnNamePattern) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         checkForClosedConnectionX();
         // check input params, table and columnNamePattern cannot be null
         if (table == null) {
@@ -1586,6 +1615,7 @@ private ClientResultSet getColumnPrivilegesX(String catalog,
 
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLCOLPRIVILEGES(?,?,?,?,?)");
 
@@ -1607,6 +1637,7 @@ private ClientResultSet getColumnPrivilegesX(String catalog,
     //
     public ResultSet getTablePrivileges(String catalog,
                                                  String schemaPattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                                  String tableNamePattern) throws SQLException {
         try
         {
@@ -1628,6 +1659,7 @@ private ClientResultSet getTablePrivilegesX(String catalog,
                                           String tableNamePattern) throws SqlException {
         checkForClosedConnectionX();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLTABLEPRIVILEGES(?,?,?,?)");
 
@@ -1653,6 +1685,7 @@ public ResultSet getBestRowIdentifier(String catalog,
                                                    String table,
                                                    int scope,
                                                    boolean nullable) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -1683,6 +1716,7 @@ private ClientResultSet getBestRowIdentifierX(String catalog,
                 new ClientMessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL)); 
 
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLSPECIALCOLUMNS(?,?,?,?,?,?,?)");
 
@@ -1703,6 +1737,7 @@ private ClientResultSet getBestRowIdentifierX(String catalog,
 
     public ResultSet getVersionColumns(String catalog,
                                                 String schema,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                                 String table) throws SQLException {
         try
         {
@@ -1730,6 +1765,7 @@ private ClientResultSet getVersionColumnsX(String catalog,
                 new ClientMessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL)); 
 
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLSPECIALCOLUMNS(?,?,?,?,?,?,?)");
 
@@ -1741,6 +1777,7 @@ private ClientResultSet getVersionColumnsX(String catalog,
         cs.setShortX(6, (short) 0);
         cs.setStringX(7, getOptions());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
         return executeCatalogQuery(cs);
     }
 
@@ -1753,6 +1790,7 @@ private ClientResultSet getVersionColumnsX(String catalog,
     //
     public ResultSet getPrimaryKeys(String catalog,
                                              String schema,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                              String table) throws SQLException {
         try
         {
@@ -1780,6 +1818,7 @@ private ClientResultSet getPrimaryKeysX(String catalog,
                 new ClientMessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL)); 
 
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLPRIMARYKEYS(?,?,?,?)");
 
@@ -1803,6 +1842,7 @@ private ClientResultSet getPrimaryKeysX(String catalog,
     //
     public ResultSet getImportedKeys(String catalog,
                                               String schema,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                               String table) throws SQLException {
         try
         {
@@ -1825,10 +1865,12 @@ private ClientResultSet getImportedKeysX(String catalog,
         checkForClosedConnectionX();
 
         // validate the table name       
+//IC see: https://issues.apache.org/jira/browse/DERBY-2607
         if (table == null) {
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL)); 
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLFOREIGNKEYS(?,?,?,?,?,?,?)");
 
@@ -1840,6 +1882,7 @@ private ClientResultSet getImportedKeysX(String catalog,
         cs.setStringX(6, table);
         // We're passing the keyword EXPORTEDKEY, but this support may not be in the GA version of SPs.
         // As a workaround in getCrossReference(), we'll just "select * where 0=1" when primaryTable==""
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
         if (connection_.holdability() == ResultSet.HOLD_CURSORS_OVER_COMMIT) {
             cs.setStringX(7, "DATATYPE='JDBC';IMPORTEDKEY=1; CURSORHOLD=1");
         } else {
@@ -1860,6 +1903,7 @@ private ClientResultSet getImportedKeysX(String catalog,
     //
     public ResultSet getExportedKeys(String catalog,
                                               String schema,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                               String table) throws SQLException {
         try
         {
@@ -1897,11 +1941,14 @@ private ClientResultSet getExportedKeysX(String catalog,
         cs.setStringX(6, "");
         // We're passing the keyword EXPORTEDKEY, but this support may not be in the GA version of SPs.
         // As a workaround in getCrossReference(), we'll just "select * where 0=1" when foreignTable==""
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
         if (connection_.holdability() == ResultSet.HOLD_CURSORS_OVER_COMMIT) {
             cs.setStringX(7, "DATATYPE='JDBC';EXPORTEDKEY=1; CURSORHOLD=1");
         } else {
             cs.setStringX(7, "DATATYPE='JDBC';EXPORTEDKEY=1; CURSORHOLD=0");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
         return executeCatalogQuery(cs);
     }
 
@@ -1920,6 +1967,7 @@ public ResultSet getCrossReference(String primaryCatalog,
                                                 String primaryTable,
                                                 String foreignCatalog,
                                                 String foreignSchema,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                                 String foreignTable) throws SQLException {
         try
         {
@@ -1959,6 +2007,8 @@ private ClientResultSet getCrossReferenceX(String primaryCatalog,
 
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLFOREIGNKEYS(?,?,?,?,?,?,?)");
 
@@ -1969,6 +2019,7 @@ private ClientResultSet getCrossReferenceX(String primaryCatalog,
         cs.setStringX(5, foreignSchema);
         cs.setStringX(6, foreignTable);
         cs.setStringX(7, getOptions());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
         return executeCatalogQuery(cs);
     }
 
@@ -1978,6 +2029,7 @@ private ClientResultSet getCrossReferenceX(String primaryCatalog,
     //
     //
     public ResultSet getTypeInfo() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -1997,6 +2049,7 @@ private ClientResultSet getTypeInfoX() throws SqlException {
         checkForClosedConnectionX();
 
         // check if the last call's resultset is closed or not.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLGETTYPEINFO(?,?)");
 
@@ -2020,6 +2073,7 @@ public ResultSet getIndexInfo(String catalog,
                                            String table,
                                            boolean unique,
                                            boolean approximate) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2041,12 +2095,15 @@ private ClientResultSet getIndexInfoX(String catalog,
                                     boolean unique,
                                     boolean approximate) throws SqlException {
         checkForClosedConnectionX();
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
 
         // validate the input table name
+//IC see: https://issues.apache.org/jira/browse/DERBY-2607
         if (table == null) {
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.TABLE_NAME_CANNOT_BE_NULL)); 
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLSTATISTICS(?,?,?,?,?,?)");
 
@@ -2077,6 +2134,7 @@ public ResultSet getUDTs(String catalog,
                                       String schemaPattern,
                                       String typeNamePattern,
                                       int[] types) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2098,6 +2156,7 @@ private ClientResultSet getUDTsX(String catalog,
                                int[] types) throws SqlException {
         checkForClosedConnectionX();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(
             "SYSIBM.SQLUDTS(?,?,?,?,?)");
 
@@ -2105,6 +2164,7 @@ private ClientResultSet getUDTsX(String catalog,
         cs.setStringX(2, schemaPattern);
         cs.setStringX(3, typeNamePattern);
         int i = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
         String udtTypes = "";
         while (types != null && i < types.length) {
             if (i > 0) {
@@ -2115,6 +2175,18 @@ private ClientResultSet getUDTsX(String catalog,
         }
         cs.setStringX(4, udtTypes);
         cs.setStringX(5, getOptions());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
         return executeCatalogQuery(cs);
     }
 
@@ -2122,6 +2194,8 @@ private ClientResultSet getUDTsX(String catalog,
     // helper method for the catalog queries only
     private String getOptions() {
         int cursorHold;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
         if (connection_.holdability() == ResultSet.HOLD_CURSORS_OVER_COMMIT) {
             cursorHold = 1;
         } else {
@@ -2134,6 +2208,7 @@ private String getOptions() {
     // Derby uses a PreparedStatement argument rather than a callable statement
     private ClientResultSet executeCatalogQuery(ClientPreparedStatement cs)
         throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try {
             return cs.executeQueryX();
         } catch (SqlException e) {
@@ -2177,6 +2252,7 @@ public boolean supportsGetGeneratedKeys() throws SQLException {
 
     public ResultSet getSuperTypes(String catalog,
                                             String schemaPattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                             String typeNamePattern) throws SQLException {
         try
         {
@@ -2202,6 +2278,7 @@ private ClientResultSet getSuperTypesX() throws SqlException {
                 "CAST(NULL AS VARCHAR(128)) AS SUPERTYPE_SCHEM," +
                 "VARCHAR('', 128) AS SUPERTYPE_NAME " +
                 "FROM SYSIBM.SYSDUMMY1 WHERE 1=0 WITH UR ";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement ps =
             connection_.prepareDynamicCatalogQuery(sql);
         return ps.executeQueryX();
@@ -2209,6 +2286,7 @@ private ClientResultSet getSuperTypesX() throws SqlException {
 
     public ResultSet getSuperTables(String catalog,
                                              String schemaPattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                              String tableNamePattern) throws SQLException {
         try
         {
@@ -2227,6 +2305,7 @@ public ResultSet getSuperTables(String catalog,
 
     private ClientResultSet getSuperTablesX() throws SqlException {
         checkForClosedConnectionX();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         String sql = "SELECT CAST(NULL AS VARCHAR(128)) AS TABLE_CAT," +
                 "CAST(NULL AS VARCHAR(128)) AS TABLE_SCHEM," +
                 "VARCHAR('', 128) AS TABLE_NAME," +
@@ -2241,6 +2320,7 @@ private ClientResultSet getSuperTablesX() throws SqlException {
     public ResultSet getAttributes(String catalog,
                                             String schemaPattern,
                                             String typeNamePattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                             String attributeNamePattern) throws SQLException {
         try
         {
@@ -2259,10 +2339,12 @@ public ResultSet getAttributes(String catalog,
 
     private ClientResultSet getAttributesX() throws SqlException {
         checkForClosedConnectionX();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         String sql = "SELECT CAST(NULL AS VARCHAR(128)) AS TYPE_CAT," +
                 "CAST(NULL AS VARCHAR(128)) AS TYPE_SCHEM," +
                 "VARCHAR('', 128) AS TYPE_NAME," +
                 "VARCHAR('',128) AS ATTR_NAME," +
+//IC see: https://issues.apache.org/jira/browse/DERBY-137
                 "0 AS DATA_TYPE," +
                 "VARCHAR('',129) AS ATTR_TYPE_NAME," +
                 "0 AS ATTR_SIZE," +
@@ -2283,6 +2365,7 @@ private ClientResultSet getAttributesX() throws SqlException {
                 "FROM SYSIBM.SYSDUMMY1 WHERE 1=0 WITH UR";
         ClientPreparedStatement ps =
             connection_.prepareDynamicCatalogQuery(sql);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
         return ps.executeQueryX();
     }
 
@@ -2293,6 +2376,7 @@ public boolean supportsResultSetHoldability(int holdability) throws SQLException
 
     public int getResultSetHoldability() throws SQLException {
         checkForClosedConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return ResultSet.HOLD_CURSORS_OVER_COMMIT;
     }
 
@@ -2313,6 +2397,7 @@ public int getJDBCMajorVersion() throws SQLException {
 
     public int getJDBCMinorVersion() throws SQLException {
         checkForClosedConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6324
         return JVMInfo.jdbcMinorVersion();
     }
 
@@ -2323,6 +2408,7 @@ public int getSQLStateType() throws SQLException {
 
     public boolean locatorsUpdateCopy() throws SQLException {
         checkForClosedConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2789
         return true;
     }
 
@@ -2456,9 +2542,11 @@ final public boolean serverSupportLongRDBNAM() {
 
 
     private boolean getMetaDataInfoBoolean(int infoCallIndex) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if ( !metaDataInfoIsCached_) { metaDataInfoCall(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
 
             if ( serverSupportsBooleanValues() )
             {
@@ -2594,6 +2682,7 @@ private boolean getMetaDataInfoBooleanWithTypeServer(int infoCallIndex,
         // Stored Procedure will return a String containing a
         // comma seperated list of all the supported result Set types
         // not throwing any exception right now even if the the type is wrong as per the spec
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             String returnedFromSP = null;
@@ -2603,8 +2692,10 @@ private boolean getMetaDataInfoBooleanWithTypeServer(int infoCallIndex,
                 metaDataInfoCall();
                 returnedFromSP = (String) metaDataInfoCache_[infoCallIndex];
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             StringTokenizer st = new StringTokenizer(returnedFromSP, ",");
             while (st.hasMoreTokens()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5093
                 if ((Integer.parseInt(st.nextToken())) == type) {
                     return true;
                 }
@@ -2641,10 +2732,12 @@ private boolean getMetaDataInfoInt_SupportsResultSetConcurrency(int infoCallInde
                 metaDataInfoCall();
                 returnedFromSP = (String) metaDataInfoCache_[infoCallIndex];
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             StringTokenizer st = new StringTokenizer(returnedFromSP, ";");
             while (st.hasMoreTokens()) {
                 StringTokenizer stForConc =
             new StringTokenizer(st.nextToken(), ",");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5093
                 if ((Integer.parseInt(stForConc.nextToken())) == type) {
                     while (stForConc.hasMoreTokens()) {
                         if ((Integer.parseInt(stForConc.nextToken())) == concurrency) {
@@ -2677,11 +2770,13 @@ private boolean getMetaDataInfoBoolean_supportsConvert(int infoCallIndex, int fr
                 metaDataInfoCall();
                 returnedFromSP = (String) metaDataInfoCache_[infoCallIndex];
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             StringTokenizer st = new StringTokenizer(returnedFromSP, ";");
             while (st.hasMoreTokens()) {
                 StringTokenizer stForType =
                     new StringTokenizer(st.nextToken(), ",");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5093
                 if ((Integer.parseInt(stForType.nextToken())) == fromType) {
                     while (st.hasMoreTokens()) {
                         if ((Integer.parseInt(st.nextToken())) == toType) {
@@ -2705,6 +2800,7 @@ private boolean getMetaDataInfoBoolean_supportsConvert(int infoCallIndex, int fr
     private void metaDataInfoCall() throws SqlException {
         synchronized (connection_) {
             ClientResultSet rs;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
             // These remote calls return a result set containing a single row.
             // Each column in the row corresponds to a particular get meta data info
@@ -2714,6 +2810,7 @@ private void metaDataInfoCall() throws SqlException {
             rs = (ClientResultSet) ps.executeQueryX();
             rs.nextX();
             int ColumnCount;
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
             try {
                 ColumnCount = ((ColumnMetaData) rs.getMetaDataX()).getColumnCount();
             } catch ( SQLException se ) {
@@ -2739,6 +2836,7 @@ private void metaDataInfoCall() throws SqlException {
      * @exception SQLException if a database access error occurs
      */
     public final boolean supportsStoredFunctionsUsingCallSyntax()
+//IC see: https://issues.apache.org/jira/browse/DERBY-970
         throws SQLException
     {
         checkForClosedConnection();
@@ -2818,6 +2916,7 @@ private ClientResultSet getSchemasX(String catalog, String schemaPattern)
         checkServerJdbcVersionX("getSchemas(String, String)", 4, 0);
 
         String call = "SYSIBM.SQLTABLES(?, ?, '', '', 'GETSCHEMAS=2')";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement cs = prepareMetaDataQuery(call);
         if (catalog == null) {
             cs.setNullX(1, Types.VARCHAR);
@@ -2897,6 +2996,7 @@ private ClientResultSet getClientInfoPropertiesX() throws SqlException {
      * @exception SQLException if a database access error occurs
      */
     public RowIdLifetime getRowIdLifetime() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         checkForClosedConnection();
         return RowIdLifetime.ROWID_UNSUPPORTED;
     }
@@ -2941,6 +3041,7 @@ public <T> T unwrap(Class<T> interfaces)
     public  boolean generatedKeyAlwaysReturned() { return true; }
 
     public ResultSet getPseudoColumns
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         ( String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern )
         throws SQLException
     {
@@ -2962,6 +3063,9 @@ public <T> T unwrap(Class<T> interfaces)
 
     private ClientResultSet getPseudoColumnsX() throws SqlException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         checkForClosedConnectionX();
         String sql =
             "SELECT \n" +
@@ -2979,8 +3083,13 @@ private ClientResultSet getPseudoColumnsX() throws SqlException
             "        VARCHAR('NO',128) AS IS_NULLABLE \n" +
             "    FROM SYSIBM.SYSDUMMY1 WHERE 1=0 WITH UR"
             ;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientPreparedStatement ps =
             connection_.prepareDynamicCatalogQuery(sql);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
+//IC see: https://issues.apache.org/jira/browse/DERBY-1224
         return ps.executeQueryX();
     }
 
@@ -2997,6 +3106,7 @@ private ClientResultSet getPseudoColumnsX() throws SqlException
 
 
     private ClientPreparedStatement prepareMetaDataQuery(String cmd)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         ClientPreparedStatement ps;
 
@@ -3004,8 +3114,11 @@ private ClientPreparedStatement prepareMetaDataQuery(String cmd)
                 connection_.prepareStatementX("CALL " + cmd,
                         ResultSet.TYPE_FORWARD_ONLY,
                         ResultSet.CONCUR_READ_ONLY,
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
                         connection_.holdability(),
                         ClientStatement.NO_GENERATED_KEYS,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
                         null, null);
         return ps;
     }
@@ -3019,7 +3132,10 @@ private ClientPreparedStatement prepareMetaDataQuery(String cmd)
      */
     protected void checkForClosedConnection() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
             checkForClosedConnectionX();
         } catch ( SqlException se ) {
             throw se.getSQLException();
@@ -3050,6 +3166,9 @@ private void checkForClosedConnectionX() throws SqlException {
      * specified JDBC version
      */
     private void checkServerJdbcVersionX(String method, int major, int minor)
+//IC see: https://issues.apache.org/jira/browse/DERBY-924
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
+//IC see: https://issues.apache.org/jira/browse/DERBY-970
         throws SqlException
     {
         if (serverJdbcMajorVersion < major ||
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientJDBCObjectFactory.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
index be63b5fd4b..96fca86691 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
@@ -56,6 +56,7 @@ public interface ClientJDBCObjectFactory {
      * @throws java.sql.SQLException on error
      */
     ClientPooledConnection newClientPooledConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             BasicClientDataSource ds,
             LogWriter logWriter,
             String user,
@@ -74,6 +75,7 @@ ClientPooledConnection newClientPooledConnection(
      * @return an XA connection
      * @throws java.sql.SQLException on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
     ClientXAConnection newClientXAConnection(BasicClientDataSource ds,
             LogWriter logWriter,String user,String password)
             throws SQLException;
@@ -98,9 +100,11 @@ ClientXAConnection newClientXAConnection(BasicClientDataSource ds,
      * @return a CallableStatement object
      * @throws SqlException on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientCallableStatement newCallableStatement(Agent agent,
             ClientConnection connection, String sql,
             int type,int concurrency,int holdability,
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
             ClientPooledConnection cpc) throws SqlException;
     
     /**
@@ -115,6 +119,7 @@ ClientCallableStatement newCallableStatement(Agent agent,
      * @throws SqlException on error
      */
     LogicalConnection newLogicalConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     ClientConnection physicalConnection,
                     ClientPooledConnection pooledConnection)
         throws SqlException;
@@ -131,7 +136,10 @@ LogicalConnection newLogicalConnection(
     * @throws SqlException if creation of the logical connection fails
     */
     public LogicalConnection newCachingLogicalConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection physicalConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
             ClientPooledConnection pooledConnection,
             JDBCStatementCache stmtCache) throws SqlException;
 
@@ -158,8 +166,10 @@ public LogicalConnection newCachingLogicalConnection(
      * @return a PreparedStatement object
      * @throws SqlException on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientPreparedStatement newPreparedStatement(Agent agent,
             ClientConnection connection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
             String sql,Section section,ClientPooledConnection cpc) 
             throws SqlException;
     
@@ -195,9 +205,11 @@ ClientPreparedStatement newPreparedStatement(Agent agent,
      * @return a PreparedSatement object
      * @throws SqlException on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientPreparedStatement newPreparedStatement(Agent agent,
             ClientConnection connection,String sql,
             int type,int concurrency,int holdability,int autoGeneratedKeys,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
             String [] columnNames, int[] columnIndexes, ClientPooledConnection cpc) 
             throws SqlException;
     
@@ -210,7 +222,10 @@ ClientPreparedStatement newPreparedStatement(Agent agent,
      * @param cacheInteractor the statement cache interactor
      * @return A logical prepared statement.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
     LogicalPreparedStatement newLogicalPreparedStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             PreparedStatement ps,
             StatementKey stmtKey,
             StatementCacheInteractor cacheInteractor);
@@ -224,6 +239,7 @@ LogicalPreparedStatement newLogicalPreparedStatement(
      * @return A logical callable statement.
      */
     LogicalCallableStatement newLogicalCallableStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             CallableStatement cs,
             StatementKey stmtKey,
             StatementCacheInteractor cacheInteractor);
@@ -243,7 +259,9 @@ LogicalCallableStatement newLogicalCallableStatement(
      * @return a client connection
      * @throws SqlException on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientConnection newNetConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
             LogWriter logWriter,
             int driverManagerLoginTimeout,String serverName,
             int portNumber,String databaseName, Properties properties)
@@ -264,10 +282,14 @@ ClientConnection newNetConnection(
      * @return a client connection
      * @throws SqlException on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientConnection newNetConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
             LogWriter logWriter,
             String user,
             String password,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             BasicClientDataSource dataSource,
             int rmId,
             boolean isXAConn) throws SqlException;
@@ -294,9 +316,13 @@ ClientConnection newNetConnection(
      * @return a client connection
      * @throws             SqlException on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientConnection newNetConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
             LogWriter logWriter,
             String user,String password,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             BasicClientDataSource dataSource,int rmId,
             boolean isXAConn,ClientPooledConnection cpc) throws SqlException;
     
@@ -321,6 +347,7 @@ ClientConnection newNetConnection(
      * @return a result set
      * @throws SqlException on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientResultSet newNetResultSet(
             Agent netAgent,
             MaterialStatement netStatement,
@@ -363,6 +390,7 @@ ClientDatabaseMetaData newNetDatabaseMetaData(Agent netAgent,
      * @throws SqlException on error
      *
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
      ClientStatement newStatement(Agent agent,
                      ClientConnection connection, int type,
                      int concurrency, int holdability,
@@ -400,6 +428,7 @@ ClientStatement newStatement(Agent agent,
      * @return a ParameterMetaData implementation
      *
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientParameterMetaData newParameterMetaData(ColumnMetaData columnMetaData);
     
     /**
@@ -414,5 +443,6 @@ ClientStatement newStatement(Agent agent,
      * @return a batch exception
      */
     public BatchUpdateException newBatchUpdateException
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         ( LogWriter logWriter, ClientMessageId msgid, Object[] args, long[] updateCounts, SqlException cause );
 }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientParameterMetaData.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientParameterMetaData.java
index 46781235ce..0954f9de0e 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientParameterMetaData.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientParameterMetaData.java
@@ -60,6 +60,7 @@ public int getParameterMode(int param) throws SQLException {
         {
             columnMetaData_.checkForValidColumnIndex(param);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             if (columnMetaData_.sqlxParmmode_[param - 1] ==
                 ParameterMetaData.parameterModeUnknown) {
                 return ParameterMetaData.parameterModeUnknown;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientPreparedStatement.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientPreparedStatement.java
index 1989ebcd60..7872cbc504 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientPreparedStatement.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientPreparedStatement.java
@@ -281,6 +281,7 @@ private void initPreparedStatement(String sql) throws SqlException {
             positionedUpdateCursorName_ = cursorName;
             // Get a new section from the same package as the query section
             setSection(agent_.sectionManager_.getPositionedUpdateSection(cursorName, false)); // false means get a regular section
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
 
             if (getSection() == null) {
                 throw new SqlException(agent_.logWriter_, 
@@ -295,6 +296,7 @@ private void initPreparedStatement(String sql) throws SqlException {
             // if the cursor name supplied in the sql string is different from the cursorName
             // set by setCursorName(), then server will return "cursor name not defined" error,
             // and no subsititution is made here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             if (getSection().getClientCursorName() != null && // cursor name is user defined
                     cursorName.compareTo(getSection().getClientCursorName()) == 0)
             // client's cursor name is substituted with section's server cursor name
@@ -312,6 +314,7 @@ private void initPreparedStatement(String sql) throws SqlException {
     void prepare() throws SqlException {
         try {
             // flow prepare, no static initialization is needed
+//IC see: https://issues.apache.org/jira/browse/DERBY-3426
             flowPrepareDescribeInputOutput();
         } catch (SqlException e) {
             this.markClosed();
@@ -323,6 +326,7 @@ void prepare() throws SqlException {
     //------------------- Prohibited overrides from Statement --------------------
 
     public void addBatch(String sql) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceEntry(this, "addBatch", sql);
         }
@@ -366,6 +370,7 @@ public ResultSet executeQuery() throws SQLException {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "executeQuery");
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 ClientResultSet resultSet = executeQueryX();
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "executeQuery", resultSet);
@@ -380,6 +385,7 @@ public ResultSet executeQuery() throws SQLException {
     }
 
     // also called by some DBMD methods
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientResultSet executeQueryX() throws SqlException {
         flowExecute(executeQueryMethod__);
         return resultSet_;
@@ -387,6 +393,7 @@ ClientResultSet executeQueryX() throws SqlException {
 
 
     public int executeUpdate() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -412,6 +419,8 @@ private long executeUpdateX() throws SqlException {
     }
 
     public void setNull(int parameterIndex, int jdbcType) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -428,6 +437,7 @@ public void setNull(int parameterIndex, int jdbcType) throws SQLException {
                 agent_.checkForSupportedDataType(jdbcType);
                 
                 final int paramType = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
                     getColumnMetaDataX().getColumnType(parameterIndex);
                 
                 if( ! PossibleTypes.getPossibleTypesForNull( paramType ).checkType( jdbcType )){
@@ -455,6 +465,7 @@ void setNullX(int parameterIndex, int jdbcType) throws SqlException {
         if (!parameterMetaData_.nullable_[parameterIndex - 1]) {
             throw new SqlException(agent_.logWriter_, 
                 new ClientMessageId(SQLState.LANG_NULL_INTO_NON_NULL),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 parameterIndex);
         }
         setInput(parameterIndex, null);
@@ -480,10 +491,12 @@ public void setBoolean(int parameterIndex, boolean x) throws SQLException {
                 
                 final int paramType = 
                     getColumnMetaDataX().getColumnType(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
 
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ) {
                     
                     PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.BOOLEAN,
                                                       paramType);
                     
@@ -514,6 +527,7 @@ public void setByte(int parameterIndex, byte x) throws SQLException {
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType( paramType ) ){
                     
                     PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.TINYINT,
                                                       paramType);
                     
@@ -521,6 +535,7 @@ public void setByte(int parameterIndex, byte x) throws SQLException {
                 
                 parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
                     Types.TINYINT;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 setInput(parameterIndex, Short.valueOf(x));
             }
         }
@@ -544,6 +559,7 @@ public void setShort(int parameterIndex, short x) throws SQLException {
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ){
                     
                     PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.SMALLINT,
                                                       paramType);
                                                   
@@ -561,6 +577,7 @@ public void setShort(int parameterIndex, short x) throws SQLException {
 
     // also used by DBMD methods
     void setShortX(int parameterIndex, short x) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
             Types.SMALLINT;
         setInput(parameterIndex, x);
@@ -568,6 +585,7 @@ void setShortX(int parameterIndex, short x) throws SqlException {
     }
 
     public void setInt(int parameterIndex, int x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -596,6 +614,7 @@ public void setInt(int parameterIndex, int x) throws SQLException {
 
     // also used by DBMD methods
     void setIntX(int parameterIndex, int x) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
             Types.INTEGER;
         setInput(parameterIndex, x);
@@ -616,9 +635,12 @@ public void setLong(int parameterIndex, long x) throws SQLException {
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ){
                     
                     PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.INTEGER,
                                                       paramType);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2495
                 setLongX(parameterIndex, x);
             }
         }
@@ -632,7 +654,9 @@ void setLongX(final int parameterIndex, final long x)
     {
         // Column numbers starts at 1, clientParamtertype_[0] refers to column 1
         parameterMetaData_.clientParamtertype_[parameterIndex - 1] 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 = Types.BIGINT;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
         setInput(parameterIndex, x);
     }
 
@@ -650,6 +674,7 @@ public void setFloat(int parameterIndex, float x) throws SQLException {
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ){
                     
                     PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.FLOAT,
                                                       paramType);
 
@@ -675,11 +700,17 @@ public void setDouble(int parameterIndex, double x) throws SQLException {
                 }
                 
                 final int paramType = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
                     getColumnMetaDataX().getColumnType(parameterIndex);
                 
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType(paramType) ){
                     
                     PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.DOUBLE,
                                                       paramType);
                     
@@ -687,6 +718,7 @@ public void setDouble(int parameterIndex, double x) throws SQLException {
                 
                 parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
                     Types.DOUBLE;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Double d = x;
                 setInput(parameterIndex, d);
             }
@@ -708,10 +740,13 @@ public void setBigDecimal(int parameterIndex, BigDecimal x)
                 
                 final int paramType = 
                     getColumnMetaDataX().getColumnType(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
 
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR.checkType( paramType ) ){
                     
                     PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.BIGINT,
                                                       paramType);
                     
@@ -745,17 +780,22 @@ public void setDate(int parameterIndex, Date x, Calendar calendar)
                 }
                 
                 final int paramType = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
                     getColumnMetaDataX().getColumnType(parameterIndex);
                 
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_DATE.checkType(paramType) ){
                     
                     PossibleTypes.throw22005Exception(agent_.logWriter_ ,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.DATE,
                                                       paramType);
                     
                 }
                 
                 checkForClosedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 
                 if (calendar == null) {
                     throw new SqlException(agent_.logWriter_,
@@ -763,6 +803,7 @@ public void setDate(int parameterIndex, Date x, Calendar calendar)
                         "null", "calendar", "setDate()");
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
                     Types.DATE;
 
@@ -794,10 +835,12 @@ public void setTime(int parameterIndex, Time x, Calendar calendar)
                 
                 final int paramType = 
                     getColumnMetaDataX().getColumnType(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
 
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_TIME.checkType( paramType ) ){
                     
                     PossibleTypes.throw22005Exception( agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                        Types.TIME,
                                                        paramType );
                 }
@@ -808,6 +851,7 @@ public void setTime(int parameterIndex, Time x, Calendar calendar)
                         "null", "calendar", "setTime()");
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
                     Types.TIME;
 
@@ -840,10 +884,12 @@ public void setTimestamp(int parameterIndex, Timestamp x, Calendar calendar)
                 
                 final int paramType = 
                     getColumnMetaDataX().getColumnType(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
 
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_TIMESTAMP.checkType( paramType ) ) {
                     
                     PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.TIMESTAMP,
                                                       paramType);
                     
@@ -855,6 +901,7 @@ public void setTimestamp(int parameterIndex, Timestamp x, Calendar calendar)
                         "null", "calendar", "setTimestamp()");
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
                     Types.TIMESTAMP;
 
@@ -886,9 +933,11 @@ public void setString(int parameterIndex, String x) throws SQLException {
                 
                 final int paramType = 
                     getColumnMetaDataX().getColumnType(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
 
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_STRING.checkType( paramType ) ){
                     PossibleTypes.throw22005Exception(agent_.logWriter_ ,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.VARCHAR,
                                                       paramType);
                 }
@@ -904,6 +953,7 @@ public void setString(int parameterIndex, String x) throws SQLException {
 
     // also used by DBMD methods
     void setStringX(int parameterIndex, String x) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
             Types.LONGVARCHAR;
 
@@ -915,6 +965,7 @@ void setStringX(int parameterIndex, String x) throws SqlException {
     }
 
     public void setBytes(int parameterIndex, byte[] x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -923,11 +974,13 @@ public void setBytes(int parameterIndex, byte[] x) throws SQLException {
                 }
                 
                 final int paramType = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1956
                     getColumnMetaDataX().getColumnType(parameterIndex);
                 
                 if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_BYTES.checkType( paramType ) ){
                     
                     PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                       Types.VARBINARY,
                                                       paramType );
                 }
@@ -942,7 +995,9 @@ public void setBytes(int parameterIndex, byte[] x) throws SQLException {
     }
 
     // also used by CallableLocatorProcedures
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void setBytesX(int parameterIndex, byte[] x) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
             Types.LONGVARBINARY;
 
@@ -970,12 +1025,14 @@ public void setBinaryStream(int parameterIndex,
         {
             synchronized (connection_) {
                 if (agent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     agent_.logWriter_.traceEntry(this, "setBinaryStream",
                         parameterIndex, "<input stream>", Long.valueOf(length));
                 }
                 
                 checkTypeForSetBinaryStream(parameterIndex);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3705
                 checkStreamLength(length);
                 setBinaryStreamX(parameterIndex, x, (int)length);
             }
@@ -996,8 +1053,10 @@ public void setBinaryStream(int parameterIndex,
      */
 
     public void setBinaryStream(int parameterIndex,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                 InputStream x,
                                 int length) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
         setBinaryStream(parameterIndex,x,(long)length);
     }
 
@@ -1039,6 +1098,7 @@ public void setAsciiStream(int parameterIndex,
             synchronized (connection_) {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "setAsciiStream",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         parameterIndex, "<input stream>", Long.valueOf(length));
                 }
                 
@@ -1053,6 +1113,7 @@ public void setAsciiStream(int parameterIndex,
                 }
                 checkStreamLength(length);
                 setInput(parameterIndex,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                     new ClientClob(agent_, x, Cursor.ISO_8859_1, (int) length));
             }
         }
@@ -1072,8 +1133,10 @@ public void setAsciiStream(int parameterIndex,
      * @exception SQLException thrown on failure.
      */
     public void setAsciiStream(int parameterIndex,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                InputStream x,
                                int length) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
         setAsciiStream(parameterIndex,x,(long)length);
     }
     
@@ -1085,11 +1148,13 @@ public void setAsciiStream(int parameterIndex,
      * @throws SQLException Thrown for a negative or too large length.
      */
     private void checkStreamLength(long length) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3705
         if(length > Integer.MAX_VALUE) {
             throw new SqlException(
                         agent_.logWriter_,
                         new ClientMessageId(
                             SQLState.CLIENT_LENGTH_OUTSIDE_RANGE_FOR_DATATYPE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         length,
                         Integer.MAX_VALUE
                     ).getSQLException();
@@ -1120,6 +1185,7 @@ private void checkTypeForSetBinaryStream(int parameterIndex)
         if (!PossibleTypes.POSSIBLE_TYPES_IN_SET_BINARYSTREAM.
                 checkType(paramType)) {
             PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                               Types.VARBINARY,
                                               paramType);
         }
@@ -1131,6 +1197,8 @@ private void checkTypeForSetCharacterStream(int parameterIndex)
         if (!PossibleTypes.POSSIBLE_TYPES_IN_SET_CHARACTERSTREAM.
                 checkType(paramType)) {
             PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                               Types.LONGVARCHAR,
                                               paramType);
         }
@@ -1142,6 +1210,7 @@ private void checkTypeForSetBlob(int parameterIndex)
         if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_BLOB.checkType( paramType ) ){
             
             PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                               Types.BLOB,
                                               paramType);
         }
@@ -1154,6 +1223,7 @@ private void checkTypeForSetClob(int parameterIndex)
         if( ! PossibleTypes.POSSIBLE_TYPES_IN_SET_CLOB.checkType( paramType ) ){
                     
             PossibleTypes.throw22005Exception(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                               Types.CLOB,
                                               paramType);
                     
@@ -1175,8 +1245,12 @@ private void checkTypeForSetClob(int parameterIndex)
      * @deprecated
      */
     public void setUnicodeStream(int parameterIndex,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                  InputStream x,
                                  int length) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-253
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceDeprecatedEntry(this, "setUnicodeStream",
                                                    parameterIndex,
@@ -1201,6 +1275,7 @@ public void setUnicodeStream(int parameterIndex,
      *      called on a closed <code>PreparedStatement</code>
      */
     public void setCharacterStream(int parameterIndex, Reader x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
@@ -1210,6 +1285,7 @@ public void setCharacterStream(int parameterIndex, Reader x)
             try {
                 checkTypeForSetCharacterStream(parameterIndex);
                 parameterMetaData_.clientParamtertype_[parameterIndex -1] =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     Types.CLOB;
                 if (x == null) {
                     setNull(parameterIndex, Types.LONGVARCHAR);
@@ -1235,16 +1311,22 @@ public void setCharacterStream(int parameterIndex, Reader x)
      */
 
     public void setCharacterStream(int parameterIndex,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                    Reader x,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
                                    long length) throws SQLException {
         try
         {
             synchronized (connection_) {
                 if (agent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     agent_.logWriter_.traceEntry(this, "setCharacterStream",
                             parameterIndex, x, Long.valueOf(length));
                 }
                 checkTypeForSetCharacterStream(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
                     Types.CLOB;
 
@@ -1252,6 +1334,8 @@ public void setCharacterStream(int parameterIndex,
                     setNull(parameterIndex, Types.LONGVARCHAR);
                     return;
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3705
+//IC see: https://issues.apache.org/jira/browse/DERBY-3705
                 checkStreamLength(length);
                 setInput(parameterIndex,
                          new ClientClob(agent_, x, (int)length));
@@ -1276,8 +1360,10 @@ public void setCharacterStream(int parameterIndex,
      */
 
     public void setCharacterStream(int parameterIndex,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                    Reader x,
                                    int length) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
         setCharacterStream(parameterIndex,x,(long)length);
     }
 
@@ -1309,6 +1395,7 @@ private void setBlobX(int parameterIndex, Blob x) throws SqlException {
     }
 
     public void setClob(int parameterIndex, Clob x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -1382,9 +1469,11 @@ public void setObject(int parameterIndex, Object x) throws SQLException {
 
                 int paramType = getColumnMetaDataX().getColumnType(parameterIndex);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if ( paramType == Types.JAVA_OBJECT )
                 {
                     setUDTX( parameterIndex, x );
+//IC see: https://issues.apache.org/jira/browse/DERBY-1938
                 } else if (x == null) {
                     // DERBY-1938: Allow setting Java null also when the
                     //      column type isn't specified explicitly by the
@@ -1404,6 +1493,7 @@ public void setObject(int parameterIndex, Object x) throws SQLException {
                     setLong(parameterIndex, ((Long) x).longValue());
                 } else if (x instanceof byte[]) {
                     setBytes(parameterIndex, (byte[]) x);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 } else if (x instanceof BigDecimal) {
                     setBigDecimal(parameterIndex, (BigDecimal) x);
                 } else if (x instanceof Date) {
@@ -1480,6 +1570,9 @@ private void setUDTX(int parameterIndex, Object x) throws SqlException, SQLExcep
             Class targetClass = Class.forName( targetClassName );
             if ( targetClass.isInstance( x ) )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 setInput(parameterIndex, x);
                 return;
             }
@@ -1544,6 +1637,7 @@ private void setObjectX(int parameterIndex,
         agent_.checkForSupportedDataType(targetJdbcType);
 
         if (x == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
             setNullX(parameterIndex, targetJdbcType);
             return;
         }
@@ -1552,6 +1646,7 @@ private void setObjectX(int parameterIndex,
         // the targetJdbcType is specified.
 
         int inputParameterType = CrossConverters.getInputJdbcType(targetJdbcType);
+//IC see: https://issues.apache.org/jira/browse/DERBY-250
         parameterMetaData_.clientParamtertype_[parameterIndex - 1] = inputParameterType;
         x = agent_.crossConverters_.setObject(inputParameterType, x);
 
@@ -1559,6 +1654,7 @@ private void setObjectX(int parameterIndex,
         try {
             if (targetJdbcType == Types.DECIMAL ||
                 targetJdbcType == Types.NUMERIC) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 x = ((BigDecimal) x).setScale(scale, RoundingMode.DOWN);
             }
         } catch (ArithmeticException ae) {
@@ -1568,6 +1664,7 @@ private void setObjectX(int parameterIndex,
                 new ClientMessageId(SQLState.JAVA_EXCEPTION),
                 new Object[] {ae.getClass().getName(), ae.getMessage()}, ae);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try { 
             setObject(parameterIndex, x);
         } catch ( SQLException se ) {
@@ -1586,6 +1683,7 @@ public void clearParameters() throws SQLException {
                 }
                 checkForClosedStatement();
                 if (parameterMetaData_ != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
                     Arrays.fill(parameters_, null);
                     Arrays.fill(parameterSet_, false);
                 }
@@ -1627,6 +1725,7 @@ boolean executeX() throws SqlException {
     //--------------------------JDBC 2.0-----------------------------
 
     public void addBatch() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -1637,6 +1736,7 @@ public void addBatch() throws SQLException {
                 checkThatAllParametersAreSet();
                 
                 if (parameterTypeList == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                     parameterTypeList = new ArrayList<int[]>();
                 }
 
@@ -1654,6 +1754,7 @@ public void addBatch() throws SQLException {
                     
                     // Get a copy of the parameter type data and save it in a list
                     // which will be used later on at the time of batch execution.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1292
                     parameterTypeList.add(parameterMetaData_.clientParamtertype_.clone());
                 } else {
                     batch_.add(null);
@@ -1676,6 +1777,7 @@ public int[] executeBatch() throws SQLException {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "executeBatch");
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 long[] updateCounts = null;
                 updateCounts = executeBatchX(false);
 
@@ -1777,12 +1879,14 @@ public void setURL(int parameterIndex, URL x) throws SQLException {
             agent_.logWriter_.traceEntry(this, "setURL", parameterIndex, x);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.JDBC_METHOD_NOT_IMPLEMENTED)).
                 getSQLException();
     }
 
     public ParameterMetaData getParameterMetaData() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -1793,6 +1897,7 @@ public ParameterMetaData getParameterMetaData() throws SQLException {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "getParameterMetaData", parameterMetaData);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 return (ParameterMetaData) parameterMetaData;
             }
         }
@@ -1803,8 +1908,10 @@ public ParameterMetaData getParameterMetaData() throws SQLException {
     }
 
     private ClientParameterMetaData getParameterMetaDataX()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         ClientParameterMetaData pm =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             ClientAutoloadedDriver.getFactory().
             newParameterMetaData(getColumnMetaDataX());
         return pm;
@@ -1815,6 +1922,7 @@ private ColumnMetaData getColumnMetaDataX() throws SqlException {
         return 
             parameterMetaData_ != null ?
             parameterMetaData_ : 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             ClientAutoloadedDriver.getFactory().newColumnMetaData(agent_.logWriter_, 0);
     }
 
@@ -1885,6 +1993,7 @@ public void completeDescribeInput(ColumnMetaData parameterMetaData, Sqlca sqlca)
         // parse out extended describe, so again  no problem.
         if (sqlMode_ != isCall__ && parameterMetaData_ != null) {
             // 1 means IN parameter
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
             Arrays.fill(parameterMetaData_.sqlxParmmode_, (short)1);
         }
 
@@ -1906,6 +2015,7 @@ public void completeDescribeOutput(ColumnMetaData resultSetMetaData, Sqlca sqlca
 
     private void writePrepareDescribeInputOutput() throws SqlException {
         // Notice that sql_ is passed in since in general ad hoc sql must be passed in for unprepared statements
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
         writePrepareDescribeOutput(sql_, getSection());
         writeDescribeInput(getSection());
     }
@@ -1919,6 +2029,7 @@ private void readPrepareDescribeInputOutput() throws SqlException {
     private void writePrepareDescribeInput() throws SqlException {
         // performance will be better if we flow prepare with output enable vs. prepare then describe input for callable
         // Notice that sql_ is passed in since in general ad hoc sql must be passed in for unprepared statements
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
         writePrepare(sql_, getSection());
         writeDescribeInput(getSection());
     }
@@ -1980,7 +2091,9 @@ void flowPrepareDescribeInputOutput() throws SqlException {
     }
 
     private void flowExecute(int executeType) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkForClosedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
         checkAutoGeneratedKeysParameters();
         clearWarningsX();
         checkForAppropriateSqlMode(executeType, sqlMode_);
@@ -1997,6 +2110,9 @@ private void flowExecute(int executeType) throws SqlException {
         // statements can have the same cursor name as long as their result
         // sets are not simultaneously open.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1036
+//IC see: https://issues.apache.org/jira/browse/DERBY-1183
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
         if (sqlMode_ == isQuery__) {
             checkForDuplicateCursorName();
         }
@@ -2007,6 +2123,7 @@ private void flowExecute(int executeType) throws SqlException {
 
             int numInputColumns;
             boolean outputExpected;
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
             try
             {
                 numInputColumns = (parameterMetaData_ != null) ? parameterMetaData_.getColumnCount() : 0;
@@ -2016,15 +2133,18 @@ private void flowExecute(int executeType) throws SqlException {
             {
                 // Generate a SqlException for this, we don't want to throw
                 // SQLException in this internal method
+//IC see: https://issues.apache.org/jira/browse/DERBY-842
                 throw new SqlException(se);
             }
             boolean chainAutoCommit = false;
             boolean commitSubstituted = false;
             boolean repositionedCursor = false;
             boolean timeoutSent = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientResultSet scrollableRS = null;
             boolean prepareSentForAutoGeneratedKeys = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-506
             if (doWriteTimeout) {
                 timeoutArrayList.set(0, TIMEOUT_STATEMENT + timeout_);
                 writeSetSpecialRegister(timeoutArrayList);
@@ -2047,6 +2167,8 @@ private void flowExecute(int executeType) throws SqlException {
                 chainAutoCommit = connection_.willAutoCommitGenerateFlow() && isAutoCommittableStatement_;
 
                 boolean chainOpenQueryForAutoGeneratedKeys = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
                 		((sqlUpdateMode_ == isInsertSql__ || sqlUpdateMode_ == isUpdateSql__) 
                 				&& autoGeneratedKeys_ == RETURN_GENERATED_KEYS);
                 writeExecute(getSection(),
@@ -2058,6 +2180,7 @@ private void flowExecute(int executeType) throws SqlException {
                 ); // chain flag
 
                 if (chainOpenQueryForAutoGeneratedKeys) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                     if (preparedStatementForAutoGeneratedKeys_ == null) {
                         preparedStatementForAutoGeneratedKeys_ =
                                 prepareAutoGeneratedKeysStatement(connection_);
@@ -2086,6 +2209,7 @@ private void flowExecute(int executeType) throws SqlException {
                 break;
 
             case isQuery__:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                 writeOpenQuery(getSection(),
                         fetchSize_,
                         resultSetType_,
@@ -2096,6 +2220,7 @@ private void flowExecute(int executeType) throws SqlException {
 
             case isCall__:
                 writeExecuteCall(outputRegistered_, // if no out/inout parameter, outputExpected = false
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                         null, getSection(),
                         fetchSize_,
                         false, // do not suppress ResultSets for regular CALLs
@@ -2118,6 +2243,7 @@ null, getSection(),
 
             markResultSetsClosed(true); // true means remove from list of commit and rollback listeners
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-506
             if (timeoutSent) {
                 readSetSpecialRegister(); // Read response to the EXCSQLSET
             }
@@ -2129,11 +2255,15 @@ null, getSection(),
                     scrollableRS.readPositioningFetch_();
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3426
                 else {
                     readExecute();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
             		if ((sqlUpdateMode_ == isInsertSql__ || sqlUpdateMode_ == isUpdateSql__) 
             				&& autoGeneratedKeys_ == RETURN_GENERATED_KEYS) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                         if (prepareSentForAutoGeneratedKeys) {
                             preparedStatementForAutoGeneratedKeys_.materialPreparedStatement_.readPrepareDescribeOutput_();
                         }
@@ -2172,6 +2302,9 @@ null, getSection(),
                     // result sets happening during readCloseResultSets above
                     // because ResultSet#markClosed calls
                     // Statement#removeClientCursorNameFromCache.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1036
+//IC see: https://issues.apache.org/jira/browse/DERBY-1183
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
                     setupCursorNameCacheAndMappings();
                 }
                 break;
@@ -2192,6 +2325,7 @@ null, getSection(),
 
             if (sqlMode_ == isCall__) {
                 parseStorProcReturnedScrollableRowset();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1364
                 checkForStoredProcResultSetCount(executeType);
                 // When there are no result sets back, we will commit immediately when autocommit is true.
                 // make sure a commit is not performed when making the call to the sqlca message procedure
@@ -2202,6 +2336,7 @@ null, getSection(),
 
             // The JDBC spec says that executeUpdate() should return 0
             // when no row count is returned.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1314
             if (executeType == executeUpdateMethod__ && updateCount_ < 0) {
                 updateCount_ = 0;
             }
@@ -2210,11 +2345,13 @@ null, getSection(),
             if (resultSet_ != null && resultSet_.resultSetHoldability_ != resultSetHoldability_ && sqlMode_ != isCall__) {
                 throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId(SQLState.UNABLE_TO_OPEN_RESULTSET_WITH_REQUESTED_HOLDABILTY),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         resultSetHoldability_);
             }
     }
 
     private long[] executeBatchX(boolean supportsQueryBatchRequest)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         throws SqlException, SQLException {
         synchronized (connection_) {
             checkForClosedStatement(); // Per jdbc spec (see Statement.close() javadoc)
@@ -2225,11 +2362,14 @@ private long[] executeBatchX(boolean supportsQueryBatchRequest)
 
 
     private long[] executeBatchRequestX(boolean supportsQueryBatchRequest)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException, BatchUpdateException {
         SqlException chainBreaker = null;
         int batchSize = batch_.size();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         long[] updateCounts = new long[batchSize];
         int numInputColumns;
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try {
             numInputColumns = parameterMetaData_ == null ? 0 : parameterMetaData_.getColumnCount();
         } catch ( SQLException se ) {
@@ -2245,10 +2385,13 @@ private long[] executeBatchRequestX(boolean supportsQueryBatchRequest)
         // DRDA request. This is because DRDA uses a 2-byte correlation ID,
         // and the values 0 and 0xffff are reserved as special values. So
         // that imposes an upper limit on the batch size we can support:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (batchSize > 65534)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             throw ClientAutoloadedDriver.getFactory().newBatchUpdateException(agent_.logWriter_, 
                 new ClientMessageId(SQLState.TOO_MANY_COMMANDS_FOR_BATCH), 
                 new Object[] { 65534 }, updateCounts, null );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         // Initialize all the updateCounts to indicate failure
         // This is done to account for "chain-breaking" errors where we cannot
@@ -2258,6 +2401,7 @@ private long[] executeBatchRequestX(boolean supportsQueryBatchRequest)
         }
 
         if (!supportsQueryBatchRequest && sqlMode_ == isQuery__) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             throw ClientAutoloadedDriver.getFactory().newBatchUpdateException(agent_.logWriter_, 
             new ClientMessageId(SQLState.CANNOT_BATCH_QUERIES), (Object [])null, updateCounts, null);
         }
@@ -2271,7 +2415,9 @@ private long[] executeBatchRequestX(boolean supportsQueryBatchRequest)
 
 
         if (sqlMode_ == isQuery__) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             resetResultSetList();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             resultSetList_ = new ClientResultSet[batchSize];
         }
 
@@ -2282,6 +2428,7 @@ private long[] executeBatchRequestX(boolean supportsQueryBatchRequest)
         agent_.beginBatchedWriteChain(this);
         boolean chainAutoCommit = connection_.willAutoCommitGenerateFlow() && isAutoCommittableStatement_;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-506
         if (doWriteTimeout) {
             timeoutArrayList.set(0, TIMEOUT_STATEMENT + timeout_);
             writeSetSpecialRegister(timeoutArrayList);
@@ -2291,18 +2438,22 @@ private long[] executeBatchRequestX(boolean supportsQueryBatchRequest)
 
         for (int i = 0; i < batchSize; i++) {
             if (parameterMetaData_ != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 parameterMetaData_.clientParamtertype_ = parameterTypeList.get(i);
                 parameters_ = (Object[]) batch_.get(i);
             }
             
             if (sqlMode_ != isCall__) {
                 boolean outputExpected;
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                 try {
                     outputExpected = (resultSetMetaData_ != null && resultSetMetaData_.getColumnCount() > 0);
                 } catch ( SQLException se ) {
                     throw new SqlException(se);
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                 writeExecute(getSection(),
                         parameterMetaData_,
                         parameters_,
@@ -2311,11 +2462,13 @@ private long[] executeBatchRequestX(boolean supportsQueryBatchRequest)
                         chainAutoCommit || (i != batchSize - 1));  // more statements to chain
             } else if (outputRegistered_) // make sure no output parameters are registered
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 throw ClientAutoloadedDriver.getFactory().newBatchUpdateException(agent_.logWriter_, 
                     new ClientMessageId(SQLState.OUTPUT_PARAMS_NOT_ALLOWED),
                     (Object [])null, updateCounts, null );
             } else {
                 writeExecuteCall(false, // no output expected for batched CALLs
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                         null, getSection(),
                         fetchSize_,
                         true, // suppress ResultSets for batch
@@ -2342,6 +2495,7 @@ null, getSection(),
 
         agent_.flowBatch(this, batchSize);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-506
         if (timeoutSent) {
             readSetSpecialRegister(); // Read response to the EXCSQLSET
         }
@@ -2376,11 +2530,13 @@ null, getSection(),
         catch (SqlException e) { // for chain-breaking exception only
             chainBreaker = e;
             chainBreaker.setNextException(new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
                 new ClientMessageId(SQLState.BATCH_CHAIN_BREAKING_EXCEPTION)));
         }
         // We need to clear the batch before any exception is thrown from agent_.endBatchedReadChain().
         batch_.clear();
         parameterTypeList = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1292
 
         // restore the saved input set, setting it to "current"
         parameters_ = savedInputs;
@@ -2399,6 +2555,9 @@ null, getSection(),
     public void listenToUnitOfWork() {
         if (!listenToUnitOfWork_) {
             listenToUnitOfWork_ = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
+//IC see: https://issues.apache.org/jira/browse/DERBY-557
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
             connection_.CommitAndRollbackListeners_.put(this,null);
         }
     }
@@ -2422,17 +2581,20 @@ public void completeLocalRollback(Iterator listenerIterator) {
      * @return name of java.sql interface
      */
     protected String getJdbcStatementInterfaceName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1364
         return "java.sql.PreparedStatement";
     }
 
     void checkForValidParameterIndex(int parameterIndex) throws SqlException {
         if (parameterMetaData_ == null) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             throw new SqlException(agent_.logWriter_,
                     new ClientMessageId(SQLState.NO_INPUT_PARAMETERS));
 
         if (parameterIndex < 1 || parameterIndex > parameterMetaData_.columns_) {
             throw new SqlException(agent_.logWriter_, 
                 new ClientMessageId(SQLState.LANG_INVALID_PARAM_POSITION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 parameterIndex, parameterMetaData_.columns_);
         }
     }
@@ -2447,6 +2609,7 @@ private void checkThatAllParametersAreSet() throws SqlException {
                 if (!parameterSet_[i] &&
                         (!parameterRegistered_[i] ||
                          parameterMetaData_.sqlxParmmode_[i] ==
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             ClientParameterMetaData.parameterModeInOut)) {
                     throw new SqlException(agent_.logWriter_, 
                         new ClientMessageId(SQLState.LANG_MISSING_PARMS));
@@ -2458,6 +2621,7 @@ private void checkThatAllParametersAreSet() throws SqlException {
     void checkForValidScale(int scale) throws SqlException {
         if (scale < 0 || scale > 31) {
             throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 new ClientMessageId(SQLState.BAD_SCALE_VALUE), scale);
         }
     }
@@ -2466,8 +2630,10 @@ void checkForValidScale(int scale) throws SqlException {
      * @see org.apache.derby.client.am.Statement#markClosed(boolean)
      */
     protected void markClosed(boolean removeListener){
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
         if(pooledConnection_ != null)
             pooledConnection_.onStatementClose(this);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         super.markClosed(removeListener);
         
         if (parameterMetaData_ != null) {
@@ -2479,11 +2645,13 @@ protected void markClosed(boolean removeListener){
         // Apparently, the JVM is not smart enough to traverse parameters_[] and null
         // out its members when the entire array is set to null (parameters_=null;).
         if (parameters_ != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
             Arrays.fill(parameters_, null);
         }
         parameters_ = null;
 
         if(removeListener)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             connection_.CommitAndRollbackListeners_.remove(this);
     }
     
@@ -2503,6 +2671,7 @@ protected void markClosed(boolean removeListener){
      *      called on a closed <code>PreparedStatement</code>
      */
     public void setAsciiStream(int parameterIndex, InputStream x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
@@ -2511,6 +2680,7 @@ public void setAsciiStream(int parameterIndex, InputStream x)
             }
             try {
                 checkTypeForSetAsciiStream(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 parameterMetaData_.clientParamtertype_[parameterIndex - 1] =
                     Types.CLOB;
 
@@ -2519,6 +2689,7 @@ public void setAsciiStream(int parameterIndex, InputStream x)
                     return;
                 }
                 setInput(parameterIndex,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                          new ClientClob(agent_, x, Cursor.ISO_8859_1));
             } catch (SqlException se) {
                 throw se.getSQLException();
@@ -2581,6 +2752,7 @@ public void setClob(int parameterIndex, Reader reader)
             } catch (SqlException se) {
                 throw se.getSQLException();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             setInput(parameterIndex, new ClientClob(agent_, reader));
         }
     }
@@ -2601,8 +2773,10 @@ public void setClob(int parameterIndex, Reader reader, long length)
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "setClob",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         parameterIndex, reader, Long.valueOf(length));
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
             try {
                 checkForClosedStatement();
             } catch (SqlException se) {
@@ -2611,8 +2785,10 @@ public void setClob(int parameterIndex, Reader reader, long length)
             if(length > Integer.MAX_VALUE)
                 throw new SqlException(agent_.logWriter_,
                     new ClientMessageId(SQLState.BLOB_TOO_LARGE_FOR_CLIENT),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     length, Integer.MAX_VALUE).getSQLException();
             else
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 setInput(parameterIndex,
                          new ClientClob(agent_, reader, (int)length));
         }
@@ -2637,6 +2813,7 @@ public void setClob(int parameterIndex, Reader reader, long length)
      *      marker in the SQL statement
      */
     public void setBlob(int parameterIndex, InputStream inputStream)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
@@ -2673,6 +2850,7 @@ public void setBlob(int parameterIndex, InputStream inputStream, long length)
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "setBlob", parameterIndex,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         inputStream, Long.valueOf(length));
             }
             if(length > Integer.MAX_VALUE)
@@ -2717,6 +2895,7 @@ public void setNClob(int parameterIndex, Reader reader, long length)
     }
 
     public void setRowId(int parameterIndex, RowId x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         throw SQLExceptionFactory.notImplemented("setRowId (int, RowId)");
     }
 
@@ -2725,6 +2904,7 @@ public void setNClob(int index, NClob value) throws SQLException {
     }
 
     public void setSQLXML(int parameterIndex, SQLXML xmlObject)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SQLException {
         throw SQLExceptionFactory.notImplemented("setSQLXML (int, SQLXML)");
     }
@@ -2734,6 +2914,7 @@ public void setSQLXML(int parameterIndex, SQLXML xmlObject)
     // Beginning of JDBC 4.2 methods
 
     public long executeLargeUpdate() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         try
         {
             synchronized (connection_) {
@@ -2747,6 +2928,9 @@ public long executeLargeUpdate() throws SQLException {
                 return updateValue;
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
         catch ( SqlException se ) {
             checkStatementValidity(se);
             throw se.getSQLException();
@@ -2764,6 +2948,7 @@ public long executeLargeUpdate() throws SQLException {
          */
         
         private void checkStatementValidity(SqlException sqle)  
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
                                             throws SQLException {
             //check if the statement is already closed 
             //This might be caused because the connection associated
@@ -2795,6 +2980,7 @@ private PossibleTypes(int[] types){
          */
         final public static PossibleTypes POSSIBLE_TYPES_IN_SET_GENERIC_SCALAR = 
             new PossibleTypes( new int[] { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 Types.BIGINT,
                 Types.LONGVARCHAR ,
                 Types.CHAR,
@@ -3100,6 +3286,7 @@ static SqlException throw22005Exception( LogWriter logWriter,
             throw new SqlException( logWriter,
                                     new ClientMessageId(SQLState.LANG_DATA_TYPE_GET_MISMATCH) ,
                                     new Object[]{ 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                         ClientTypes.getTypeString(valType),
                                         ClientTypes.getTypeString(paramType)
                                     },
@@ -3114,6 +3301,7 @@ static PossibleTypes getPossibleTypesForNull(int typeOfVariable){
             
             switch(typeOfVariable){
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case Types.SMALLINT:
                 return POSSIBLE_TYPES_FOR_GENERIC_SCALAR_NULL;
                 
@@ -3185,6 +3373,7 @@ static PossibleTypes getPossibleTypesForNull(int typeOfVariable){
      */
     protected void    checkStatus() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         try {
             checkForClosedStatement();
         }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientPreparedStatement42.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientPreparedStatement42.java
index 848b5e76db..ab3bf79594 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientPreparedStatement42.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientPreparedStatement42.java
@@ -44,6 +44,7 @@ public class  ClientPreparedStatement42 extends ClientPreparedStatement
      */
     public ClientPreparedStatement42
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
          Agent agent, ClientConnection connection, String sql,
          Section section,ClientPooledConnection cpc
          ) throws SqlException
@@ -73,6 +74,7 @@ public class  ClientPreparedStatement42 extends ClientPreparedStatement
      */
     public ClientPreparedStatement42
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
          Agent agent, ClientConnection connection,String sql,
          int type, int concurrency, int holdability, int autoGeneratedKeys, 
          String[] columnNames, int[] columnIndexes, ClientPooledConnection cpc
@@ -83,6 +85,7 @@ public class  ClientPreparedStatement42 extends ClientPreparedStatement
     }
     
     public  void setObject
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ( int parameterIndex, Object x, SQLType targetSqlType )
         throws SQLException
     {
@@ -111,6 +114,7 @@ public class  ClientPreparedStatement42 extends ClientPreparedStatement
         {
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     ( this, "setObject", parameterIndex, x, targetSqlType, scaleOrLength );
             }
             
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientResultSet.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientResultSet.java
index c981cfbaed..46d8a2e268 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientResultSet.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientResultSet.java
@@ -226,6 +226,7 @@ public abstract class ClientResultSet implements ResultSet,
     //---------------------constructors/finalizer---------------------------------
 
     protected ClientResultSet(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         ClientStatement statement,
                         Cursor cursor,
                         int resultSetType,
@@ -244,6 +245,7 @@ protected ClientResultSet(Agent agent,
         fetchDirection_ = statement_.fetchDirection_;
         suggestedFetchSize_ = statement_.fetchSize_;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
         maxRows_ = statement_.maxRows_;
         
         // Only set the warning if actual resultSetType returned by the server is less
@@ -256,6 +258,7 @@ protected ClientResultSet(Agent agent,
                 new SqlWarning(
                     agent_.logWriter_, 
                     new ClientMessageId(SQLState.INVALID_RESULTSET_TYPE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         statement_.resultSetType_, resultSetType_));
         }
 
@@ -278,6 +281,7 @@ protected ClientResultSet(Agent agent,
     // ---------------------------jdbc 1------------------------------------------
 
     public final boolean next() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -310,8 +314,10 @@ boolean nextX() throws SqlException {
         resetUpdatedColumns();
 
         unuseStreamsAndLOBs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
 
         // for TYPE_FORWARD_ONLY ResultSet, just call cursor.next()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetType_ == ResultSet.TYPE_FORWARD_ONLY) {
             // cursor is null for singleton selects that do not return data.
             isValidCursorPosition_ = (cursor_ == null) ? false : cursor_.next();
@@ -343,6 +349,7 @@ boolean nextX() throws SqlException {
 //    if (!isValidCursorPosition_ && // We've gone past the end (+100)
 //        cursor_ != null) {
             if ((!isValidCursorPosition_ && cursor_ != null) ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
                     (maxRows_ > 0 && cursor_.rowsRead_ > maxRows_)) {
                 isValidCursorPosition_ = false;
 
@@ -363,6 +370,7 @@ boolean nextX() throws SqlException {
                 }
             
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-213
                     statement_.resultSetCommitting(this);
                 } catch (SqlException sqle) {
                     sqlException = Utils.accumulateSQLException(sqle, sqlException);
@@ -412,6 +420,7 @@ boolean nextX() throws SqlException {
         // maxRows_ will be ignored by sensitive dynamic cursors since we don't know the rowCount
         if (!openOnClient_) {
             isValidCursorPosition_ = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
         } else if (sensitivity_ != sensitivity_sensitive_dynamic__ && maxRows_ > 0 &&
                 (firstRowInRowset_ + currentRowInRowset_ > maxRows_)) {
             isValidCursorPosition_ = false;
@@ -421,6 +430,7 @@ boolean nextX() throws SqlException {
 
 
     public void close() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -443,18 +453,22 @@ public final void closeX() throws SqlException {
         if (!openOnClient_) {
             return;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
         closeOpenStreams();
         // See if there are open locators on the current row, if valid.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3571
         if (isValidCursorPosition_ && !isOnInsertRow_) {
             lobState.checkCurrentRow(cursor_);
         }
         // NOTE: The preClose_ method must also check for locators if
         //       prefetching of data is enabled for result sets containing LOBs.
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         preClose_();
         try {
             if (openOnServer_) {
                 flowCloseAndAutoCommitIfNotAutoCommitted();
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-213
                 statement_.resultSetCommitting(this);
             }
         } finally {
@@ -465,13 +479,16 @@ public final void closeX() throws SqlException {
             statement_.closeX();
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         nullDataForGC();
     }
 
     /** Close Statement if it is set to closeOnCompletion */
     private void    closeStatementOnCompletion()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         statement_.closeMeOnCompletion();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         if ( (outerStatement_ != null) && (outerStatement_ != statement_) ) { outerStatement_.closeMeOnCompletion(); }
         outerStatement_ = null;
     }
@@ -488,10 +505,12 @@ private void nullDataForGC() {
     }
 
     private void flowCloseAndAutoCommitIfNotAutoCommitted()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         agent_.beginWriteChain(statement_);
         boolean performedAutoCommit = writeCloseAndAutoCommit();
         agent_.flow(statement_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-213
         readCloseAndAutoCommit(performedAutoCommit);
         agent_.endReadChain();
     }
@@ -519,6 +538,8 @@ void writeClose() throws SqlException {
         // close cursor if autoCommit is true.
         autoCommitted_ = false;
         if (generatedSection_ == null) { // none call statement result set case
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             writeCursorClose_(statement_.getSection());
         } else { // call statement result set(s) case
             writeCursorClose_(generatedSection_);
@@ -552,6 +573,7 @@ public boolean wasNull() throws SQLException {
             }
             checkForClosedResultSet("wasNull");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             if (wasNull_ == ClientResultSet.WAS_NULL_UNSET) {
                 throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId(SQLState.WASNULL_INVALID));
@@ -576,12 +598,14 @@ public boolean getBoolean(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getBoolean", column);
             }
             checkGetterPreconditions(column, "getBoolean");
             boolean result = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if (isOnInsertRow_ && updatedColumns_[column - 1] == null) {
                     result = false;
@@ -593,6 +617,7 @@ public boolean getBoolean(int column) throws SQLException {
             } else {
                 result = isNull(column) ? false : cursor_.getBoolean(column);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceExit(this, "getBoolean", result);
             }
@@ -610,12 +635,14 @@ public byte getByte(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getByte", column);
             }
             checkGetterPreconditions(column, "getByte");
             byte result = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if ((isOnInsertRow_) && (updatedColumns_[column - 1] == null)) {
                     result = 0;
@@ -644,17 +671,20 @@ public short getShort(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getShort", column);
             }
             checkGetterPreconditions(column, "getShort");
             short result = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if (isOnInsertRow_ && updatedColumns_[column - 1] == null) {
                     result = 0;
                 } else {
                     result = ((Short) agent_.crossConverters_.setObject(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             Types.SMALLINT,
                             updatedColumns_[column - 1])).shortValue();
                 }
@@ -678,17 +708,20 @@ public int getInt(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getInt", column);
             }
             checkGetterPreconditions(column, "getInt");
             int result = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if (isOnInsertRow_ && updatedColumns_[column - 1] == null) {
                     result = 0;
                 } else {
                     result = ((Integer) agent_.crossConverters_.setObject(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             Types.INTEGER,
                             updatedColumns_[column - 1])).intValue();
                 }
@@ -712,17 +745,20 @@ public long getLong(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getLong", column);
             }
             checkGetterPreconditions(column, "getLong");
             long result = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if (isOnInsertRow_ && updatedColumns_[column - 1] == null) {
                     result = 0;
                 } else {
                     result = ((Long) agent_.crossConverters_.setObject(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             Types.BIGINT,
                             updatedColumns_[column - 1])).longValue();
                 }
@@ -746,17 +782,20 @@ public float getFloat(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getFloat", column);
             }
             checkGetterPreconditions(column, "getFloat");
             float result = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if ((isOnInsertRow_ && updatedColumns_[column - 1] == null)) {
                     result = 0;
                 } else {
                     result = ((Float) agent_.crossConverters_.setObject(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             Types.REAL,
                             updatedColumns_[column - 1])).floatValue();
                 }
@@ -780,17 +819,20 @@ public double getDouble(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getDouble", column);
             }
             checkGetterPreconditions(column, "getDouble");
             double result = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
             if (wasNonNullSensitiveUpdate(column) || isOnInsertRow_) {
                 if (isOnInsertRow_ && updatedColumns_[column - 1] == null) {
                     result = 0;
                 } else {
                     result = ((Double) agent_.crossConverters_.setObject(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             Types.DOUBLE,
                             updatedColumns_[column - 1])).doubleValue();
                 }
@@ -815,11 +857,13 @@ public BigDecimal getBigDecimal(int column, int scale) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceDeprecatedEntry(this, "getBigDecimal", column, scale);
             }
             checkGetterPreconditions(column, "getBigDecimal");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             BigDecimal result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = ((BigDecimal) agent_.crossConverters_.setObject(
@@ -849,11 +893,13 @@ public BigDecimal getBigDecimal(int column) throws SQLException {
         {
 
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getBigDecimal", column);
             }
             checkGetterPreconditions(column, "getBigDecimal");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             BigDecimal result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = (BigDecimal)agent_.crossConverters_.setObject(
@@ -879,6 +925,7 @@ public Date getDate(int column, Calendar cal) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getDate", column);
@@ -890,6 +937,7 @@ public Date getDate(int column, Calendar cal) throws SQLException {
                     new ClientMessageId(SQLState.CALENDAR_IS_NULL));
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Date result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = (Date)agent_.crossConverters_.setObject(
@@ -923,6 +971,7 @@ public Time getTime(int column, Calendar cal) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getTime", column, cal);
@@ -934,6 +983,7 @@ public Time getTime(int column, Calendar cal) throws SQLException {
                     new ClientMessageId(SQLState.CALENDAR_IS_NULL));
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Time result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = (Time)agent_.crossConverters_.setObject(
@@ -968,6 +1018,7 @@ public Timestamp getTimestamp(int column, Calendar calendar)
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(
@@ -980,6 +1031,7 @@ public Timestamp getTimestamp(int column, Calendar calendar)
                     new ClientMessageId(SQLState.CALENDAR_IS_NULL));
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Timestamp result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = (Timestamp)agent_.crossConverters_.setObject(
@@ -1014,6 +1066,7 @@ public Timestamp getTimestamp(int column) throws SQLException {
      * @return a calendar initialized to the specified time
      */
     private static Calendar createCalendar(java.util.Date date) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
         return cal;
@@ -1028,6 +1081,7 @@ private static Calendar createCalendar(java.util.Date date) {
      * @return a date object that represents the date in {@code cal}
      */
     private Date convertFromDefaultCalendar(Date date, Calendar cal) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Calendar from = createCalendar(date);
         cal.clear();
         cal.set(from.get(Calendar.YEAR),
@@ -1045,6 +1099,7 @@ private Date convertFromDefaultCalendar(Date date, Calendar cal) {
      * @return a time object that represents the time in {@code cal}
      */
     private Time convertFromDefaultCalendar(Time time, Calendar cal) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Calendar from = createCalendar(time);
         cal.clear();
         cal.set(1970, Calendar.JANUARY, 1, // normalized date: 1970-01-01
@@ -1063,6 +1118,7 @@ private Time convertFromDefaultCalendar(Time time, Calendar cal) {
      * @return a timestamp object that represents the timestamp in {@code cal}
      */
     private Timestamp convertFromDefaultCalendar(Timestamp ts, Calendar cal) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Calendar from = createCalendar(ts);
         cal.clear();
         cal.set(from.get(Calendar.YEAR),
@@ -1087,7 +1143,9 @@ public String getString(int column) throws SQLException {
             }
             checkGetterPreconditions(column, "getString");
             int type = resultSetMetaData_.types_[column - 1];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             if (type == ClientTypes.BLOB || type == ClientTypes.CLOB) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
                 checkLOBMultiCall(column);
                 // If the above didn't fail, this is the first getter
                 // invocation, or only getBytes and/or getString have been
@@ -1096,6 +1154,7 @@ public String getString(int column) throws SQLException {
             }
             String result = null;
             if (wasNonNullSensitiveUpdate(column)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 result = (String)agent_.crossConverters_.setObject(
                     Types.CHAR, updatedColumns_[column - 1]);
             } else {
@@ -1118,13 +1177,16 @@ public byte[] getBytes(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getBytes", column);
             }
             checkGetterPreconditions(column, "getBytes");
             int type = resultSetMetaData_.types_[column - 1];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             if (type == ClientTypes.BLOB) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
                 checkLOBMultiCall(column);
                 // If the above didn't fail, this is the first getter
                 // invocation, or only getBytes has been invoked previously.
@@ -1133,6 +1195,7 @@ public byte[] getBytes(int column) throws SQLException {
             }
             byte[] result = null;
             if (wasNonNullSensitiveUpdate(column)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 result = (byte[])agent_.crossConverters_.setObject(
                     Types.BINARY, updatedColumns_[column - 1]);
             } else {
@@ -1155,6 +1218,7 @@ public InputStream getBinaryStream(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getBinaryStream", column);
@@ -1163,6 +1227,7 @@ public InputStream getBinaryStream(int column) throws SQLException {
             checkGetterPreconditions(column, "getBinaryStream");
             useStreamOrLOB(column);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             InputStream result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = new ByteArrayInputStream(
@@ -1188,6 +1253,7 @@ public InputStream getAsciiStream(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getAsciiStream", column);
@@ -1196,6 +1262,7 @@ public InputStream getAsciiStream(int column) throws SQLException {
             checkGetterPreconditions(column, "getAsciiStream");
             useStreamOrLOB(column);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             InputStream result = null;
             if (wasNonNullSensitiveUpdate(column)) {
 
@@ -1227,6 +1294,7 @@ public InputStream getAsciiStream(int column) throws SQLException {
      * @deprecated
      */
     public InputStream getUnicodeStream(int column) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-253
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceDeprecatedEntry(this, "getUnicodeStream",
                                                    column);
@@ -1240,6 +1308,7 @@ public Reader getCharacterStream(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getCharacterStream", column);
@@ -1248,6 +1317,7 @@ public Reader getCharacterStream(int column) throws SQLException {
             checkGetterPreconditions(column, "getCharacterStream");
             useStreamOrLOB(column);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Reader result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = new StringReader
@@ -1260,6 +1330,7 @@ public Reader getCharacterStream(int column) throws SQLException {
                 agent_.logWriter_.traceExit(this, "getCharacterStream", result);
             }
             setWasNull(column);  // Placed close to the return to minimize risk of thread interference
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
             currentReader = result;
             return result;
         }
@@ -1274,12 +1345,14 @@ public Blob getBlob(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getBlob", column);
             }
             checkGetterPreconditions(column, "getBlob");
             useStreamOrLOB(column);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Blob result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = (Blob) agent_.crossConverters_.setObject(Types.BLOB,
@@ -1304,12 +1377,14 @@ public Clob getClob(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getClob", column);
             }
             checkGetterPreconditions(column, "getClob");
             useStreamOrLOB(column);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Clob result = null;
             if (wasNonNullSensitiveUpdate(column)) {
                 result = (Clob) agent_.crossConverters_.setObject(Types.CLOB,
@@ -1334,11 +1409,13 @@ public Ref getRef(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getRef", column);
             }
             checkGetterPreconditions(column, "getRef");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Ref result = isNull(column) ? null : cursor_.getRef(column);
             if (true) {
                 throw new SqlException(agent_.logWriter_,
@@ -1361,11 +1438,13 @@ public Array getArray(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getArray", column);
             }
             checkGetterPreconditions(column, "getArray");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Array result = isNull(column) ? null : cursor_.getArray(column);
             if (true) {
                 throw new SqlException(agent_.logWriter_,
@@ -1388,6 +1467,7 @@ public Object getObject(int column) throws SQLException {
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getObject", column);
@@ -1408,7 +1488,13 @@ public Object getObject(int column) throws SQLException {
     Object getObjectX(int column) throws SqlException {
         checkGetterPreconditions(column, "getObject");
         int type = resultSetMetaData_.types_[column - 1];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (type == ClientTypes.BLOB || type == ClientTypes.CLOB) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
             useStreamOrLOB(column);
         }
         Object result = null;
@@ -1423,9 +1509,11 @@ Object getObjectX(int column) throws SqlException {
 
     // Live life on the edge and run unsynchronized
     public Object getObject(int column, Map map) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             closeOpenStreams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getObject", column, map);
@@ -1477,6 +1565,7 @@ private boolean wasNullSensitiveUpdate(int column) {
     }
 
     private void setWasNull(int column) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
         if (wasNullSensitiveUpdate(column) || (isOnInsertRow_ && updatedColumns_[column - 1] == null)) {
             wasNull_ = WAS_NULL;
         } else {
@@ -1495,6 +1584,7 @@ private boolean isNull(int column) {
     // ------------- Methods for accessing results by column name ----------------
 
     public final boolean getBoolean(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
@@ -1906,6 +1996,7 @@ public final SQLWarning getWarnings() throws SQLException {
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceExit(this, "getWarnings", warnings_);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-860
         return warnings_ == null ? null : warnings_.getSQLWarning();
     }
 
@@ -1947,7 +2038,11 @@ public String getCursorName() throws SQLException {
                 if (generatedSection_ != null) {
                     return "stored procedure generated cursor:" + generatedSection_.getServerCursorName();
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1036
+//IC see: https://issues.apache.org/jira/browse/DERBY-1183
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
                 if (statement_.cursorName_ == null) {// cursor name is not assigned yet
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                     statement_.cursorName_ = statement_.getSection().getServerCursorName();
                 }
                 if (agent_.loggingEnabled()) {
@@ -1970,6 +2065,7 @@ public ResultSetMetaData getMetaData() throws SQLException {
             }
 
             ResultSetMetaData resultSetMetaData = getMetaDataX();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceExit(this, "getMetaData", resultSetMetaData);
@@ -1990,6 +2086,7 @@ ColumnMetaData getMetaDataX() throws SqlException {
 
 
     public final int findColumn(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2018,6 +2115,7 @@ protected final int findColumnX(String columnName, String operation) throws SqlE
     //-------------------------- Traversal/Positioning ---------------------------
 
     public boolean isBeforeFirst() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
@@ -2049,6 +2147,7 @@ private boolean isBeforeFirstX() throws SqlException {
     }
 
     public boolean isAfterLast() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
@@ -2077,11 +2176,13 @@ private boolean isAfterLastX() throws SqlException {
                     (firstRowInRowset_ == currentRowInRowset_ &&
                     currentRowInRowset_ == lastRowInRowset_ &&
                     lastRowInRowset_ == 0 &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
                     absolutePosition_ == (maxRows_ == 0 ? rowCount_ + 1 : maxRows_ + 1)));
         }
     }
 
     public boolean isFirst() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
@@ -2111,6 +2212,7 @@ private boolean isFirstX() {
     }
 
     public boolean isLast() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
@@ -2141,6 +2243,7 @@ private boolean isLastX() throws SqlException {
     }
 
     public void beforeFirst() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2182,6 +2285,7 @@ private void beforeFirstX() throws SqlException {
     }
 
     public void afterLast() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2222,6 +2326,7 @@ private void afterLastX() throws SqlException {
     }
 
     public boolean first() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2255,6 +2360,7 @@ private boolean firstX() throws SqlException {
 
         resetRowsetFlags();
         unuseStreamsAndLOBs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
 
         // if first row is not in the current rowset, fetch the first rowset from the server.
         // rowIsInCurrentRowset with orientation first will always return false for dynamic cursors.
@@ -2277,6 +2383,7 @@ private boolean firstX() throws SqlException {
     }
 
     public boolean last() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2304,18 +2411,23 @@ private boolean lastX() throws SqlException {
         moveToCurrentRowX();
 
         wasNull_ = ClientResultSet.WAS_NULL_UNSET;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         // discard all previous updates when moving the cursor
         resetUpdatedColumns();
 
         resetRowsetFlags();
         unuseStreamsAndLOBs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
 
         // only get the rowCount for static cursors.
         if (rowCountIsUnknown()) {
             getRowCount();
         }
         long row = rowCount_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
         if (sensitivity_ != sensitivity_sensitive_dynamic__ && maxRows_ > 0) {
             if (rowCount_ > maxRows_) {
                 row = maxRows_;
@@ -2342,6 +2454,7 @@ private boolean lastX() throws SqlException {
     }
 
     public int getRow() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2365,10 +2478,12 @@ private int getRowX() throws SqlException {
         checkForClosedResultSet("getRow");
         long row;
         checkThatResultSetIsNotDynamic();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetType_ == ResultSet.TYPE_FORWARD_ONLY)
         // for forward-only cursors, getRow() should return 0 if cursor is not on a valid row,
         // i.e. afterlast.
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
             row = (cursor_.allRowsReceivedFromServer() &&
                     cursor_.currentRowPositionIsEqualToNextRowPosition()) ? 0 : cursor_.rowsRead_;
         } else {
@@ -2388,12 +2503,14 @@ private int getRowX() throws SqlException {
         if (row > Integer.MAX_VALUE) {
             this.accumulateWarning(new SqlWarning(agent_.logWriter_, 
                 new ClientMessageId(SQLState.NUMBER_OF_ROWS_TOO_LARGE_FOR_INT),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 row));
         }
         return (int) row;
     }
 
     public boolean absolute(int row) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2427,6 +2544,7 @@ private boolean absoluteX(int row) throws SqlException {
 
         resetRowsetFlags();
         unuseStreamsAndLOBs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
 
         if (maxRows_ > 0) {
             // if "row" is positive and > maxRows, fetch afterLast
@@ -2435,6 +2553,7 @@ private boolean absoluteX(int row) throws SqlException {
                 afterLastX();
                 isValidCursorPosition_ = false;
                 return isValidCursorPosition_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             } else if (row <= 0 && Math.abs(row) > maxRows_) {
                 beforeFirstX();
                 isValidCursorPosition_ = false;
@@ -2479,6 +2598,7 @@ private boolean absoluteX(int row) throws SqlException {
     }
 
     public boolean relative(int rows) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2510,8 +2630,10 @@ private boolean relativeX(int rows) throws SqlException {
         // discard all previous updates when moving the cursor.
         resetUpdatedColumns();
         unuseStreamsAndLOBs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
 
         // If the resultset is empty, relative(n) is a null operation
+//IC see: https://issues.apache.org/jira/browse/DERBY-276
         if (resultSetContainsNoRows()) {
             isValidCursorPosition_ = false;
             return isValidCursorPosition_;
@@ -2560,6 +2682,7 @@ private boolean relativeX(int rows) throws SqlException {
         // Ok, now we are on a row and ready to do some real positioning.....
 
         resetRowsetFlags();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
 
         // currentAbsoluteRowNumber is used for static cursors only.
         long currentAbsoluteRowNumber = firstRowInRowset_ + currentRowInRowset_;
@@ -2569,6 +2692,7 @@ private boolean relativeX(int rows) throws SqlException {
         // the currentrow number, will fetch beforeFirst anyways.  do not need to check
         // for maxRows.
         if (sensitivity_ != sensitivity_sensitive_dynamic__ &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
                 maxRows_ > 0 && rows > 0 && currentAbsoluteRowNumber + rows > maxRows_) {
             afterLastX();
             isValidCursorPosition_ = false;
@@ -2583,6 +2707,7 @@ private boolean relativeX(int rows) throws SqlException {
             long rowNumber =
                     (sensitivity_ == sensitivity_sensitive_dynamic__) ? currentRowInRowset_ + rows :
                     currentAbsoluteRowNumber + rows - absolutePosition_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
             if (maxRows_ < Math.abs(rowNumber) && maxRows_ != 0) {
                 if (rowNumber > 0) {
                     afterLastX();
@@ -2605,6 +2730,7 @@ private boolean relativeX(int rows) throws SqlException {
     }
 
     public boolean previous() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2632,6 +2758,9 @@ private boolean previousX() throws SqlException {
         moveToCurrentRowX();
 
         wasNull_ = ClientResultSet.WAS_NULL_UNSET;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         // discard all previous updates when moving the cursor.
         resetUpdatedColumns();
@@ -2660,6 +2789,7 @@ private boolean previousX() throws SqlException {
             return isValidCursorPosition_;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
         if (sensitivity_ != sensitivity_sensitive_dynamic__ && maxRows_ > 0 &&
                 (firstRowInRowset_ + currentRowInRowset_ > maxRows_)) {
             isValidCursorPosition_ = false;
@@ -2669,6 +2799,7 @@ private boolean previousX() throws SqlException {
     }
 
     public void setFetchDirection(int direction) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -2679,6 +2810,7 @@ public void setFetchDirection(int direction) throws SQLException {
                 checkThatResultSetTypeIsScrollable();
 
                 switch (direction) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 case ResultSet.FETCH_FORWARD:
                 case ResultSet.FETCH_REVERSE:
                 case ResultSet.FETCH_UNKNOWN:
@@ -2687,6 +2819,7 @@ public void setFetchDirection(int direction) throws SQLException {
                 default:
                     throw new SqlException(agent_.logWriter_, 
                         new ClientMessageId(SQLState.INVALID_FETCH_DIRECTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         direction);
                 }
             }
@@ -2720,9 +2853,11 @@ public void setFetchSize(int rows) throws SQLException {
                     agent_.logWriter_.traceEntry(this, "setFetchSize", rows);
                 }
                 checkForClosedResultSet("setFetchSize");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3573
                 if (rows < 0) {
                     throw new SqlException(agent_.logWriter_, 
                         new ClientMessageId(SQLState.INVALID_FETCH_SIZE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         rows).getSQLException();
                 }
                 setFetchSize_(rows);
@@ -2786,6 +2921,7 @@ public boolean rowUpdated() throws SQLException {
         {
             checkForClosedResultSet("rowUpdated");
             checkPositionedOnPlainRow();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1323
 
             boolean rowUpdated = cursor_.getIsRowUpdated();
 
@@ -2805,6 +2941,7 @@ public boolean rowInserted() throws SQLException {
         {
             checkForClosedResultSet("rowInserted");
             checkPositionedOnPlainRow();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1323
 
             boolean rowInserted = false;
 
@@ -2827,6 +2964,7 @@ public boolean rowDeleted() throws SQLException {
         {
             checkForClosedResultSet("rowDeleted");
             checkPositionedOnPlainRow();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1323
 
             boolean rowDeleted = 
                 (resultSetType_ == ResultSet.TYPE_SCROLL_INSENSITIVE) ?
@@ -2856,6 +2994,7 @@ public void updateNull(int column) throws SQLException {
                 if (!resultSetMetaData_.nullable_[column - 1]) {
                     throw new SqlException(agent_.logWriter_, 
                         new ClientMessageId(SQLState.LANG_NULL_INTO_NON_NULL),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         column);
                 }
                 updateColumn(column, null);
@@ -3095,6 +3234,7 @@ public void updateBinaryStream(int column,
         {
             synchronized (connection_) {
                 if (agent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
                     agent_.logWriter_.traceEntry(this, "", column, x, length);
                 }
                 checkUpdatePreconditions(column, "updateBinaryStream");
@@ -3117,6 +3257,7 @@ public void updateAsciiStream(int column,
                     agent_.logWriter_.traceEntry(this, "updateAsciiStream", column, x, length);
                 }
                 checkUpdatePreconditions(column, "updateAsciiStream");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                 updateColumn(column, agent_.crossConverters_.setObjectFromCharacterStream(
                         resultSetMetaData_.types_[column - 1], x, Cursor.ISO_8859_1, length));
             }
@@ -3181,6 +3322,7 @@ public void updateObject(int column, Object x) throws SQLException {
     }
 
     public void updateNCharacterStream(int columnIndex, Reader x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         throw jdbc3MethodNotSupported();
     }
@@ -3407,6 +3549,10 @@ public void updateBinaryStream(String columnName,
     }
 
     public void updateAsciiStream(String columnName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                   InputStream x,
                                   int length) throws SQLException {
         try
@@ -3423,6 +3569,8 @@ public void updateAsciiStream(String columnName,
     }
 
     public void updateCharacterStream(String columnName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                       Reader x,
                                       int length) throws SQLException {
         try
@@ -3467,6 +3615,7 @@ public void updateObject(String columnName, Object x) throws SQLException {
     }
 
     public void updateNCharacterStream(String columnName, Reader x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         throw jdbc3MethodNotSupported();
     }
@@ -3485,6 +3634,7 @@ public void insertRow() throws SQLException {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "insertRow");
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
                 insertRowX();
             }
         }
@@ -3503,6 +3653,7 @@ private void insertRowX() throws SqlException {
        }
  
         // if not on a valid row, then do not accept updateXXX calls
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
         if (!isValidCursorPosition_) {
             throw new SqlException(agent_.logWriter_, 
                 new ClientMessageId(SQLState.CURSOR_INVALID_OPERATION_AT_CURRENT_POSITION));
@@ -3624,7 +3775,9 @@ private boolean updateRowX() throws SqlException {
                 } else {
                     // Check if the original column is null.  Calling CrossConverters.setObject on a null
                     // column causes "Data Conversion" Exception.
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                     Object originalObj;
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                     try {
                         originalObj = getObject(i + 1);
                     } catch ( SQLException se ) {
@@ -3650,6 +3803,7 @@ private boolean updateRowX() throws SqlException {
             } else {
                 positionToCurrentRowAndUpdate();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
         } finally {
             resetUpdatedColumns();
         }
@@ -3695,6 +3849,7 @@ private void deleteRowX() throws SqlException {
 
         if (isOnInsertRow_) {
             throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1266
                 new ClientMessageId(SQLState.NO_CURRENT_ROW));
         }
 
@@ -3710,9 +3865,11 @@ private void deleteRowX() throws SqlException {
             positionToCurrentRowAndDelete();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetType_ == ResultSet.TYPE_FORWARD_ONLY) {
             cursor_.isUpdateDeleteHole_ = true;
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
             if (preparedStatementForDelete_.updateCount_ > 0) {
                 
                 cursor_.isUpdateDeleteHoleCache_.set((int) currentRowInRowset_,
@@ -3725,6 +3882,7 @@ private void deleteRowX() throws SqlException {
     }
 
     public void refreshRow() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -3743,13 +3901,17 @@ public void refreshRow() throws SQLException {
     private void refreshRowX() throws SqlException {
         checkForClosedResultSet("refreshRow");
         checkThatResultSetTypeIsScrollable();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     checkForUpdatableResultSet("refreshRow");
         if (isBeforeFirstX() || isAfterLastX() || isOnInsertRow_) {
             throw new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1266
+//IC see: https://issues.apache.org/jira/browse/DERBY-1266
                 new ClientMessageId(SQLState.NO_CURRENT_ROW));
         }
     
         // this method does nothing if ResultSet is TYPE_SCROLL_INSENSITIVE
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetType_ == ResultSet.TYPE_SCROLL_SENSITIVE) {
             isValidCursorPosition_ = getRefreshRowset();
             try {
@@ -3759,6 +3921,9 @@ private void refreshRowX() throws SqlException {
             }
 
             unuseStreamsAndLOBs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
 
         }
     }
@@ -3801,6 +3966,7 @@ public void moveToInsertRow() throws SQLException {
                 checkForClosedResultSet("moveToInsertRow");
                 checkForUpdatableResultSet("moveToInsertRow");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
                 resetUpdatedColumnsForInsert();
                 
                 // Note that even though we navigate "away" from the current row
@@ -3816,6 +3982,7 @@ public void moveToInsertRow() throws SQLException {
                 // the insert row. This is important since attempting to 
                 // release locators for a non-valid cursor position will trigger 
                 // an error on the server. See DERBY-6228.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
                 savedIsValidCursorPosition_ = isValidCursorPosition_;
                 isValidCursorPosition_ = true;
             }
@@ -3852,7 +4019,9 @@ public void moveToCurrentRow() throws SQLException {
      * @throws SqlException if releasing a LOB locator fails
      */
     private void moveToCurrentRowX() throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
         if (isOnInsertRow_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
             resetUpdatedColumns();
             isOnInsertRow_ = false;
             isOnCurrentRow_ = true;
@@ -3860,8 +4029,10 @@ private void moveToCurrentRowX() throws SqlException {
                 updateColumnInfoFromCache();
             }
             // Restore the old value when leaving the insert row. See DERBY-6228.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
             isValidCursorPosition_ = savedIsValidCursorPosition_;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3571
         if (isValidCursorPosition_) {
             // isOnInsertRow must be false here.
             if (SanityManager.DEBUG) {
@@ -3891,6 +4062,7 @@ public Statement getStatement() throws SQLException {
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceExit(this, "getStatement", statement_);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3446
         if (statement_.getOwner() != null) {
             return statement_.getOwner();
         } else {
@@ -3932,6 +4104,7 @@ public void updateRef(String columnName, Ref x) throws SQLException {
      * or this method is called on a closed result set
      */
     public void updateBlob(int columnIndex, Blob x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "updateBlob",
@@ -4002,6 +4175,7 @@ public void updateBlob(int columnIndex, InputStream x, long length)
                 updateColumn(columnIndex,
                              agent_.crossConverters_.setObject(
                                     resultSetMetaData_.types_[columnIndex -1],
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                     new ClientBlob(agent_, x, (int)length)));
             } catch (SqlException se) {
                 throw se.getSQLException();
@@ -4046,6 +4220,7 @@ public void updateArray(String columnName, Array x) throws SQLException {
     }
 
     boolean repositionScrollableResultSetBeforeJDBC1PositionedUpdateDelete()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         boolean repositionedCursor = false;
 
@@ -4053,7 +4228,9 @@ boolean repositionScrollableResultSetBeforeJDBC1PositionedUpdateDelete()
         long rowToFetch = getRowUncast() - absolutePosition_;
 
         // if rowToFetch is zero, already positioned on the current row
+//IC see: https://issues.apache.org/jira/browse/DERBY-1361
         if (rowToFetch != 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             writePositioningFetch_((generatedSection_ == null) ? statement_.getSection() : generatedSection_,
                     scrollOrientation_relative__,
                     rowToFetch);
@@ -4072,6 +4249,7 @@ private void flowPositioningFetch(int scrollOrientation,
         try {
             agent_.beginWriteChain(statement_);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             writePositioningFetch_((generatedSection_ == null) ? statement_.getSection() : generatedSection_,
                     scrollOrientation,
                     rowToFetch);
@@ -4096,12 +4274,15 @@ private void positionToCurrentRowAndUpdate() throws SqlException {
         if (resultSetType_ != ResultSet.TYPE_FORWARD_ONLY &&
                 (currentRowPosRelativeToAbsoluteRowPos != 0 ||
                 (currentRowPosRelativeToAbsoluteRowPos == 0 && cursorUnpositionedOnServer_))) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             writePositioningFetch_((generatedSection_ == null) ? statement_.getSection() : generatedSection_,
                     scrollOrientation_relative__,
                     currentRowPosRelativeToAbsoluteRowPos);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-611
             writeUpdateRow(false);
         } catch ( SQLException se ) {
             throw new SqlException(se);
@@ -4147,6 +4328,7 @@ private void update() throws SqlException {
         agent_.beginWriteChain(statement_);
 
         if (isRowsetCursor_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
             try {
                 preparedStatementForUpdate_.setInt(updatedColumns_.length + 1, (int) (currentRowInRowset_ + 1));
             } catch ( SQLException se ) {
@@ -4185,11 +4367,13 @@ private void positionToCurrentRowAndDelete() throws SqlException {
         if (resultSetType_ != ResultSet.TYPE_FORWARD_ONLY &&
                 (currentRowPosRelativeToAbsoluteRowPos != 0 ||
                 (currentRowPosRelativeToAbsoluteRowPos == 0 && cursorUnpositionedOnServer_))) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             writePositioningFetch_((generatedSection_ == null) ? statement_.getSection() : generatedSection_,
                     scrollOrientation_relative__,
                     currentRowPosRelativeToAbsoluteRowPos);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try {
             writeDeleteRow();
         } catch ( SQLException sqle ) {
@@ -4201,6 +4385,10 @@ private void positionToCurrentRowAndDelete() throws SqlException {
         // adjust the absolute position on the client.
         absolutePosition_ += currentRowPosRelativeToAbsoluteRowPos;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetType_ != ResultSet.TYPE_FORWARD_ONLY &&
                 (currentRowPosRelativeToAbsoluteRowPos != 0 ||
                 (currentRowPosRelativeToAbsoluteRowPos == 0 && cursorUnpositionedOnServer_))) {
@@ -4248,6 +4436,7 @@ private void delete() throws SqlException {
     private void setRowsetAfterLastEvent() throws SqlException {
         firstRowInRowset_ = 0;
         lastRowInRowset_ = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
         absolutePosition_ = (maxRows_ == 0) ? rowCount_ + 1 : maxRows_ + 1;
         currentRowInRowset_ = 0;
         rowsReceivedInCurrentRowset_ = 0;
@@ -4283,6 +4472,7 @@ public void setValidCursorPosition(boolean isValidCursorPosition) {
     }
 
     private void moveToAfterLast() throws DisconnectException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         flowPositioningFetch(ClientResultSet.scrollOrientation_after__, 0);
     }
 
@@ -4292,10 +4482,13 @@ private void moveToBeforeFirst() throws DisconnectException {
     }
 
     private void writeInsertRow(boolean chainedWritesFollowingSetLob)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
         try
         {
             preparedStatementForInsert_.materialPreparedStatement_.writeExecute_(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                     preparedStatementForInsert_.getSection(),
                     preparedStatementForInsert_.parameterMetaData_,
                     preparedStatementForInsert_.parameters_,
@@ -4312,8 +4505,10 @@ private void writeInsertRow(boolean chainedWritesFollowingSetLob)
     
     private void writeUpdateRow(boolean chainedWritesFollowingSetLob)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             preparedStatementForUpdate_.materialPreparedStatement_.writeExecute_(preparedStatementForUpdate_.getSection(),
                     preparedStatementForUpdate_.parameterMetaData_,
                     preparedStatementForUpdate_.parameters_,
@@ -4328,9 +4523,14 @@ private void writeUpdateRow(boolean chainedWritesFollowingSetLob)
     }
 
     private void writeDeleteRow() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         try
         {
             if (isRowsetCursor_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                 preparedStatementForDelete_.materialPreparedStatement_.writeExecute_(preparedStatementForDelete_.getSection(),
                         preparedStatementForDelete_.parameterMetaData_,
                         preparedStatementForDelete_.parameters_,
@@ -4373,12 +4573,14 @@ private void readDeleteRow() throws DisconnectException, SqlException {
     public void listenToUnitOfWork() {
         if (!listenToUnitOfWork_) {
             listenToUnitOfWork_ = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
             connection_.CommitAndRollbackListeners_.put(this, null);
         }
     }
 
     public void completeLocalCommit(Iterator listenerIterator) {
         cursorUnpositionedOnServer_ = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3571
         lobState.discardState(); // Locators released on server side.
         markAutoCommitted();
         if (!cursorHold_) {
@@ -4392,6 +4594,7 @@ public void completeLocalCommit(Iterator listenerIterator) {
     }
 
     public void completeLocalRollback(Iterator listenerIterator) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3571
         lobState.discardState(); // Locators released on server side.
         markAutoCommitted();
         // all cursors need to be closed at rollback
@@ -4445,6 +4648,7 @@ void markClosed(boolean removeListener) {
         if (removeListener) {
             connection_.CommitAndRollbackListeners_.remove(this);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         closeStatementOnCompletion();
     }
 
@@ -4532,6 +4736,7 @@ private String buildInsertString() throws SqlException {
         int column;
         boolean foundOneUpdatedColumnAlready = false;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
         StringBuffer insertSQL = new StringBuffer("INSERT INTO ");
         StringBuffer valuesSQL = new StringBuffer("VALUES (");
 
@@ -4571,6 +4776,7 @@ private String buildUpdateString() throws SqlException {
 
         // For Derby, eg update t1 set c1=?, c2=? where current of cursorname
         boolean foundOneUpdatedColumnAlready = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
         StringBuffer updateString = new StringBuffer(64);
         updateString.append("UPDATE ").append(getTableName()).append(" SET ");
 
@@ -4579,6 +4785,7 @@ private String buildUpdateString() throws SqlException {
                 if (foundOneUpdatedColumnAlready) {
                     updateString.append(",");
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                 try {
                     updateString.append(Utils.quoteSqlIdentifier(
                             resultSetMetaData_.getColumnName(column))).append(" = ? ");
@@ -4594,6 +4801,7 @@ private String buildUpdateString() throws SqlException {
             return null;
         }
         updateString.append(" WHERE CURRENT OF ").append(getServerCursorName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
 
         if (isRowsetCursor_) {
             updateString.append(" FOR ROW ? OF ROWSET");
@@ -4629,6 +4837,7 @@ private String getTableName() throws SqlException {
         String tableName = "";
         int baseTableColumn = 0;
         int totalColumns;
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try {
             totalColumns = resultSetMetaData_.getColumnCount();
         } catch ( SQLException sqle ) {
@@ -4656,14 +4865,17 @@ private String getTableName() throws SqlException {
     }
 
     private String getServerCursorName() throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
         return statement_.getSection().getServerCursorName();
     }
 
     private void getPreparedStatementForInsert() throws SqlException {
         // each column is associated with a tableName in the extended describe info.
         String insertString = buildInsertString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             preparedStatementForInsert_ = (ClientPreparedStatement)statement_.
                 connection_.prepareStatement(insertString);
         } catch ( SQLException sqle ) {
@@ -4682,6 +4894,7 @@ private void getPreparedStatementForUpdate() throws SqlException {
         preparedStatementForUpdate_ =
                 statement_.connection_.preparePositionedUpdateStatement(updateString,
                         statement_.getSection().getPositionedUpdateSection());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
 
     }
 
@@ -4691,11 +4904,13 @@ private void getPreparedStatementForDelete() throws SqlException {
 
         preparedStatementForDelete_ =
                 statement_.connection_.preparePositionedUpdateStatement(deleteString,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                         statement_.getSection().getPositionedUpdateSection()); // update section
     }
 
     private final void resetUpdatedColumnsForInsert() {
         // initialize updateColumns with nulls for all columns
+//IC see: https://issues.apache.org/jira/browse/DERBY-5012
         for (int i = 0; i < resultSetMetaData_.columns_; i++) {
             updateColumn(i+1, null);
             columnUpdated_[i] = false;
@@ -4704,6 +4919,7 @@ private final void resetUpdatedColumnsForInsert() {
 
     private final void resetUpdatedColumns() {
         if (updatedColumns_ != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5015
             Arrays.fill(updatedColumns_, null);
         }
         if (columnUpdated_ != null) {
@@ -4723,6 +4939,7 @@ private final void checkGetterPreconditions(int column, String operation)
     }
 
     private final void checkUpdatePreconditions(int column, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                         String operation)
     throws SqlException {
 
@@ -4750,6 +4967,7 @@ private void checkForValidColumnIndex(int column) throws SqlException {
         if (column < 1 || column > resultSetMetaData_.columns_) {
             throw new SqlException(agent_.logWriter_, 
                 new ClientMessageId(SQLState.LANG_INVALID_COLUMN_POSITION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 column, resultSetMetaData_.columns_);
         }
     }
@@ -4767,6 +4985,7 @@ protected final void checkForClosedResultSet(String operation)
 
     private final void checkForUpdatableResultSet(String operation) 
         throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetConcurrency_ == ResultSet.CONCUR_READ_ONLY) {
             throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId(SQLState.UPDATABLE_RESULTSET_API_DISALLOWED),
@@ -4783,6 +5002,7 @@ private final void checkForValidCursorPosition() throws SqlException {
 
 
     private final void checkPositionedOnPlainRow() throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1323
         if (isOnInsertRow_ || !isValidCursorPosition_) {
             throw new SqlException
                 (agent_.logWriter_, 
@@ -4792,6 +5012,7 @@ private final void checkPositionedOnPlainRow() throws SqlException {
 
 
     private final void checkThatResultSetTypeIsScrollable() throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetType_ == ResultSet.TYPE_FORWARD_ONLY) {
             throw new SqlException(agent_.logWriter_, 
                 new ClientMessageId(SQLState.CURSOR_MUST_BE_SCROLLABLE));
@@ -4880,6 +5101,7 @@ private void updateColumnInfoFromCache() {
         // currentRowInRowset_ should never be bigger than the max value of an int,
         // because we have a driver imposed limit of fetch size 1000.
         cursor_.columnDataPosition_ =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 cursor_.columnDataPositionCache_.get((int) currentRowInRowset_);
         cursor_.columnDataComputedLength_ =
                 cursor_.columnDataLengthCache_.get((int) currentRowInRowset_);
@@ -4910,6 +5132,7 @@ protected final void checkAndThrowReceivedQueryTerminatingException() throws Sql
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void parseScrollableRowset() throws SqlException {
         // modified check from qrydtaReturned to cursor.dataBufferHasUnprocesseData()
         if (cursor_.dataBufferHasUnprocessedData() && scrollable_) {
@@ -4918,6 +5141,7 @@ void parseScrollableRowset() throws SqlException {
 
             // This method is only called after open query to parse out the very first rowset
             // received.
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
             if (cursor_.allRowsReceivedFromServer() &&
                 rowsReceivedInCurrentRowset_ == 0) {
                 setRowsetNoRowsEvent();
@@ -4955,6 +5179,7 @@ protected void getRowCount() throws SqlException {
         agent_.beginWriteChain(statement_);
 
         Section section = (generatedSection_ == null) ? statement_.getSection() : generatedSection_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
 
         // send the first CNTQRY to place cursor after last to retrieve the rowCount_.
         writePositioningFetch_(section, scrollOrientation_after__, 0);
@@ -4981,16 +5206,19 @@ protected void getRowCount() throws SqlException {
         if (isRowsetCursor_ && sensitivity_ != sensitivity_sensitive_dynamic__ && firstRowInRowset_ != 0) {
             absolutePosition_ = firstRowInRowset_;
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
             absolutePosition_ = (maxRows_ == 0) ? rowCount_ + 1 : maxRows_ + 1;
         }
     }
 
     private void flowGetRowset(int orientation, long rowNumber) throws SqlException {
         // clear lobs before fetching rows
+//IC see: https://issues.apache.org/jira/browse/DERBY-1382
         cursor_.clearLobData_();
         cursor_.resetDataBuffer();
         agent_.beginWriteChain(statement_);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
         writeScrollableFetch_((generatedSection_ == null) ? statement_.getSection() : generatedSection_,
                 fetchSize_,
                 orientation,
@@ -5121,6 +5349,7 @@ else if (isAfterLast) {
             
             // If afterLast and maxRows > 0, go backward from maxRows and not 
             // from last row in the resultSet
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
             if (maxRows_ > 0 && orientation == scrollOrientation_relative__ && isAfterLast) {
                 rowNumber += maxRows_ + 1;
                 orientation = scrollOrientation_absolute__;
@@ -5133,6 +5362,7 @@ else if (isAfterLast) {
 
         // If no row was received but received sqlcode +100, then the cursor is
         // positioned before first.
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (rowsReceivedInCurrentRowset_ == 0 &&
             cursor_.allRowsReceivedFromServer()) {
             isBeforeFirst_ = true;
@@ -5158,6 +5388,7 @@ private void adjustPreviousRowset(int orientation, long rowNumber, boolean isAft
             lastRowInRowset_ = rowsReceivedInCurrentRowset_;
             absolutePosition_ = (isAfterLastRow) ? lastRowInRowset_ + 1 : lastRowInRowset_;
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
             if (maxRows_ == 0)
                 lastRowInRowset_ = (isAfterLastRow) ? rowCount_ : firstRowInRowset_ - 1;
             else
@@ -5183,6 +5414,7 @@ private boolean getAbsoluteRowset(long row) throws SqlException {
 
         // If no row was received but received sqlcode +100, then the cursor is
         // positioned after last or before first.
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if ((rowsReceivedInCurrentRowset_ == 0 &&
              cursor_.allRowsReceivedFromServer()) ||
                 orientation == scrollOrientation_before__) {
@@ -5213,6 +5445,7 @@ private void adjustAbsoluteRowset(long rowNumber) {
 
     private boolean getRelativeRowset(long rows) throws SqlException {
         if (rows == 0 &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
                 (cursor_.allRowsReceivedFromServer() ||
                  absolutePosition_ > rowCount_)) {
             setRowsetAfterLastEvent();
@@ -5223,6 +5456,7 @@ private boolean getRelativeRowset(long rows) throws SqlException {
         flowGetRowset(scrollOrientation_relative__, rows);
         parseRowset_();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (rowsReceivedInCurrentRowset_ == 0 &&
             cursor_.allRowsReceivedFromServer()) {
             if (rows > 0) {
@@ -5254,6 +5488,7 @@ private boolean getFirstRowset() throws SqlException {
         parseRowset_();
 
         // If no row was received but received sqlcode +100, then no row in the result set
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (rowsReceivedInCurrentRowset_ == 0 &&
             cursor_.allRowsReceivedFromServer()) {
             resetRowsetFlags();
@@ -5288,6 +5523,7 @@ private boolean getLastRowset(long row) throws SqlException {
             // If fetchSize_ is smaller than the total number of rows in the ResultSet,
             // then fetch one rowset of fetchSize_ number of rows.  Otherwise, we will
             // fetch all rows in the ResultSet, so start fetching from row 1.
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
             long rowNumber;
             if (maxRows_ == 0) {
                 rowNumber = (fetchSize_ < row) ? ((-1) * fetchSize_) : 1;
@@ -5298,7 +5534,10 @@ private boolean getLastRowset(long row) throws SqlException {
         }
         parseRowset_();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (rowsReceivedInCurrentRowset_ == 0 &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
             cursor_.allRowsReceivedFromServer()) {
             isAfterLast_ = true;
             setRowsetAfterLastEvent();
@@ -5317,6 +5556,7 @@ private boolean getLastRowset(long row) throws SqlException {
     private void adjustLastRowset(long row) {
         lastRowInRowset_ = row;
         firstRowInRowset_ = lastRowInRowset_ - rowsReceivedInCurrentRowset_ + 1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
         if (firstRowInRowset_ <= 0) {
             firstRowInRowset_ = 1;
         }
@@ -5347,6 +5587,7 @@ private void adjustRefreshRowset() {
     }
 
     private void setAbsolutePositionBasedOnAllRowsReceived() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         absolutePosition_ = (cursor_.allRowsReceivedFromServer()) ?
                 lastRowInRowset_ + 1 : lastRowInRowset_;
     }
@@ -5439,22 +5680,27 @@ private void resetRowsetFlags() {
 
     private void resetRowsetSqlca() {
         if (rowsetSqlca_ != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5015
             Arrays.fill(rowsetSqlca_, null);
         }
     }
     
     
     private CloseFilterInputStream createCloseFilterInputStream(InputStream is)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if(is == null){
             return null;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
         if( currentStream == is ){
             return currentStream;
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
         closeOpenStreams();
         
         currentStream = new CloseFilterInputStream(is);
@@ -5479,6 +5725,7 @@ private void closeOpenStreams() throws SqlException {
             } catch (IOException ioe) {                
                 throw new SqlException(agent_.logWriter_,
                         new ClientMessageId(SQLState.JAVA_EXCEPTION), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                         ioe, "java.io.IOException", ioe.getMessage());
             }
             currentStream = null;
@@ -5490,6 +5737,7 @@ private void closeOpenStreams() throws SqlException {
             } catch (IOException ioe) {                
                 throw new SqlException(agent_.logWriter_,
                         new ClientMessageId(SQLState.JAVA_EXCEPTION), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                         ioe, "java.io.IOException", ioe.getMessage());
             }
             currentReader = null;
@@ -5505,6 +5753,7 @@ private void closeOpenStreams() throws SqlException {
      * @throws SQLException if the column has already been accessed
      */
     private void useStreamOrLOB(int columnIndex) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
         checkLOBMultiCall(columnIndex);
         columnUsedFlags_[columnIndex - 1] = true;
     }
@@ -5525,6 +5774,7 @@ private void useStreamOrLOB(int columnIndex) throws SqlException {
      */
     private void checkLOBMultiCall(int columnIndex)
             throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
         if (columnUsedFlags_ == null) {
             columnUsedFlags_ = new boolean[resultSetMetaData_.columns_];
         }
@@ -5546,6 +5796,7 @@ private void unuseStreamsAndLOBs() {
 
     private SQLException jdbc3MethodNotSupported()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-842
         return new SqlException(agent_.logWriter_,
             new ClientMessageId(SQLState.JDBC_METHOD_NOT_IMPLEMENTED)).
             getSQLException();
@@ -5562,6 +5813,7 @@ private SQLException jdbc3MethodNotSupported()
      * @exception SQLException if a database error occurs
      */
     public final int getHoldability() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-948
         if (agent_.loggingEnabled()) {
             agent_.logWriter_.traceEntry(this, "getHoldability");
         }
@@ -5615,6 +5867,7 @@ public final boolean isClosed() throws SQLException {
      *      result set
      */
     public void updateAsciiStream(int columnIndex, InputStream x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
@@ -5627,6 +5880,7 @@ public void updateAsciiStream(int columnIndex, InputStream x)
                         agent_.crossConverters_.setObjectFromCharacterStream(
                             resultSetMetaData_.types_[columnIndex -1],
                             x,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                             Cursor.ISO_8859_1,
                             CrossConverters.UNKNOWN_LENGTH));
             } catch (SqlException se) {
@@ -5653,10 +5907,12 @@ public void updateAsciiStream(int columnIndex, InputStream x)
      *                if a database-access error occurs
      */
     public void updateAsciiStream(int columnIndex, InputStream x,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
                     long length) throws SQLException {
         if(length > Integer.MAX_VALUE)
                 throw new SqlException(agent_.logWriter_,
                     new ClientMessageId(SQLState.CLIENT_LENGTH_OUTSIDE_RANGE_FOR_DATATYPE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     length, Integer.MAX_VALUE).getSQLException();
         else
             updateAsciiStream(columnIndex,x,(int)length);
@@ -5680,6 +5936,7 @@ public void updateAsciiStream(int columnIndex, InputStream x,
      *      result set
      */
     public void updateBinaryStream(int columnIndex, InputStream x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
@@ -5721,6 +5978,7 @@ public void updateBinaryStream(int columnIndex, InputStream x,
          if(length > Integer.MAX_VALUE)
                 throw new SqlException(agent_.logWriter_,
                     new ClientMessageId(SQLState.CLIENT_LENGTH_OUTSIDE_RANGE_FOR_DATATYPE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     length, Integer.MAX_VALUE).getSQLException();
         else
             updateBinaryStream(columnIndex,x,(int)length);
@@ -5745,6 +6003,7 @@ public void updateBinaryStream(int columnIndex, InputStream x,
      *      result set
      */
     public void updateBlob(int columnIndex, InputStream x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
@@ -5756,6 +6015,7 @@ public void updateBlob(int columnIndex, InputStream x)
                 updateColumn(columnIndex,
                              agent_.crossConverters_.setObject(
                                     resultSetMetaData_.types_[columnIndex -1],
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                     new ClientBlob(agent_, x)));
             } catch (SqlException se) {
                 throw se.getSQLException();
@@ -5822,6 +6082,7 @@ public void updateCharacterStream(int columnIndex, Reader x,
         if(length > Integer.MAX_VALUE)
                 throw new SqlException(agent_.logWriter_,
                     new ClientMessageId(SQLState.CLIENT_LENGTH_OUTSIDE_RANGE_FOR_DATATYPE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     length, Integer.MAX_VALUE).getSQLException();
         else
             updateCharacterStream(columnIndex,x,(int)length);
@@ -5848,6 +6109,7 @@ public void updateCharacterStream(int columnIndex, Reader x,
      *      result set
      */
     public void updateClob(int columnIndex, Reader reader)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         synchronized (connection_) {
             if (agent_.loggingEnabled()) {
@@ -5859,6 +6121,7 @@ public void updateClob(int columnIndex, Reader reader)
                 updateColumn(columnIndex,
                              agent_.crossConverters_.setObject(
                                  resultSetMetaData_.types_[columnIndex -1], 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                  new ClientClob(agent_, reader)));
             } catch (SqlException se) {
                 throw se.getSQLException();
@@ -5941,6 +6204,7 @@ public void updateAsciiStream(String columnName, InputStream x,
      *      result set
      */
     public void updateBinaryStream(String columnLabel, InputStream x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         try {
             updateBinaryStream(findColumnX(columnLabel, "updateBinaryStream"), x);
@@ -5996,6 +6260,7 @@ public void updateBinaryStream(String columnName, InputStream x,
      *      result set
      */
     public void updateBlob(String columnLabel, InputStream x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SQLException {
         try {
             updateBlob(findColumnX(columnLabel, "updateBlob"), x);
@@ -6126,6 +6391,7 @@ public void updateClob(int columnIndex, Reader x, long length)
                 updateColumn(columnIndex,
                              agent_.crossConverters_.setObject(
                                  resultSetMetaData_.types_[columnIndex -1],
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                  new ClientClob(agent_, x, (int)length)));
             } catch (SqlException se) {
                 throw se.getSQLException();
@@ -6240,6 +6506,7 @@ public void updateClob(String columnLabel, Clob x)
      * @param index 1-based column index
      */
     public final void markLOBAsPublished(int index) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3601
         this.lobState.markAsPublished(index);
     }
 
@@ -6255,6 +6522,7 @@ final void createLOBColumnTracker() {
             SanityManager.ASSERT(this.lobState == null,
                     "LOB state tracker already initialized.");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3601
         if (this.connection_.supportsSessionDataCaching() &&
                 this.resultSetMetaData_.hasLobColumns()) {
             final int columnCount = this.resultSetMetaData_.columns_;
@@ -6263,6 +6531,7 @@ final void createLOBColumnTracker() {
             boolean[] tmpIsBlob = new boolean[columnCount];
             for (int i=0; i < columnCount; i++) {
                 int type = this.resultSetMetaData_.types_[i];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (type == ClientTypes.BLOB || type == ClientTypes.CLOB) {
                     tmpIndexes[lobCount] = i +1; // Convert to 1-based index.
                     tmpIsBlob[lobCount++] = (type == ClientTypes.BLOB);
@@ -6273,6 +6542,7 @@ final void createLOBColumnTracker() {
             boolean[] isBlob = new boolean[lobCount];
             System.arraycopy(tmpIndexes, 0, lobIndexes, 0, lobCount);
             System.arraycopy(tmpIsBlob, 0, isBlob, 0, lobCount);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3601
             this.lobState = new LOBStateTracker(lobIndexes, isBlob, true);
         } else {
             // Use a no-op state tracker to simplify code expecting a tracker.
@@ -6281,6 +6551,7 @@ final void createLOBColumnTracker() {
     }
 
     public Reader getNCharacterStream(int columnIndex)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         throws SQLException {
         throw SQLExceptionFactory.notImplemented("getNCharacterStream(int)");
     }
@@ -6464,6 +6735,19 @@ public void updateNClob(String columnName, InputStream x, long length)
      */
 
      public void updateNClob(String columnName, Reader x, long length)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                            throws SQLException {
          throw SQLExceptionFactory.notImplemented("updateNClob(String,Reader,long)");
      }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientSavepoint.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientSavepoint.java
index 4af629790b..30d6b274e4 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientSavepoint.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientSavepoint.java
@@ -26,6 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.sql.SQLException;
 import java.sql.Savepoint;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class ClientSavepoint implements Savepoint {
     // ----------------- internals -----------------------------------------------
 
@@ -36,6 +37,7 @@ class ClientSavepoint implements Savepoint {
     //---------------------constructors/finalizer---------------------------------
 
     // create a named savepoint.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientSavepoint(Agent agent, String savepointName) {
         agent_ = agent;
         savepointName_ = savepointName;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientStatement.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientStatement.java
index 8450b40c2c..bc89968c6f 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientStatement.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientStatement.java
@@ -949,6 +949,7 @@ public void setCursorName(String name) throws SQLException {
 
                 // Per jdbc spec (see Statement.close() javadoc)
                 checkForClosedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
                 if (name == null || name.equals("")) {
                     throw new SqlException(agent_.logWriter_, 
@@ -1004,6 +1005,7 @@ boolean executeX(String sql) throws SqlException {
     }
 
     public ResultSet getResultSet() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             synchronized (connection_) {
@@ -1013,6 +1015,7 @@ public ResultSet getResultSet() throws SQLException {
 
                 // Per jdbc spec (see Statement.close() javadoc)
                 checkForClosedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "getResultSet", resultSet_);
@@ -1040,6 +1043,7 @@ public int getUpdateCount() throws SQLException {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "getUpdateCount", updateCount_);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 return (int) updateCount_;
             }
         }
@@ -1051,6 +1055,7 @@ public int getUpdateCount() throws SQLException {
 
     // Added by JDBC 4.2
     public long getLargeUpdateCount() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         try
         {
             synchronized (connection_) {
@@ -1060,6 +1065,8 @@ public long getLargeUpdateCount() throws SQLException {
 
                 // Per jdbc spec (see Statement.close() javadoc)
                 checkForClosedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "getUpdateCount", updateCount_);
@@ -1105,6 +1112,7 @@ public void setFetchDirection(int direction) throws SQLException {
 
                 // Per jdbc spec (see Statement.close() javadoc)
                 checkForClosedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
                 switch (direction) {
                 case ResultSet.FETCH_FORWARD:
@@ -1115,6 +1123,7 @@ public void setFetchDirection(int direction) throws SQLException {
                 default:
                     throw new SqlException(agent_.logWriter_,
                         new ClientMessageId(SQLState.INVALID_FETCH_DIRECTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         direction);
                 }
             }
@@ -1150,10 +1159,12 @@ public void setFetchSize(int rows) throws SQLException {
 
                 // Per jdbc spec (see Statement.close() javadoc)
                 checkForClosedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
                 if (rows < 0 || (maxRows_ != 0 && rows > maxRows_)) {
                     throw new SqlException(agent_.logWriter_, 
                         new ClientMessageId(SQLState.INVALID_ST_FETCH_SIZE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         rows).getSQLException();
                 }
                 fetchSize_ = rows;
@@ -1236,6 +1247,7 @@ public void clearBatch() throws SQLException {
                     agent_.logWriter_.traceEntry(this, "clearBatch");
                 }
                 checkForClosedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
                 batch_.clear();
             }
         }
@@ -1252,6 +1264,7 @@ public int[] executeBatch() throws SQLException {
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceEntry(this, "executeBatch");
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 long[] updateCounts = executeBatchX();
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "executeBatch", updateCounts);
@@ -1267,6 +1280,7 @@ public int[] executeBatch() throws SQLException {
 
     // Added by JDBC 4.2
     public long[] executeLargeBatch() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         try
         {
             synchronized (connection_) {
@@ -1288,19 +1302,23 @@ public long[] executeLargeBatch() throws SQLException {
 
     private long[] executeBatchX() throws SqlException, BatchUpdateException {
         // Per jdbc spec (see Statement.close() javadoc)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         checkForClosedStatement();
         clearWarningsX(); // Per jdbc spec 0.7, and getWarnings() javadoc
         resultSetList_ = null;
         // Initialize all the updateCounts to indicate failure
         // This is done to account for "chain-breaking" errors where we cannot
         // read any more replies
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         long[] updateCounts = new long[batch_.size()];
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
         Arrays.fill(updateCounts, -3);
         flowExecuteBatch(updateCounts);
         return updateCounts;
     }
 
     public Connection getConnection() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             checkForClosedStatement();
@@ -1339,8 +1357,10 @@ public boolean getMoreResults(int current) throws SQLException {
 
     private boolean getMoreResultsX(int current) throws SqlException {
         // Per jdbc spec (see Statement.close() javadoc)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         checkForClosedStatement();
         boolean resultIsResultSet;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         updateCount_ = -1L;
         if (resultSetList_ == null) {
             if (resultSet_ != null) {
@@ -1351,6 +1371,7 @@ private boolean getMoreResultsX(int current) throws SqlException {
             }
             resultIsResultSet = false;
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             if (current == CLOSE_CURRENT_RESULT &&
                     resultSetList_[indexOfCurrentResultSet_] != null) {
                 resultSetList_[indexOfCurrentResultSet_].closeX();
@@ -1376,11 +1397,13 @@ private boolean getMoreResultsX(int current) throws SqlException {
     }
 
     public ResultSet getGeneratedKeys() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceEntry(this, "getGeneratedKeys");
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             checkForClosedStatement();
             if (agent_.loggingEnabled()) {
                 agent_.logWriter_.traceExit(this, "getGeneratedKeys", generatedKeysResultSet_);
@@ -1402,6 +1425,7 @@ public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException
                 }
                 autoGeneratedKeys_ = autoGeneratedKeys;
                 int updateValue = (int) executeUpdateX(sql);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "executeUpdate", updateValue);
                 }
@@ -1420,6 +1444,7 @@ public long executeLargeUpdate(String sql, int autoGeneratedKeys) throws SQLExce
         {
             synchronized (connection_) {
                 if (agent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                     agent_.logWriter_.traceEntry(this, "executeLargeUpdate", sql, autoGeneratedKeys);
                 }
                 autoGeneratedKeys_ = autoGeneratedKeys;
@@ -1452,6 +1477,7 @@ public int executeUpdate(String sql, int columnIndexes[]) throws SQLException {
                 }
 
                 int updateValue = (int) executeUpdateX(sql);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "executeUpdate", updateValue);
                 }
@@ -1470,9 +1496,12 @@ public long executeLargeUpdate(String sql, int columnIndexes[]) throws SQLExcept
         {
             synchronized (connection_) {  
                 if (agent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                     agent_.logWriter_.traceEntry(this, "executeLargeUpdate", sql, columnIndexes);
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (columnIndexes != null && columnIndexes.length > 0) {
                     autoGeneratedKeys_ = ClientStatement.RETURN_GENERATED_KEYS;
                     generatedKeysColumnIndexes_ = columnIndexes.clone();
@@ -1501,7 +1530,10 @@ public int executeUpdate(String sql, String columnNames[]) throws SQLException {
                     agent_.logWriter_.traceEntry(this, "executeUpdate", sql, columnNames);
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (columnNames != null && columnNames.length > 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     autoGeneratedKeys_ = ClientStatement.RETURN_GENERATED_KEYS;
                     generatedKeysColumnNames_ = columnNames.clone();
                 } else {
@@ -1509,6 +1541,7 @@ public int executeUpdate(String sql, String columnNames[]) throws SQLException {
                 }
 
                 int updateValue = (int) executeUpdateX(sql);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 if (agent_.loggingEnabled()) {
                     agent_.logWriter_.traceExit(this, "executeUpdate", updateValue);
                 }
@@ -1527,10 +1560,14 @@ public long executeLargeUpdate(String sql, String columnNames[]) throws SQLExcep
         {
             synchronized (connection_) {
                 if (agent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                     agent_.logWriter_.traceEntry(this, "executeLargeUpdate", sql, columnNames);
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (columnNames != null && columnNames.length > 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     autoGeneratedKeys_ = ClientStatement.RETURN_GENERATED_KEYS;
                     generatedKeysColumnNames_ = columnNames.clone();
                 } else {
@@ -1579,10 +1616,12 @@ public boolean execute(String sql, int columnIndexes[]) throws SQLException {
                     agent_.logWriter_.traceEntry(this, "execute", sql, columnIndexes);
                 }             
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (columnIndexes != null && columnIndexes.length > 0) {
                     autoGeneratedKeys_ = ClientStatement.RETURN_GENERATED_KEYS;
                     generatedKeysColumnIndexes_ = columnIndexes.clone();
                 } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
                     generatedKeysColumnIndexes_ = null;
                 }
 
@@ -1607,7 +1646,10 @@ public boolean execute(String sql, String columnNames[]) throws SQLException {
                     agent_.logWriter_.traceEntry(this, "execute", sql, columnNames);
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (columnNames != null && columnNames.length > 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     autoGeneratedKeys_ = ClientStatement.RETURN_GENERATED_KEYS;
                     generatedKeysColumnNames_ = columnNames.clone();
                 } else {
@@ -1652,7 +1694,9 @@ public int getResultSetHoldability() throws SQLException {
      */
     private Section setSpecialRegisterSection_ = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void writeSetSpecialRegister(ArrayList sqlsttList)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3198
         throws SqlException {
         if (setSpecialRegisterSection_ == null) {
             setSpecialRegisterSection_ = 
@@ -1663,6 +1707,7 @@ void writeSetSpecialRegister(ArrayList sqlsttList)
                                                     sqlsttList);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readSetSpecialRegister() throws SqlException {
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(setSpecialRegisterSection_ != null);
@@ -1693,11 +1738,13 @@ private void readExecuteImmediateForBatch(String sql) throws SqlException {
         materialStatement_.readExecuteImmediateForBatch_(sql);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void writePrepareDescribeOutput(String sql,
                                            Section section) throws SqlException {
         materialStatement_.writePrepareDescribeOutput_(sql, section);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readPrepareDescribeOutput() throws SqlException {
         materialStatement_.readPrepareDescribeOutput_();
     }
@@ -1712,6 +1759,7 @@ public void completePrepareDescribeOutput(ColumnMetaData resultSetMetaData,
     }
 
     // Used for re-prepares across commit only
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void writePrepare(String sql, Section section) throws SqlException {
         materialStatement_.writePrepare_(sql, section);
     }
@@ -1728,6 +1776,7 @@ public void completePrepare(Sqlca sqlca) {
         markPrepared();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void writeOpenQuery(Section section,
                                int fetchSize,
                                int resultSetType) throws SqlException {
@@ -1736,6 +1785,7 @@ void writeOpenQuery(Section section,
                 resultSetType);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readOpenQuery() throws SqlException {
         materialStatement_.readOpenQuery_();
     }
@@ -1753,6 +1803,7 @@ public void completeOpenQuery(Sqlca sqlca, ClientResultSet resultSet) {
         resultSet.resultSetMetaData_.resultSetConcurrency_ = resultSet.resultSetConcurrency_;
         // Create tracker for LOB locator columns.
         resultSet.createLOBColumnTracker();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3571
 
         // only cache the Cursor object for a PreparedStatement and if a Cursor object is
         // not already cached.
@@ -1766,6 +1817,7 @@ public void completeOpenQuery(Sqlca sqlca, ClientResultSet resultSet) {
             return;
         }
         resultSet.cursor_.rowsRead_ = fetchedRowBase;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         // Set fetchSize_ to the default(64) if not set by the user if the resultset is scrollable.
         // This fetchSize_ is used to check for a complete rowset when rowsets are parsed.
@@ -1773,8 +1825,10 @@ public void completeOpenQuery(Sqlca sqlca, ClientResultSet resultSet) {
         // fetchSize of 64 is sent on behalf of the application, so we need to update the fetchSize_
         // here to 64.
         if (resultSet_.fetchSize_ == 0 &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
              (resultSet_.resultSetType_ == ResultSet.TYPE_SCROLL_INSENSITIVE ||
               resultSet_.resultSetType_ == ResultSet.TYPE_SCROLL_SENSITIVE)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             resultSet_.setFetchSize_(Configuration.defaultFetchSize);
         }
     }
@@ -1790,6 +1844,7 @@ public void completeExecuteCallOpenQuery(
         resultSet.resultSetMetaData_ = resultSetMetaData;
         // Create tracker for LOB locator columns.
         resultSet.createLOBColumnTracker();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3571
 
         // The following two assignments should have already happened via prepareEvent(),
         // but are included here for safety for the time being.
@@ -1797,6 +1852,7 @@ public void completeExecuteCallOpenQuery(
             return;
         }
         resultSet.cursor_.rowsRead_ = fetchedRowBase;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         resultSet.generatedSection_ = generatedSection;
 
@@ -1805,10 +1861,12 @@ public void completeExecuteCallOpenQuery(
         // fetchSize_ is not set, we do not send any default value.  Here since we always send
         // the fetchSize_, we need to set it to what we sent.
         if (resultSet.fetchSize_ == 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             resultSet.fetchSize_ = Configuration.defaultFetchSize;
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void writeExecuteCall(boolean outputExpected,
                                  String procedureName,
                                  Section section,
@@ -1827,15 +1885,18 @@ void writeExecuteCall(boolean outputExpected,
                 inputs);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readExecuteCall() throws SqlException {
         materialStatement_.readExecuteCall_();
     }
 
     public void completeExecuteCall(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Sqlca sqlca,
             Cursor singletonParams,
             ClientResultSet[] resultSets) {
         completeExecuteCall(sqlca, singletonParams);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         resultSetList_ = resultSets.clone();
         if (resultSets != null) {
             resultSet_ = resultSets[0];
@@ -1871,6 +1932,7 @@ public void completeExecute(Sqlca sqlca) {
             // sometime for call statement, protocol will return updateCount_, we will always set that to 0
             // sqlMode_ is not set for statements, only for prepared statements
             if (sqlMode_ == isCall__) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 updateCount_ = -1L;
             }
             // Sqlcode 466 indicates a call statement has issued and result sets returned.
@@ -1896,6 +1958,7 @@ public void setUpdateCount(long updateCount) {
      * @param owner the owning statement, if any
      */
     protected final void setOwner(Statement owner) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3446
         this.owner = owner;
     }
 
@@ -1904,6 +1967,7 @@ protected final void setOwner(Statement owner) {
      *
      * @return The designated owner of this statement, or {@code null} if none.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final Statement getOwner() {
         return this.owner;
     }
@@ -2026,6 +2090,8 @@ private boolean writeCloseResultSets(int number, boolean allowAutoCommits)
         if (connection_.autoCommit_ && requiresAutocommit && isAutoCommittableStatement_) {
             connection_.writeAutoCommit();
             if (connection_.isXAConnection_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 return connection_.getXAState() ==
                        ClientConnection.XA_T0_NOT_ASSOCIATED;
             } else {
@@ -2044,6 +2110,7 @@ final void readCloseResultSets(boolean allowAutoCommits) throws SqlException {
     }
 
     private void readCloseResultSets(int number, boolean allowAutoCommits)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         boolean requiredAutocommit = false;
         if (resultSetList_ != null) {
@@ -2141,6 +2208,7 @@ public void completeExecuteSetStatement(Sqlca sqlca) {
      * added to the list of open statements.
      */
     void markClosed() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         markClosed(false);
     }
     
@@ -2157,7 +2225,9 @@ void markClosed() {
      */
     void markClosed(boolean removeListener) {
         openOnClient_ = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         markResultSetsClosed(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         closeEverythingExceptResultSets( removeListener );
     }
 
@@ -2175,6 +2245,7 @@ private void    closeEverythingExceptResultSets( boolean removeListener )
         removeClientCursorNameFromCache();
         markPreparedStatementForAutoGeneratedKeysClosed();
         setSection(null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
 
         // mark close ResultSetMetaData
         if (resultSetMetaData_ != null) {
@@ -2184,7 +2255,9 @@ private void    closeEverythingExceptResultSets( boolean removeListener )
         
         if(removeListener)
             connection_.openStatements_.remove(this);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3198
         if (setSpecialRegisterSection_ != null) {
             setSpecialRegisterSection_.free();
             setSpecialRegisterSection_ = null;
@@ -2205,6 +2278,7 @@ private void markPreparedStatementForAutoGeneratedKeysClosed() {
      * from the commit and rollback listeners list in
      * <code>org.apache.derby.client.am.Connection</code>.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
     final void markResultSetsClosed(boolean removeListener)
     {
         try {
@@ -2239,13 +2313,16 @@ final void markResultSetsClosed(boolean removeListener)
     private void flowExecute(int executeType, String sql) throws SqlException {
         // Per jdbc spec (see Statement.close() javadoc)
         checkForClosedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         clearWarningsX(); // Per jdbc spec 0.7, and getWarnings() javadoc
         sql = escape(sql);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5806
         sqlMode_ = executeType==executeQueryMethod__?isQuery__:isUpdate__;
         parseSqlAndSetSqlModes(sql);
         checkAutoGeneratedKeysParameters();
         if (sqlMode_ == isUpdate__) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             updateCount_ = 0L;
         } else {
             updateCount_ = -1L;
@@ -2258,6 +2335,9 @@ private void flowExecute(int executeType, String sql) throws SqlException {
         // statements can have the same cursor name as long as their result
         // sets are not simultaneously open.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1036
+//IC see: https://issues.apache.org/jira/browse/DERBY-1183
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
         if (sqlMode_ == isQuery__) {
             checkForDuplicateCursorName();
         }
@@ -2267,6 +2347,7 @@ private void flowExecute(int executeType, String sql) throws SqlException {
             agent_.beginWriteChain(this);
             boolean piggybackedAutoCommit = writeCloseResultSets(true);  // true means permit auto-commits
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientResultSet scrollableRS = null;
             Section newSection = null;
             boolean repositionedCursor = false;
@@ -2304,6 +2385,7 @@ private void flowExecute(int executeType, String sql) throws SqlException {
                     newSection = agent_.sectionManager_.getPositionedUpdateSection(cursorName, true); // true means get an execute immediate section
                     if (newSection == null) {
                         throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4777
                             new ClientMessageId(SQLState.LANG_CURSOR_NOT_FOUND),
                             cursorName);
                     }
@@ -2328,13 +2410,17 @@ private void flowExecute(int executeType, String sql) throws SqlException {
                     writeExecuteImmediate(sql, newSection);
                 }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-3426
                else {
                     newSection = agent_.sectionManager_.getDynamicSection(resultSetHoldability_);
 
                     writeExecuteImmediate(sql, newSection);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
             		if ((sqlUpdateMode_ == isInsertSql__ || sqlUpdateMode_ == isUpdateSql__) 
             				&& autoGeneratedKeys_ == RETURN_GENERATED_KEYS) {
                         // chain a "select from identity_val_local()" to the insert statement
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                         if (preparedStatementForAutoGeneratedKeys_ == null) {
                             preparedStatementForAutoGeneratedKeys_ =
                                  prepareAutoGeneratedKeysStatement(connection_);
@@ -2361,6 +2447,7 @@ private void flowExecute(int executeType, String sql) throws SqlException {
 
             readCloseResultSets(true);  // true means permit auto-commits
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-506
             if (timeoutSent) {
                 readSetSpecialRegister(); // Read response to the EXCSQLSET
             }
@@ -2374,6 +2461,7 @@ private void flowExecute(int executeType, String sql) throws SqlException {
 
             markResultSetsClosed(true); // true means remove from list of commit and rollback listeners
             setSection(newSection);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
 
             switch (sqlMode_) {
             case isQuery__:
@@ -2394,6 +2482,9 @@ private void flowExecute(int executeType, String sql) throws SqlException {
                     // result sets happening during readCloseResultSets above
                     // because ResultSet#markClosed calls
                     // Statement#removeClientCursorNameFromCache.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1036
+//IC see: https://issues.apache.org/jira/browse/DERBY-1183
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
                     setupCursorNameCacheAndMappings();
                 }
 
@@ -2407,14 +2498,18 @@ private void flowExecute(int executeType, String sql) throws SqlException {
                 }
                 readExecuteImmediate();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
         		if ((sqlUpdateMode_ == isInsertSql__ || sqlUpdateMode_ == isUpdateSql__) 
         				&& autoGeneratedKeys_ == RETURN_GENERATED_KEYS) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                     if (prepareSentForAutoGeneratedKeys) {
                         preparedStatementForAutoGeneratedKeys_.materialPreparedStatement_.readPrepareDescribeOutput_();
                     }
                     preparedStatementForAutoGeneratedKeys_.readOpenQuery();
                     generatedKeysResultSet_ = preparedStatementForAutoGeneratedKeys_.resultSet_;
                     preparedStatementForAutoGeneratedKeys_.resultSet_ = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
                     generatedKeysResultSet_.outerStatement_ = this;
                 }
 
@@ -2439,12 +2534,14 @@ private void flowExecute(int executeType, String sql) throws SqlException {
             if (resultSet_ != null && resultSet_.resultSetHoldability_ != resultSetHoldability_ && sqlMode_ != isCall__) {
                 throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId(SQLState.UNABLE_TO_OPEN_RS_WITH_REQUESTED_HOLDABILITY),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     resultSetHoldability_);
             }
 
         // In the case of executing a call to a stored procedure.
         if (sqlMode_ == isCall__) {
             parseStorProcReturnedScrollableRowset();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1364
             checkForStoredProcResultSetCount(executeType);
             // When there is no result sets back, we will commit immediately when autocommit is true.
             if (connection_.autoCommit_ && resultSet_ == null && resultSetList_ == null) {
@@ -2479,6 +2576,7 @@ private void flowExecuteBatch(long[] updateCounts)
             // net will need to be able to reset the send buffer
             if (flowSQL) {
                 if (sqlMode_ != isCall__) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                     setSection(agent_.sectionManager_.getDynamicSection(resultSetHoldability_));
                     writeExecuteImmediate(sql, getSection());
                 } else {
@@ -2505,6 +2603,7 @@ private void flowExecuteBatch(long[] updateCounts)
                     invalidSQLCaughtByClient = e;
                 }
                 if (invalidSQLCaughtByClient == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                     updateCount_ = -1L;
                     if (sqlMode_ != isCall__) {
                         readExecuteImmediateForBatch(sql);
@@ -2516,6 +2615,7 @@ private void flowExecuteBatch(long[] updateCounts)
                     }
                 } else {
                     agent_.accumulateReadException(invalidSQLCaughtByClient);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     updateCount_ = Statement.EXECUTE_FAILED;
                     invalidSQLCaughtByClient = null;
                 }
@@ -2585,6 +2685,7 @@ public void accumulateWarning(SqlWarning e) {
         if (warnings_ == null) {
             warnings_ = e;
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-860
             warnings_.setNextWarning(e);
         }
     }
@@ -2600,6 +2701,7 @@ private void markPrepared() {
      * @return name of java.sql interface
      */
     protected String getJdbcStatementInterfaceName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1364
         return "java.sql.Statement";
     }
 
@@ -2644,10 +2746,12 @@ void parseSqlAndSetSqlModes(String sql) throws SqlException {
      */
     private String isolateAnyInitialIdentifier (String sql) {
         int idx;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4748
         for (idx = 0; idx < sql.length(); idx++) {
             char ch = sql.charAt(idx);
             if (!Character.isLetter(ch)) {
                 // first non-token char found
+//IC see: https://issues.apache.org/jira/browse/DERBY-4338
                 break;
             }
         }
@@ -2709,6 +2813,7 @@ private String getStatementToken(String sql) throws SqlException {
                 case '-':
                     if (idx == sql.length() - 1) {
                         // no more characters, so this is the token
+//IC see: https://issues.apache.org/jira/browse/DERBY-5011
                         tokenFound = "-";
                     } else if (sql.charAt(idx + 1) == '-') {
                         state = INSIDE_SIMPLECOMMENT;
@@ -2823,6 +2928,7 @@ final void checkForAppropriateSqlMode(int executeType, int sqlMode) throws SqlEx
      *                         match the execute type
      */
     private void checkResultSetCount(int executeType) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1364
         switch (executeType) {
         case executeQueryMethod__:
             // We'll just rely on finalizers to close the dangling result sets.
@@ -2894,6 +3000,7 @@ final void checkForClosedStatement() throws SqlException {
         if (!openOnClient_) {
             agent_.checkForDeferredExceptions();
             throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1395
                 new ClientMessageId(SQLState.ALREADY_CLOSED), "Statement");
         } else {
             agent_.checkForDeferredExceptions();
@@ -2922,6 +3029,9 @@ private void checkForInvalidBatchedSql(String sql) throws SqlException {
 
     // Two open result sets can not have the same cursor name. 
     protected void checkForDuplicateCursorName() throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1036
+//IC see: https://issues.apache.org/jira/browse/DERBY-1183
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
         if (cursorName_ != null && (connection_.clientCursorNameCache_.
                                     containsKey(cursorName_))) {
             throw new SqlException
@@ -2943,6 +3053,7 @@ protected void setupCursorNameCacheAndMappings() {
             // whenever the result set produced by this statement
             // is referenced in a positioned update/delete statement.
             agent_.sectionManager_.mapCursorNameToQuerySection
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                 (cursorName_, getSection());
             getSection().setClientCursorName(cursorName_);
             
@@ -2951,7 +3062,9 @@ protected void setupCursorNameCacheAndMappings() {
                                                    cursorName_);
         } else {
         // canned cursor name
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         agent_.sectionManager_.mapCursorNameToQuerySection
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                 (getSection().getServerCursorName(), getSection());
     }
 
@@ -2969,6 +3082,7 @@ String[] extractCursorNameFromWhereCurrentOf(String sql) {
             if (whereIndex != -1) {
                 String[] whereCurrentOf = {"where", "current", "of"};
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 StringTokenizer st =
                     new StringTokenizer(sql.substring(whereIndex));
 
@@ -3029,9 +3143,11 @@ void resetCursorNameAndRemoveFromWhereCurrentOfMappings() {
         if (section_ != null) {
             agent_.sectionManager_.removeCursorNameToResultSetMapping(cursorName_,
                     getSection().getServerCursorNameForPositionedUpdate());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
 
             // remove resultset mapping for other cursors (other than positioned
             // update statements) - DERBY-210
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
             agent_.sectionManager_.removeCursorNameToResultSetMapping(cursorName_,
                     getSection().getServerCursorName());
 
@@ -3050,6 +3166,7 @@ private void mapCursorNameToResultSet() {
         if (cursorName_ != null) {
             agent_.sectionManager_.mapCursorNameToResultSet(cursorName_, resultSet_);
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             agent_.sectionManager_.mapCursorNameToResultSet(getSection().getServerCursorName(), resultSet_);
         }
     }
@@ -3080,6 +3197,7 @@ String escape(String sql) throws SqlException {
     // buffer at prepare-time.
     String cacheCursorAttributesToSendOnPrepare() throws SqlException {
         StringBuffer cursorAttributes = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetType_ == ResultSet.TYPE_SCROLL_SENSITIVE) {
             // append "SENSITIVE STATIC SCROLL"
             cursorAttributes.append(Configuration.cursorAttribute_SensitiveStatic);
@@ -3092,6 +3210,7 @@ String cacheCursorAttributesToSendOnPrepare() throws SqlException {
         }
 
         // Default is read-only, forward-only.  No attribute needs to be sent.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetConcurrency_ == ResultSet.CONCUR_UPDATABLE) {
             cursorAttributes.append(Configuration.cursorAttribute_ForUpdate); // FOR UPDATE
         }
@@ -3107,15 +3226,18 @@ String cacheCursorAttributesToSendOnPrepare() throws SqlException {
     }
 
     protected static ClientPreparedStatement 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             prepareAutoGeneratedKeysStatement(ClientConnection cc) 
             throws SqlException {
         String s = "select IDENTITY_VAL_LOCAL() from SYSIBM.SYSDUMMY1";
         ClientPreparedStatement cps =
                     cc.newPreparedStatement_(s,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             ResultSet.TYPE_FORWARD_ONLY,
                             ResultSet.CONCUR_READ_ONLY,
                             ResultSet.HOLD_CURSORS_OVER_COMMIT,
                             Statement.NO_GENERATED_KEYS,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
                             null, null);
             // need a special case for Derby, since the attribute has to go through the wire.
             // This same special casing for Derby is already in place in method PS.cacheCursorAttributesToSendOnPrepare() as called by prepareStatementX().
@@ -3123,26 +3245,31 @@ String cacheCursorAttributesToSendOnPrepare() throws SqlException {
             // Maybe just call prepareStatementX() or use some special purpose prepare method like the ones in Connection.
             // Something more abstract so that we don't have to special case the WITH HOLD thing twice.
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             cps.cursorAttributesToSendOnPrepare_ = Configuration.cursorAttribute_WithHold; 
             cps.materialPreparedStatement_.writePrepareDescribeOutput_(cps.sql_, cps.getSection());
             return cps;
     }
 
     void checkAutoGeneratedKeysParameters() throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (autoGeneratedKeys_ != Statement.NO_GENERATED_KEYS &&
                 autoGeneratedKeys_ != Statement.RETURN_GENERATED_KEYS) {
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.INVALID_API_PARAMETER),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 autoGeneratedKeys_, "autoGeneratedKeys",
                 "Statement.execute()/executeQuery()");
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
         if (sqlUpdateMode_ == isInsertSql__)
         {
         if (generatedKeysColumnNames_ != null && 
                 generatedKeysColumnNames_.length > 1) {
             throw new SqlException(agent_.logWriter_,
                     new ClientMessageId(SQLState.INVALID_COLUMN_ARRAY_LENGTH),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     generatedKeysColumnNames_.length);
             }
         
@@ -3169,6 +3296,9 @@ public boolean isQueryMode() {
     }
 
     protected void removeClientCursorNameFromCache() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1036
+//IC see: https://issues.apache.org/jira/browse/DERBY-1183
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
         if (cursorName_ != null && 
                 connection_.clientCursorNameCache_.containsKey(cursorName_)) {
             connection_.clientCursorNameCache_.remove(cursorName_);
@@ -3182,8 +3312,10 @@ protected void removeClientCursorNameFromCache() {
      * @param closingRS The ResultSet to be closed
      * @throws SqlException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void resultSetCommitting(ClientResultSet closingRS)
             throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-213
         resultSetCommitting(closingRS, false);
     }
     
@@ -3209,6 +3341,7 @@ boolean resultSetCommitting(
         // If so, then no commit. The last result set to close will close the statement.
         if (resultSetList_ != null) {
             for (int i = 0; i < resultSetList_.length; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 ClientResultSet crs = resultSetList_[i];
                 if (crs == null)
                     continue;
@@ -3256,6 +3389,7 @@ private void markAutoCommitted() {
 
     public  void    closeOnCompletion() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         try { checkForClosedStatement(); }
         catch (SqlException se) { throw se.getSQLException(); }
         
@@ -3295,6 +3429,7 @@ void    closeMeOnCompletion()
                 }
 
                 // if we got here, then the Statement has no open ResultSets left
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
                 openOnClient_ = false;
                 closeEverythingExceptResultSets( true );
             }
@@ -3306,6 +3441,7 @@ private boolean isOpen( ClientResultSet rs ) throws SQLException
         return ( (rs != null) && (!rs.isClosed()) );
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void resetResultSetList() {
         indexOfCurrentResultSet_ = -1; //reset ResultSetList
     }
@@ -3317,6 +3453,7 @@ void resetResultSetList() {
      * @return section_
      */
     public Section getSection() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
         return section_;
     }
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClientTypes.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClientTypes.java
index fba2472817..dec35ebc80 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClientTypes.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClientTypes.java
@@ -30,6 +30,7 @@ public class ClientTypes {
     // -------------------------------- Driver types -------------------------------------------------
 
     final static int BIT        =  Types.BIT;          // -7;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     // Not currently supported as a DERBY column type.  Mapped to SMALLINT.
     //final static int TINYINT   = Types.TINYINT;       // -6;
@@ -61,6 +62,7 @@ public class ClientTypes {
     public final static int LONGVARCHAR = Types.LONGVARCHAR;   // -1;
 
     final static int DATE = Types.DATE;          // 91;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     final static int TIME = Types.TIME;          // 92;
 
@@ -84,6 +86,7 @@ private ClientTypes() {
     
     static String getTypeString(int type)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
         switch (type )
         {
             case BIGINT:        return "BIGINT";
@@ -106,9 +109,11 @@ static String getTypeString(int type)
             case VARBINARY:     return "VARBINARY";
             case VARCHAR:       return "VARCHAR";
             // Types we don't support:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case Types.ARRAY: return "ARRAY";
             case Types.DATALINK: return "DATALINK";
             case Types.REF: return "REF";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             case Types.ROWID: return "ROWID";
             case Types.SQLXML: return "SQLXML";
             case Types.STRUCT: return "STRUCT";
@@ -119,6 +124,7 @@ static String getTypeString(int type)
 
     static public int mapDERBYTypeToDriverType(boolean isDescribed, int sqlType, long length, int ccsid) {
         switch (Utils.getNonNullableSqlType(sqlType)) { // mask the isNullable bit
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
         case DRDAConstants.DB2_SQLTYPE_BOOLEAN:
             return BOOLEAN;
         case DRDAConstants.DB2_SQLTYPE_SMALL:
@@ -139,6 +145,7 @@ static public int mapDERBYTypeToDriverType(boolean isDescribed, int sqlType, lon
             } else {
                 return 0;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
         case DRDAConstants.DB2_SQLTYPE_DECIMAL:            // can map to either NUMERIC or DECIMAL
         case DRDAConstants.DB2_SQLTYPE_NUMERIC:            // can map to either NUMERIC or DECIMAL
             return DECIMAL;
@@ -170,6 +177,7 @@ static public int mapDERBYTypeToDriverType(boolean isDescribed, int sqlType, lon
         case DRDAConstants.DB2_SQLTYPE_TIMESTAMP:
             return TIMESTAMP;
         case DRDAConstants.DB2_SQLTYPE_CLOB:    // large object character SBCS/Mixed
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return ClientTypes.CLOB;
         case DRDAConstants.DB2_SQLTYPE_BLOB:    // large object bytes
             return Types.BLOB;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorInputStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorInputStream.java
index 0e135fc18c..be02faecaf 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorInputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorInputStream.java
@@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * straight-forward.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class ClobLocatorInputStream extends InputStream {
     
     /**
@@ -69,8 +70,10 @@ class ClobLocatorInputStream extends InputStream {
      * @param clob <code>Clob</code> object that contains locator for
      *        the <code>Clob</code> value on the server.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClobLocatorInputStream(ClientConnection connection, ClientClob clob)
             throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2622
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(clob.isLocator());
         }
@@ -91,10 +94,12 @@ class ClobLocatorInputStream extends InputStream {
      * @param pos the position inside the <code>Clob<code> from which
      *            the reading must begin.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClobLocatorInputStream(
             ClientConnection connection,
             ClientClob clob,
             long pos) throws SqlException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
         this(connection, clob);
         this.currentPos = pos;
     }
@@ -111,6 +116,7 @@ public int read() throws IOException {
             return -1;
         } else {
             // convert byte in range [-128,127] to int in range [0,255]
+//IC see: https://issues.apache.org/jira/browse/DERBY-3226
             return bytes[0] & 0xff;
         }
     }
@@ -120,6 +126,7 @@ public int read() throws IOException {
      */
     public int read(byte[] b, int off, int len) throws IOException {
         if (len == 0) return 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
         if ((off < 0) || (len < 0) || (len > b.length - off)) {
             throw new IndexOutOfBoundsException();
         }
@@ -145,10 +152,12 @@ public int read(byte[] b, int off, int len) throws IOException {
     private byte[] readBytes(int len) throws IOException {
         try {
             int actualLength
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
                     = (int )Math.min(len, clob.sqlLength() - currentPos + 1);
             String resultStr = connection.locatorProcedureCall().
                     clobGetSubString(clob.getLocator(),
                     currentPos, actualLength);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
             byte[] result = getBytesFromString(resultStr);
             currentPos += result.length;
             return result;
@@ -174,6 +183,7 @@ private byte[] getBytesFromString(String str) {
         //converted Byte array that will be returned
         //to the user
         byte[] result = new byte[str.length()];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
 
         //Iterate through the String to
         //Convert each character in the
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorOutputStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorOutputStream.java
index 01345779ad..1d3c66afd0 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorOutputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorOutputStream.java
@@ -36,6 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * buffering of data is done.  Hence, for efficiency #write(byte[])
  * should be used instead of #write(int).
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class ClobLocatorOutputStream extends OutputStream {
     
     /**
@@ -59,6 +60,7 @@ class ClobLocatorOutputStream extends OutputStream {
      * @param pos the position in the <code>CLOB</code> value at which
      *        to start writing; the first position is 1
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClobLocatorOutputStream(
             ClientClob clob,
             long pos) throws SqlException {
@@ -95,6 +97,7 @@ public void write(byte[] b) throws IOException {
     public void write(byte[] b, int off, int len) throws IOException {
         if (len == 0) return;
         if ((off < 0) || (off > b.length) || (len < 0) ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
                 (len > b.length - off)) {
             throw new IndexOutOfBoundsException();
         }
@@ -126,7 +129,9 @@ public void flush() {
      */
     private void writeBytes(byte[] b) throws IOException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
             String clobStr = new String(b, "ISO-8859-1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             clob.setStringX(currentPos, clobStr, 0, clobStr.length());
             currentPos += b.length;
         } catch (SqlException ex) {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorReader.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorReader.java
index 48043870d1..c93b06c362 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorReader.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorReader.java
@@ -37,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * this.  A more efficient skip implementation should also be
  * straight-forward.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class ClobLocatorReader extends Reader {
     /**
      * Connection used to read Clob from server.
@@ -76,6 +77,7 @@ class ClobLocatorReader extends Reader {
      * @param clob <code>Clob</code> object that contains locator for
      *        the <code>Clob</code> value on the server.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClobLocatorReader(ClientConnection connection, ClientClob clob)
     throws SqlException {
         if (SanityManager.DEBUG) {
@@ -106,8 +108,12 @@ class ClobLocatorReader extends Reader {
      *            retrieved.
      * @param len The length in characters of the partial value to be retrieved.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClobLocatorReader(ClientConnection connection, ClientClob clob,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
             long pos, long len) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2622
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(clob.isLocator());
         }
@@ -115,10 +121,12 @@ class ClobLocatorReader extends Reader {
         this.connection = connection;
         this.clob = clob;
         this.currentPos = pos;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
         if(len != -1) {
             this.maxPos = Math.min(clob.sqlLength(), pos + len - 1);
         }
         else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             this.maxPos = -1;
         }
     }
@@ -145,6 +153,7 @@ public int read() throws IOException {
     public int read(char[] c, int off, int len) throws IOException {
         checkClosed();
         if (len == 0) return 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
         if ((off < 0) || (len < 0) || (len > c.length - off)) {
             throw new IndexOutOfBoundsException();
         }
@@ -207,10 +216,12 @@ private char[] readCharacters(int len) throws IOException {
             int actualLength = -1;
             //check if maxPos has been set and calculate actualLength
             //based on that.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             if(maxPos != -1) {
                 //maxPos has been set. use maxPos to calculate the
                 //actual length based on the value set for maxPos.
                 actualLength 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
                     = (int )Math.min(len, maxPos - currentPos + 1);
             }
             else {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorWriter.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorWriter.java
index 33ad2fa63f..22e6089e3d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorWriter.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClobLocatorWriter.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * buffering of data is done.  Hence, for efficiency {@code #write(char[])}
  * should be used instead of {@code #write(int)}.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class ClobLocatorWriter extends Writer {
     /**
      * Connection used to read Clob from server.
@@ -67,6 +68,7 @@ class ClobLocatorWriter extends Writer {
      * @param pos the position in the {@code CLOB} value at which
      *        to start writing; the first position is 1
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClobLocatorWriter(
             ClientConnection connection,
             ClientClob clob,
@@ -148,6 +150,7 @@ public void write(char[] c, int off, int len) throws IOException {
         checkClosed();
         if (len == 0) return;
         if ((off < 0) || (off > c.length) || (len < 0) ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
                 (len > c.length - off)) {
             throw new IndexOutOfBoundsException();
         }
@@ -165,6 +168,7 @@ public void write(char[] c, int off, int len) throws IOException {
     private void writeCharacters(char[] c, int off, int len)
     throws IOException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
             clob.setStringX(currentPos, new String(c, off, len), 0, len);
             currentPos += len;
         } catch (SqlException ex) {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClobOutputStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClobOutputStream.java
index b023f7f985..a3c3650d7b 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClobOutputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClobOutputStream.java
@@ -25,19 +25,23 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.io.OutputStream;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class ClobOutputStream extends OutputStream {
     private ClientClob clob_;
     private long offset_;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClobOutputStream(ClientClob clob, long offset) throws SqlException {
         clob_ = clob;
         offset_ = offset;
         
         /*
+//IC see: https://issues.apache.org/jira/browse/DERBY-796
             offset_ starts from 1 while sqlLenth_=0
             in the case of a empty Clob hence check from
             offset_-1
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         if ((offset_-1) > clob_.sqlLength()) {
             throw new IndexOutOfBoundsException();
         }
@@ -61,6 +65,7 @@ public void write(byte b[], int off, int len) throws IOException {
 
         byte[] newByte = new byte[len];
         System.arraycopy(b, off, newByte, 0, len);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         writeBytes(newByte);
     }
 
@@ -69,7 +74,9 @@ private void writeBytes(byte b[])  throws IOException
     {
         // Since this is an OutputStream returned by Clob.setAsciiStream 
         // use Ascii encoding when creating the String from bytes
+//IC see: https://issues.apache.org/jira/browse/DERBY-1519
         String str = new String(b, "ISO-8859-1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         clob_.reInitForNonLocator(
                 clob_.string_.substring(0, (int) offset_ - 1).concat(str));
         offset_ += b.length;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ClobWriter.java b/java/org.apache.derby.client/org/apache/derby/client/am/ClobWriter.java
index fe2d13b73b..4f5cda8e26 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ClobWriter.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ClobWriter.java
@@ -25,23 +25,30 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.io.Writer;
 import org.apache.derby.shared.common.reference.SQLState;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class ClobWriter extends Writer {
     private final ClientClob clob_;
     private long offset_;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClobWriter(ClientClob clob, long offset) throws SqlException {
         clob_ = clob;
         offset_ = offset;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         if (offset_ - 1 > clob_.sqlLength()) {
             throw new SqlException(clob_.agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 new ClientMessageId(SQLState.BLOB_INVALID_OFFSET), offset);
         }
     }
 
     public void write(int c) {
         StringBuffer sb = new StringBuffer(clob_.string_.substring(0, (int) offset_ - 1));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1245
+//IC see: https://issues.apache.org/jira/browse/DERBY-1354
         sb.append((char)c);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         updateClob(sb);
     }
 
@@ -54,6 +61,7 @@ public void write(char cbuf[], int off, int len) {
         }
         StringBuffer sb = new StringBuffer(clob_.string_.substring(0, (int) offset_ - 1));
         sb.append(cbuf, off, len);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2540
         updateClob(sb);
     }
 
@@ -79,6 +87,7 @@ public void close() throws IOException {
     
     private void updateClob(StringBuffer sb) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         clob_.reInitForNonLocator(sb.toString());
         offset_ = clob_.string_.length() + 1;
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/CloseFilterInputStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/CloseFilterInputStream.java
index 9be27f0cae..1b23266565 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/CloseFilterInputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/CloseFilterInputStream.java
@@ -30,12 +30,14 @@ class CloseFilterInputStream extends FilterInputStream {
     
     private static final String ALREADY_CLOSED_ERR_MESSAGE = 
             SqlException.getMessageUtil().getTextMessage(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
                 MessageId.OBJECT_CLOSED);
     
     private boolean closed;
     
     public CloseFilterInputStream(InputStream is){
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         super(is);
         closed = false;
         
@@ -46,6 +48,7 @@ public int read()
         throws IOException {
 
         if(closed){
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
             throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
         }
         
@@ -58,6 +61,7 @@ public int read(byte[] b)
         throws IOException {
         
         if(closed){
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
             throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
         }
 
@@ -72,6 +76,7 @@ public int read(byte[] b,
         throws IOException{
         
         if(closed){
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
             throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
         }
 
@@ -84,6 +89,7 @@ public long skip(long n)
         throws IOException{
 
         if(closed){
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
             throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
         }
         
@@ -96,6 +102,7 @@ public int available()
         throws IOException{
         
         if(closed){
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
             throw new IOException(ALREADY_CLOSED_ERR_MESSAGE);
         }
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ColumnMetaData.java b/java/org.apache.derby.client/org/apache/derby/client/am/ColumnMetaData.java
index 40af711231..cbb82fa2b1 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ColumnMetaData.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ColumnMetaData.java
@@ -95,8 +95,10 @@ public class ColumnMetaData implements ResultSetMetaData {
     // only used for result set meta data.
 
     transient int resultSetConcurrency_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     transient private Hashtable<String, Integer> columnNameToIndexCache_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
     transient private boolean statementClosed_ = false;
 
@@ -109,6 +111,7 @@ private void checkForClosedStatement() throws SqlException {
         // agent_.checkForDeferredExceptions();
         if (statementClosed_) {
             throw new SqlException(logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     new ClientMessageId (SQLState.LANG_STATEMENT_CLOSED_NO_REASON));
         }
     }
@@ -175,6 +178,7 @@ public boolean isAutoIncrement(int column) throws SQLException {
         {
             checkForClosedStatement();
             checkForValidColumnIndex(column);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1355
             if( sqlxGenerated_[column - 1] == 2) {
                 return true;
             }
@@ -194,6 +198,7 @@ public boolean isCaseSensitive(int column) throws SQLException {
             //return true if the SQLTYPE is CHAR, VARCHAR, LOGVARCHAR or CLOB
             int type = types_[column - 1];
             return
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     type == ClientTypes.CHAR ||
                     type == ClientTypes.VARCHAR ||
                     type == ClientTypes.LONGVARCHAR ||
@@ -238,6 +243,7 @@ public int isNullable(int column) throws SQLException {
             checkForClosedStatement();
             checkForValidColumnIndex(column);
             if (nullable_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 return ResultSetMetaData.columnNullable;
             } else {
                 return ResultSetMetaData.columnNoNulls;
@@ -257,6 +263,7 @@ public boolean isSigned(int column) throws SQLException {
             //return true only if the SQLType is SMALLINT, INT, BIGINT, FLOAT, REAL, DOUBLE, NUMERIC OR DECIMAL
             int type = types_[column - 1];
             return
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     type == ClientTypes.SMALLINT ||
                     type == ClientTypes.INTEGER ||
                     type == ClientTypes.BIGINT ||
@@ -279,6 +286,7 @@ public int getColumnDisplaySize(int column) throws SQLException {
             checkForValidColumnIndex(column);
             int jdbcType = types_[column - 1];
             switch (jdbcType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case ClientTypes.BOOLEAN:
                 return 5;
             case ClientTypes.INTEGER:
@@ -288,6 +296,7 @@ public int getColumnDisplaySize(int column) throws SQLException {
             case ClientTypes.BIGINT:
                 return 20;
             case ClientTypes.REAL:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
                 return 15;
             case ClientTypes.DOUBLE:
             case Types.FLOAT:
@@ -300,7 +309,10 @@ public int getColumnDisplaySize(int column) throws SQLException {
         // 3. precision > scale > 0, 2 should be added to precision for sign and decimal.
         int scale = getScale(column);
         int precision = getPrecision(column);
+//IC see: https://issues.apache.org/jira/browse/DERBY-836
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         return (scale == 0) ? (precision + 1) : ((scale == precision) ? (precision + 3) : (precision + 2));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case ClientTypes.CHAR:
             case ClientTypes.VARCHAR:
             case ClientTypes.LONGVARCHAR:
@@ -313,6 +325,7 @@ public int getColumnDisplaySize(int column) throws SQLException {
             case ClientTypes.TIMESTAMP:
                 return 29;
             case ClientTypes.JAVA_OBJECT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                 return JDBC40Translation.DEFAULT_COLUMN_DISPLAY_SIZE;
             case ClientTypes.BINARY:
             case ClientTypes.VARBINARY:
@@ -322,6 +335,8 @@ public int getColumnDisplaySize(int column) throws SQLException {
         // range. In such cases, the size is limited to the max. int value
         // This behavior is consistent with the same in Embedded mode.
         int size = (int) (2 * sqlLength_[column - 1]);  // eg. "FF" represents just one byte
+//IC see: https://issues.apache.org/jira/browse/DERBY-2425
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if ( size < 0 )
             size = Integer.MAX_VALUE;
                 return size;
@@ -414,6 +429,7 @@ public int getPrecision(int column) throws SQLException {
             int jdbcType = types_[column - 1];
 
             switch (jdbcType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case ClientTypes.BOOLEAN:
                 return 1;
             case Types.NUMERIC:
@@ -445,8 +461,11 @@ public int getPrecision(int column) throws SQLException {
             case ClientTypes.TIME:
                 return 8;
             case ClientTypes.TIMESTAMP:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
                 return 29;
             case ClientTypes.JAVA_OBJECT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                 return JDBC40Translation.UNKNOWN_PRECISION;
             default:
                 throw new SqlException(logWriter_, 
@@ -499,6 +518,7 @@ public String getTableName(int column) throws SQLException {
      * @throws SQLException thrown on failure
      */
     public String getCatalogName(int column) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try
         {
             checkForClosedStatement();
@@ -538,6 +558,7 @@ public String getColumnTypeName(int column) throws SQLException {
             int sqlType = sqlType_[column - 1];
 
             switch (sqlType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DB2_SQLTYPE_BOOLEAN:
             case DRDAConstants.DB2_SQLTYPE_NBOOLEAN:
                 return "BOOLEAN";
@@ -558,6 +579,7 @@ public String getColumnTypeName(int column) throws SQLException {
                 return "CLOB";
             case DRDAConstants.DB2_SQLTYPE_VARCHAR:
             case DRDAConstants.DB2_SQLTYPE_NVARCHAR:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (jdbcType == ClientTypes.VARBINARY) {
                     return "VARCHAR FOR BIT DATA";
                 } else {
@@ -582,6 +604,7 @@ public String getColumnTypeName(int column) throws SQLException {
                 return "SBCS";
             case DRDAConstants.DB2_SQLTYPE_FLOAT:
             case DRDAConstants.DB2_SQLTYPE_NFLOAT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (jdbcType == ClientTypes.DOUBLE) {
                     return "DOUBLE";
                 }
@@ -624,6 +647,7 @@ public boolean isReadOnly(int column) throws SQLException {
             checkForValidColumnIndex(column);
             if (sqlxUpdatable_ == null) {
                 // If no extended describe, return resultSet's concurrency
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 return resultSetConcurrency_ ==
                        ResultSet.CONCUR_READ_ONLY;
             }
@@ -642,6 +666,7 @@ public boolean isWritable(int column) throws SQLException {
             checkForValidColumnIndex(column);
             if (sqlxUpdatable_ == null) {
                 // If no extended describe, return resultSet's concurrency
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 return resultSetConcurrency_ ==
                        ResultSet.CONCUR_UPDATABLE;
             }
@@ -679,6 +704,7 @@ public String getColumnClassName(int column) throws SQLException {
 
             int jdbcType = types_[column - 1];
             switch (jdbcType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case Types.BOOLEAN:
                 return "java.lang.Boolean";
             case Types.BIT:
@@ -728,6 +754,9 @@ public String getColumnClassName(int column) throws SQLException {
                 return sqlUDTclassName_[ column - 1 ];
             default:
                 throw new SqlException(logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                         new ClientMessageId (SQLState.UNSUPPORTED_TYPE));
             }
         }
@@ -743,7 +772,9 @@ public String getColumnClassName(int column) throws SQLException {
     void checkForValidColumnIndex(int column) throws SqlException {
         if (column < 1 || column > columns_) {
             throw new SqlException(logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     new ClientMessageId (SQLState.LANG_INVALID_COLUMN_POSITION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     column, columns_);
         }
     }
@@ -784,7 +815,9 @@ private void nullDataForGC() {
 
     boolean hasLobColumns() {
         for (int i = 0; i < columns_; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             switch (Utils.getNonNullableSqlType(sqlType_[i])) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DB2_SQLTYPE_BLOB:
             case DRDAConstants.DB2_SQLTYPE_CLOB:
                 return true;
@@ -799,6 +832,7 @@ boolean hasLobColumns() {
     int findColumnX(String columnName) throws SqlException {
         // Create cache if it doesn't exist
         if (columnNameToIndexCache_ == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             columnNameToIndexCache_ = new Hashtable<String, Integer>();
         } else { // Check cache for mapping
             Integer index = columnNameToIndexCache_.get(columnName);
@@ -813,17 +847,20 @@ int findColumnX(String columnName) throws SqlException {
                     this.sqlName_[col] != null &&
                     this.sqlName_[col].equalsIgnoreCase(columnName)) {
                 // Found it, add it to the cache
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 columnNameToIndexCache_.put(columnName, col + 1);
                 return col + 1;
             }
         }
         throw new SqlException(logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 new ClientMessageId (SQLState.INVALID_COLUMN_NAME), columnName);
     }
 
     // assign ordinal position as the column name if null.
     private void assignColumnName(int column) {
         if (columnNameToIndexCache_ == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             columnNameToIndexCache_ = new Hashtable<String, Integer>();
         }
         String columnName = Integer.toString(column);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/Configuration.java b/java/org.apache.derby.client/org/apache/derby/client/am/Configuration.java
index 4b849191d4..78b1b3d9d4 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/Configuration.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/Configuration.java
@@ -47,6 +47,7 @@ static ProductVersionHolder getProductVersionHolder() {
 
 
     // for DatabaseMetaData.getDriverName()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final static String
         dncDriverName = "Apache Derby Network Client JDBC Driver";
 
@@ -58,6 +59,7 @@ static ProductVersionHolder getProductVersionHolder() {
             {0x53, 0x59, 0x53, 0x4c, 0x56, 0x4c, 0x30, 0x31};
 
     public static byte[] getDncPackageConsistencyToken() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return dncPackageConsistencyToken.clone();
     }
 
@@ -68,6 +70,7 @@ public static byte[] getDncPackageConsistencyToken() {
             {"1.5", "1.6", "1.7", "1.8"};
 
     static String[] getDncCompatibleJREVersions() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return dncCompatibleJREVersions.clone();
     }
 
@@ -91,6 +94,7 @@ static String[] getDncCompatibleJREVersions() {
 
     // This is the DERBY default and maps to DERBY's "Cursor Stability".
     final static int defaultIsolation = Connection.TRANSACTION_READ_COMMITTED;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     // ---------------------------- statement defaults----------------------------
 
@@ -122,6 +126,7 @@ static String[] getDncCompatibleJREVersions() {
     }
 
     public static SqlException getExceptionOnLoadResources() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return exceptionsOnLoadResources;
     }
     
@@ -131,11 +136,13 @@ public static SqlException getExceptionOnLoadResources() {
     private static void loadProductVersionHolder() throws SqlException {
         try {
             dncProductVersionHolder__ = buildProductVersionHolder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (PrivilegedActionException e) {
             throw new SqlException(null, 
                     new ClientMessageId (SQLState.ERROR_PRIVILEGED_ACTION),
                     e.getException());                    
         } catch (IOException ioe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
             throw SqlException.javaException(null, ioe);
         }
     }
@@ -143,12 +150,15 @@ private static void loadProductVersionHolder() throws SqlException {
 
     // Create ProductVersionHolder in security block for Java 2 security.
     private static ProductVersionHolder buildProductVersionHolder() throws
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             PrivilegedActionException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return AccessController.doPrivileged(
                 new PrivilegedExceptionAction<ProductVersionHolder>() {
 
                     public ProductVersionHolder run() throws IOException {
                         InputStream versionStream = getClass().getResourceAsStream("/" + ProductGenusNames.CLIENT_INFO);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
                         return ProductVersionHolder.getProductVersionHolderFromMyEnv(versionStream);
                     }
@@ -163,6 +173,7 @@ public ProductVersionHolder run() throws IOException {
     
     public static boolean supportsJDBC42() {
         // use reflection to identify whether we support JDBC42
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         try {
             Class.forName("java.sql.SQLType");
             return true;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/CrossConverters.java b/java/org.apache.derby.client/org/apache/derby/client/am/CrossConverters.java
index 4783ce64a3..d115685f57 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/CrossConverters.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/CrossConverters.java
@@ -66,6 +66,7 @@ final class CrossConverters {
     public static final int UNKNOWN_LENGTH = Integer.MIN_VALUE;
 
     private final static BigDecimal bdMaxByteValue__ =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             BigDecimal.valueOf(Byte.MAX_VALUE);
     private final static BigDecimal bdMinByteValue__ =
             BigDecimal.valueOf(Byte.MIN_VALUE);
@@ -115,12 +116,14 @@ final class CrossConverters {
     final Object setObject(int targetType, boolean source) throws SqlException {
         short numVal = source ? (short) 1 : 0;
         switch (targetType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.BIT:
         case ClientTypes.BOOLEAN:
             return Boolean.valueOf(source);
 
         case ClientTypes.SMALLINT:
             return Short.valueOf(numVal);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
         case ClientTypes.INTEGER:
             return Integer.valueOf(numVal);
@@ -159,6 +162,7 @@ final Object setObject(int targetType, byte source) throws SqlException {
     // In support of PS.setShort()
     final Object setObject(int targetType, short source) throws SqlException {
         switch (targetType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.BIT:
         case ClientTypes.BOOLEAN:
             return Boolean.valueOf(source != 0);
@@ -209,6 +213,7 @@ final Object setObject(int targetType, int source) throws SqlException {
             }
             return Short.valueOf((short) source);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.INTEGER:
             return Integer.valueOf(source);
 
@@ -240,6 +245,7 @@ final Object setObject(int targetType, int source) throws SqlException {
     // don't support the BIT/BOOLEAN as underlying DERBY targetTypes.
     final boolean setBooleanFromObject(Object source, int sourceType) throws SqlException {
         switch (sourceType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.SMALLINT:
             return getBooleanFromShort(((Short) source).shortValue());
         case ClientTypes.INTEGER:
@@ -266,6 +272,7 @@ final boolean setBooleanFromObject(Object source, int sourceType) throws SqlExce
     // don't support the BIT/BOOLEAN as underlying DERBY targetTypes.
     final byte setByteFromObject(Object source, int sourceType) throws SqlException {
         switch (sourceType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.SMALLINT:
             return getByteFromShort(((Short) source).shortValue());
         case ClientTypes.INTEGER:
@@ -312,6 +319,7 @@ final Object setObject(int targetType, long source) throws SqlException {
             }
             return Integer.valueOf((int) source);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.BIGINT:
             return Long.valueOf(source);
 
@@ -368,6 +376,7 @@ final Object setObject(int targetType, float source) throws SqlException {
             }
             return Long.valueOf((long) source);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.REAL:
             if (Configuration.rangeCheckCrossConverters &&
                     // change the check from (source > Float.MAX_VALUE || source < -Float.MIN_VALUE))
@@ -397,6 +406,7 @@ final Object setObject(int targetType, float source) throws SqlException {
                     //            |                          |________________________
                     //-------------------------------------------------------------------------------------
                     (source == Double.POSITIVE_INFINITY || source == Double.NEGATIVE_INFINITY)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
                 throw new OutsideRangeForDataTypeException(
                     agent_.logWriter_, "DOUBLE");
             }
@@ -404,7 +414,9 @@ final Object setObject(int targetType, float source) throws SqlException {
             // Convert to Double via String to avoid changing the precision,
             // which may happen if we cast float to double.
             return Double.valueOf(String.valueOf(source));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.DECIMAL:
             // Can't use the following commented out line because it changes precision of the result.
             //return new java.math.BigDecimal (source);
@@ -427,6 +439,10 @@ final Object setObject(int targetType, float source) throws SqlException {
     // In support of PS.setDouble()
     final Object setObject(int targetType, double source) throws SqlException {
         switch (targetType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.BIT:
         case ClientTypes.BOOLEAN:
             return Boolean.valueOf(source != 0);
@@ -434,10 +450,15 @@ final Object setObject(int targetType, double source) throws SqlException {
         case ClientTypes.SMALLINT:
             if (Configuration.rangeCheckCrossConverters &&
                     (source > Short.MAX_VALUE || source < Short.MIN_VALUE)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
                 throw new OutsideRangeForDataTypeException(
                     agent_.logWriter_, "SMALLINT");
             }
             return Short.valueOf((short) source);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
         case ClientTypes.INTEGER:
             if (Configuration.rangeCheckCrossConverters &&
@@ -446,6 +467,9 @@ final Object setObject(int targetType, double source) throws SqlException {
                     agent_.logWriter_, "INTEGER");
             }
             return Integer.valueOf((int) source);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
         case ClientTypes.BIGINT:
             if (Configuration.rangeCheckCrossConverters &&
@@ -454,7 +478,10 @@ final Object setObject(int targetType, double source) throws SqlException {
                     agent_.logWriter_, "BIGINT");
             }
             return Long.valueOf((long) source);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.REAL:
             if (Configuration.rangeCheckCrossConverters &&
                     (source > Float.MAX_VALUE || source < -Float.MAX_VALUE)) {
@@ -462,7 +489,10 @@ final Object setObject(int targetType, double source) throws SqlException {
                     agent_.logWriter_, "REAL");
             }
             return Float.valueOf((float) source);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.DOUBLE:
             if (Configuration.rangeCheckCrossConverters &&
                     // change the check from (source > Double.MAX_VALUE || source < -Double.MIN_VALUE))
@@ -481,6 +511,7 @@ final Object setObject(int targetType, double source) throws SqlException {
             }
             return Double.valueOf(source);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.DECIMAL:
             // Use BigDecimal.valueOf(source) instead of new BigDecimal(source),
             // as the latter may change the precision.
@@ -510,11 +541,14 @@ final Object setObject(int targetType, BigDecimal source)
         case ClientTypes.SMALLINT:
             if (Configuration.rangeCheckCrossConverters &&
                     (source.compareTo(bdMaxShortValue__) == 1 || source.compareTo(bdMinShortValue__) == -1)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
                 throw new OutsideRangeForDataTypeException(
                     agent_.logWriter_, "SMALLINT");
             }
             return Short.valueOf(source.shortValue());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.INTEGER:
             if (Configuration.rangeCheckCrossConverters &&
                     (source.compareTo(bdMaxIntValue__) == 1 || source.compareTo(bdMinIntValue__) == -1)) {
@@ -522,7 +556,9 @@ final Object setObject(int targetType, BigDecimal source)
                     agent_.logWriter_, "INTEGER");
             }
             return Integer.valueOf(source.intValue());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.BIGINT:
             if (Configuration.rangeCheckCrossConverters &&
                     (source.compareTo(bdMaxLongValue__) == 1 || source.compareTo(bdMinLongValue__) == -1)) {
@@ -530,15 +566,20 @@ final Object setObject(int targetType, BigDecimal source)
                     agent_.logWriter_, "BIGINT");
             }
             return Long.valueOf(source.longValue());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.REAL:
             if (Configuration.rangeCheckCrossConverters &&
                     (source.compareTo(bdMaxFloatValue__) == 1 || source.compareTo(bdMinFloatValue__) == -1)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
                 throw new OutsideRangeForDataTypeException(
                     agent_.logWriter_, "REAL");
             }
             return Float.valueOf(source.floatValue());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.DOUBLE:
             if (Configuration.rangeCheckCrossConverters &&
                     (source.compareTo(bdMaxDoubleValue__) == 1 || source.compareTo(bdMinDoubleValue__) == -1)) {
@@ -546,7 +587,9 @@ final Object setObject(int targetType, BigDecimal source)
                     agent_.logWriter_, "DOUBLE");
             }
             return Double.valueOf(source.doubleValue());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.DECIMAL:
             return source;
 
@@ -601,6 +644,7 @@ final Object setObject(int targetType, Time source) throws SqlException {
         default:
             throw new SqlException(agent_.logWriter_, 
                 new ClientMessageId (SQLState.LANG_DATA_TYPE_SET_MISMATCH),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 "java.sql.Time", ClientTypes.getTypeString(targetType));
         }
     }
@@ -639,6 +683,7 @@ final Object setObject(int targetType, Timestamp source)
     final Object setObject(int targetDriverType, String source) throws SqlException {
         try {
             switch (targetDriverType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case ClientTypes.BIT:
             case ClientTypes.BOOLEAN:
             {
@@ -652,24 +697,33 @@ final Object setObject(int targetDriverType, String source) throws SqlException
                 } else {
                     throw new SqlException(agent_.logWriter_,
                         new ClientMessageId(SQLState.LANG_FORMAT_EXCEPTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         ClientTypes.getTypeString(targetDriverType));
                 }
             }
 
             case ClientTypes.SMALLINT:
                 return Short.valueOf(source);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case ClientTypes.INTEGER:
                 return Integer.valueOf(source);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case ClientTypes.BIGINT:
                 return Long.valueOf(source);
 
             case ClientTypes.REAL:
                 return Float.valueOf(source);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
             case ClientTypes.DOUBLE:
                 return Double.valueOf(source);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
             case ClientTypes.DECIMAL:
                 return new BigDecimal(source);
@@ -706,6 +760,7 @@ final Object setObject(int targetDriverType, String source) throws SqlException
             throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId 
                     (SQLState.LANG_FORMAT_EXCEPTION), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e,
                     ClientTypes.getTypeString(targetDriverType));
         }
@@ -717,6 +772,7 @@ final Object setObject(int targetDriverType, String source) throws SqlException
      */
     public static int getInputJdbcType(int jdbcType) {
         switch (jdbcType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case Types.TINYINT:
         case Types.SMALLINT:
             return Types.INTEGER;
@@ -738,6 +794,7 @@ public static int getInputJdbcType(int jdbcType) {
     // In support of PS.setBytes()
     final Object setObject(int targetType, byte[] source) throws SqlException {
         switch (targetType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientTypes.BINARY:
         case ClientTypes.VARBINARY:
         case ClientTypes.LONGVARBINARY:
@@ -793,6 +850,7 @@ private String setStringFromReader(Reader r, int length)
             if (length != CrossConverters.UNKNOWN_LENGTH &&
                     length != totalRead) {
                 throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                         new ClientMessageId (SQLState.READER_UNDER_RUN));
             }
             return sw.toString();
@@ -804,6 +862,7 @@ private String setStringFromReader(Reader r, int length)
     // Convert from InputStream source to target type.
     // In support of PS.setAsciiStream, PS.setUnicodeStream
     // Note: PS.setCharacterStream() is handled by setObject(Reader)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final Object setObjectFromCharacterStream(
             int targetType,
             InputStream source,
@@ -835,6 +894,8 @@ final Object setObjectFromCharacterStream(
     // create a String by reading all of the bytes from inputStream, applying encoding
     private String setStringFromStream(
             InputStream is,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
             Charset encoding,
             int length) throws SqlException {
 
@@ -848,15 +909,18 @@ private String setStringFromStream(
                     baos.write(read);
                     read = is.read();
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             } catch (IOException e) {
                 throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId(SQLState.JAVA_EXCEPTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, e.getClass().getName(), e.getMessage());
             }
 
             if (length != CrossConverters.UNKNOWN_LENGTH &&
                     length != totalRead) {
                 throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                         new ClientMessageId (SQLState.READER_UNDER_RUN));
             }
 
@@ -865,6 +929,7 @@ private String setStringFromStream(
 
     // Convert from Blob source to target type
     // In support of PS.setBlob()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final Object setObject(int targetType, Blob source) throws SqlException {
         switch (targetType) {
         case ClientTypes.BLOB:
@@ -902,6 +967,7 @@ final Object setObjectFromBinaryStream(
 
     // create a byte[] by reading all of the bytes from inputStream
     private byte[] setBytesFromStream(InputStream is, int length)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         int totalRead = 0;
@@ -914,12 +980,19 @@ private byte[] setBytesFromStream(InputStream is, int length)
                 read = is.read();
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             if (length != CrossConverters.UNKNOWN_LENGTH &&
                     length != totalRead) {
                 throw new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                         new ClientMessageId (SQLState.READER_UNDER_RUN));
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (IOException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
             throw SqlException.javaException(agent_.logWriter_, e);
         }
         return baos.toByteArray();
@@ -927,6 +1000,7 @@ private byte[] setBytesFromStream(InputStream is, int length)
 
     // Convert from Clob source to target type
     // In support of PS.setClob()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final Object setObject(int targetType, Clob source) throws SqlException {
         switch (targetType) {
         case ClientTypes.CLOB:
@@ -941,6 +1015,7 @@ final Object setObject(int targetType, Clob source) throws SqlException {
     // The Java compiler uses static binding, so we can't rely on the strongly
     // typed setObject() methods above for each of the Java Object instance types.
     final Object setObject(int targetType, Object source) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1177
         if (source == null) {
             return null;
         } else if (source instanceof Boolean) {
@@ -953,6 +1028,7 @@ final Object setObject(int targetType, Object source) throws SqlException {
             return setObject(targetType, ((Float) source).floatValue());
         } else if (source instanceof Double) {
             return setObject(targetType, ((Double) source).doubleValue());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } else if (source instanceof BigDecimal) {
             return setObject(targetType, (BigDecimal) source);
         } else if (source instanceof Date) {
@@ -1091,7 +1167,17 @@ final byte getByteFromFloat(float source) throws SqlException {
 
     final byte getByteFromDouble(double source) throws SqlException {
         if (Configuration.rangeCheckCrossConverters &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 (source > Byte.MAX_VALUE || source < Byte.MIN_VALUE)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
             throw new OutsideRangeForDataTypeException(
                 agent_.logWriter_, "TINYINT");
         }
@@ -1109,6 +1195,7 @@ final byte getByteFromString(String source) throws SqlException {
         } catch (NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     (SQLState.LANG_FORMAT_EXCEPTION), e, "byte");
         }
     }
@@ -1147,7 +1234,18 @@ final short getShortFromFloat(float source) throws SqlException {
 
     final short getShortFromDouble(double source) throws SqlException {
         if (Configuration.rangeCheckCrossConverters &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 (source > Short.MAX_VALUE || source < Short.MIN_VALUE)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
             throw new OutsideRangeForDataTypeException(
                 agent_.logWriter_, "SMALLINT");
         }
@@ -1162,10 +1260,13 @@ final short getShortFromBoolean(boolean source) throws SqlException {
     final short getShortFromString(String source) throws SqlException {
         try {
             return parseShort(source);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId 
                     (SQLState.LANG_FORMAT_EXCEPTION), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, "short");
         }
     }
@@ -1194,7 +1295,13 @@ final int getIntFromFloat(float source) throws SqlException {
 
     final int getIntFromDouble(double source) throws SqlException {
         if (Configuration.rangeCheckCrossConverters &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 (source > Integer.MAX_VALUE || source < Integer.MIN_VALUE)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
             throw new OutsideRangeForDataTypeException(
                 agent_.logWriter_, "INTEGER");
         }
@@ -1212,6 +1319,7 @@ final int getIntFromString(String source) throws SqlException {
         } catch (NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, "int");
         }
     }
@@ -1230,7 +1338,11 @@ final long getLongFromFloat(float source) throws SqlException {
 
     final long getLongFromDouble(double source) throws SqlException {
         if (Configuration.rangeCheckCrossConverters &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 (source > Long.MAX_VALUE || source < Long.MIN_VALUE)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
             throw new OutsideRangeForDataTypeException(
                 agent_.logWriter_, "BIGINT");
         }
@@ -1248,6 +1360,7 @@ final long getLongFromString(String source) throws SqlException {
         } catch (NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, "long");
         }
     }
@@ -1256,7 +1369,10 @@ final long getLongFromString(String source) throws SqlException {
 
     final float getFloatFromDouble(double source) throws SqlException {
         if (Configuration.rangeCheckCrossConverters &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-1136
                 Float.isInfinite((float)source)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
             throw new OutsideRangeForDataTypeException(
                 agent_.logWriter_, "DOUBLE");
         }
@@ -1274,6 +1390,7 @@ final float getFloatFromString(String source) throws SqlException {
         } catch (NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, "float");
         }
     }
@@ -1290,6 +1407,7 @@ final double getDoubleFromString(String source) throws SqlException {
         } catch (NumberFormatException e) {
             throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, "double");
         }
     }
@@ -1302,9 +1420,17 @@ final BigDecimal getBigDecimalFromString(String source)
             // Unfortunately, the big decimal constructor calls java.lang.Long.parseLong(),
             // which doesn't like spaces, so we have to call trim() to get rid of the spaces from CHAR columns.
             return new BigDecimal(source.trim());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (NumberFormatException e) {
             throw new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     new ClientMessageId (SQLState.LANG_FORMAT_EXCEPTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, "java.math.BigDecimal");
         }
     }
@@ -1359,6 +1485,9 @@ final Timestamp getTimestampFromString(String source, Calendar cal)
             return timestamp_valueOf(source, cal);
         } catch (IllegalArgumentException e) { // subsumes NumberFormatException
             throw new SqlException(agent_.logWriter_, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     new ClientMessageId (SQLState.LANG_DATE_SYNTAX_EXCEPTION), e);
         }
     }
@@ -1513,6 +1642,8 @@ private static void initTimePortion(Calendar cal, String time) {
      */
     private static Timestamp timestamp_valueOf(String s, Calendar cal) {
         if (s == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throw new IllegalArgumentException();
         }
 
@@ -1705,6 +1836,7 @@ private static long parseLong(String s) throws NumberFormatException {
         if (negative) {
             if (i > 1) {
                 return result;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             } else {    // Only got "-"
                 throw new NumberFormatException(s);
             }
@@ -1714,6 +1846,7 @@ private static long parseLong(String s) throws NumberFormatException {
     }
 
     private static void skipPadding(String s, int i, int length)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws NumberFormatException {
         while (i < length) {
             if (s.charAt(i++) != ' ') {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/Cursor.java b/java/org.apache.derby.client/org/apache/derby/client/am/Cursor.java
index 43208beaf5..b97ee511af 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/Cursor.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/Cursor.java
@@ -101,6 +101,7 @@ public abstract class Cursor {
     // Total number of rows read so far.
     // This should never exceed this.statement.maxRows
     long rowsRead_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
     // Maximum column size limit in bytes.
     int maxFieldSize_ = 0;
@@ -110,6 +111,7 @@ public abstract class Cursor {
     protected ArrayList<int[]> columnDataPositionCache_ = new ArrayList<int[]>();
     protected ArrayList<int[]> columnDataLengthCache_ = new ArrayList<int[]>();
     protected ArrayList<boolean[]> columnDataIsNullCache_ = new ArrayList<boolean[]>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     ArrayList<Boolean> isUpdateDeleteHoleCache_ = new ArrayList<Boolean>();
     boolean isUpdateDeleteHole_;
 
@@ -142,6 +144,7 @@ public abstract class Cursor {
     public Cursor(Agent agent) {
         agent_ = agent;
         isRowUpdated_ = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         dataBufferStream_ = new ByteArrayOutputStream();
     }
 
@@ -152,6 +155,7 @@ public void setNumberOfColumns(int numberOfColumns) {
         columns_ = numberOfColumns;
         nullable_ = new boolean[numberOfColumns];
         charset_ = new Charset[numberOfColumns];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
 
         ccsid_ = new int[numberOfColumns];
 
@@ -178,6 +182,7 @@ protected boolean stepNext(boolean allowServerFetch) throws SqlException {
         
         // Moving out of the hole, set isUpdateDeleteHole to false
         isUpdateDeleteHole_ = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-718
 
         isRowUpdated_ = false;
 
@@ -195,6 +200,7 @@ protected boolean stepNext(boolean allowServerFetch) throws SqlException {
         // scrollable cursors, for the arrays to be reused.  It is not used for forward-only
         // cursors, so just pass in 0.
         boolean rowPositionIsValid =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             calculateColumnOffsetsForRow_(0, allowServerFetch);
         markNextRowPosition();
         return rowPositionIsValid;
@@ -208,6 +214,7 @@ protected boolean stepNext(boolean allowServerFetch) throws SqlException {
      * @exception SqlException if an error occurs
      */
     public boolean next() throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         return stepNext(true);
     }
 
@@ -234,6 +241,7 @@ public final boolean allRowsReceivedFromServer() {
         return allRowsReceivedFromServer_;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final boolean currentRowPositionIsEqualToNextRowPosition() {
         return (currentRowPosition_ == nextRowPosition_);
     }
@@ -247,10 +255,13 @@ public final void resetDataBuffer() {
         lastValidBytePosition_ = 0;
         currentRowPosition_ = 0;
         nextRowPosition_ = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         setAllRowsReceivedFromServer(false);
         dataBufferStream_.reset();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final boolean dataBufferHasUnprocessedData() {
         return (lastValidBytePosition_ - position_) > 0;
     }
@@ -381,6 +392,7 @@ private final double get_DOUBLE(int column) {
 
     // Build a java.math.BigDecimal from a fixed point decimal byte representation.
     private final BigDecimal get_DECIMAL(int column) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
         return Decimal.getBigDecimal(dataBuffer_,
                 columnDataPosition_[column - 1],
                 getColumnPrecision(column - 1),
@@ -391,6 +403,7 @@ private final BigDecimal get_DECIMAL(int column) throws SqlException {
     // Build a Java double from a fixed point decimal byte representation.
     private double getDoubleFromDECIMAL(int column) throws SqlException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return Decimal.getDouble(dataBuffer_,
                     columnDataPosition_[column - 1],
                     getColumnPrecision(column - 1),
@@ -398,6 +411,7 @@ private double getDoubleFromDECIMAL(int column) throws SqlException {
         } catch (IllegalArgumentException e) {
             throw new SqlException(agent_.logWriter_, 
                 new ClientMessageId (SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                 e, "double");
         }
     }
@@ -406,6 +420,7 @@ private double getDoubleFromDECIMAL(int column) throws SqlException {
     private long getLongFromDECIMAL(int column, String targetType)
             throws SqlException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return Decimal.getLong(dataBuffer_,
                     columnDataPosition_[column - 1],
                     getColumnPrecision(column - 1),
@@ -413,6 +428,7 @@ private long getLongFromDECIMAL(int column, String targetType)
         } catch (ArithmeticException e) {
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId (SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                 e, targetType);
         } catch (IllegalArgumentException e) {
             throw new SqlException(agent_.logWriter_,
@@ -428,6 +444,7 @@ private long getLongFromDECIMAL(int column, String targetType)
     // for all other cases length is the number of bytes.
     // The length does not include the null terminator.
     private String getVARCHAR(int column) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
         if (ccsid_[column - 1] == 1200) {
             return getStringWithoutConvert(columnDataPosition_[column - 1] + 2,
                     columnDataComputedLength_[column - 1] - 2);
@@ -443,6 +460,7 @@ private String getVARCHAR(int column) throws SqlException {
                 new ClientMessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         String tempString = new String(dataBuffer_,
                 columnDataPosition_[column - 1] + 2,
                 columnDataComputedLength_[column - 1] - 2,
@@ -463,11 +481,13 @@ private String getCHAR(int column) throws SqlException {
         // a mixed or double byte ccsid (ccsid = 0).  this check for null in the
         // cursor is only required for types which can have mixed or double
         // byte ccsids.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
         if (charset_[column - 1] == null) {
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.CHARACTER_CONVERTER_NOT_AVAILABLE));
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         String tempString = new String(dataBuffer_,
                 columnDataPosition_[column - 1],
                 columnDataComputedLength_[column - 1],
@@ -479,6 +499,7 @@ private String getCHAR(int column) throws SqlException {
 
     // Build a JDBC Date object from the DERBY ISO DATE field.
     private Date getDATE(int column, Calendar cal) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return DateTime.dateBytesToDate(dataBuffer_,
             columnDataPosition_[column - 1],
             cal,
@@ -487,6 +508,7 @@ private Date getDATE(int column, Calendar cal) throws SqlException {
 
     // Build a JDBC Time object from the DERBY ISO TIME field.
     private Time getTIME(int column, Calendar cal) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return DateTime.timeBytesToTime(dataBuffer_,
                 columnDataPosition_[column - 1],
                 cal,
@@ -561,6 +583,7 @@ private byte[] get_CHAR_FOR_BIT_DATA(int column) throws SqlException {
         // Otherwise, use the smaller of maxFieldSize and the actual column length.
         int columnLength = (maxFieldSize_ == 0) ? columnDataComputedLength_[column - 1] :
                 Math.min(maxFieldSize_, columnDataComputedLength_[column - 1]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         byte[] bytes = new byte[columnLength];
         System.arraycopy(dataBuffer_, columnDataPosition_[column - 1], bytes, 0, columnLength);
@@ -586,6 +609,8 @@ private byte[] get_VARCHAR_FOR_BIT_DATA(int column) throws SqlException {
     private Object get_UDT(int column) throws SqlException {
         byte[] bytes;
         int columnLength =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             (maxFieldSize_ == 0) ? columnDataComputedLength_[column - 1] - 2 :
             Math.min(maxFieldSize_, columnDataComputedLength_[column - 1] - 2);
         bytes = new byte[columnLength];
@@ -603,6 +628,7 @@ private Object get_UDT(int column) throws SqlException {
                 (
                  agent_.logWriter_, 
                  new ClientMessageId (SQLState.NET_MARSHALLING_UDT_ERROR),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                  e,
                  e.getMessage()
                  );
@@ -619,6 +645,7 @@ private Calendar getRecyclableCalendar()
     {
         if (recyclableCalendar_ == null)
             recyclableCalendar_ = new GregorianCalendar();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         return recyclableCalendar_;
     }
@@ -631,6 +658,7 @@ private Calendar getRecyclableCalendar()
      *
      * @return The locator procedures object.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3571
     CallableLocatorProcedures getLocatorProcedures() {
         return agent_.connection_.locatorProcedureCall();
     }
@@ -663,6 +691,7 @@ CallableLocatorProcedures getLocatorProcedures() {
     public abstract ClientBlob getBlobColumn_(int column, Agent agent,
                                         boolean toBePublished)
             throws SqlException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2892
 
     /**
      * Returns a {@code Clob} object.
@@ -681,6 +710,7 @@ public abstract ClientClob getClobColumn_(int column, Agent agent,
 
     final boolean getBoolean(int column) throws SqlException {
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case Types.BOOLEAN:
             return get_BOOLEAN(column);
         case Types.SMALLINT:
@@ -695,6 +725,7 @@ final boolean getBoolean(int column) throws SqlException {
             return agent_.crossConverters_.getBooleanFromDouble(get_DOUBLE(column));
         case Types.DECIMAL:
             // For performance we don't materialize the BigDecimal, but convert directly from decimal bytes to a long.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5536
             return agent_.crossConverters_.getBooleanFromLong(
                 getLongFromDECIMAL(column, "boolean"));
         case Types.CHAR:
@@ -703,6 +734,7 @@ final boolean getBoolean(int column) throws SqlException {
         case Types.LONGVARCHAR:
             return agent_.crossConverters_.getBooleanFromString(getVARCHAR(column));
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "boolean", column );
         }
     }
@@ -710,6 +742,7 @@ final boolean getBoolean(int column) throws SqlException {
     final byte getByte(int column) throws SqlException {
         // This needs to be changed to use jdbcTypes[]
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case Types.BOOLEAN:
             return agent_.crossConverters_.getByteFromBoolean(get_BOOLEAN(column));
         case Types.SMALLINT:
@@ -724,6 +757,7 @@ final byte getByte(int column) throws SqlException {
             return agent_.crossConverters_.getByteFromDouble(get_DOUBLE(column));
         case Types.DECIMAL:
             // For performance we don't materialize the BigDecimal, but convert directly from decimal bytes to a long.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5536
             return agent_.crossConverters_.getByteFromLong(
                 getLongFromDECIMAL(column, "byte"));
         case Types.CHAR:
@@ -732,12 +766,14 @@ final byte getByte(int column) throws SqlException {
         case Types.LONGVARCHAR:
             return agent_.crossConverters_.getByteFromString(getVARCHAR(column));
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "byte", column );
         }
     }
 
     final short getShort(int column) throws SqlException {
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case Types.BOOLEAN:
             return agent_.crossConverters_.getShortFromBoolean(get_BOOLEAN(column));
         case Types.SMALLINT:
@@ -752,6 +788,7 @@ final short getShort(int column) throws SqlException {
             return agent_.crossConverters_.getShortFromDouble(get_DOUBLE(column));
         case Types.DECIMAL:
             // For performance we don't materialize the BigDecimal, but convert directly from decimal bytes to a long.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5536
             return agent_.crossConverters_.getShortFromLong(
                 getLongFromDECIMAL(column, "short"));
         case Types.CHAR:
@@ -760,12 +797,14 @@ final short getShort(int column) throws SqlException {
         case Types.LONGVARCHAR:
             return agent_.crossConverters_.getShortFromString(getVARCHAR(column));
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "short", column );
         }
     }
 
     final int getInt(int column) throws SqlException {
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case Types.BOOLEAN:
             return agent_.crossConverters_.getIntFromBoolean(get_BOOLEAN(column));
         case Types.SMALLINT:
@@ -780,6 +819,7 @@ final int getInt(int column) throws SqlException {
             return agent_.crossConverters_.getIntFromDouble(get_DOUBLE(column));
         case Types.DECIMAL:
             // For performance we don't materialize the BigDecimal, but convert directly from decimal bytes to a long.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5536
             return agent_.crossConverters_.getIntFromLong(
                 getLongFromDECIMAL(column, "int"));
         case Types.CHAR:
@@ -788,12 +828,14 @@ final int getInt(int column) throws SqlException {
         case Types.LONGVARCHAR:
             return agent_.crossConverters_.getIntFromString(getVARCHAR(column));
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError(  "int", column );
         }
     }
 
     final long getLong(int column) throws SqlException {
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case Types.BOOLEAN:
             return agent_.crossConverters_.getLongFromBoolean(get_BOOLEAN(column));
         case Types.SMALLINT:
@@ -808,6 +850,7 @@ final long getLong(int column) throws SqlException {
             return agent_.crossConverters_.getLongFromDouble(get_DOUBLE(column));
         case Types.DECIMAL:
             // For performance we don't materialize the BigDecimal, but convert directly from decimal bytes to a long.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5536
             return getLongFromDECIMAL(column, "long");
         case Types.CHAR:
             return agent_.crossConverters_.getLongFromString(getCHAR(column));
@@ -815,12 +858,14 @@ final long getLong(int column) throws SqlException {
         case Types.LONGVARCHAR:
             return agent_.crossConverters_.getLongFromString(getVARCHAR(column));
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "long", column );
         }
     }
 
     final float getFloat(int column) throws SqlException {
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case Types.BOOLEAN:
             return agent_.crossConverters_.getFloatFromBoolean(get_BOOLEAN(column));
         case Types.REAL:
@@ -842,12 +887,14 @@ final float getFloat(int column) throws SqlException {
         case Types.LONGVARCHAR:
             return agent_.crossConverters_.getFloatFromString(getVARCHAR(column));
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "float", column );
         }
     }
 
     final double getDouble(int column) throws SqlException {
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case Types.BOOLEAN:
             return agent_.crossConverters_.getDoubleFromBoolean(get_BOOLEAN(column));
         case Types.REAL:
@@ -871,6 +918,7 @@ final double getDouble(int column) throws SqlException {
         case Types.LONGVARCHAR:
             return agent_.crossConverters_.getDoubleFromString(getVARCHAR(column));
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "double", column );
         }
     }
@@ -900,6 +948,7 @@ final BigDecimal getBigDecimal(int column) throws SqlException {
         case Types.LONGVARCHAR:
             return agent_.crossConverters_.getBigDecimalFromString(getVARCHAR(column));
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "java.math.BigDecimal", column );
         }
     }
@@ -918,10 +967,12 @@ final Date getDate(int column, Calendar cal) throws SqlException {
             return agent_.crossConverters_.
                     getDateFromString(getVARCHAR(column), cal);
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "java.sql.Date", column );
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final Time getTime(int column, Calendar cal) throws SqlException {
         switch (jdbcTypes_[column - 1]) {
         case Types.TIME:
@@ -936,10 +987,12 @@ final Time getTime(int column, Calendar cal) throws SqlException {
             return agent_.crossConverters_.
                     getTimeFromString(getVARCHAR(column), cal);
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "java.sql.Time", column );
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final Timestamp getTimestamp(int column, Calendar cal)
             throws SqlException {
         switch (jdbcTypes_[column - 1]) {
@@ -957,14 +1010,17 @@ final Timestamp getTimestamp(int column, Calendar cal)
             return agent_.crossConverters_.
                     getTimestampFromString(getVARCHAR(column), cal);
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "java.sql.Timestamp", column );
         }
     }
 
     final String getString(int column) throws SqlException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             String tempString;
             switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case Types.BOOLEAN:
                 if ( get_BOOLEAN( column ) ) { return Boolean.TRUE.toString(); }
                 else { return Boolean.FALSE.toString(); }
@@ -1021,6 +1077,7 @@ final String getString(int column) throws SqlException {
                 tempString = c.getSubString(1, (int) c.length());
                 return tempString;
             default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
                 throw coercionError( "String", column );
             }
         } catch ( SQLException se ) {
@@ -1031,6 +1088,7 @@ final String getString(int column) throws SqlException {
     final byte[] getBytes(int column) throws SqlException {
         try {
             switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case Types.BINARY:
                 return get_CHAR_FOR_BIT_DATA(column);
             case Types.VARBINARY:
@@ -1041,6 +1099,7 @@ final byte[] getBytes(int column) throws SqlException {
                 byte[] bytes = b.getBytes(1, (int) b.length());
                 return bytes;
             default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
                 throw coercionError( "byte[]", column );
             }
         } catch ( SQLException se ) {
@@ -1048,9 +1107,11 @@ final byte[] getBytes(int column) throws SqlException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final InputStream getBinaryStream(int column) throws SqlException
     {
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case Types.BINARY:
                 return new ByteArrayInputStream(get_CHAR_FOR_BIT_DATA(column));
             case Types.VARBINARY:
@@ -1071,9 +1132,11 @@ final InputStream getBinaryStream(int column) throws SqlException
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final InputStream getAsciiStream(int column) throws SqlException
     {
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case Types.CLOB:
                 ClientClob c = getClobColumn_(column, agent_, false);
                 if (c.isLocator()) {
@@ -1084,6 +1147,7 @@ final InputStream getAsciiStream(int column) throws SqlException
                     return c.getAsciiStreamX();
                 }
             case Types.CHAR:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                 return new ByteArrayInputStream(
                         getCHAR(column).getBytes(ISO_8859_1));
             case Types.VARCHAR:
@@ -1099,14 +1163,18 @@ final InputStream getAsciiStream(int column) throws SqlException
             case Types.BLOB:
                 return getBinaryStream(column);
             default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
                 throw coercionError( "java.io.InputStream", column );
         }
     }
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final Reader getCharacterStream(int column)
             throws SqlException 
     {
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case Types.CLOB:
                 ClientClob c = getClobColumn_(column, agent_, false);
                 if (c.isLocator()) {
@@ -1116,12 +1184,14 @@ final Reader getCharacterStream(int column)
                 } else {
                     return c.getCharacterStreamX();
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case Types.CHAR:
                 return new StringReader(getCHAR(column));
             case Types.VARCHAR:
             case Types.LONGVARCHAR:
                 return new StringReader(getVARCHAR(column));
             case Types.BINARY:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                 return new InputStreamReader(
                     new ByteArrayInputStream(
                         get_CHAR_FOR_BIT_DATA(column)), UTF_16BE);
@@ -1133,15 +1203,18 @@ final Reader getCharacterStream(int column)
             case Types.BLOB:
                 return new InputStreamReader(getBinaryStream(column), UTF_16BE);
             default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
                 throw coercionError( "java.io.Reader", column );
             }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final Blob getBlob(int column) throws SqlException {
         switch (jdbcTypes_[column - 1]) {
         case ClientTypes.BLOB:
             return getBlobColumn_(column, agent_, true);
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "java.sql.Blob", column );
         }
     }
@@ -1151,10 +1224,12 @@ final Clob getClob(int column) throws SqlException {
         case ClientTypes.CLOB:
             return getClobColumn_(column, agent_, true);
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "java.sql.Clob", column );
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final Array getArray(int column) throws SqlException {
         throw new SqlException(agent_.logWriter_, 
             new ClientMessageId (SQLState.NOT_IMPLEMENTED),
@@ -1168,7 +1243,9 @@ final Ref getRef(int column) throws SqlException {
 
     final Object getObject(int column) throws SqlException {
         switch (jdbcTypes_[column - 1]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case Types.BOOLEAN:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
             return get_BOOLEAN(column);
         case Types.SMALLINT:
             // See Table 4 in JDBC 1 spec (pg. 932 in jdbc book)
@@ -1202,10 +1279,14 @@ final Object getObject(int column) throws SqlException {
         case Types.JAVA_OBJECT:
             return get_UDT( column );
         case Types.BLOB:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2892
+//IC see: https://issues.apache.org/jira/browse/DERBY-2892
             return getBlobColumn_(column, agent_, true);
         case Types.CLOB:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2892
             return getClobColumn_(column, agent_, true);
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
             throw coercionError( "Object", column );
         }
     }
@@ -1215,6 +1296,7 @@ public final void allocateCharBuffer() {
         int maxCharLength = 0;
         for (int i = 0; i < columns_; i++) {
             switch (jdbcTypes_[i]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             case ClientTypes.CHAR:
             case ClientTypes.VARCHAR:
             case ClientTypes.LONGVARCHAR:
@@ -1242,9 +1324,11 @@ private String getStringWithoutConvert(int position, int actualLength) {
     }
 
     private ColumnTypeConversionException coercionError
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
         ( String targetType, int sourceColumn )
     {
         return new ColumnTypeConversionException
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             (agent_.logWriter_,
              targetType,
              ClientTypes.getTypeString(jdbcTypes_[sourceColumn -1]));
@@ -1260,6 +1344,7 @@ public void nullDataForGC() {
         columnDataIsNullCache_ = null;
         jdbcTypes_ = null;
         nullable_ = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
         charset_ = null;
         this.ccsid_ = null;
         isUpdateDeleteHoleCache_ = null;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/DateTime.java b/java/org.apache.derby.client/org/apache/derby/client/am/DateTime.java
index ae28c40564..ce7f5de9e0 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/DateTime.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/DateTime.java
@@ -69,8 +69,10 @@ private DateTime() {
      */
     static final Date dateBytesToDate(byte[] buffer,
             int offset,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Calendar recyclableCal,
             Charset encoding) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
 
         int year, month, day;
 
@@ -83,7 +85,9 @@ static final Date dateBytesToDate(byte[] buffer,
             monthIndx = 5;
             dayIndx = 8;
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throw new IllegalArgumentException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-847
                 SqlException.getMessageUtil().getTextMessage(
                     SQLState.LANG_FORMAT_EXCEPTION));
         }
@@ -160,6 +164,7 @@ static final Time timeBytesToTime(byte[] buffer,
      * @return TimeStamp translated from buffer with specified encoding
      */
     static final Timestamp timestampBytesToTimestamp(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
             byte[] buffer, int offset, Calendar recyclableCal,
             Charset encoding, boolean supportsTimestampNanoseconds)
     {
@@ -173,6 +178,7 @@ static final Timestamp timestampBytesToTimestamp(
          * the parsed nanoseconds value and use that to set nanos.
          */
         int nanos = parseTimestampString(timestamp, cal, supportsTimestampNanoseconds);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         Timestamp ts = new Timestamp(cal.getTimeInMillis());
         ts.setNanos( nanos );
         return ts;
@@ -263,11 +269,13 @@ private static int parseTimestampString(String timestamp,
     public static final int dateToDateBytes(byte[] buffer,
                                             int offset,
                                             DateTimeValue date)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
     throws SqlException {
         int year = date.getYear();
         if (year > 9999) {
             throw new SqlException(null,
                 new ClientMessageId(SQLState.YEAR_EXCEEDS_MAXIMUM),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 year, "9999");
         }
         int month = date.getMonth() + 1;
@@ -348,11 +356,13 @@ public static final int timestampToTimestampBytes(byte[] buffer,
                                                       int offset,
                                                       DateTimeValue timestamp,
                                                       boolean supportsTimestampNanoseconds) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
     throws SqlException {
         int year = timestamp.getYear();
         if (year > 9999) {
             throw new SqlException(null,
                 new ClientMessageId(SQLState.YEAR_EXCEEDS_MAXIMUM),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 year, "9999");
         }
         int month = timestamp.getMonth() + 1;
@@ -430,6 +440,7 @@ public static final int timestampToTimestampBytes(byte[] buffer,
     static final Timestamp dateBytesToTimestamp(byte[] buffer,
                                                                 int offset,
                                                                 Calendar recyclableCal,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                                                                 Charset encoding)
     {
         int year, month, day;
@@ -461,6 +472,7 @@ static final Timestamp dateBytesToTimestamp(byte[] buffer,
 
         Calendar cal = getCleanCalendar(recyclableCal);
         cal.set(year, month, day, 0, 0, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         Timestamp ts = new Timestamp(cal.getTimeInMillis());
         ts.setNanos(0);
         return ts;
@@ -480,6 +492,8 @@ static final Timestamp dateBytesToTimestamp(byte[] buffer,
      */
     static final Timestamp timeBytesToTimestamp(byte[] buffer,
                                                 int offset,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                                                 Calendar recyclableCal,
                                                 Charset encoding)
 {
@@ -515,6 +529,7 @@ static final Timestamp timeBytesToTimestamp(byte[] buffer,
 
         // Derby's resolution for the TIME type is only seconds.
         cal.set(Calendar.MILLISECOND, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return new Timestamp(cal.getTimeInMillis());
     }
     
@@ -530,6 +545,7 @@ static final Timestamp timeBytesToTimestamp(byte[] buffer,
      */
     static final Date timestampBytesToDate(byte[] buffer,
                                            int offset,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                                            Calendar recyclableCal,
                                            Charset encoding)
      {
@@ -555,6 +571,8 @@ static final Date timestampBytesToDate(byte[] buffer,
 
         Calendar cal = getCleanCalendar(recyclableCal);
         cal.set(year, month, day);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return new Date(cal.getTimeInMillis());
     }
 
@@ -570,6 +588,7 @@ static final Date timestampBytesToDate(byte[] buffer,
      */
     static final Time timestampBytesToTime(byte[] buffer,
                                            int offset,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                                            Calendar recyclableCal,
                                            Charset encoding)
     {
@@ -603,6 +622,8 @@ static final Time timestampBytesToTime(byte[] buffer,
          * must be set to January 1, 1970. So override those values now.
          */
         cal.set(1970, Calendar.JANUARY, 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return new Time(cal.getTimeInMillis());
     }
 
@@ -626,6 +647,7 @@ private static Calendar getCleanCalendar(Calendar recyclableCal)
          * Make sure we clear that out before returning, per the
          * contract of this method.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         Calendar result = new GregorianCalendar();
         result.clear();
         return result;
@@ -651,6 +673,7 @@ private static Calendar getCleanCalendar(Calendar recyclableCal)
     public static int getTimestampLength( boolean supportsTimestampNanoseconds )
     {
         return supportsTimestampNanoseconds ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
             DRDAConstants.JDBC_TIMESTAMP_LENGTH : DRDAConstants.DRDA_OLD_TIMESTAMP_LENGTH;
     }
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/DateTimeValue.java b/java/org.apache.derby.client/org/apache/derby/client/am/DateTimeValue.java
index 8e19ec31e2..a733932a87 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/DateTimeValue.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/DateTimeValue.java
@@ -72,6 +72,7 @@ private DateTimeValue(Calendar cal, int nanoFraction) {
      * Create an instance from a {@code java.sql.Timestamp} using the specified
      * {@code java.util.Calendar}.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     DateTimeValue(Date date, Calendar cal) {
         this(initCalendar(cal, date), 0);
     }
@@ -80,6 +81,7 @@ private DateTimeValue(Calendar cal, int nanoFraction) {
      * Create an instance from a {@code java.sql.Time} using the specified
      * {@code java.util.Calendar}.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     DateTimeValue(Time time, Calendar cal) {
         this(initCalendar(cal, time), 0);
     }
@@ -88,6 +90,7 @@ private DateTimeValue(Calendar cal, int nanoFraction) {
      * Create an instance from a {@code java.sql.Timestamp} using the specified
      * {@code java.util.Calendar}.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     DateTimeValue(Timestamp ts, Calendar cal) {
         this(initCalendar(cal, ts), ts.getNanos());
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/Decimal.java b/java/org.apache.derby.client/org/apache/derby/client/am/Decimal.java
index 93b018edd6..a53c7db6ea 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/Decimal.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/Decimal.java
@@ -163,6 +163,7 @@ static BigDecimal getBigDecimal(
             signum = 1;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
         if (precision <= 18) {
             // can be handled by long without overflow.
             long value = packedNybblesToLong(buffer, offset, 0, length * 2 - 1);
@@ -229,6 +230,8 @@ static BigDecimal getBigDecimal(
             magnitude[14] = (byte) (value[3] >>> 8);
             magnitude[15] = (byte) (value[3]);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return new BigDecimal(new BigInteger(signum, magnitude), scale);
         } else {
             // throw an exception here if nibbles is greater than 31
@@ -315,6 +318,7 @@ static long getLong(
 
         if (precision > 31) {
             // throw an exception here if nibbles is greater than 31
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throw new IllegalArgumentException(
                 msgutil.getTextMessage(SQLState.DECIMAL_TOO_MANY_DIGITS));
         }
@@ -330,6 +334,7 @@ static long getLong(
             signum = 1;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5536
         if (precision - scale <= 18) {
             // Can be handled by long without overflow.
             // Compute the integer part only.
@@ -362,6 +367,7 @@ static long getLong(
      */
     public static final int bigDecimalToPackedDecimalBytes(byte[] buffer,
                                                            int offset,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                                            BigDecimal b,
                                                            int declaredPrecision,
                                                            int declaredScale)
@@ -381,6 +387,7 @@ public static final int bigDecimalToPackedDecimalBytes(byte[] buffer,
         if (bigPrecision > 31) {
             throw new SqlException(null,
                 new ClientMessageId(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                 new SqlCode(-405), "packed decimal");
         }
 
@@ -392,6 +399,7 @@ public static final int bigDecimalToPackedDecimalBytes(byte[] buffer,
             if (bigWholeIntegerLength > declaredWholeIntegerLength) {
                 throw new SqlException(null,
                     new ClientMessageId(SQLState.NUMERIC_OVERFLOW),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     new SqlCode(-413), b.toString(), "packed decimal");
             }
         }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/DisconnectException.java b/java/org.apache.derby.client/org/apache/derby/client/am/DisconnectException.java
index be85b17c81..8f9b7fb12a 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/DisconnectException.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/DisconnectException.java
@@ -36,6 +36,7 @@ private DisconnectException(Agent agent, ClientMessageId msgid,
     }
 
     public DisconnectException(Agent agent, ClientMessageId msgid,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                                Throwable t, Object... args) {
         this(agent, msgid, args, SqlCode.disconnectError, (Throwable)t);
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/EncryptionManager.java b/java/org.apache.derby.client/org/apache/derby/client/am/EncryptionManager.java
index 54cec9a1f1..fffadf5ae0 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/EncryptionManager.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/EncryptionManager.java
@@ -652,6 +652,7 @@ public byte[] substitutePassword(
             };
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         Convert a byte array to a String with a hexadecimal format.
         The String may be converted back to a byte array using fromHexString.
         <BR>
@@ -670,6 +671,7 @@ the second character represents the low nibble ({@code b & 0x0f}).
     */
     private String toHexString(byte[] data, int offset, int length)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         StringBuilder s = new StringBuilder(length*2);
         int end = offset+length;
 
@@ -689,6 +691,7 @@ private String toHexString(byte[] data, int offset, int length)
         Convert a string into a byte array in hex format.
         <BR>
         For each character (b) two bytes are generated, the first byte 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         represents the high nibble (4 bits) in hexadecimal ({@code b & 0xf0}),
         the second byte represents the low nibble ({@code b & 0x0f}).
         <BR>
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ExceptionFormatter.java b/java/org.apache.derby.client/org/apache/derby/client/am/ExceptionFormatter.java
index dcd3247edd..f99ef77ff0 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ExceptionFormatter.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ExceptionFormatter.java
@@ -27,6 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.sql.SQLWarning;
 import javax.transaction.xa.XAException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class ExceptionFormatter {
     // returnTokensOnly is true only when exception tracing is enabled so
     // that we don't try to go to the server for a message while we're in
@@ -35,6 +36,7 @@ class ExceptionFormatter {
     // when TRACE_DIAGNOSTICS is on  because tracing occurs within the exception constructor.
     static void printTrace(SqlException e,
                                   PrintWriter printWriter,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                   String messageHeader,
                                   boolean returnTokensOnly) {
         String header;
@@ -43,10 +45,12 @@ static void printTrace(SqlException e,
                 header = messageHeader + "[" + "SQLException@" + Integer.toHexString(e.hashCode()) + "]";
                 printWriter.println(header + " java.sql.SQLException");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 Throwable throwable = e.getCause();
                 if (throwable != null) {
                     printTrace(throwable, printWriter, header);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5076
                 Sqlca sqlca = e.getSqlca();
                 if (sqlca != null) {
                     printTrace(sqlca, printWriter, header);
@@ -69,6 +73,7 @@ static void printTrace(SqlException e,
                         if (!sqlca.messageTextRetrievedContainsTokensOnly_) { // got the message text.
                             printWriter.println(header + " Message    = " + message);
                         } else { // got only message tokens.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1061
                             SqlException mysteryException = sqlca.exceptionThrownOnStoredProcInvocation_;
                             if (mysteryException != null &&
                                     (mysteryException.getErrorCode() == -440 || mysteryException.getErrorCode() == -444)) {
@@ -88,6 +93,7 @@ static void printTrace(SqlException e,
                 printWriter.println(header + " Stack trace follows");
                 e.printStackTrace(printWriter);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5076
                 sqlca = e.getSqlca();
                 if (sqlca != null) {
                     // JDK stack trace calls e.getMessage(), now that it is finished,
@@ -103,6 +109,8 @@ static void printTrace(SqlException e,
     }
 
     static void printTrace(SQLException e,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                   PrintWriter printWriter,
                                   String messageHeader,
                                   boolean returnTokensOnly) {
@@ -126,7 +134,9 @@ static void printTrace(SQLException e,
                 printWriter.println(header + " SQL state  = " + e.getSQLState());
                 printWriter.println(header + " Error code = " + String.valueOf(e.getErrorCode()));
                 printWriter.println(header + " Message    = " + e.getMessage());
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 if (e instanceof DataTruncation) {
                     printWriter.println(header + " Index         = " +
                                         ((DataTruncation) e).getIndex());
@@ -158,12 +168,14 @@ static void printTrace(SQLException e,
     }
 
     private static void printTrace(Sqlca sqlca,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                   PrintWriter printWriter,
                                   String messageHeader) {
         String header = messageHeader + "[" + "Sqlca@" + Integer.toHexString(sqlca.hashCode()) + "]";
         synchronized (printWriter) {
             printWriter.println(header + " DERBY SQLCA from server");
             printWriter.println(header + " SqlCode        = " + sqlca.getSqlCode());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             printWriter.println(header + " SqlErrd        = " + sqlca.formatSqlErrd());
             printWriter.println(header + " SqlErrmc       = " + sqlca.getSqlErrmc());
             printWriter.println(header + " SqlErrp        = " + sqlca.getSqlErrp());
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/FailedProperties40.java b/java/org.apache.derby.client/org/apache/derby/client/am/FailedProperties40.java
index a1729599bc..2c947daa7e 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/FailedProperties40.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/FailedProperties40.java
@@ -40,6 +40,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class FailedProperties40 {
     private final HashMap<String,ClientInfoStatus> failedProps_ = 
     new HashMap<String,ClientInfoStatus>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1380
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
 
     private final String firstKey_;
     private final String firstValue_;
@@ -52,6 +54,7 @@ public class FailedProperties40 {
      * @return the created <code>Properties</code> object
      */
     public static Properties makeProperties(String name, String value) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     Properties p = new Properties();
         if (name != null || value != null)
             p.setProperty(name, value);
@@ -76,6 +79,7 @@ public FailedProperties40(Properties props) {
         Enumeration e = props.keys();
         firstKey_ = (String)e.nextElement();
         firstValue_ = props.getProperty(firstKey_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1380
         failedProps_.put(firstKey_, ClientInfoStatus.REASON_UNKNOWN_PROPERTY);
         while (e.hasMoreElements()) {
             failedProps_.put((String)e.nextElement(), 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/LOBStateTracker.java b/java/org.apache.derby.client/org/apache/derby/client/am/LOBStateTracker.java
index d8d7730085..4c4220a58d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/LOBStateTracker.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/LOBStateTracker.java
@@ -84,6 +84,7 @@ class LOBStateTracker {
      * @param doRelease whether locators shall be released
      * @see #NO_OP_TRACKER
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3601
     LOBStateTracker(int[] lobIndexes, boolean[] isBlob, boolean doRelease) {
         this.columns = lobIndexes;
         this.isBlob = isBlob;
@@ -106,6 +107,7 @@ void checkCurrentRow(Cursor cursor)
             throws SqlException {
         // If we are on a delete hole, there are no locators to release, and 
         // trying to release them will cause an error. See DERBY-6228.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
         if (this.doRelease && !cursor.getIsUpdateDeleteHole()) {
             CallableLocatorProcedures procs = cursor.getLocatorProcedures();
             for (int i=0; i < this.columns.length; i++) {
@@ -117,6 +119,7 @@ void checkCurrentRow(Cursor cursor)
                     if (locator == this.lastLocatorSeen[i]) {
                         // We are being called on the same row twice...
                         return;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3658
                     } else if (locator == Lob.INVALID_LOCATOR) {
                         // The locator is invalid, probably because the
                         // database is running in soft upgrade mode and
@@ -133,6 +136,8 @@ void checkCurrentRow(Cursor cursor)
                 }
             }
             // Reset state for the next row.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3601
+//IC see: https://issues.apache.org/jira/browse/DERBY-3601
             Arrays.fill(this.published, false);
         }
     }
@@ -145,11 +150,13 @@ void checkCurrentRow(Cursor cursor)
      * to release them from the client side in this case.
      */
     void discardState() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3601
         if (this.doRelease) {
             // Force the state to published for all LOB columns.
             // This will cause checkCurrentRow to ignore all LOBs on the next
             // invocation. The method markAsPublished cannot be called before
             // after checkCurrentRow has been called again.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3601
             Arrays.fill(this.published, true);
         }
     }
@@ -164,6 +171,7 @@ void discardState() {
      * @param index 1-based column index
      */
     void markAsPublished(int index) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3601
         if (this.doRelease) {
             int internalIndex = Arrays.binarySearch(this.columns, index);
             this.published[internalIndex] = true;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/Lob.java b/java/org.apache.derby.client/org/apache/derby/client/am/Lob.java
index 5a8fbe7213..f79e6a84ab 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/Lob.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/Lob.java
@@ -78,6 +78,7 @@ public abstract class Lob implements UnitOfWorkListener {
     private int transactionID_;
 
     //-----------------------------messageId------------------------------------------
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final static private ClientMessageId LOB_OBJECT_LENGTH_UNKNOWN_YET =
         new ClientMessageId( SQLState.LOB_OBJECT_LENGTH_UNKNOWN_YET );
     
@@ -108,9 +109,11 @@ long sqlLength() throws SqlException
     {
         if (lengthObtained_) return sqlLength_;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         if (isLocator()) {
             sqlLength_ = getLocatorLength();
             lengthObtained_ = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         } else if (willBeLayerBStreamed()) {
             throw new SqlException(agent_.logWriter_,
                                    LOB_OBJECT_LENGTH_UNKNOWN_YET);
@@ -142,6 +145,7 @@ void setSqlLength(long length)
      * 
      * @return length of Lob
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
     long getLocatorLength() throws SqlException
     {
         return -1;
@@ -151,6 +155,9 @@ long getLocatorLength() throws SqlException
     //-----------------------event callback methods-------------------------------
 
     public void listenToUnitOfWork() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
+//IC see: https://issues.apache.org/jira/browse/DERBY-557
+//IC see: https://issues.apache.org/jira/browse/DERBY-210
         agent_.connection_.CommitAndRollbackListeners_.put(this,null);
     }
 
@@ -201,8 +208,10 @@ void checkForClosedConnection() throws SqlException {
      *      while reading from the stream
      */
     protected InputStream materializeStream(InputStream is, String typeDesc)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws SqlException {
         final int GROWBY = 32 * 1024; // 32 KB
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> byteArrays = new ArrayList<byte[]>();
         byte[] curBytes = new byte[GROWBY];
         int totalLength = 0;
@@ -221,6 +230,7 @@ protected InputStream materializeStream(InputStream is, String typeDesc)
                         curBytes = new byte[GROWBY];
                     }
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
                 if (partLength > 0) {
                     totalLength += partLength;
                 }
@@ -235,6 +245,7 @@ protected InputStream materializeStream(InputStream is, String typeDesc)
                                 typeDesc
                         );
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             if (partLength > 0) {
                 byteArrays.add(curBytes);
             }
@@ -250,6 +261,8 @@ protected InputStream materializeStream(InputStream is, String typeDesc)
             throw new SqlException(null,
                         new ClientMessageId(
                             SQLState.LANG_STREAMING_COLUMN_I_O_EXCEPTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3913
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                             ioe,
                             typeDesc
                     );
@@ -282,6 +295,7 @@ public boolean willBeLayerBStreamed() {
      * @return true if Lob is based on locator, false otherwise
      */
     public boolean isLocator() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         return ((dataType_ & LOCATOR) == LOCATOR);
     }
 
@@ -311,6 +325,7 @@ protected void checkPosAndLength(long pos, long length)
         if (pos <= 0) {
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.BLOB_BAD_POSITION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 pos).getSQLException();
         }
         if (length < 0) {
@@ -318,6 +333,7 @@ protected void checkPosAndLength(long pos, long length)
                 new ClientMessageId(SQLState.BLOB_NONPOSITIVE_LENGTH),
                 length).getSQLException();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4060
         if (length > (this.length() - (pos -1))) {
             throw new SqlException(agent_.logWriter_,
                 new ClientMessageId(SQLState.POS_AND_LENGTH_GREATER_THAN_LOB),
@@ -344,6 +360,7 @@ protected void checkPosAndLength(long pos, long length)
      * depend on updateCount for invalidation
      */
     protected synchronized void incrementUpdateCount() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
         updateCount++;
     }
     
@@ -387,7 +404,10 @@ protected void checkValidity() throws SQLException{
             throw se.getSQLException();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4312
+//IC see: https://issues.apache.org/jira/browse/DERBY-4224
         if(!isValid_ || (isLocator()  && 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 (transactionID_ != agent_.connection_.getTransactionID())))
             throw new SqlException(null,new ClientMessageId(SQLState.LOB_OBJECT_INVALID))
                                                   .getSQLException();
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/LogWriter.java b/java/org.apache.derby.client/org/apache/derby/client/am/LogWriter.java
index 0034e3b174..4e2f5fcd1d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/LogWriter.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/LogWriter.java
@@ -47,6 +47,7 @@ public LogWriter(PrintWriter printWriter, int traceLevel) {
     }
 
     final protected boolean loggingEnabled(int traceLevel) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (SanityManager.DEBUG) {
             if (printWriter_ == null) {
                 SanityManager.THROWASSERT(
@@ -144,7 +145,9 @@ private String getClassNameOfInstanceIfTraced(Object instance) {
         if (instance == null) // this prevents NPE from instance.getClass() used below
         {
             return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } else if (instance instanceof ClientConnection && loggingEnabled(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 BasicClientDataSource.TRACE_CONNECTION_CALLS)) {
             return "ClientConnection";
         } else if (instance instanceof ClientResultSet && loggingEnabled(
@@ -221,6 +224,7 @@ public void traceExit(Object instance, String methodName, Object returnValue) {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void traceDeprecatedExit(Object instance,
                              String methodName,
                              Object returnValue) {
@@ -235,6 +239,7 @@ void traceDeprecatedExit(Object instance,
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void traceExit(
             Object instance,
             String methodName,
@@ -244,6 +249,7 @@ void traceExit(
         traceExit(instance, methodName, returnValue);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void traceExit(
             Object instance,
             String methodName,
@@ -266,6 +272,7 @@ void traceExit(
             Object instance,
             String methodName,
             ClientDatabaseMetaData returnValue) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         traceExit(instance, methodName, "DatabaseMetaData@" + Integer.toHexString(returnValue.hashCode()));
     }
@@ -297,6 +304,7 @@ void traceExit(Object instance, String methodName, byte returnValue) {
     // --------------------------- method entry tracing --------------------------
 
     public void traceEntry(Object instance, String methodName, Object... args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
         traceEntryAllArgs(instance, methodName, false, args);
     }
 
@@ -341,6 +349,7 @@ private static String toPrintableString(Object o) {
 
     // ---------------------------tracing exceptions and warnings-----------------
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void traceDiagnosable(SqlException e) {
         if (!loggingEnabled(BasicClientDataSource.TRACE_DIAGNOSTICS)) {
             return;
@@ -362,7 +371,11 @@ public void traceDiagnosable(SQLException e) {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void traceDiagnosable(XAException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (!loggingEnabled(BasicClientDataSource.TRACE_DIAGNOSTICS)) {
             return;
         }
@@ -379,6 +392,7 @@ void traceParameterMetaData(
             ColumnMetaData columnMetaData) {
 
         if (!loggingEnabled(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 BasicClientDataSource.TRACE_PARAMETER_META_DATA) ||
                 columnMetaData == null) {
             return;
@@ -391,6 +405,7 @@ void traceParameterMetaData(
                 dncprintln(header, "Number of parameter columns: " + columnMetaData.getColumnCount());
                 traceColumnMetaData(header, columnMetaData);
                 dncprintln(header, "END TRACE_PARAMETER_META_DATA");
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
             } catch (SQLException e) {
                 dncprintln(header, "Encountered an SQL exception while trying to trace parameter meta data");
                 dncprintln(header, "END TRACE_PARAMETER_META_DATA");
@@ -399,10 +414,13 @@ void traceParameterMetaData(
     }
 
     void traceResultSetMetaData(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientStatement statement,
             ColumnMetaData columnMetaData) {
 
         if (!loggingEnabled(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 BasicClientDataSource.TRACE_RESULT_SET_META_DATA) ||
                 columnMetaData == null) {
             return;
@@ -415,6 +433,7 @@ void traceResultSetMetaData(
                 dncprintln(header, "Number of result set columns: " + columnMetaData.getColumnCount());
                 traceColumnMetaData(header, columnMetaData);
                 dncprintln(header, "END TRACE_RESULT_SET_META_DATA");
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
             } catch (SQLException e) {
                 dncprintln(header, "Encountered an SQL exception while trying to trace result set meta data");
                 dncprintln(header, "END TRACE_RESULT_SET_META_DATA");
@@ -473,6 +492,7 @@ private void traceColumnMetaData(String header, ColumnMetaData columnMetaData) {
                 printWriter_.println(" }");
                 printWriter_.flush();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         } catch (SQLException e) {
             dncprintln(header, "Encountered an SQL exception while trying to trace column meta data");
         }
@@ -482,6 +502,7 @@ private void traceColumnMetaData(String header, ColumnMetaData columnMetaData) {
     // Including protocol manager levels, and driver configuration
 
     // Jdbc 2
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
     void traceConnectEntry(BasicClientDataSource dataSource) {
         if (loggingEnabled(
                 BasicClientDataSource.TRACE_DRIVER_CONFIGURATION)) {
@@ -493,11 +514,14 @@ void traceConnectEntry(BasicClientDataSource dataSource) {
     }
 
     // Jdbc 1
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void traceConnectEntry(String server,
                                   int port,
                                   String database,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                   Properties properties) {
         if (loggingEnabled(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 BasicClientDataSource.TRACE_DRIVER_CONFIGURATION)) {
             traceDriverConfigurationJdbc1();
         }
@@ -506,6 +530,7 @@ void traceConnectEntry(String server,
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void traceConnectResetEntry(
             Object instance, LogWriter logWriter,
             String user, BasicClientDataSource ds) {
@@ -516,6 +541,7 @@ void traceConnectResetEntry(
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void traceConnectExit(ClientConnection connection) {
         if (loggingEnabled(BasicClientDataSource.TRACE_CONNECTS)) {
             traceConnectsExit(connection);
@@ -536,6 +562,7 @@ private void traceConnectsResetEntry(BasicClientDataSource dataSource) {
             traceConnectsResetEntry(dataSource.getServerName(),
                     dataSource.getPortNumber(),
                     dataSource.getDatabaseName(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-446
                     getProperties(dataSource));
         } catch ( SqlException se ) {
             dncprintln("Encountered an SQL exception while trying to trace connection reset entry");
@@ -547,6 +574,7 @@ private void traceConnectsEntry(BasicClientDataSource dataSource) {
             traceConnectsEntry(dataSource.getServerName(),
                     dataSource.getPortNumber(),
                     dataSource.getDatabaseName(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-446
                     getProperties(dataSource));
         } catch ( SqlException se ) {
             dncprintln("Encountered an SQL exception while trying to trace connection entry");
@@ -557,6 +585,7 @@ private void traceConnectsEntry(BasicClientDataSource dataSource) {
     private void traceConnectsResetEntry(String server,
                                          int port,
                                          String database,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                          Properties properties) {
         dncprintln("BEGIN TRACE_CONNECT_RESET");
         dncprintln("Connection reset requested for " + server + ":" + port + "/" + database);
@@ -568,6 +597,7 @@ private void traceConnectsResetEntry(String server,
     private void traceConnectsEntry(String server,
                                     int port,
                                     String database,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                     Properties properties) {
         synchronized (printWriter_) {
             dncprintln("BEGIN TRACE_CONNECTS");
@@ -591,6 +621,7 @@ public void traceConnectsExit(ClientConnection c) {
                 dncprintln(header, "Driver name: " + c.databaseMetaData_.getDriverName());
                 dncprintln(header, "Driver version: " + c.databaseMetaData_.getDriverVersion());
                 dncprintln(header, "END TRACE_CONNECTS");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             } catch (SQLException e) {
                 dncprintln(header, "Encountered an SQL exception while trying to trace connection exit");
                 dncprintln(header, "END TRACE_CONNECTS");
@@ -610,6 +641,7 @@ public void traceConnectsResetExit(ClientConnection c) {
                 dncprintln(header, "Driver name: " + c.databaseMetaData_.getDriverName());
                 dncprintln(header, "Driver version: " + c.databaseMetaData_.getDriverVersion());
                 dncprintln(header, "END TRACE_CONNECT_RESET");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             } catch (SQLException e) {
                 dncprintln(header, "Encountered an SQL exception while trying to trace connection reset exit");
                 dncprintln(header, "END TRACE_CONNECT_RESET");
@@ -623,6 +655,7 @@ public void traceConnectsResetExit(ClientConnection c) {
     // printWriter_ synchronized by caller.
     private void writeProperties(Properties properties) {
         printWriter_.print("{ ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         for (Iterator i = properties.entrySet().iterator(); i.hasNext();) {
             Map.Entry e = (Map.Entry) (i.next());
             if ("password".equals(e.getKey())) {
@@ -639,6 +672,7 @@ private void writeProperties(Properties properties) {
     }
 
     private String escapePassword(String pw) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         StringBuilder sb = new StringBuilder(pw);
         for (int j = 0; j < pw.length(); j++) {
             sb.setCharAt(j, '*');
@@ -666,6 +700,7 @@ private void traceDriverConfigurationJdbc1() {
     }
 
     private void writeDriverConfiguration() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         Version.writeDriverConfiguration(printWriter_);
     }
 
@@ -676,6 +711,7 @@ private Properties getProperties(BasicClientDataSource cds)
     throws SqlException {
         
         Properties properties = BasicClientDataSource.getProperties(cds);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         if (properties.getProperty(Attribute.PASSWORD_ATTR) != null) {
             properties.setProperty(Attribute.PASSWORD_ATTR, "********");
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalCallableStatement.java b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalCallableStatement.java
index 7750418120..2c8f028530 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalCallableStatement.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalCallableStatement.java
@@ -56,6 +56,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class LogicalCallableStatement
     extends LogicalPreparedStatement
     implements CallableStatement {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     /**
      * Creates a new logical callable statement.
@@ -67,6 +68,8 @@ public class LogicalCallableStatement
      */
     public LogicalCallableStatement(CallableStatement physicalCs,
                                     StatementKey stmtKey,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                                     StatementCacheInteractor cacheInteractor) {
         super(physicalCs, stmtKey, cacheInteractor);
     }
@@ -395,6 +398,7 @@ public void setTimestamp(String parameterName, Timestamp x, Calendar cal) throws
     ////////////////////////////////////////////////////////////////////
 
     public RowId getRowId(int arg0)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             throws SQLException {
         return getPhysCs().getRowId(arg0);
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalCallableStatement42.java b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalCallableStatement42.java
index ad050515cb..b152a3ccaa 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalCallableStatement42.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalCallableStatement42.java
@@ -56,6 +56,7 @@ public LogicalCallableStatement42(CallableStatement physicalCs,
     public  void registerOutParameter( int parameterIndex, SQLType sqlType )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ((ClientCallableStatement42)getPhysCs()).
             registerOutParameter( parameterIndex, sqlType );
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalConnection.java b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalConnection.java
index 693ab33298..af14b404d3 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalConnection.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalConnection.java
@@ -61,6 +61,7 @@ public class LogicalConnection implements Connection {
      * <p>
      * Set to {@code null} when this logical connection is closed.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ClientConnection physicalConnection_;
     private ClientPooledConnection pooledConnection_ = null;
     /**
@@ -72,11 +73,13 @@ public class LogicalConnection implements Connection {
     private LogicalDatabaseMetaData logicalDatabaseMetaData = null;
 
     public LogicalConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection physicalConnection,
             ClientPooledConnection pooledConnection) throws SqlException {
 
         physicalConnection_ = physicalConnection;
         pooledConnection_ = pooledConnection;
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         try {
             checkForNullPhysicalConnection();
         } catch ( SQLException se ) {
@@ -106,6 +109,7 @@ public void close() throws SQLException {
         //  there is no deadlock when calling back into the pooledConnection_.recycleConnection
         //  below, we first synchronize on the pooledConnection and then on this
         //  LogicalConnection
+//IC see: https://issues.apache.org/jira/browse/DERBY-5560
         synchronized (pooledConnection_) {
             synchronized (this) {
                 try {
@@ -119,11 +123,14 @@ public void close() throws SQLException {
 
                     if (physicalConnection_.isClosed()) // connection is closed or has become stale
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                         pooledConnection_.informListeners(new SqlException(null,
                                 new ClientMessageId(
                                 SQLState.PHYSICAL_CONNECTION_ALREADY_CLOSED)));
                     } else {
                         physicalConnection_.checkForTransactionInProgress();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
                         physicalConnection_.closeForReuse(
                                 pooledConnection_.isStatementPoolingEnabled());
                         if (!physicalConnection_.isGlobalPending_()) {
@@ -148,11 +155,14 @@ synchronized public void closeWithoutRecyclingToPool() throws SqlException {
             if (physicalConnection_.isClosed()) // connection is closed or has become stale
             {
                 throw new SqlException(null, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                     new ClientMessageId(SQLState.NO_CURRENT_CONNECTION)); // no call to informListeners()
             } else {
                 ; // no call to recycleConnection()
             }
         } finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
             physicalConnection_.closeForReuse(
                     pooledConnection_.isStatementPoolingEnabled());  //poolfix
             physicalConnection_ = null;
@@ -178,6 +188,7 @@ public boolean isClosed() throws SQLException {
      * @throws SQLException if this logical connection has been closed
      */
     protected final void checkForNullPhysicalConnection()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5561
             throws SQLException {
         if (physicalConnection_ == null) {
             SqlException se = new SqlException(null, 
@@ -196,14 +207,18 @@ protected final void checkForNullPhysicalConnection()
      * 
      * @param sqle the cause of the notification
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     final void notifyException(SQLException sqle) {
         if (physicalConnection_ != null) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
             pooledConnection_.informListeners(new SqlException(sqle));
     }
 
     // ---------------------- wrapped public entry points ------------------------
     // All methods are forwarded to the physical connection in a standard way
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public Statement createStatement() throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -214,6 +229,7 @@ synchronized public Statement createStatement() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public PreparedStatement prepareStatement(String sql)
             throws SQLException {
         try {
@@ -225,8 +241,10 @@ synchronized public PreparedStatement prepareStatement(String sql)
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public CallableStatement prepareCall(String sql)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         try {
             checkForNullPhysicalConnection();
             return physicalConnection_.prepareCall(sql);
@@ -236,6 +254,7 @@ synchronized public CallableStatement prepareCall(String sql)
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5561
     synchronized public String nativeSQL(String sql) throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -256,6 +275,7 @@ synchronized public void setAutoCommit(boolean autoCommit) throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5561
     synchronized public boolean getAutoCommit() throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -296,6 +316,7 @@ synchronized public void setTransactionIsolation(int level) throws SQLException
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5561
     synchronized public int getTransactionIsolation() throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -306,6 +327,7 @@ synchronized public int getTransactionIsolation() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public SQLWarning getWarnings() throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -342,7 +364,9 @@ synchronized public void clearWarnings() throws SQLException {
      * @throws SQLException if an error occurs
      */
     public synchronized DatabaseMetaData getMetaData()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3431
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         try {
             checkForNullPhysicalConnection();
             // Create metadata object on demand, then cache it for later use.
@@ -377,6 +401,7 @@ protected LogicalDatabaseMetaData newLogicalDatabaseMetaData()
      * @return The metadata object from the underlying physical connection.
      * @throws SQLException if the logical connection has been closed
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final synchronized DatabaseMetaData getRealMetaDataObject()
             throws SQLException {
         // Check if the logical connection has been closed.
@@ -394,6 +419,7 @@ final synchronized DatabaseMetaData getRealMetaDataObject()
     }
 
     synchronized public void setReadOnly(boolean readOnly) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         try {
             checkForNullPhysicalConnection();
             physicalConnection_.setReadOnly(readOnly);
@@ -403,6 +429,7 @@ synchronized public void setReadOnly(boolean readOnly) throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5561
     synchronized public boolean isReadOnly() throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -423,6 +450,7 @@ synchronized public void setCatalog(String catalog) throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5561
     synchronized public String getCatalog() throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -433,6 +461,7 @@ synchronized public String getCatalog() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public Statement createStatement(int resultSetType,
                                                            int resultSetConcurrency) throws SQLException {
         try {
@@ -444,6 +473,7 @@ synchronized public Statement createStatement(int resultSetType,
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public PreparedStatement prepareStatement(String sql,
                                                                     int resultSetType,
                                                                     int resultSetConcurrency) throws SQLException {
@@ -456,6 +486,7 @@ synchronized public PreparedStatement prepareStatement(String sql,
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public CallableStatement prepareCall(String sql,
                                                                int resultSetType,
                                                                int resultSetConcurrency) throws SQLException {
@@ -468,6 +499,7 @@ synchronized public CallableStatement prepareCall(String sql,
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     synchronized public Map<String, Class<?>> getTypeMap() throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -478,6 +510,7 @@ synchronized public Map<String, Class<?>> getTypeMap() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     synchronized public void setTypeMap(Map map) throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -488,6 +521,7 @@ synchronized public void setTypeMap(Map map) throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public Statement createStatement(
             int resultSetType,
             int resultSetConcurrency,
@@ -502,6 +536,7 @@ synchronized public Statement createStatement(
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public CallableStatement prepareCall(
             String sql,
             int resultSetType,
@@ -517,6 +552,7 @@ synchronized public CallableStatement prepareCall(
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public PreparedStatement prepareStatement(
             String sql,
             int resultSetType,
@@ -533,6 +569,7 @@ synchronized public PreparedStatement prepareStatement(
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public PreparedStatement prepareStatement(
             String sql,
             int autoGeneratedKeys) throws SQLException {
@@ -546,6 +583,7 @@ synchronized public PreparedStatement prepareStatement(
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public PreparedStatement prepareStatement(
             String sql,
             int columnIndexes[]) throws SQLException {
@@ -559,6 +597,7 @@ synchronized public PreparedStatement prepareStatement(
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public PreparedStatement prepareStatement(
             String sql,
             String columnNames[]) throws SQLException {
@@ -572,6 +611,7 @@ synchronized public PreparedStatement prepareStatement(
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5561
     synchronized public void setHoldability(int holdability) throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -582,6 +622,7 @@ synchronized public void setHoldability(int holdability) throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5561
     synchronized public int getHoldability() throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -592,6 +633,7 @@ synchronized public int getHoldability() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public Savepoint setSavepoint() throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -602,6 +644,7 @@ synchronized public Savepoint setSavepoint() throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public Savepoint setSavepoint(String name)
             throws SQLException {
         try {
@@ -613,6 +656,7 @@ synchronized public Savepoint setSavepoint(String name)
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public void rollback(Savepoint savepoint) throws SQLException {
         try {
             checkForNullPhysicalConnection();
@@ -623,6 +667,7 @@ synchronized public void rollback(Savepoint savepoint) throws SQLException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized public void releaseSavepoint(Savepoint savepoint)
             throws SQLException {
         try {
@@ -666,6 +711,7 @@ public int getServerVersion() {
     //
     ////////////////////////////////////////////////////////////////////
     public Array createArrayOf(String typeName, Object[] elements)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         throws SQLException {
         try
         {
@@ -904,8 +950,11 @@ public <T>T unwrap(Class<T> interfaces)
     /**
      * Get the name of the current schema.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5561
     synchronized public String   getSchema() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         try {
             checkForNullPhysicalConnection();
             return physicalConnection_.getSchema();
@@ -918,6 +967,7 @@ synchronized public String   getSchema() throws SQLException
     /**
      * Set the default schema for the Connection.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5561
     synchronized public void   setSchema(  String schemaName ) throws SQLException
     {
         try {
@@ -931,6 +981,7 @@ synchronized public void   setSchema(  String schemaName ) throws SQLException
 
     public  void    abort( Executor executor )  throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         try
         {
             if ( physicalConnection_ != null )
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalDatabaseMetaData.java b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalDatabaseMetaData.java
index 17a2008068..74838d6e8d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalDatabaseMetaData.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalDatabaseMetaData.java
@@ -37,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * of the underlying physical connection.
  */
 class LogicalDatabaseMetaData implements DatabaseMetaData {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     /** The associated logical connection. */
     private final LogicalConnection logicalCon;
@@ -54,6 +55,7 @@ class LogicalDatabaseMetaData implements DatabaseMetaData {
      * @param logWriter destination for log/error messages
      * @throws SQLException if obtaining the JDBC driver versions fail
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     LogicalDatabaseMetaData(LogicalConnection logicalCon,
                             LogWriter logWriter)
             throws SQLException {
@@ -76,6 +78,7 @@ class LogicalDatabaseMetaData implements DatabaseMetaData {
      * @throws SQLException if the logical connection has been closed, or
      *      obtaining the metadata object fails
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final DatabaseMetaData getRealMetaDataObject()
             throws SQLException {
         return this.logicalCon.getRealMetaDataObject();
@@ -825,6 +828,7 @@ public boolean supportsStatementPooling() throws SQLException {
     // JDBC 4.0 methods
 
     public boolean autoCommitFailureClosesAllResultSets()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             throws SQLException {
         return getRealMetaDataObject().autoCommitFailureClosesAllResultSets();
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalPreparedStatement.java b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalPreparedStatement.java
index 68ac206949..c6e048a6a2 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalPreparedStatement.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalPreparedStatement.java
@@ -61,6 +61,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class LogicalPreparedStatement
     extends LogicalStatementEntity
     implements PreparedStatement {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     /**
      * Creates a new logical prepared statement.
@@ -72,6 +73,8 @@ public class LogicalPreparedStatement
      */
     public LogicalPreparedStatement(PreparedStatement physicalPs,
                                     StatementKey stmtKey,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                                     StatementCacheInteractor cacheInteractor) {
         super(physicalPs, stmtKey, cacheInteractor);
     }
@@ -397,6 +400,7 @@ public ResultSet executeQuery(String sql) throws SQLException {
     ////////////////////////////////////////////////////////////////
 
     public void setRowId(int arg0, RowId arg1)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             throws SQLException {
          getPhysPs().setRowId(arg0, arg1);
     }
@@ -515,6 +519,7 @@ public boolean isPoolable()
 
     public  long    executeLargeUpdate() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return ((ClientPreparedStatement) getPhysPs()).executeLargeUpdate();
     }
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalPreparedStatement42.java b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalPreparedStatement42.java
index 3f790ccceb..d3c8040cb6 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalPreparedStatement42.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalPreparedStatement42.java
@@ -40,6 +40,7 @@ public class LogicalPreparedStatement42 extends LogicalPreparedStatement
      * @throws IllegalArgumentException if {@code cache} is {@code null}
      */
     public LogicalPreparedStatement42 (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             PreparedStatement physicalPs,
             StatementKey stmtKey,
             StatementCacheInteractor cacheInteractor ) {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalStatementEntity.java b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalStatementEntity.java
index f4496b18ff..72a3263aa3 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/LogicalStatementEntity.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/LogicalStatementEntity.java
@@ -50,6 +50,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 //@ThreadSafe
 abstract class LogicalStatementEntity
         implements Statement {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     /**
      * Tells if we're holding a callable statement or not.
@@ -91,6 +92,8 @@ abstract class LogicalStatementEntity
      */
     protected LogicalStatementEntity(PreparedStatement physicalPs,
                                      StatementKey stmtKey,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                                      StatementCacheInteractor cacheInteractor) {
         if (cacheInteractor.getCache() == null) {
             // Internal check, failure indicates programming error.
@@ -100,8 +103,10 @@ protected LogicalStatementEntity(PreparedStatement physicalPs,
         }
         this.stmtKey = stmtKey;
         this.cache = cacheInteractor.getCache();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
         this.owner = cacheInteractor;
         this.physicalPs = physicalPs;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (physicalPs instanceof CallableStatement) {
             this.hasCallableStmt = true;
             this.physicalCs = (CallableStatement)physicalPs;
@@ -118,6 +123,7 @@ protected LogicalStatementEntity(PreparedStatement physicalPs,
      * @return A prepared statement.
      * @throws SQLException if the logical statement has been closed
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized PreparedStatement getPhysPs()
             throws SQLException {
         if (physicalPs == null) {
@@ -134,6 +140,7 @@ synchronized PreparedStatement getPhysPs()
      * @return A callable statement.
      * @throws SQLException if the logical statement has been closed
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized CallableStatement getPhysCs()
             throws SQLException {
         if (SanityManager.DEBUG) {
@@ -155,6 +162,7 @@ synchronized CallableStatement getPhysCs()
      * @throws SQLException if the logical statement has been closed
      */
     private synchronized Statement getPhysStmt()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
             throws SQLException
     {
         if ( hasCallableStmt ) { return getPhysCs(); }
@@ -168,12 +176,14 @@ private synchronized Statement getPhysStmt()
      */
     public synchronized void close() throws SQLException {
         if (physicalPs != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             final ClientPreparedStatement temporaryPsRef =
                     (ClientPreparedStatement)physicalPs;
             // Nullify both references.
             physicalPs = null;
             physicalCs = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
             this.owner.markClosed(this);
             // Nullify the reference, since the entity object might stick around
             // for a while.
@@ -182,6 +192,7 @@ public synchronized void close() throws SQLException {
             temporaryPsRef.setOwner(null);
             // NOTE: Accessing ps state directly below only to avoid tracing.
             // If the underlying statement has become closed, don't cache it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4843
             if (!temporaryPsRef.openOnClient_) {
                 return;
             }
@@ -193,6 +204,7 @@ public synchronized void close() throws SQLException {
 
             // Reset the statement for reuse.
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
                 temporaryPsRef.resetForReuse();
             } catch (SqlException sqle) {
                 // Get a wrapper and throw it.
@@ -234,6 +246,7 @@ synchronized boolean isLogicalEntityClosed() {
      * instance implements {@code iface}
      */
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5872
         getPhysStmt(); // Just to check that the statement is not closed.
         return iface.isInstance(this);
     }
@@ -248,6 +261,7 @@ public boolean isWrapperFor(Class<?> iface) throws SQLException {
      * interface
      */
     public <T> T unwrap(Class<T> iface) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (((ClientStatement) getPhysStmt()).isClosed()) {
             throw new SqlException(null,
                 new ClientMessageId(SQLState.ALREADY_CLOSED),
@@ -272,6 +286,7 @@ public <T> T unwrap(Class<T> iface) throws SQLException {
 
     public  void    closeOnCompletion() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ((ClientStatement) getPhysStmt()).closeOnCompletion();
     }
 
@@ -288,6 +303,7 @@ public  boolean isCloseOnCompletion() throws SQLException
 
     public  long[] executeLargeBatch() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return ((ClientStatement) getPhysStmt()).executeLargeBatch();
     }
     public  long executeLargeUpdate( String sql ) throws SQLException
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/MaterialStatement.java b/java/org.apache.derby.client/org/apache/derby/client/am/MaterialStatement.java
index 8c9a6675be..9c95b78226 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/MaterialStatement.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/MaterialStatement.java
@@ -63,6 +63,7 @@ public abstract void writeExecuteCall_(boolean outputExpected,
 
     public abstract void writeSetSpecialRegister_(
         Section section, ArrayList sqlsttList) throws SqlException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     public abstract void readSetSpecialRegister_() throws SqlException;
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/ProductLevel.java b/java/org.apache.derby.client/org/apache/derby/client/am/ProductLevel.java
index 401c714253..5a4004553d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/ProductLevel.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/ProductLevel.java
@@ -21,6 +21,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.derby.client.am;
 
 public class ProductLevel {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     String databaseProductName_;
     int versionLevel_;
     int releaseLevel_;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/SQLExceptionFactory.java b/java/org.apache.derby.client/org/apache/derby/client/am/SQLExceptionFactory.java
index 1bd0286e20..7e22568941 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/SQLExceptionFactory.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/SQLExceptionFactory.java
@@ -82,6 +82,7 @@ else if ( sqlState.equals( SQLState.LANG_CHECK_CONSTRAINT_VIOLATED ) )
                 ex = new DerbySQLIntegrityConstraintViolationException(message, sqlState,
                     errCode, args[1], args[0]);
             else
+//IC see: https://issues.apache.org/jira/browse/DERBY-6803
                 ex = new DerbySQLIntegrityConstraintViolationException(message, sqlState,
                     errCode, args[0], args[1]);
         } else if (sqlState.startsWith(SQLState.AUTHORIZATION_SPEC_PREFIX)) {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/Section.java b/java/org.apache.derby.client/org/apache/derby/client/am/Section.java
index 9bb7fe694e..3f6ede3e7a 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/Section.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/Section.java
@@ -99,6 +99,7 @@ public void setPKGNAMCBytes(byte[] b) {
      * @return the package name and consistency token information
      */
     public byte[] getPKGNAMCBytes() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return PKGNAMCBytes != null ?
                PKGNAMCBytes.clone() :
                null;
@@ -125,6 +126,7 @@ public String getServerCursorName() {
 
     // member for positioned update sections only
     String serverCursorNameForPositionedUpdate_ = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     public String getServerCursorNameForPositionedUpdate() {
         return serverCursorNameForPositionedUpdate_;
@@ -144,6 +146,7 @@ public void setClientCursorName(String clientCursorName) { //
         this.clientCursorName_ = clientCursorName;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void free() {
         if (resultSetHoldability_ != -1) {
             this.agent_.sectionManager_.freeSection(this, resultSetHoldability_);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/SectionManager.java b/java/org.apache.derby.client/org/apache/derby/client/am/SectionManager.java
index f05d0e5ce2..810bc5f6ef 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/SectionManager.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/SectionManager.java
@@ -180,6 +180,7 @@ void mapCursorNameToQuerySection(String cursorName, Section section) {
         positionedUpdateCursorNameToQuerySection_.put(cursorName, section);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void mapCursorNameToResultSet(
             String cursorName,
             ClientResultSet resultSet) {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/SqlCode.java b/java/org.apache.derby.client/org/apache/derby/client/am/SqlCode.java
index aa13633a50..1072cc6c1e 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/SqlCode.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/SqlCode.java
@@ -31,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class SqlCode {
     private int code_;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     SqlCode(int code) {
         code_ = code;
     }
@@ -47,6 +48,7 @@ public final int getCode() {
     public final static SqlCode queuedXAError = new SqlCode(-4203);
 
     final static SqlCode disconnectError = new SqlCode(40000);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     /** SQL code for SQL state 02000 (end of data). DRDA does not
      * specify the SQL code for this SQL state, but Derby uses 100. */
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/SqlException.java b/java/org.apache.derby.client/org/apache/derby/client/am/SqlException.java
index 362c40dae4..b8cc487830 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/SqlException.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/SqlException.java
@@ -86,6 +86,7 @@ public class SqlException extends Exception implements Diagnosable {
     protected SqlException nextException_;
     
     public static final String CLIENT_MESSAGE_RESOURCE_NAME =
+//IC see: https://issues.apache.org/jira/browse/DERBY-838
         "org.apache.derby.loc.clientmessages";
     
     /**
@@ -117,7 +118,9 @@ public class SqlException extends Exception implements Diagnosable {
      *   messages
      */
     public static MessageUtil getMessageUtil() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-847
         if ( msgutil_ == null ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             msgutil_ = new MessageUtil(MessageUtil.CLIENT_MESSAGE_RESOURCE_NAME);
         }
         
@@ -160,11 +163,13 @@ public static MessageUtil getMessageUtil() {
      *      is chained into the nextException chain.  Otherwise it is chained
      *      using initCause().
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     SqlException(LogWriter logwriter,
         ClientMessageId msgid, Object[] args, Throwable cause)
     {
         this(
             logwriter,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1069
             cause,
             getMessageUtil().getCompleteMessage(
                 msgid.msgid,
@@ -175,6 +180,7 @@ public static MessageUtil getMessageUtil() {
 
     // Use the following SQLExceptions when you want to override the error
     // code that is derived from the severity of the message id.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     SqlException(LogWriter logWriter, ClientMessageId msgid, Object[] args,
         SqlCode sqlcode, Throwable t) {
         this(logWriter, msgid, args, t);
@@ -182,6 +188,7 @@ public static MessageUtil getMessageUtil() {
     }
 
     public SqlException(LogWriter logWriter, ClientMessageId msgid,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                         SqlCode sqlcode, Object... args) {
         this(logWriter, msgid, args, sqlcode, (Throwable)null);
     }
@@ -197,6 +204,7 @@ public SqlException(LogWriter logWriter, ClientMessageId msgid,
     }
     
     public SqlException(LogWriter logwriter,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                         ClientMessageId msgid,
                         Object... args)
     {
@@ -210,12 +218,15 @@ public SqlException(LogWriter logwriter,
      * @param sqlca the SQLCA sent from the server
      */
     public SqlException(LogWriter logWriter, Sqlca sqlca) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
         this(sqlca, 0, true);
         // only set the error code for the first exception in the chain (we
         // don't know the error code for the rest)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
         errorcode_ = sqlca.getErrorCode();
         if ( logWriter != null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             logWriter.traceDiagnosable(SqlException.this);
         }
     }
@@ -253,6 +264,7 @@ private SqlException(Sqlca sqlca, int number, boolean chain) {
     private SqlException(LogWriter logWriter, String reason, String sqlState,
         int errorCode)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-842
         this(logWriter, (Throwable)null, reason, sqlState, errorCode);
     }
 
@@ -265,6 +277,7 @@ private SqlException(LogWriter logWriter, Throwable throwable,
         setThrowable(throwable);
         
         if (logWriter != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             logWriter.traceDiagnosable(SqlException.this);
         }
         
@@ -289,6 +302,7 @@ else if ( throwable instanceof SQLException )
             setNextException((SQLException) throwable );
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
         if (throwable != null) {
             initCause(throwable);
         }
@@ -322,9 +336,12 @@ public SQLException getSQLException()
                         
         // When we have support for JDBC 4 SQLException subclasses, this is
         // where we decide which exception to create
+//IC see: https://issues.apache.org/jira/browse/DERBY-1140
         SQLException sqle = exceptionFactory.getSQLException(getMessage(), getSQLState(), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6803
             getErrorCode(), getArgs());
         sqle.initCause(this);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
 
         // Set up the nextException chain
         if ( nextException_ != null )
@@ -342,6 +359,7 @@ public SQLException getSQLException()
     // when getMessage() is called.
     // Called by the Agent.
     void setBatchPositionLabel(int index) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3902
         batchPositionLabel_ = getMessageUtil().getTextMessage(MessageId.BATCH_POSITION_ID) + 
             index + ": ";
     }
@@ -357,6 +375,7 @@ public String toString() {
     }
 
     private Object []getArgs() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6803
         if( sqlca_ != null )
             return ((Sqlca)sqlca_).getArgs(messageNumber_);
         return null;
@@ -364,6 +383,7 @@ public String toString() {
 
     @Override
     public String getMessage() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
         if ( wrappedException_ != null )
         {
             return wrappedException_.getMessage();
@@ -379,6 +399,7 @@ public String getMessage() {
         // the connection and JDBC not being retrievable (hence why it is
         // being cached here).
         if (sqlca_ != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
             cachedMessage_ = message_ =
                     ((Sqlca) sqlca_).getJDBCMessage(messageNumber_);
         }
@@ -407,6 +428,7 @@ public String getSQLState() {
             return wrappedException_.getSQLState();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
         return sqlstate_;
     }
 
@@ -416,6 +438,7 @@ public int getErrorCode() {
             return wrappedException_.getErrorCode();
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
         return errorcode_;
     }
 
@@ -452,6 +475,7 @@ public void setNextException(SQLException nextException)
         else
         {
             // Add this exception to the end of the chain
+//IC see: https://issues.apache.org/jira/browse/DERBY-860
             SqlException theEnd = this;
             while (theEnd.nextException_ != null) {
                 theEnd = theEnd.nextException_;
@@ -465,6 +489,7 @@ public void setNextException(SQLException nextException)
      * we encountered an underlying Java exception
      */
     static SqlException javaException(LogWriter logWriter, Throwable e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
         return new SqlException(logWriter, 
             new ClientMessageId (SQLState.JAVA_EXCEPTION), 
             new Object[] {e.getClass().getName(), e.getMessage()}, e);
@@ -476,6 +501,7 @@ static SqlException javaException(LogWriter logWriter, Throwable e) {
     SqlException copyAsUnchainedSQLException(LogWriter logWriter) {
         if (sqlca_ != null) {
             // server error
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
             return new SqlException(sqlca_, messageNumber_, false);
         } else {
             return new SqlException(logWriter, getMessage(), getSQLState(), getErrorCode()); // client error
@@ -487,6 +513,7 @@ SqlException copyAsUnchainedSQLException(LogWriter logWriter) {
 // for common ResultSet data conversion exceptions.
 
 class ColumnTypeConversionException extends SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4949
     ColumnTypeConversionException(LogWriter logWriter, String targetType,
         String sourceType) {
         super(logWriter,
@@ -498,6 +525,7 @@ class ColumnTypeConversionException extends SqlException {
 // An intermediate exception encapsulation to provide code-reuse
 // for common CrossConverters data conversion exceptions.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
 class OutsideRangeForDataTypeException extends SqlException {
     OutsideRangeForDataTypeException(LogWriter logWriter, String instance) {
         super(logWriter,
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/SqlWarning.java b/java/org.apache.derby.client/org/apache/derby/client/am/SqlWarning.java
index 64e1d7b5f8..b15958303d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/SqlWarning.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/SqlWarning.java
@@ -34,6 +34,7 @@ public class SqlWarning extends SqlException implements Diagnosable {
 
     private SqlWarning nextWarning_;
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
     SqlWarning(LogWriter logwriter, ClientMessageId msgid, Object... args)
     {
         super(logwriter, msgid, args);
@@ -69,6 +70,7 @@ public SQLWarning getSQLWarning()
             getErrorCode());
 
         sqlw.initCause(this);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
 
         // Set up the nextException chain
         if ( nextWarning_ != null )
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/Sqlca.java b/java/org.apache.derby.client/org/apache/derby/client/am/Sqlca.java
index 807e5cd73f..8f33974b6f 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/Sqlca.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/Sqlca.java
@@ -37,7 +37,9 @@ public abstract class Sqlca {
     private  static  final   int LOW_ORDER_UPDATE_COUNT = 2;
     private  static  final   int HIGH_ORDER_UPDATE_COUNT = 3;
     public  static  final   int SQL_ERR_LENGTH = 6;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     transient private ClientConnection connection_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1061
     SqlException exceptionThrownOnStoredProcInvocation_;
     boolean messageTextRetrievedContainsTokensOnly_ = true;
 
@@ -86,6 +88,7 @@ void returnTokensOnlyInMessageText(boolean returnTokensOnlyInMessageText) {
      *
      * @return number of messages
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
     synchronized int numberOfMessages() {
         initSqlErrmcMessages();
         if (sqlErrmcMessages_ != null) {
@@ -148,6 +151,7 @@ synchronized public String getSqlErrmc() {
         // sqlErrmc string is dependent on sqlErrmcMessages_ array having
         // been built
         initSqlErrmcMessages();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
 
         // sqlErrmc will be built only if sqlErrmcMessages_ has been built.
         // Otherwise, a null string will be returned.
@@ -164,8 +168,10 @@ synchronized public String getSqlErrmc() {
         // concatenate tokens with sqlErrmcDelimiter delimiters into one String
         StringBuffer buffer = new StringBuffer();
         int indx;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
         for (indx = 0; indx < sqlErrmcMessages_.length - 1; indx++) {
             buffer.append(sqlErrmcMessages_[indx]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6803
             buffer.append(MessageUtils.SQLERRMC_MESSAGE_DELIMITER);
             // all but the first message should be preceded by the SQL state
             // and a colon (see DRDAConnThread.buildTokenizedSqlerrmc() on the
@@ -201,6 +207,7 @@ synchronized public String getSqlErrp() {
             return null;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
         sqlErrp_ = bytes2String(sqlErrpBytes_, 0, sqlErrpBytes_.length);
         return sqlErrp_;
     }
@@ -210,10 +217,12 @@ private int[] getSqlErrd() {
             return sqlErrd_;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         sqlErrd_ = new int[ SQL_ERR_LENGTH ]; // create an int array.
         return sqlErrd_;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     String formatSqlErrd() {
         return Utils.getStringFromInts(getSqlErrd());
     }
@@ -223,6 +232,7 @@ String formatSqlErrd() {
     synchronized public String getSqlWarn() {
         if (sqlWarn_ == null) {
             if (sqlWarnBytes_ != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                 sqlWarn_ = bytes2String(sqlWarnBytes_, 0, sqlWarnBytes_.length);
             } else {
                 sqlWarn_ = elevenBlanks;
@@ -241,6 +251,7 @@ synchronized public String getSqlState() {
      * @param messageNumber the error to retrieve SQL state for
      * @return SQL state for the error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
     synchronized String getSqlState(int messageNumber) {
         initSqlErrmcMessages();
         if (sqlStates_ != null) {
@@ -250,6 +261,7 @@ synchronized String getSqlState(int messageNumber) {
     }
 
     public Object [] getArgs(int messageNumber) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6803
         if (sqlErrmcMessages_ != null)
 	    return MessageUtils.getArgs(getSqlState(messageNumber),
                                         sqlErrmcMessages_[messageNumber] );
@@ -267,6 +279,7 @@ private String getMessage(int messageNumber) throws SqlException {
             return getUnformattedMessage(messageNumber);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ClientCallableStatement cs = null;
         synchronized (connection_) {
             try {
@@ -274,7 +287,9 @@ private String getMessage(int messageNumber) throws SqlException {
                 // Cannot let this statement commit the transaction. Otherwise, 
                 // calling getWarnings while navigating a ResultSet will 
                 // release and invalidate locators used by the cursor.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
                 cs.isAutoCommittableStatement_ = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
                 String errmc = null;
                 String sqlState = null;
 
@@ -299,12 +314,15 @@ private String getMessage(int messageNumber) throws SqlException {
                 cs.setIntX(9, getSqlErrd()[4]);
                 cs.setIntX(10, getSqlErrd()[5]);
                 // SQLWarn: SQL warning flags.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 cs.setStringX(11, getSqlWarn());
                 // SQLState: standard SQL state.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
                 cs.setStringX(12, sqlState);
                 // MessageFileName: Not used by our driver, so set to null.
                 cs.setStringX(13, null);
                 // Locale: language preference requested for the return error message.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 cs.setStringX(14, Locale.getDefault().toString());
                 // server could return a locale different from what we requested
                 cs.registerOutParameterX(14, Types.VARCHAR);
@@ -318,6 +336,7 @@ private String getMessage(int messageNumber) throws SqlException {
                     // Return the message text.
                     messageTextRetrievedContainsTokensOnly_ = false;
                     String message = cs.getStringX(15);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
                     if (cachedMessages == null) {
                         cachedMessages = new String[numberOfMessages()];
                     }
@@ -332,6 +351,7 @@ private String getMessage(int messageNumber) throws SqlException {
                 if (cs != null) {
                     try {
                         cs.closeX();
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                     } catch (SqlException doNothing) {
                     }
                 }
@@ -340,6 +360,7 @@ private String getMessage(int messageNumber) throws SqlException {
     }
 
     // May or may not get the formatted message depending upon datasource directives.  cannot throw exeption.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
     synchronized String getJDBCMessage(int messageNumber) {
         // The transient connection_ member will only be null if the Sqlca has been deserialized
         if (connection_ != null && connection_.retrieveMessageText_) {
@@ -347,6 +368,7 @@ synchronized String getJDBCMessage(int messageNumber) {
                 return getMessage(messageNumber);
             } catch (SqlException e) {
                 // Invocation of stored procedure fails, so we return error message tokens directly.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1061
                 exceptionThrownOnStoredProcInvocation_ = e;
                 chainDeferredExceptionsToAgentOrAsConnectionWarnings((SqlException) e);
                 return getUnformattedMessage(messageNumber);
@@ -369,6 +391,7 @@ private String getUnformattedMessage(int messageNumber) {
         if (messageNumber == 0) {
             // if the first exception in the chain is requested, return all the
             // information we have
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
             errorCode = getErrorCode();
             sqlState = getSqlState();
             sqlErrmc = getSqlErrmc();
@@ -390,11 +413,13 @@ private void chainDeferredExceptionsToAgentOrAsConnectionWarnings(SqlException e
             if (current.getErrorCode() == -440) {
                 SqlWarning warningForStoredProcFailure = new SqlWarning(agent_.logWriter_,
                     new ClientMessageId(SQLState.UNABLE_TO_OBTAIN_MESSAGE_TEXT_FROM_SERVER));
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                 warningForStoredProcFailure.setNextException(current.getSQLException());
                 connection_.accumulate440WarningForMessageProcFailure(warningForStoredProcFailure);
             } else if (current.getErrorCode() == -444) {
                 SqlWarning warningForStoredProcFailure = new SqlWarning(agent_.logWriter_,
                     new ClientMessageId(SQLState.UNABLE_TO_OBTAIN_MESSAGE_TEXT_FROM_SERVER));
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                 warningForStoredProcFailure.setNextException(current.getSQLException());
                 connection_.accumulate444WarningForMessageProcFailure(warningForStoredProcFailure);
             } else {
@@ -413,6 +438,7 @@ private void chainDeferredExceptionsToAgentOrAsConnectionWarnings(SqlException e
     DataTruncation getDataTruncation() {
         // The network server has serialized all the parameters needed by
         // the constructor in the SQLERRMC field.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6803
         String[] tokens = getSqlErrmc().split(MessageUtils.SQLERRMC_TOKEN_DELIMITER);
         return new DataTruncation(
                 Integer.parseInt(tokens[0]),                // index
@@ -426,6 +452,7 @@ DataTruncation getDataTruncation() {
 
     private void processSqlErrmcTokens(byte[] tokenBytes) {
         if (tokenBytes == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
             return;
         }
 
@@ -437,6 +464,7 @@ private void processSqlErrmcTokens(byte[] tokenBytes) {
         }
 
         // tokenize and convert tokenBytes
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
         String fullString = bytes2String(tokenBytes, 0, length);
         String[] tokens = fullString.split("\\u0014{3}");
         String[] states = new String[tokens.length];
@@ -463,6 +491,7 @@ public long getUpdateCount() {
         if (sqlErrd_ == null) {
             return 0L;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         long    result = getSqlErrd()[ LOW_ORDER_UPDATE_COUNT ];
         result &= 0xFFFFFFFFL;
         result |= ((long) getSqlErrd()[ HIGH_ORDER_UPDATE_COUNT ] << 32);
@@ -484,6 +513,7 @@ public boolean containsSqlcax() {
 
     public void resetRowsetSqlca(ClientConnection connection,
                                  int sqlCode,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                  String sqlState) {
         connection_ = connection;
         sqlCode_ = sqlCode;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/StatementCacheInteractor.java b/java/org.apache.derby.client/org/apache/derby/client/am/StatementCacheInteractor.java
index 9d0da6c5da..da4f93fcf4 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/StatementCacheInteractor.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/StatementCacheInteractor.java
@@ -60,6 +60,7 @@ public final class StatementCacheInteractor {
     /** List of open logical statements created by this cache interactor. */
     //@GuardedBy("this")
     private final ArrayList<LogicalStatementEntity> openLogicalStatements =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             new ArrayList<LogicalStatementEntity>();
     /**
      * Tells if this interactor is in the process of shutting down.
@@ -75,6 +76,7 @@ public final class StatementCacheInteractor {
      * @param physicalConnection associated physical connection
      */
     StatementCacheInteractor(JDBCStatementCache cache,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                              ClientConnection physicalConnection) {
         this.cache = cache;
         this.physicalConnection = physicalConnection;
@@ -83,9 +85,11 @@ public final class StatementCacheInteractor {
     /**
      * @see java.sql.Connection#prepareStatement(String)
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized PreparedStatement prepareStatement(String sql)
             throws SQLException {
         StatementKey stmtKey = StatementKeyFactory.newPrepared(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                 sql, physicalConnection.getCurrentSchemaName(),
                 physicalConnection.holdability());
         PreparedStatement ps = cache.getCached(stmtKey);
@@ -104,8 +108,10 @@ synchronized PreparedStatement prepareStatement(
                                                 int resultSetConcurrency)
             throws SQLException {
         StatementKey stmtKey = StatementKeyFactory.newPrepared(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                 sql, physicalConnection.getCurrentSchemaName(), resultSetType,
                 resultSetConcurrency, physicalConnection.holdability());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         PreparedStatement ps = cache.getCached(stmtKey);
         if (ps == null) {
             ps = physicalConnection.prepareStatement(
@@ -124,9 +130,11 @@ synchronized PreparedStatement prepareStatement(
                                                 int resultSetHoldability)
             throws SQLException {
         StatementKey stmtKey = StatementKeyFactory.newPrepared(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                 sql, physicalConnection.getCurrentSchemaName(), resultSetType,
                 resultSetConcurrency, resultSetHoldability);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         PreparedStatement ps = cache.getCached(stmtKey);
         if (ps == null) {
             ps = physicalConnection.prepareStatement(
@@ -138,26 +146,36 @@ synchronized PreparedStatement prepareStatement(
     /**
      * @see java.sql.Connection#prepareStatement(String,int)
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized PreparedStatement prepareStatement(
                                                 String sql,
                                                 int autoGeneratedKeys)
             throws SQLException {
         StatementKey stmtKey = StatementKeyFactory.newPrepared(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                 sql, physicalConnection.getCurrentSchemaName(),
                 physicalConnection.getHoldability(), autoGeneratedKeys);
         PreparedStatement ps = cache.getCached(stmtKey);
         if (ps == null) {
             ps = physicalConnection.prepareStatement(sql, autoGeneratedKeys);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
         return createLogicalPreparedStatement(ps, stmtKey);
     }
 
     /**
      * @see java.sql.Connection#prepareCall(String)
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized CallableStatement prepareCall(String sql)
             throws SQLException {
         StatementKey stmtKey = StatementKeyFactory.newCallable(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                 sql, physicalConnection.getCurrentSchemaName(),
                 physicalConnection.holdability());
         CallableStatement cs =
@@ -172,11 +190,13 @@ synchronized CallableStatement prepareCall(String sql)
     /**
      * @see java.sql.Connection#prepareCall(String,int,int)
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized CallableStatement prepareCall(String sql,
                                                       int resultSetType,
                                                       int resultSetConcurrency)
             throws SQLException {
         StatementKey stmtKey = StatementKeyFactory.newCallable(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                 sql, physicalConnection.getCurrentSchemaName(), resultSetType,
                 resultSetConcurrency, physicalConnection.holdability());
         CallableStatement cs =
@@ -191,14 +211,17 @@ synchronized CallableStatement prepareCall(String sql,
     /**
      * @see java.sql.Connection#prepareCall(String,int,int,int)
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized CallableStatement prepareCall(String sql,
                                                       int resultSetType,
                                                       int resultSetConcurrency,
                                                       int resultSetHoldability)
             throws SQLException {
         StatementKey stmtKey = StatementKeyFactory.newCallable(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                 sql, physicalConnection.getCurrentSchemaName(), resultSetType,
                 resultSetConcurrency, resultSetHoldability);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         CallableStatement cs =
             (CallableStatement)cache.getCached(stmtKey);
 
@@ -206,6 +229,9 @@ synchronized CallableStatement prepareCall(String sql,
             cs = physicalConnection.prepareCall(sql, resultSetType, resultSetConcurrency,
                     resultSetHoldability);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
         return createLogicalCallableStatement(cs, stmtKey);
     }
 
@@ -215,12 +241,15 @@ synchronized CallableStatement prepareCall(String sql,
      * A cache interactor is bound to a single (caching) logical connection.
      * @throws SQLException if closing an open logical connection fails
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized void closeOpenLogicalStatements()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3457
             throws SQLException {
         // Transist to closing state, to avoid changing the list of open
         // statements as we work our way through the list.
         this.connCloseInProgress = true;
         // Iterate through the list and close the logical statements.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (LogicalStatementEntity logicalStatement : openLogicalStatements) {
             logicalStatement.close();
         }
@@ -233,6 +262,7 @@ synchronized void closeOpenLogicalStatements()
      *
      * @param logicalStmt the logical statement being closed
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized void markClosed(LogicalStatementEntity logicalStmt) {
         // If we are not in the process of shutting down the logical connection,
         // remove the notifying statement from the list of open statements.
@@ -255,11 +285,21 @@ synchronized void markClosed(LogicalStatementEntity logicalStmt) {
      * @throws SQLException if creating a logical prepared statement fails
      */
     private PreparedStatement createLogicalPreparedStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             PreparedStatement ps,
             StatementKey stmtKey) throws SQLException {
 
         LogicalPreparedStatement logicalPs =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 ClientAutoloadedDriver.getFactory().newLogicalPreparedStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                                                     ps, stmtKey, this);
         this.openLogicalStatements.add(logicalPs);
         return logicalPs;
@@ -274,11 +314,19 @@ private PreparedStatement createLogicalPreparedStatement(
      * @throws SQLException if creating a logical callable statement fails
      */
     private CallableStatement createLogicalCallableStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             CallableStatement cs,
             StatementKey stmtKey) throws SQLException {
 
         LogicalCallableStatement logicalCs =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 ClientAutoloadedDriver.getFactory().newLogicalCallableStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                                                     cs, stmtKey, this);
         this.openLogicalStatements.add(logicalCs);
         return logicalCs;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/StatementCallbackInterface.java b/java/org.apache.derby.client/org/apache/derby/client/am/StatementCallbackInterface.java
index e6d616e710..d9609a0367 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/StatementCallbackInterface.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/StatementCallbackInterface.java
@@ -33,6 +33,7 @@ public interface StatementCallbackInterface extends UnitOfWorkListener {
     // A query has been opened on the server.
     public void completeOpenQuery(Sqlca sqlca, ClientResultSet resultSet)
             throws DisconnectException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     public void completeExecuteCallOpenQuery(
         Sqlca sqlca,
@@ -55,6 +56,7 @@ public void completeExecuteCallOpenQuery(
     public void completeExecute(Sqlca sqlca);
 
     public void completeExecuteCall(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         Sqlca sqlca,
         Cursor params,
         ClientResultSet[] resultSets);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveBlobLocatorInputStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveBlobLocatorInputStream.java
index 84afd8c194..f868658df3 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveBlobLocatorInputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveBlobLocatorInputStream.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * which re-creates the underlying Blob locator stream whenever a
  * update happens on the Blob object associated with this stream.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class UpdateSensitiveBlobLocatorInputStream
         extends UpdateSensitiveLOBLocatorInputStream {
     //Stores the Blob instance associated with
@@ -49,6 +50,7 @@ class UpdateSensitiveBlobLocatorInputStream
      * @throws SqlException If any exception occurs during stream
      *                      creation.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     UpdateSensitiveBlobLocatorInputStream(
             ClientConnection con,
             ClientBlob blob) throws SqlException {
@@ -72,6 +74,7 @@ class UpdateSensitiveBlobLocatorInputStream
      * @throws SqlException If any exception occurs during stream
      *                      creation.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     UpdateSensitiveBlobLocatorInputStream(
             ClientConnection con,
             ClientBlob blob,
@@ -93,6 +96,7 @@ class UpdateSensitiveBlobLocatorInputStream
      *                      re-creating the underlying streams.
      */
     protected InputStream reCreateStream() throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         InputStream is_;
         
         //Verify if a subset of the underlying
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveClobLocatorInputStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveClobLocatorInputStream.java
index 5a199ed1b0..7f1502f48d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveClobLocatorInputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveClobLocatorInputStream.java
@@ -31,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * which re-creates the underlying Clob locator stream whenever a
  * update happens on the Clob object associated with this stream.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class UpdateSensitiveClobLocatorInputStream
         extends UpdateSensitiveLOBLocatorInputStream {
     //Stores the Clob instance associated with
@@ -50,6 +51,7 @@ class UpdateSensitiveClobLocatorInputStream
      * @throws SqlException If any exception occurs during stream
      *                      creation.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     UpdateSensitiveClobLocatorInputStream(
             ClientConnection con,
             ClientClob clob) throws SqlException {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveClobLocatorReader.java b/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveClobLocatorReader.java
index 1ff98b60ff..a281a3cc56 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveClobLocatorReader.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveClobLocatorReader.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * this stream verifies that the underlying Clob has not
  * changed and if it has it recreates the specific streams.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class UpdateSensitiveClobLocatorReader extends Reader {
     //The ClobLocatorReader instance
     //wrapped inside a BufferedReader
@@ -68,6 +69,7 @@ class UpdateSensitiveClobLocatorReader extends Reader {
      *            this stream.
      */
     protected UpdateSensitiveClobLocatorReader(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection con,
             ClientClob clob) throws SqlException {
 
@@ -106,6 +108,7 @@ protected UpdateSensitiveClobLocatorReader(
      *
      */
     protected UpdateSensitiveClobLocatorReader(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection con,
             ClientClob clob,
             long pos,
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveLOBLocatorInputStream.java b/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveLOBLocatorInputStream.java
index 5508d521c5..7383cd4a14 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveLOBLocatorInputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/UpdateSensitiveLOBLocatorInputStream.java
@@ -36,6 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * streams.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 abstract class UpdateSensitiveLOBLocatorInputStream extends InputStream {
     //The ClobLocatorInputStream or
     //BlobLocatorInputStream instance
@@ -85,6 +86,7 @@ abstract class UpdateSensitiveLOBLocatorInputStream extends InputStream {
      *           appropriate locator stream instance.
      */
     protected UpdateSensitiveLOBLocatorInputStream(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection con,
             Lob lob,
             InputStream is) throws SqlException {
@@ -124,6 +126,7 @@ protected UpdateSensitiveLOBLocatorInputStream(
      *
      */
     protected UpdateSensitiveLOBLocatorInputStream(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection con,
             Lob lob,
             InputStream is,
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/Utils.java b/java/org.apache.derby.client/org/apache/derby/client/am/Utils.java
index 4d588d7750..487ac0b81e 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/Utils.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/Utils.java
@@ -98,7 +98,9 @@ static public int computeBigDecimalPrecision(BigDecimal decimal) {
         byte[] bBytes = decimal.unscaledValue().abs().toByteArray();
 
         if (byteArrayCmp(bBytes, tenRadixArr[tenRadixArr.length - 1]) >= 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throw new IllegalArgumentException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-847
                 SqlException.getMessageUtil().
                     getTextMessage(MessageId.CONN_PRECISION_TOO_LARGE));
         }
@@ -213,12 +215,14 @@ public static  int[]   squashLongs( long[] longs )
         int count = (longs == null) ? 0 : longs.length;
         int[]   ints = new int[ count ];
         for ( int i = 0; i < count; i++ ) { ints[ i ] = (int) longs[ i ]; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         return ints;
     }
 
     // latestException is assumed to be non-null, accumulatedExceptions can be null
     public static SQLException accumulateSQLException(SQLException latestException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-852
                                                       SQLException accumulatedExceptions) {
         if (accumulatedExceptions == null) {
             return latestException;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/Version.java b/java/org.apache.derby.client/org/apache/derby/client/am/Version.java
index c6565a0486..f8551b0b8e 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/Version.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/Version.java
@@ -34,6 +34,7 @@ public abstract class Version {
     
     // for DatabaseMetaData.getDriverVersion()
     public static String getDriverVersion() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4293
         return Configuration.getProductVersionHolder().getVersionBuildString(true);
     }
 
@@ -54,6 +55,7 @@ public static int getProtocolMaintVersion() {
     // Not an external, just a helper method
     private static String getDriverNameAndVersion() {
         return Configuration.dncDriverName + " " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4293
                 Configuration.getProductVersionHolder().getVersionBuildString(true);
     }
 
@@ -66,6 +68,7 @@ static void writeDriverConfiguration(PrintWriter printWriter) {
             printWriter.println(header + "Driver: " + getDriverNameAndVersion());
 
             printWriter.print(header + "Compatible JRE versions: { ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             String [] cv = Configuration.getDncCompatibleJREVersions();
             for (int i = 0; i < cv.length; i++) {
                 printWriter.print(cv[i]);
@@ -80,6 +83,7 @@ static void writeDriverConfiguration(PrintWriter printWriter) {
             printWriter.println(header + "Default fetch size: " + Configuration.defaultFetchSize);
             printWriter.println(header + "Default isolation: " + Configuration.defaultIsolation);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             SecurityManager security = System.getSecurityManager();
             if (security == null) {
                 printWriter.println(header + "No security manager detected.");
@@ -124,6 +128,7 @@ static void writeDriverConfiguration(PrintWriter printWriter) {
     private static void printSystemProperty(SecurityManager security,
                                             String prefix,
                                             String property,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                             PrintWriter printWriter) {
         String header = "[derby] ";
         synchronized (printWriter) {
@@ -136,6 +141,7 @@ private static void printSystemProperty(SecurityManager security,
                 printWriter.flush();
             } catch (SecurityException e) {
                 printWriter.println(header + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3902
                     msgutil.getTextMessage(MessageId.SECURITY_MANAGER_NO_ACCESS_ID, property));
                 printWriter.flush();
             }
@@ -144,6 +150,7 @@ private static void printSystemProperty(SecurityManager security,
 
     // printWriter synchronized by caller
     private static void detectLocalHost(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             SecurityManager security,
             PrintWriter printWriter) {
 
@@ -156,6 +163,7 @@ private static void detectLocalHost(
                 printWriter.flush();
             } catch (UnknownHostException e) {
                 printWriter.println(header + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3902
                     msgutil.getTextMessage(MessageId.UNKNOWN_HOST_ID, e.getMessage()));
                 printWriter.flush();
             }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/XaException.java b/java/org.apache.derby.client/org/apache/derby/client/am/XaException.java
index c1ac6647ac..c3672d4495 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/XaException.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/XaException.java
@@ -30,6 +30,9 @@ public class XaException extends XAException implements Diagnosable {
 
     public XaException(LogWriter logWriter, Throwable throwable, String s) {
         super(s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
         initCause(throwable);
         if (logWriter != null) {
             logWriter.traceDiagnosable(this);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/JDBCStatementCache.java b/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/JDBCStatementCache.java
index 9ded592418..12fca80fb2 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/JDBCStatementCache.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/JDBCStatementCache.java
@@ -55,6 +55,7 @@ public final class JDBCStatementCache {
     //@GuardedBy("this");
     private final
         LinkedHashMap<StatementKey, PreparedStatement> statements;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     /**
      * Creates a new, empty JDBC statement cache.
@@ -85,6 +86,7 @@ public synchronized PreparedStatement getCached(
             SanityManager.ASSERT(statementKey != null,
                                  "statementKey is not supposed to be null");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return statements.remove(statementKey);
     }
 
@@ -98,6 +100,7 @@ public synchronized PreparedStatement getCached(
      */
     public synchronized boolean cacheStatement(
                                         StatementKey statementKey,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                         PreparedStatement ps) {
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(statementKey != null,
@@ -121,6 +124,8 @@ public synchronized boolean cacheStatement(
     //@NotThreadSafe
     private static class BoundedLinkedHashMap
             extends LinkedHashMap<StatementKey, PreparedStatement> {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         /** Maximum number of entries. */
         private final int maxSize;
@@ -150,8 +155,11 @@ public BoundedLinkedHashMap(int maxCapacity) {
          *      <code>false</code> if not.
          */
         protected boolean removeEldestEntry(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 Map.Entry<StatementKey, PreparedStatement> eldest) {
             final boolean remove = size() > maxSize;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3324
             if (remove && eldest != null) {
                 try {
                     eldest.getValue().close();
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/StatementKey.java b/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/StatementKey.java
index 7810558681..23bdfd0241 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/StatementKey.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/StatementKey.java
@@ -72,6 +72,7 @@ public class StatementKey {
     StatementKey(boolean isCallableStatement, String sql, String schema,
             int rsType, int rsConcurrency, int rsHoldability,
             int autogeneratedKeys) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3438
         if (schema == null) {
             // Not localized (yet), because this should never reach the user.
             throw new IllegalArgumentException("schema is <null>");
@@ -84,8 +85,10 @@ public class StatementKey {
         this.holdability = rsHoldability;
         this.autogeneratedKeys = autogeneratedKeys;
         // In sane builds, make sure valid JDBC values are passed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3324
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 rsType == ResultSet.TYPE_FORWARD_ONLY ||
                 rsType == ResultSet.TYPE_SCROLL_INSENSITIVE ||
                 rsType == ResultSet.TYPE_SCROLL_SENSITIVE,
@@ -122,6 +125,7 @@ public boolean equals(Object obj) {
         if (!this.schema.equals(other.schema)) {
             return false;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3438
         if (this.sql == null && other.sql != null) {
             return false;
         }
@@ -140,6 +144,7 @@ public boolean equals(Object obj) {
     public int hashCode() {
         int hash = 7;
         hash = 47 * hash + (this.isCallableStatement ? 1 : 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3438
         hash = 47 * hash + (this.sql == null ? 3 : this.sql.hashCode());
         hash = 47 * hash + this.schema.hashCode();
         hash = 47 * hash + this.type;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java b/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java
index c1d8cb9c02..7e03d86048 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java
@@ -56,6 +56,7 @@ public final class StatementKeyFactory {
     public static StatementKey newPrepared(
             String sql, String schema, int holdability) {
         return new StatementKey(PREPARED, sql, schema,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 ResultSet.TYPE_FORWARD_ONLY,
                 ResultSet.CONCUR_READ_ONLY,
                 holdability, Statement.NO_GENERATED_KEYS);
@@ -79,6 +80,7 @@ public static StatementKey newPrepared(
     public static StatementKey newPrepared(
             String sql, String schema, int holdability, int autogeneratedKeys) {
         return new StatementKey(PREPARED, sql, schema,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                 ResultSet.TYPE_FORWARD_ONLY,
                                 ResultSet.CONCUR_READ_ONLY,
                                 holdability, autogeneratedKeys);
@@ -97,8 +99,10 @@ public static StatementKey newPrepared(
      * @return A statement key.
      */
     public static StatementKey newPrepared(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3324
             String sql, String schema, int rst, int rsc, int rsh) {
         return new StatementKey(PREPARED, sql, schema, rst, rsc, rsh,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                 Statement.NO_GENERATED_KEYS);
     }
 
@@ -116,6 +120,8 @@ public static StatementKey newPrepared(
      */
     public static StatementKey newCallable(
             String sql, String schema, int holdability) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3324
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return newCallable(sql, schema, ResultSet.TYPE_FORWARD_ONLY,
                 ResultSet.CONCUR_READ_ONLY, holdability);
     }
@@ -134,8 +140,10 @@ public static StatementKey newCallable(
      * @return A statement key.
      */
     public static StatementKey newCallable(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3324
             String sql, String schema, int rst, int rsc, int rsh) {
         return new StatementKey(CALLABLE, sql, schema, rst, rsc, rsh,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                 Statement.NO_GENERATED_KEYS);
     }
 }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/CcsidManager.java b/java/org.apache.derby.client/org/apache/derby/client/net/CcsidManager.java
index 8a3ba617ac..be8c91dd7b 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/CcsidManager.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/CcsidManager.java
@@ -29,6 +29,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 // Performs character conversions as required to send and receive PROTOCOL control data.
 // User data uses the JVM's built in converters, i18n.jar,
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 abstract class CcsidManager {
     byte space_; // ' ' character
     byte dot_;   // '.' character
@@ -61,6 +62,7 @@ abstract class CcsidManager {
     // @param sourceString A Java String to convert.
     // @return A new byte array representing the String in a particular ccsid.
     public abstract byte[] convertFromJavaString(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         String sourceString,
         Agent agent) throws SqlException;
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java b/java/org.apache.derby.client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java
index 5ec63989e6..c8a8c3de8a 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java
@@ -71,12 +71,14 @@ public class ClientJDBCObjectFactoryImpl implements ClientJDBCObjectFactory{
      */
     private static final MessageUtil msgutil_ =
         SqlException.getMessageUtil();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
     /**
      * @return an instance of {@link
      * org.apache.derby.client.ClientPooledConnection}
      */
     public ClientPooledConnection newClientPooledConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             BasicClientDataSource ds,
             LogWriter logWriter,
             String user,
@@ -90,6 +92,7 @@ public ClientPooledConnection newClientPooledConnection(
     public ClientXAConnection newClientXAConnection(BasicClientDataSource ds,
         LogWriter logWriter,String user, String password) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
         return new ClientXAConnection(ds, logWriter, user, password);
     }
     /**
@@ -113,6 +116,7 @@ public ClientXAConnection newClientXAConnection(BasicClientDataSource ds,
      * @throws SqlException on error
      */
     public ClientCallableStatement newCallableStatement(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection connection,
             String sql,int type,int concurrency,
             int holdability,ClientPooledConnection cpc) throws SqlException {
@@ -125,7 +129,9 @@ public ClientCallableStatement newCallableStatement(Agent agent,
      * org.apache.derby.client.am.LogicalConnection}
      */
     public LogicalConnection newLogicalConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     ClientConnection physicalConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1180
                     ClientPooledConnection pooledConnection)
         throws SqlException {
         return new LogicalConnection(physicalConnection, pooledConnection);
@@ -144,7 +150,10 @@ public LogicalConnection newLogicalConnection(
     * @throws SqlException if creation of the logical connection fails
     */
     public LogicalConnection newCachingLogicalConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection physicalConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
             ClientPooledConnection pooledConnection,
             JDBCStatementCache stmtCache) throws SqlException {
         return new CachingLogicalConnection(physicalConnection,
@@ -176,6 +185,7 @@ public LogicalConnection newCachingLogicalConnection(
      * @throws SqlException on error
      */
     public ClientPreparedStatement newPreparedStatement(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection connection,
             String sql,Section section,ClientPooledConnection cpc) 
             throws SqlException {
@@ -214,6 +224,7 @@ public ClientPreparedStatement newPreparedStatement(Agent agent,
      *
      */
     public ClientPreparedStatement newPreparedStatement(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection connection,
             String sql,int type,int concurrency,int holdability,
             int autoGeneratedKeys,String [] columnNames,
@@ -243,8 +254,11 @@ public ClientPreparedStatement newPreparedStatement(Agent agent,
      * @return A logical prepared statement.
      */
     public LogicalPreparedStatement newLogicalPreparedStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             PreparedStatement ps,
             StatementKey stmtKey,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
             StatementCacheInteractor cacheInteractor) {
         return new LogicalPreparedStatement(ps, stmtKey, cacheInteractor);
     }
@@ -258,8 +272,11 @@ public LogicalPreparedStatement newLogicalPreparedStatement(
      * @return A logical callable statement.
      */
     public LogicalCallableStatement newLogicalCallableStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             CallableStatement cs,
             StatementKey stmtKey,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
             StatementCacheInteractor cacheInteractor) {
         return new LogicalCallableStatement(cs, stmtKey, cacheInteractor);
     }
@@ -268,14 +285,17 @@ public LogicalCallableStatement newLogicalCallableStatement(
      * @return an instance of {@link org.apache.derby.client.net.NetConnection}
      */
     public ClientConnection newNetConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
             LogWriter logWriter,
             int driverManagerLoginTimeout,
             String serverName,
             int portNumber,
             String databaseName,
             Properties properties) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         return new NetConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
                 logWriter,
                 driverManagerLoginTimeout,
                 serverName,
@@ -287,7 +307,9 @@ public ClientConnection newNetConnection(
      * @return an instance of {@link org.apache.derby.client.net.NetConnection}
      */
     public ClientConnection newNetConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
             LogWriter logWriter, String user, String password,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             BasicClientDataSource dataSource,
             int rmId,
             boolean isXAConn) throws SqlException {
@@ -318,8 +340,10 @@ public ClientConnection newNetConnection(
      * @throws             SqlException on error
      */
     public ClientConnection newNetConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
             LogWriter logWriter,String user,
             String password,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             BasicClientDataSource dataSource,
             int rmId,boolean isXAConn,
             ClientPooledConnection cpc) throws SqlException {
@@ -352,6 +376,7 @@ public ClientResultSet newNetResultSet(Agent netAgent,
      * @return an instance of {@link NetDatabaseMetaData}
      */
     public ClientDatabaseMetaData newNetDatabaseMetaData(Agent netAgent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection netConnection) {
         return new NetDatabaseMetaData((NetAgent)netAgent,
                 (NetConnection)netConnection);
@@ -372,6 +397,7 @@ public ClientDatabaseMetaData newNetDatabaseMetaData(Agent netAgent,
      *
      */
      public ClientStatement newStatement(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                      ClientConnection connection, int type,
                      int concurrency, int holdability,
                      int autoGeneratedKeys, String[] columnNames,
@@ -421,6 +447,7 @@ public ColumnMetaData newColumnMetaData(LogWriter logWriter, int upperBound) {
      *
      */
     public ClientParameterMetaData newParameterMetaData(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ColumnMetaData columnMetaData) {
         return new ClientParameterMetaData(columnMetaData);
     }
@@ -431,11 +458,13 @@ public ClientParameterMetaData newParameterMetaData(
     public  BatchUpdateException    newBatchUpdateException
         ( LogWriter logWriter, ClientMessageId msgid, Object[] args, long[] updateCounts, SqlException cause )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         BatchUpdateException bue = newBatchUpdateException
             (
              msgutil_.getCompleteMessage( msgid.msgid, args),
              ExceptionUtil.getSQLStateFromIdentifier(msgid.msgid),
              ExceptionUtil.getSeverityFromIdentifier(msgid.msgid),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
              updateCounts,
              cause
              );
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl42.java b/java/org.apache.derby.client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl42.java
index 5eaa32f0e7..394ad27965 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl42.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl42.java
@@ -57,6 +57,7 @@ public class ClientJDBCObjectFactoryImpl42 extends ClientJDBCObjectFactoryImpl
     protected   BatchUpdateException   newBatchUpdateException
         ( String message, String sqlState, int errorCode, long[] updateCounts, SqlException cause )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return new BatchUpdateException(
             message,
             sqlState,
@@ -84,6 +85,7 @@ public ClientPreparedStatement newPreparedStatement(Agent agent,
      * statement is closed.
      */
     public ClientPreparedStatement newPreparedStatement(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection connection,
             String sql,int type,int concurrency,
             int holdability,int autoGeneratedKeys,
@@ -119,6 +121,7 @@ public LogicalPreparedStatement newLogicalPreparedStatement(
      */
     public ClientResultSet newNetResultSet(Agent netAgent,
             MaterialStatement netStatement,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             Cursor cursor,int qryprctyp,int sqlcsrhld,
             int qryattscr,int qryattsns,int qryattset,long qryinsid,
             int actualResultSetType,int actualResultSetConcurrency,
@@ -132,6 +135,7 @@ public ClientResultSet newNetResultSet(Agent netAgent,
 
     /** return a ClientCallableStatement42 object */
     public ClientCallableStatement newCallableStatement(Agent agent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientConnection connection,
             String sql,int type,int concurrency,
             int holdability,ClientPooledConnection cpc) throws SqlException {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/CodePoint.java b/java/org.apache.derby.client/org/apache/derby/client/net/CodePoint.java
index 307c8790b7..cbada4ed0d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/CodePoint.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/CodePoint.java
@@ -22,6 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.derby.client.net;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class CodePoint {
     // ---------------callable statement codepoints-------------------------------
 
@@ -115,6 +116,7 @@ class CodePoint {
 
     // Sync Point Control Request.
     final static int SYNCCTL = 0x1055;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     // Sync Point Resync Command.
     final static int SYNCRSY = 0x1069;
@@ -172,6 +174,7 @@ class CodePoint {
 
     // SQL Data Reply Data.
     final static int SQLDTARD = 0x2413;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     // SQL Statement.
     final static int SQLSTT = 0x2414;
@@ -497,6 +500,7 @@ class CodePoint {
 
     // Open Query Complete.
     final static int OPNQRYRM = 0x2205;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     // End of Query.
     final static int ENDQRYRM = 0x220B;
@@ -509,6 +513,7 @@ class CodePoint {
 
     // RDB Result Set Reply Message.
     final static int RSLSETRM = 0x2219;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     //----------------------------fdoca code points-------------------------------
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/CodePointNameTable.java b/java/org.apache.derby.client/org/apache/derby/client/net/CodePointNameTable.java
index 60d84b4591..e89a2383a0 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/CodePointNameTable.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/CodePointNameTable.java
@@ -30,8 +30,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 // This data type may be modified for performance to adapt to any sort of lookup implementation,
 // such as binary search on an underlying sorted array.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class CodePointNameTable extends Hashtable<Integer, String> {
     CodePointNameTable() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
         put(CodePoint.ACCSECRD, "ACCSECRD");
         put(CodePoint.TYPDEFNAM, "TYPDEFNAM");
         put(CodePoint.TYPDEFOVR, "TYPDEFOVR");
@@ -94,6 +96,7 @@ class CodePointNameTable extends Hashtable<Integer, String> {
     }
 
     String lookup(int codePoint) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return get(codePoint);
     }
 }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/ConnectionReply.java b/java/org.apache.derby.client/org/apache/derby/client/net/ConnectionReply.java
index 46e393b12e..e4b7b70ab1 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/ConnectionReply.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/ConnectionReply.java
@@ -26,9 +26,11 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.am.SqlException;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class ConnectionReply {
     private ConnectionReplyInterface materialConnectionReply_;
     Agent agent_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     ConnectionReply(
             Agent agent,
@@ -38,6 +40,7 @@ class ConnectionReply {
         materialConnectionReply_ = materialConnectionReply;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readCommitSubstitute(ConnectionCallbackInterface connection)
             throws SqlException {
         materialConnectionReply_.readCommitSubstitute(connection);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/ConnectionRequestInterface.java b/java/org.apache.derby.client/org/apache/derby/client/net/ConnectionRequestInterface.java
index 98b3c2e4b2..0dc5d29b3d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/ConnectionRequestInterface.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/ConnectionRequestInterface.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 interface ConnectionRequestInterface {
     public void writeCommitSubstitute(NetConnection connection)
             throws SqlException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     public void writeLocalCommit(NetConnection connection)
             throws SqlException;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/EbcdicCcsidManager.java b/java/org.apache.derby.client/org/apache/derby/client/net/EbcdicCcsidManager.java
index 8c99457725..2a3f36b45e 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/EbcdicCcsidManager.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/EbcdicCcsidManager.java
@@ -34,6 +34,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * should be fine since this class is intended for converting DDM Parameter data only.
  */
 class EbcdicCcsidManager extends CcsidManager {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     private static final int[] conversionArrayToEbcdic = {
         0x0000, 0x0001, 0x0002, 0x0003, 0x0037, 0x002d, 0x002e, 0x002f
@@ -130,7 +131,9 @@ public EbcdicCcsidManager() {
     }
 
     public byte[] convertFromJavaString(String sourceString, Agent agent)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5068
         CharBuffer src = CharBuffer.wrap(sourceString);
         ByteBuffer dest = ByteBuffer.allocate(sourceString.length());
         startEncoding();
@@ -168,6 +171,7 @@ public boolean encode(CharBuffer src, ByteBuffer dest, Agent agent)
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
     String convertToJavaString(byte[] sourceBytes, int offset, int numToConvert) {
         int i = 0, j = 0;
         char[] theChars = new char[numToConvert];
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/EncodedInputStream.java b/java/org.apache.derby.client/org/apache/derby/client/net/EncodedInputStream.java
index d2f2fe7159..95ab9f324d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/EncodedInputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/EncodedInputStream.java
@@ -54,6 +54,7 @@ public final class EncodedInputStream extends InputStream {
      */
     public static EncodedInputStream createUTF8Stream(Reader reader) {
         return new EncodedInputStream(reader, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                                       UTF_8,
                                       BUFFERED_CHAR_LEN,
                                       BUFFERED_CHAR_LEN*3);
@@ -67,6 +68,7 @@ public static EncodedInputStream createUTF8Stream(Reader reader) {
      */
     static EncodedInputStream createUTF16BEStream(Reader reader) {
         return new EncodedInputStream(reader,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                                       UTF_16BE,
                                       BUFFERED_CHAR_LEN,
                                       BUFFERED_CHAR_LEN*2);
@@ -94,16 +96,19 @@ static EncodedInputStream createUTF16BEStream(Reader reader) {
      *      holding the encoded bytes
      */
     private EncodedInputStream(Reader reader,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                                Charset encoding,
                                int charBufferSize,
                                int initialByteBufferSize) {
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         reader_ = reader;
         decodedBuffer_ = new char[charBufferSize];
 
         encodedOutputStream_ = new PublicBufferOutputStream(
                 initialByteBufferSize);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
         encodedStreamWriter_ =
                 new OutputStreamWriter(encodedOutputStream_, encoding);
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetAgent.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetAgent.java
index 108a4fa07d..7e5fa49ec0 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetAgent.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetAgent.java
@@ -44,6 +44,7 @@ public class NetAgent extends Agent {
     //---------------------navigational members-----------------------------------
 
     // All these request objects point to the same physical request object.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     ConnectionRequestInterface connectionRequest_;
     StatementRequestInterface statementRequest_;
     ResultSetRequestInterface resultSetRequest_;
@@ -66,6 +67,7 @@ public class NetAgent extends Agent {
     // Alias for (Request) super.*Request, all in one
     // In the case of the NET implementation, these all point to the same physical request object.
     private Request request_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     NetConnectionRequest netConnectionRequest_;
     private NetPackageRequest netPackageRequest_;
     private NetStatementRequest netStatementRequest_;
@@ -95,6 +97,7 @@ public class NetAgent extends Agent {
     
     // TODO: Remove target? Keep just one CcsidManager?
     //public CcsidManager targetCcsidManager_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     Typdef typdef_;
     Typdef targetTypdef_;
     Typdef originalTargetTypdef_; // added to support typdef overrides
@@ -118,6 +121,7 @@ public class NetAgent extends Agent {
 
     // Only used for testing
     public NetAgent(NetConnection netConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     LogWriter logWriter) throws SqlException {
         super(netConnection, logWriter);
         this.netConnection_ = netConnection;
@@ -135,6 +139,7 @@ public NetAgent(NetConnection netConnection,
         port_ = port;
         netConnection_ = netConnection;
         clientSSLMode_ = clientSSLMode;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2356
 
         if (server_ == null) {
             throw new DisconnectException(this, 
@@ -143,11 +148,13 @@ public NetAgent(NetConnection netConnection,
         }
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             socket_ = (Socket)AccessController.doPrivileged(
                 new OpenSocketAction(server, port, clientSSLMode_));
         } catch (PrivilegedActionException e) {
             throw new DisconnectException(this,
                 new ClientMessageId(SQLState.CONNECT_UNABLE_TO_CONNECT_TO_SERVER),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                 e.getException(),
                 e.getException().getClass().getName(), server, port,
                 e.getException().getMessage());
@@ -160,6 +167,7 @@ public NetAgent(NetConnection netConnection,
                 socket_.setKeepAlive(true); // PROTOCOL Manual: TCP/IP connection allocation rule #2
                 socket_.setSoTimeout(loginTimeout * 1000);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (SocketException e) {
             try {
                 socket_.close();
@@ -175,6 +183,7 @@ public NetAgent(NetConnection netConnection,
                 rawSocketOutputStream_ = socket_.getOutputStream();
                 rawSocketInputStream_ = socket_.getInputStream();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (IOException e) {
             try {
                 socket_.close();
@@ -182,6 +191,7 @@ public NetAgent(NetConnection netConnection,
             }
             exceptionOpeningSocket_ = new DisconnectException(this, 
                 new ClientMessageId(SQLState.CONNECT_UNABLE_TO_OPEN_SOCKET_STREAM),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                 e, e.getMessage());
         }
 
@@ -189,6 +199,7 @@ public NetAgent(NetConnection netConnection,
         utf8CcsidManager_ = new Utf8CcsidManager();
         
         currentCcsidManager_ = ebcdicCcsidManager_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
 
         if (netConnection_.isXAConnection()) {
             NetXAConnectionReply netXAConnectionReply_ = new NetXAConnectionReply(this, netConnection_.commBufferSize_);
@@ -205,6 +216,8 @@ public NetAgent(NetConnection netConnection,
             statementReply_ = (StatementReply) resultSetReply_;
             packageReply_ = (ConnectionReply) statementReply_;
             connectionReply_ = (ConnectionReply) packageReply_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
             NetXAConnectionRequest netXAConnectionRequest_ = new NetXAConnectionRequest(this, netConnection_.commBufferSize_);
             netResultSetRequest_ = (NetResultSetRequest) netXAConnectionRequest_;
             netStatementRequest_ = (NetStatementRequest) netResultSetRequest_;
@@ -229,6 +242,8 @@ public NetAgent(NetConnection netConnection,
             statementReply_ = (StatementReply) resultSetReply_;
             packageReply_ = (ConnectionReply) statementReply_;
             connectionReply_ = (ConnectionReply) packageReply_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
             netResultSetRequest_ = new NetResultSetRequest(this, netConnection_.commBufferSize_);
             netStatementRequest_ = (NetStatementRequest) netResultSetRequest_;
             netPackageRequest_ = (NetPackageRequest) netStatementRequest_;
@@ -256,6 +271,7 @@ protected void resetAgent_(LogWriter netLogWriter,
         // Set TCP/IP Socket Properties
         try {
             socket_.setSoTimeout(loginTimeout * 1000);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (SocketException e) {
             try {
                 socket_.close();
@@ -301,6 +317,7 @@ public void close_() throws SqlException {
                 // changing {4} to e.getMessage() may require pub changes
                 accumulatedExceptions = new SqlException(logWriter_,
                     new ClientMessageId(SQLState.COMMUNICATION_ERROR),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, e.getMessage());
             } finally {
                 rawSocketInputStream_ = null;
@@ -310,6 +327,8 @@ public void close_() throws SqlException {
         if (rawSocketOutputStream_ != null) {
             try {
                 rawSocketOutputStream_.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             } catch (IOException e) {
                 // note when {6} = 0 it indicates the socket was closed.
                 // this should be ok since we are going to go an close the socket
@@ -317,6 +336,7 @@ public void close_() throws SqlException {
                 // changing {4} to e.getMessage() may require pub changes
                 SqlException latestException = new SqlException(logWriter_,
                     new ClientMessageId(SQLState.COMMUNICATION_ERROR),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, e.getMessage());
                 accumulatedExceptions = Utils.accumulateSQLException(latestException, accumulatedExceptions);
             } finally {
@@ -327,6 +347,7 @@ public void close_() throws SqlException {
         if (socket_ != null) {
             try {
                 socket_.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             } catch (IOException e) {
                 // again {6} = 0, indicates the socket was closed.
                 // maybe set {4} to e.getMessage().
@@ -334,6 +355,9 @@ public void close_() throws SqlException {
                 // add this to the message pubs.
                 SqlException latestException = new SqlException(logWriter_,
                     new ClientMessageId(SQLState.COMMUNICATION_ERROR),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                         e, e.getMessage());
                 accumulatedExceptions = Utils.accumulateSQLException(latestException, accumulatedExceptions);
             } finally {
@@ -359,6 +383,7 @@ public void close_() throws SqlException {
      * infinite timeout.
      */
     protected void setTimeout(int timeout) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1090
         try {
             // Sets a timeout on the socket
             socket_.setSoTimeout(timeout * 1000); // convert to milliseconds
@@ -404,7 +429,9 @@ protected int getTimeout() {
     private void sendRequest() throws DisconnectException {
         try {
             request_.flush(rawSocketOutputStream_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (IOException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             throwCommunicationsFailure(e);
         }
     }
@@ -414,6 +441,7 @@ public InputStream getInputStream() {
     }
 
     public CcsidManager getCurrentCcsidManager() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         return currentCcsidManager_;
     }
     
@@ -421,6 +449,7 @@ public OutputStream getOutputStream() {
         return rawSocketOutputStream_;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void setInputStream(InputStream inputStream) {
         rawSocketInputStream_ = inputStream;
     }
@@ -429,6 +458,7 @@ void setOutputStream(OutputStream outputStream) {
         rawSocketOutputStream_ = outputStream;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void throwCommunicationsFailure(Throwable cause)
         throws DisconnectException {
         //DisconnectException
@@ -438,6 +468,7 @@ void throwCommunicationsFailure(Throwable cause)
         accumulateChainBreakingReadExceptionAndThrow(
             new DisconnectException(this,
                 new ClientMessageId(SQLState.COMMUNICATION_ERROR),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                 cause, cause.getMessage()));
     }
         
@@ -512,6 +543,8 @@ private void readDeferredResetConnection() throws SqlException {
             netConnection_.readDeferredReset();
             checkForExceptions();
         } catch (SqlException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             DisconnectException de = new DisconnectException(this, 
                 new ClientMessageId(SQLState.CONNECTION_FAILED_ON_DEFERRED_RESET));
             de.setNextException(sqle);
@@ -520,6 +553,7 @@ private void readDeferredResetConnection() throws SqlException {
     }
 
     protected void beginReadChain(ClientStatement statement)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         // Clear here as endWriteChain may not always be called
         writeChainIsDirty_ = false;
@@ -537,13 +571,16 @@ protected void beginReadChainOutsideUOW() throws SqlException {
     /**
      * Switches the current CCSID manager to UTF-8
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void switchToUtf8CcsidMgr() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         currentCcsidManager_ = utf8CcsidManager_;
     }
     
     /**
      * Switches the current CCSID manager to EBCDIC
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void switchToEbcdicMgr() {
         currentCcsidManager_ = ebcdicCcsidManager_;
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetCallableStatement.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetCallableStatement.java
index 7a04f6997d..c4bca015cd 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetCallableStatement.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetCallableStatement.java
@@ -26,10 +26,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.ClientAutoloadedDriver;
 import org.apache.derby.client.ClientPooledConnection;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetCallableStatement extends NetPreparedStatement
         implements MaterialPreparedStatement {
 
     ClientCallableStatement callableStatement_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     //-----------------------------state------------------------------------------
 
@@ -71,7 +73,9 @@ private void initNetCallableStatement(ClientCallableStatement statement) {
                          int type,
                          int concurrency,
                          int holdability,
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
                          ClientPooledConnection cpc) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         this(ClientAutoloadedDriver.getFactory().newCallableStatement(netAgent,
                 netConnection, sql, type, concurrency, holdability,cpc),
                 netAgent,
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetConfiguration.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetConfiguration.java
index 2a88f36801..c65af4c443 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetConfiguration.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetConfiguration.java
@@ -172,6 +172,7 @@ public class NetConfiguration {
         // mm = minor version
         // x = protocol MaintenanceVersion
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
         String prdId = DRDAConstants.DERBY_DRDA_CLIENT_ID;
         if (majorVersion < 10) {
             prdId += "0";
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetConnection.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetConnection.java
index 71c80086e1..559acf96de 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetConnection.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetConnection.java
@@ -113,6 +113,7 @@ public class NetConnection extends ClientConnection {
     // for example, the product id (prdid) would give this driver an idea of
     // what type of sevrer it is connected to.
     String targetSrvclsnm_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     // Server Product Release Level of the target server returned in excsatrd.
     // specifies the procuct release level of a ddm server.
@@ -142,6 +143,7 @@ public class NetConnection extends ClientConnection {
     // Correlation Token of the source sent to the server in the accrdb.
     // It is saved like the prddta in case it is needed for a connect reflow.
     byte[] crrtkn_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     // The Secmec used by the target.
     // It contains the negotiated security mechanism for the connection.
@@ -189,14 +191,19 @@ private String getDeferredResetPassword() {
     //---------------------constructors/finalizer---------------------------------
 
     // For jdbc 1 connections
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
     NetConnection(LogWriter logWriter,
                          int driverManagerLoginTimeout,
                          String serverName,
                          int portNumber,
                          String databaseName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                          Properties properties) throws SqlException {
         super(logWriter, driverManagerLoginTimeout, serverName, portNumber,
               databaseName, properties);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
         this.pooledConnection_ = null;
         this.closeStatementsOnClose = true;
         netAgent_ = (NetAgent) super.agent_;
@@ -204,24 +211,32 @@ private String getDeferredResetPassword() {
             throw netAgent_.exceptionOpeningSocket_;
         }
         checkDatabaseName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         String password = BasicClientDataSource.getPassword(properties);
         securityMechanism_ =
                 BasicClientDataSource.getSecurityMechanism(properties);
         flowConnect(password, securityMechanism_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-374
         if(!isConnectionNull())
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             completeConnect();
         //DERBY-2026. reset timeout after connection is made
         netAgent_.setTimeout(0);
     }
 
     // For JDBC 2 Connections
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
     NetConnection(LogWriter logWriter,
                          String user,
                          String password,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                          BasicClientDataSource dataSource,
                          int rmId,
                          boolean isXAConn) throws SqlException {
         super(logWriter, user, password, isXAConn, dataSource);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
         this.pooledConnection_ = null;
         this.closeStatementsOnClose = true;
         netAgent_ = (NetAgent) super.agent_;
@@ -248,21 +263,28 @@ private String getDeferredResetPassword() {
      * @throws             SqlException
      */
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
     NetConnection(LogWriter logWriter,
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
                          String user,
                          String password,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                          BasicClientDataSource dataSource,
                          int rmId,
                          boolean isXAConn,
                          ClientPooledConnection cpc) throws SqlException {
         super(logWriter, user, password, isXAConn, dataSource);
         netAgent_ = (NetAgent) super.agent_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         initialize(password, dataSource, isXAConn);
         this.pooledConnection_=cpc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
         this.closeStatementsOnClose = !cpc.isStatementPoolingEnabled();
     }
 
     private void initialize(String password,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                             BasicClientDataSource dataSource,
                             boolean isXAConn) throws SqlException {
         securityMechanism_ = dataSource.getSecurityMechanism(password);
@@ -278,6 +300,7 @@ private void initialize(String password,
         // and it's not a subsubprotocol recognized by our drivers.
         // If so, bail out here.
         if(!isConnectionNull()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2498
             completeConnect();
         }
         else
@@ -442,6 +465,8 @@ private void flowSimpleConnect() throws SqlException {
             // is returned in one of the connect flows.
             open_ = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
             handleLoginTimeout( e );
             
             // logWriter may be closed in agent_.close(),
@@ -455,6 +480,8 @@ private void flowSimpleConnect() throws SqlException {
             {
                 exceptionToBeThrown = new SqlException(agent_.logWriter_,
                     new ClientMessageId(SQLState.JAVA_EXCEPTION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, e.getClass().getName(), e.getMessage());
             }
 
@@ -471,10 +498,12 @@ private void flowSimpleConnect() throws SqlException {
 
     /** Handle socket timeouts during connection attempts */
     private void    handleLoginTimeout( Throwable original )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         throws SqlException
     {
         for ( Throwable cause = original; cause != null; cause = cause.getCause() )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             if ( cause instanceof SocketTimeoutException )
             {
                 throw new SqlException
@@ -484,6 +513,7 @@ private void    handleLoginTimeout( Throwable original )
     }
 
     private boolean flowReconnect(String password, int securityMechanism)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         constructExtnam();
         // these calls need to be after newing up the agent
@@ -530,6 +560,7 @@ private boolean flowReconnect(String password, int securityMechanism)
             default:
                 throw new SqlException(agent_.logWriter_, 
                     new ClientMessageId(SQLState.SECMECH_NOT_SUPPORTED),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     securityMechanism);
             }
         } catch (SqlException sqle) {            // this may not be needed because on method up the stack
@@ -673,6 +704,7 @@ private void flowServerAttributes() throws SqlException {
                 targetCmnappc_,
                 targetXamgr_,
                 targetSyncptmgr_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
                 targetRsyncmgr_,
                 targetUnicodemgr_);
         agent_.flowOutsideUOW();
@@ -753,6 +785,7 @@ private void writeServerAttributesAndKeyExchange(int securityMechanism,
                 targetCmnappc_,
                 targetXamgr_,
                 targetSyncptmgr_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
                 targetRsyncmgr_,
                 targetUnicodemgr_);
         netAgent_.netConnectionRequest_.writeAccessSecurity(securityMechanism,
@@ -779,6 +812,7 @@ private void writeSecurityCheckAndAccessRdb(int securityMechanism,
         netAgent_.netConnectionRequest_.writeAccessDatabase(databaseName_,
                 false,
                 crrtkn_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5068
                 prddta_.array(),
                 netAgent_.typdef_);
     }
@@ -790,6 +824,7 @@ private void readSecurityCheckAndAccessRdb() throws SqlException {
 
     void writeDeferredReset() throws SqlException {
         // NetConfiguration.SECMEC_USRIDPWD
+//IC see: https://issues.apache.org/jira/browse/DERBY-3421
         if (securityMechanism_ == NetConfiguration.SECMEC_USRIDPWD) {
             writeAllConnectCommandsChained(NetConfiguration.SECMEC_USRIDPWD,
                     user_,
@@ -873,6 +908,7 @@ void readDeferredReset() throws SqlException {
 
     //-------------------parse callback methods--------------------------------
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void setServerAttributeData(String srvclsnm,
                                 String srvrlslv) {
         targetSrvclsnm_ = srvclsnm;      // since then can be optionally returned from the
@@ -912,6 +948,7 @@ void setAccessSecurityData(int secchkcd,
 
                     // a security token is required for USRENCPWD, or EUSRIDPWD.
                     if (!sectknReceived) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
                         agent_.accumulateChainBreakingReadExceptionAndThrow(
                             new DisconnectException(agent_, 
                                 new ClientMessageId(SQLState.NET_SECTKN_NOT_RETURNED)));
@@ -933,6 +970,7 @@ void setAccessSecurityData(int secchkcd,
                 // will be surfaced by endReadChain
                 // agent_.accumulateChainBreakingReadExceptionAndThrow (
                 //   new DisconnectException (agent_,"secmec not supported ","0000", -999));
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
                 agent_.accumulateReadException(new SqlException(agent_.logWriter_, 
                     new ClientMessageId(SQLState.NET_SECKTKN_NOT_RETURNED)));
             }
@@ -963,13 +1001,16 @@ void rdbAccessed(int svrcod,
     //-------------------Abstract object factories--------------------------------
 
     protected Agent newAgent_(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             LogWriter logWriter,
             int loginTimeout,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             String serverName,
             int portNumber,
             int clientSSLMode) throws SqlException {
 
         return new NetAgent(this,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
                 logWriter,
                 loginTimeout,
                 serverName,
@@ -987,11 +1028,13 @@ protected ClientStatement newStatement_(
     }
 
     protected void resetStatement_(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientStatement statement,
             int type,
             int concurrency,
             int holdability) throws SqlException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         ((NetStatement) statement.getMaterialStatement()).resetNetStatement(netAgent_, this, type, concurrency, holdability);
     }
 
@@ -1001,6 +1044,7 @@ protected ClientPreparedStatement newPositionedUpdatePreparedStatement_(
 
         //passing the pooledConnection_ object which will be used to raise 
         //StatementEvents to the PooledConnection
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
         return new NetPreparedStatement(netAgent_, this, sql, section,pooledConnection_).preparedStatement_;
     }
 
@@ -1025,6 +1069,7 @@ protected void resetPreparedStatement_(ClientPreparedStatement ps,
                                            int resultSetConcurrency,
                                            int resultSetHoldability,
                                            int autoGeneratedKeys,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
                                            String[] columnNames,
                                            int[] columnIndexes) throws SqlException {
         ((NetPreparedStatement) ps.materialPreparedStatement_).resetNetPreparedStatement(netAgent_, this, sql, resultSetType, resultSetConcurrency, 
@@ -1033,6 +1078,7 @@ protected void resetPreparedStatement_(ClientPreparedStatement ps,
 
 
     protected ClientCallableStatement newCallableStatement_(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             String sql,
             int type,
             int concurrency,
@@ -1040,6 +1086,7 @@ protected ClientCallableStatement newCallableStatement_(
 
         //passing the pooledConnection_ object which will be used to raise 
         //StatementEvents to the PooledConnection
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
         return new NetCallableStatement(netAgent_, this, sql, type, concurrency, holdability,pooledConnection_).callableStatement_;
     }
 
@@ -1053,6 +1100,7 @@ protected void resetCallableStatement_(ClientCallableStatement cs,
 
 
     protected ClientDatabaseMetaData newDatabaseMetaData_() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             return ClientAutoloadedDriver.getFactory().newNetDatabaseMetaData(netAgent_, this);
     }
 
@@ -1072,6 +1120,7 @@ private void checkUserLength(String user) throws SqlException {
         if ((usridLength == 0) || (usridLength > NetConfiguration.USRID_MAXSIZE)) {
             throw new SqlException(netAgent_.logWriter_, 
                 new ClientMessageId(SQLState.CONNECT_USERID_LENGTH_OUT_OF_RANGE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 usridLength, NetConfiguration.USRID_MAXSIZE);
         }
     }
@@ -1081,6 +1130,7 @@ private void checkPasswordLength(String password) throws SqlException {
         if ((passwordLength == 0) || (passwordLength > NetConfiguration.PASSWORD_MAXSIZE)) {
             throw new SqlException(netAgent_.logWriter_,
                 new ClientMessageId(SQLState.CONNECT_PASSWORD_LENGTH_OUT_OF_RANGE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 passwordLength, NetConfiguration.PASSWORD_MAXSIZE);
         }
     }
@@ -1096,6 +1146,7 @@ private void checkUser(String user) throws SqlException {
     private void checkUserPassword(String user, String password) throws SqlException {
         checkUser(user);
         if (password == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             throw new SqlException(netAgent_.logWriter_, 
                 new ClientMessageId(SQLState.CONNECT_PASSWORD_ISNULL));
         }
@@ -1124,6 +1175,8 @@ private void checkSecmgrForSecmecSupport(int securityMechanism) throws SqlExcept
         if (!secmecSupported) {
             throw new SqlException(agent_.logWriter_, 
                 new ClientMessageId(SQLState.SECMECH_NOT_SUPPORTED),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 securityMechanism);
         }
     }
@@ -1142,6 +1195,7 @@ private SqlException mapSecchkcd(int secchkcd) {
         switch (secchkcd) {
         case CodePoint.SECCHKCD_01:  // ERROR SVRCOD
             return new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
                 new ClientMessageId(SQLState.NET_CONNECT_AUTH_FAILED),
                 msgutil.getTextMessage(MessageId.CONN_SECMECH_NOT_SUPPORTED));
         case CodePoint.SECCHKCD_10:  // ERROR SVRCOD
@@ -1206,10 +1260,12 @@ protected void constructCrrtkn() throws SqlException {
         if (crrtkn_ == null) {
             crrtkn_ = new byte[19];
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Arrays.fill(crrtkn_, (byte) 0);
         }
 
         byte [] localAddressBytes = netAgent_.socket_.getLocalAddress().getAddress();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         // IP addresses are returned in a 4 byte array.
         // Obtain the character representation of each half byte.
@@ -1225,6 +1281,7 @@ protected void constructCrrtkn() throws SqlException {
             // the characters 'G' thro 'P'(in order to use the crrtkn as the LUWID when using
             // SNA in a hop site). For example, 0 is mapped to G, 1 is mapped H,etc.
             if (i == 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
                 crrtkn_[j] = netAgent_.getCurrentCcsidManager().numToSnaRequiredCrrtknChar_[halfByte];
             } else {
                 crrtkn_[j] = netAgent_.getCurrentCcsidManager().numToCharRepresentation_[halfByte];
@@ -1244,6 +1301,7 @@ protected void constructCrrtkn() throws SqlException {
         int num = netAgent_.socket_.getLocalPort();
 
         int halfByte = (num >> 12) & 0x0f;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         crrtkn_[9] = netAgent_.getCurrentCcsidManager().numToSnaRequiredCrrtknChar_[halfByte];
         halfByte = (num >> 8) & 0x0f;
         crrtkn_[10] = netAgent_.getCurrentCcsidManager().numToCharRepresentation_[halfByte];
@@ -1257,6 +1315,7 @@ protected void constructCrrtkn() throws SqlException {
         // If the new time stamp is the
         // same as one of the already created ones, then recreate the time stamp.
         long time = System.currentTimeMillis();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         for (int i = 0; i < 6; i++) {
             // store 6 bytes of 8 byte time into crrtkn
@@ -1268,6 +1327,7 @@ protected void constructCrrtkn() throws SqlException {
     private void constructExtnam() throws SqlException {
         /* Construct the EXTNAM based on the thread name */
         char[] chars = Thread.currentThread().getName().toCharArray();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         /* DERBY-4584: Replace non-EBCDIC characters (> 0xff) with '?' */
         for (int i = 0; i < chars.length; i++) {
@@ -1278,9 +1338,11 @@ private void constructExtnam() throws SqlException {
 
     private void constructPrddta() throws SqlException {
         if (prddta_ == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5068
             prddta_ = ByteBuffer.allocate(NetConfiguration.PRDDTA_MAXSIZE);
         } else {
             prddta_.clear();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Arrays.fill(prddta_.array(), (byte) 0);
         }
 
@@ -1354,6 +1416,7 @@ private void initializeClientSeed() throws SqlException {
     }
 
     private byte[] encryptedPasswordForUSRENCPWD(String password) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         return encryptionManager_.encryptData(netAgent_.getCurrentCcsidManager().convertFromJavaString(password, netAgent_),
                 NetConfiguration.SECMEC_USRENCPWD,
                 netAgent_.getCurrentCcsidManager().convertFromJavaString(user_, netAgent_),
@@ -1392,6 +1455,7 @@ private byte[] passwordSubstituteForUSRSSBPWD(String password) throws SqlExcepti
             String dataSourceUserName = dataSource_.getUser();
             if (!dataSourceUserName.equals("") &&
                 userName.equalsIgnoreCase(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     ClientDataSourceInterface.propertyDefault_user) &&
                 !dataSourceUserName.equalsIgnoreCase(
                     ClientDataSourceInterface.propertyDefault_user))
@@ -1501,6 +1565,7 @@ protected boolean isGlobalPending_() {
     }
 
     protected boolean doCloseStatementsOnClose_() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3441
         return closeStatementsOnClose;
     }
 
@@ -1532,6 +1597,9 @@ protected boolean allowCloseInUOW_() {
     // Allow local COMMIT/ROLLBACK only if we are not in an XA transaction
     protected boolean allowLocalCommitRollback_() {
        
+//IC see: https://issues.apache.org/jira/browse/DERBY-966
+//IC see: https://issues.apache.org/jira/browse/DERBY-1005
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (getXAState() == XA_T0_NOT_ASSOCIATED) {
             return true;
         }
@@ -1556,6 +1624,7 @@ public OutputStream getOutputStream() {
 
 
     public void writeTransactionStart(ClientStatement statement)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
     }
 
@@ -1565,7 +1634,9 @@ public void readTransactionStart() throws SqlException {
 
     public void setIndoubtTransactions(
             List<Xid> indoubtTransactions) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1192
         if (isXAConnection_) {
             if (indoubtTransactions_ != null) {
                 indoubtTransactions_.clear();
@@ -1574,12 +1645,14 @@ public void setIndoubtTransactions(
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     Xid[] getIndoubtTransactionIds() {
         Xid[] result = new Xid[0];
         return indoubtTransactions_.toArray(result);
     }
 
     public SectionManager newSectionManager
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             (Agent agent) {
         return new SectionManager(agent);
     }
@@ -1596,6 +1669,8 @@ public boolean willAutoCommitGenerateFlow() {
         int xaState = getXAState();
 
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-339
+//IC see: https://issues.apache.org/jira/browse/DERBY-246
         if (xaState == XA_T0_NOT_ASSOCIATED) {
             doCommit = true;
         }
@@ -1612,6 +1687,7 @@ public EncryptionManager getEncryptionManager() {
     }
 
     public byte[] getTargetPublicKey() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return targetPublicKey_ != null ?
                targetPublicKey_.clone() :
                null;
@@ -1625,6 +1701,8 @@ public String getProductID() {
      * @return Returns the connectionNull.
      */
     public final boolean isConnectionNull() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-374
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         return connectionNull;
     }
     /**
@@ -1640,7 +1718,9 @@ public void setConnectionNull(boolean connectionNull) {
      *
      * @return true if QRYCLSIMP is fully supported
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final boolean serverSupportsQryclsimp() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         NetDatabaseMetaData metadata =
             (NetDatabaseMetaData) databaseMetaData_;
         return metadata.serverSupportsQryclsimp();
@@ -1672,6 +1752,7 @@ public final boolean serverSupportLongRDBNAM() {
      */
     protected final boolean supportsSessionDataCaching() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
         NetDatabaseMetaData metadata =
             (NetDatabaseMetaData) databaseMetaData_;
 
@@ -1683,6 +1764,7 @@ protected final boolean supportsSessionDataCaching() {
      * @return true if the server supports the UTF-8 Ccsid Manager
      */
     protected final boolean serverSupportsUtf8Ccsid() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         return targetUnicodemgr_ == CcsidManager.UTF8_CCSID;
     }
     
@@ -1699,6 +1781,7 @@ protected final boolean serverSupportsUDTs() {
     }
 
     protected final boolean serverSupportsEXTDTAAbort() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         NetDatabaseMetaData metadata =
             (NetDatabaseMetaData) databaseMetaData_;
 
@@ -1713,6 +1796,7 @@ protected final boolean serverSupportsEXTDTAAbort() {
     protected final boolean serverSupportsLocators() {
         // Support for locators was added in the same version as layer B
         // streaming.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3571
         return serverSupportsLayerBStreaming();
     }
 
@@ -1763,6 +1847,7 @@ protected void readXARollback_() throws SqlException {
     
     
     protected void writeXATransactionStart(ClientStatement statement)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         xares_.netXAConn_.writeTransactionStart(statement);
     }
@@ -1770,6 +1855,7 @@ protected void writeXATransactionStart(ClientStatement statement)
     // JDBC 4.0 methods
 
     public Array createArrayOf(String typeName, Object[] elements)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         throws SQLException {
         throw SQLExceptionFactory.notImplemented ("createArrayOf(String,Object[])");
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetConnectionReply.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetConnectionReply.java
index 4cf78236a6..e206e44955 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetConnectionReply.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetConnectionReply.java
@@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.sanity.SanityManager;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetConnectionReply extends Reply
         implements ConnectionReplyInterface {
     private static MessageUtil msgutil_ = SqlException.getMessageUtil();
@@ -51,6 +52,7 @@ class NetConnectionReply extends Reply
     }
 
     // NET only entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readExchangeServerAttributes(ClientConnection connection)
             throws SqlException {
         startSameIdChainParse();
@@ -60,6 +62,7 @@ void readExchangeServerAttributes(ClientConnection connection)
     }
 
     // NET only entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readAccessSecurity(ClientConnection connection,
                             int securityMechanism) throws SqlException {
         startSameIdChainParse();
@@ -69,6 +72,7 @@ void readAccessSecurity(ClientConnection connection,
     }
 
     // NET only entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readSecurityCheck(ClientConnection connection) throws SqlException {
         startSameIdChainParse();
         parseSECCHKreply((NetConnection) connection);
@@ -77,6 +81,7 @@ void readSecurityCheck(ClientConnection connection) throws SqlException {
     }
 
     // NET only entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readAccessDatabase(ClientConnection connection) throws SqlException {
         startSameIdChainParse();
         parseACCRDBreply((NetConnection) connection);
@@ -114,6 +119,7 @@ public void readLocalXARollback(ConnectionCallbackInterface connection) throws D
     }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readXaStartUnitOfWork(NetConnection conn) throws DisconnectException {
     }
 
@@ -166,6 +172,8 @@ private void parseRDBCMMreply(ConnectionCallbackInterface connection) throws Dis
     // for the rdbrllbck command.
     private void parseRDBRLLBCKreply(ConnectionCallbackInterface connection) throws DisconnectException {
         parseTypdefsOrMgrlvlovrs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         parseENDUOWRM(connection);
         int peekCP = parseTypdefsOrMgrlvlovrs();
@@ -216,6 +224,7 @@ private void parseACCSECreply(NetConnection netConnection, int securityMechanism
 
         peekCP = peekCodePoint();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (SanityManager.DEBUG) {
             if (peekCP != Reply.END_OF_SAME_ID_CHAIN) {
                 SanityManager.THROWASSERT("expected END_OF_SAME_ID_CHAIN");
@@ -243,6 +252,7 @@ private void parseSECCHKreply(NetConnection netConnection) throws DisconnectExce
             // incorrect but consider it a conversation protocol error
             // 0x03 - OBJDSS sent when not allowed.
             //parseSECTKN (true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             parseSECTKN(false);
         }
     }
@@ -296,6 +306,7 @@ int parseTypdefsOrMgrlvlovrs() throws DisconnectException {
     //-----------------------------parse DDM Reply Messages-----------------------
 
     private void parseCommitError(ConnectionCallbackInterface connection)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         int peekCP = peekCodePoint();
         switch (peekCP) {
@@ -439,6 +450,7 @@ void parseCommonError(int peekCP) throws DisconnectException {
      *
      */
     private NetSqlca parseAbnormalEndUow(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ConnectionCallbackInterface connection,
             UnitOfWorkListener uwl) throws DisconnectException {
 
@@ -485,6 +497,11 @@ NetSqlca parseAbnormalEndUow(ResultSetCallbackInterface r) throws DisconnectExce
     }
 
     private void parseRdbAccessFailed(NetConnection netConnection)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         parseRDBAFLRM();
 
@@ -503,7 +520,9 @@ private void parseRdbAccessFailed(NetConnection netConnection)
         NetSqlca netSqlca = parseSQLCARD(null);
         
         //Check if the SQLCARD has null SQLException
+//IC see: https://issues.apache.org/jira/browse/DERBY-374
         if(netSqlca.getSqlErrmc() == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             netConnection.setConnectionNull(true);
         else
             netConnection.completeSqlca(netSqlca);
@@ -801,6 +820,7 @@ void parseENDUOWRM(ConnectionCallbackInterface connection) throws DisconnectExce
     //   RECCNT - optional (MINVAL 0, MINLVL 3)
     //
     // Called by all the Reply classesCMDCHKRM
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void parseCMDCHKRM() throws DisconnectException {
         boolean svrcodReceived = false;
         int svrcod = CodePoint.SVRCOD_INFO;
@@ -852,6 +872,7 @@ void parseCMDCHKRM() throws DisconnectException {
             new DisconnectException(
                 agent_,
                 new ClientMessageId(SQLState.DRDA_CONNECTION_TERMINATED),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                 new SqlException(agent_.logWriter_, netSqlca),
                 msgutil_.getTextMessage(MessageId.CONN_DRDA_CMDCHKRM)));
     }
@@ -925,6 +946,7 @@ void parseRDBNACRM() throws DisconnectException {
         checkRequiredObjects(svrcodReceived, rdbnamReceived);
 
         netAgent_.setSvrcod(svrcod);
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
         agent_.accumulateChainBreakingReadExceptionAndThrow(
             new DisconnectException(agent_,
                 new ClientMessageId(SQLState.DRDA_CONNECTION_TERMINATED),
@@ -986,6 +1008,7 @@ private void parseRDBNFNRM(NetConnection netConnection) throws DisconnectExcepti
 
         netAgent_.setSvrcod(svrcod);
         agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             new ClientMessageId(SQLState.NET_DATABASE_NOT_FOUND),
             netConnection.databaseName_));
     }
@@ -1046,6 +1069,7 @@ private void parseRDBATHRM(NetConnection netConnection) throws DisconnectExcepti
 
         netAgent_.setSvrcod(svrcod);
         netAgent_.accumulateReadException(new SqlException(agent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             new ClientMessageId(SQLState.NET_CONNECT_AUTH_FAILED),
             msgutil_.getTextMessage(MessageId.CONN_USER_NOT_AUTHORIZED_TO_DB)));
     }
@@ -1211,6 +1235,7 @@ private void parseRDBACCRM() throws DisconnectException {
 
         netAgent_.setSvrcod(svrcod);
         agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             new ClientMessageId(SQLState.DRDA_CONNECTION_TERMINATED),
             msgutil_.getTextMessage(MessageId.CONN_DRDA_RDBACCRM)));
     }
@@ -1657,6 +1682,7 @@ private void parseMGRLVLRM() throws DisconnectException {
     // CODPNT - required
     // RDBNAM - optional (MINLVL 3)
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void parseCMDNSPRM() throws DisconnectException {
         boolean svrcodReceived = false;
         int svrcod = CodePoint.SVRCOD_INFO;
@@ -1705,6 +1731,7 @@ void parseCMDNSPRM() throws DisconnectException {
 
         netAgent_.setSvrcod(svrcod);
         agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             new ClientMessageId(SQLState.DRDA_DDM_COMMAND_NOT_SUPPORTED),
                 Integer.toHexString(codpnt)));
     }
@@ -1750,6 +1777,7 @@ private void parseABNUOWRM() throws DisconnectException {
                 // not having to convert this to a string is a time saver also.
                 foundInPass = true;
                 rdbnamReceived = checkAndGetReceivedFlag(rdbnamReceived);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 String rdbnam = parseRDBNAM(true);
                 peekCP = peekCodePoint();
             }
@@ -1842,6 +1870,7 @@ private void parseEXCSATRD(NetConnection netConnection) throws DisconnectExcepti
                 // for logging errors.
                 foundInPass = true;
                 srvnamReceived = checkAndGetReceivedFlag(srvnamReceived);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 parseSRVNAM(); // not used yet
                 peekCP = peekCodePoint();
             }
@@ -1865,6 +1894,7 @@ private void parseEXCSATRD(NetConnection netConnection) throws DisconnectExcepti
         }
         popCollectionStack();
         // according the the DDM book, all these instance variables are optional
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         netConnection.setServerAttributeData(srvclsnm, srvrlslv);
     }
 
@@ -1898,6 +1928,8 @@ private void parseDummyEXCSATRD(NetConnection netConnection) throws DisconnectEx
                 // driver may use it for logging purposes later).
                 foundInPass = true;
                 extnamReceived = checkAndGetReceivedFlag(extnamReceived);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 String extnam = parseEXTNAM();
                 peekCP = peekCodePoint();
             }
@@ -2037,6 +2069,7 @@ private void parseACCSECRD(NetConnection netConnection, int securityMechanism) t
                 sectkn);
         
         /* Switch to UTF-8 or EBCDIC managers depending on what's supported */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         if (netConnection.serverSupportsUtf8Ccsid()) {
             netConnection.netAgent_.switchToUtf8CcsidMgr();
         } else {
@@ -2099,6 +2132,7 @@ int parseXARETVAL() throws DisconnectException {
     }
 
     // Process XA return value
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     byte parseSYNCTYPE() throws DisconnectException {
         return 0;
     }
@@ -2106,6 +2140,7 @@ byte parseSYNCTYPE() throws DisconnectException {
     // This method handles the parsing of all command replies and reply data
     // for the SYNCCTL command.
     int parseSYNCCTLreply(ConnectionCallbackInterface connection)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
         throws DisconnectException {
         if (peekCodePoint() == CodePoint.PBSD) {
             parsePBSD();
@@ -2255,6 +2290,7 @@ private void parseMGRLVLLS(NetConnection netConnection) throws DisconnectExcepti
                 }
                 netConnection.targetSyncptmgr_ = managerLevel;
                 break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
             case CodePoint.UNICODEMGR:
                 if ((managerLevel < NetConfiguration.MIN_UNICODE_MGRLVL) ||
                         (managerLevel > netConnection.targetUnicodemgr_)) {
@@ -2408,6 +2444,7 @@ private int parseUOWDSP() throws DisconnectException {
 
     // Relational Database Name specifies the name of a relational
     // database of the server.  A server can have more than one RDB.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     String parseRDBNAM(boolean skip) throws DisconnectException {
         parseLengthAndMatchCodePoint(CodePoint.RDBNAM);
         if (skip) {
@@ -2424,6 +2461,7 @@ int parseXIDCNT() throws DisconnectException {
         return readUnsignedShort();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     Xid parseXID() throws DisconnectException {
         return null;
     }
@@ -2510,6 +2548,7 @@ int parseSVRCOD(int minSvrcod, int maxSvrcod) throws DisconnectException {
     }
 
     int parseFastSVRCOD(int minSvrcod, int maxSvrcod)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         matchCodePoint(CodePoint.SVRCOD);
 
@@ -2531,6 +2570,7 @@ int parseFastSVRCOD(int minSvrcod, int maxSvrcod)
         return svrcod;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     NetSqlca parseSQLCARD(Sqlca[] rowsetSqlca) throws DisconnectException {
         parseLengthAndMatchCodePoint(CodePoint.SQLCARD);
         int ddmLength = getDdmLength();
@@ -2609,6 +2649,7 @@ private NetSqlca parseSQLCAGRP(Sqlca[] rowsetSqlca) throws DisconnectException {
                     sqlstate,
                     sqlerrproc);
             parseSQLCAXGRP(netSqlca);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
             if (netAgent_.targetSqlam_ >= NetConfiguration.MGRLVL_7) {
                 netSqlca.setRowsetRowCount(parseSQLDIAGGRP(rowsetSqlca));
@@ -2705,6 +2746,7 @@ private void parseSQLCAXGRP(NetSqlca netSqlca) throws DisconnectException {
 
         netSqlca.setSqlerrd(sqlerrd);
         netSqlca.setSqlwarnBytes(sqlwarn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         netSqlca.setSqlerrmcBytes(sqlerrmc); // sqlerrmc may be null
     }
 
@@ -2729,6 +2771,7 @@ private long parseSQLDIAGGRP(Sqlca[] rowsetSqlca) throws DisconnectException {
     // this is duplicated in parseColumnMetaData, but different
     // DAGroup under NETColumnMetaData requires a lot more stuffs including
     // precsion, scale and other stuffs
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     String parseFastVCS() throws DisconnectException {
         // doublecheck what readString() does if the length is 0
         return readFastString(readFastUnsignedShort(),
@@ -2746,6 +2789,7 @@ boolean checkAndGetReceivedFlag(boolean receivedFlag)
         return true;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void checkRequiredObjects(boolean receivedFlag) throws DisconnectException {
         if (!receivedFlag) {
             doSyntaxrmSemantics(CodePoint.SYNERRCD_REQ_OBJ_NOT_FOUND);
@@ -2782,11 +2826,13 @@ private void checkRequiredObjects(boolean receivedFlag,
 
     private void doObjnsprmSemantics(int codePoint) throws DisconnectException {
         agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             new ClientMessageId(SQLState.DRDA_DDM_OBJECT_NOT_SUPPORTED),
             Integer.toHexString(codePoint)));
     }
 
     // Also called by NetStatementReply and others
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void doPrmnsprmSemantics(int codePoint) throws DisconnectException {
         agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
             new ClientMessageId(SQLState.DRDA_DDM_PARAM_NOT_SUPPORTED),
@@ -2800,6 +2846,7 @@ void doValnsprmSemantics(int codePoint, int value) throws DisconnectException {
 
     private void doValnsprmSemantics(int codePoint, String value)
             throws DisconnectException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         // special case the FDODTA codepoint not to disconnect.
         if (codePoint == CodePoint.FDODTA) {
@@ -2835,6 +2882,7 @@ private void doValnsprmSemantics(int codePoint, String value)
             }
             agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
                 new ClientMessageId(SQLState.DRDA_NO_AVAIL_CODEPAGE_CONVERSION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 cpValue, value));
             return;
         }
@@ -2843,6 +2891,8 @@ private void doValnsprmSemantics(int codePoint, String value)
         // Returning more information would
         // require rearranging this code a little.
         agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             new ClientMessageId(SQLState.DRDA_DDM_PARAMVAL_NOT_SUPPORTED),
             Integer.toHexString(codePoint)));
     }
@@ -2869,6 +2919,7 @@ void doDtamchrmSemantics() throws DisconnectException {
     //       is producted for SQL CONNECT statement.
     private void doMgrlvlrmSemantics(String manager, String level) throws DisconnectException {
         agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             new ClientMessageId(SQLState.DRDA_MGRLVLRM),
             manager, level));
     }
@@ -2879,6 +2930,7 @@ private void doMgrlvlrmSemantics(int manager, int level) throws DisconnectExcept
     }
 
     private void doMgrlvlrmSemantics(int[] nameList, int[] levelList) throws DisconnectException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         StringBuilder managerNames = new StringBuilder(100);
         StringBuilder managerLevels = new StringBuilder(100);
 
@@ -2944,10 +2996,12 @@ private void doMgrlvlrmSemantics(int[] nameList, int[] levelList) throws Disconn
     //          transaction is rolled back and the application is disconnected
     //          from the remote database.
     private void doPrccnvrmSemantics(int conversationProtocolErrorCode)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         // we may need to map the conversation protocol error code, prccnvcd, to some kind
         // of reason code.  For now just return the prccnvcd as the reason code
         agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             new ClientMessageId(SQLState.DRDA_CONNECTION_TERMINATED),
                 msgutil_.getTextMessage(MessageId.CONN_DRDA_PRCCNVRM, 
                     Integer.toHexString(conversationProtocolErrorCode))));
@@ -3124,6 +3178,7 @@ private int parseSQLDCGRP(Sqlca[] rowsetSqlca, int lastRow) throws DisconnectExc
             if (rowsetSqlca[sqldcRown] != null) {
                 rowsetSqlca[sqldcRown].resetRowsetSqlca(netAgent_.netConnection_,
                         sqldcCode,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         sqldcState);
             } else {
                 rowsetSqlca[sqldcRown] = new NetSqlca(netAgent_.netConnection_,
@@ -3237,6 +3292,8 @@ private void skipFastNVCMorNVCS() throws DisconnectException {
                 skipFastBytes(vcm_length);
             }
             if (readFastUnsignedByte() != CodePoint.NULLDATA) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
                 agent_.accumulateChainBreakingReadExceptionAndThrow(
                     new DisconnectException(agent_,
                         new ClientMessageId(
@@ -3304,7 +3361,9 @@ private void parseInitialPBSD(ClientConnection connection)
      * current schema as an UTF-8 String.
      * @throws org.apache.derby.client.am.DisconnectException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void parsePBSD() throws DisconnectException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
         parseLengthAndMatchCodePoint(CodePoint.PBSD);
         int peekCP = peekCodePoint();
         while (peekCP != END_OF_SAME_ID_CHAIN) {
@@ -3317,6 +3376,8 @@ void parsePBSD() throws DisconnectException {
             case CodePoint.PBSD_SCHEMA:
                 netAgent_.netConnection_.
                     completePiggyBackSchema
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                     (readString(getDdmLength(), Typdef.UTF8ENCODING));
                 break;
             default:
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetConnectionRequest.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetConnectionRequest.java
index e53be7a39c..74f9eebb17 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetConnectionRequest.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetConnectionRequest.java
@@ -28,9 +28,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.am.ClientMessageId;
 import org.apache.derby.shared.common.reference.SQLState;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetConnectionRequest extends Request
     implements ConnectionRequestInterface {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
     NetConnectionRequest(NetAgent netAgent, int bufferSize) {
         super(netAgent, bufferSize);
     }
@@ -161,6 +164,7 @@ void writeXID(int codepoint, Xid xid) throws SqlException {
     void writeXAFlags(int codepoint, int xaFlags) {
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
     void writeXATimeout(int codepoint, long xaTimeout) {
     }
 
@@ -246,6 +250,8 @@ private void buildEXCSAT(String externalName,
                 targetSecmgr,
                 targetXamgr,
                 targetSyncptmgr,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
                 targetRsyncmgr,
                 targetUnicodemgr);
 
@@ -356,6 +362,7 @@ private void buildACCRDB(String rdbnam,
         // write the data and pad with the correct number of bytes as needed.
         // this instance variable is always required.
         buildRDBNAM(rdbnam,true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
 
         // the rdb access manager class specifies an instance of the SQLAM
         // that accesses the RDB.  the sqlam manager class codepoint
@@ -434,6 +441,7 @@ private void buildEXTNAM(String extnam) throws SqlException {
                 NetConfiguration.EXTNAM_MAXSIZE);
 
         // Writing the truncated string as to preserve previous behavior
+//IC see: https://issues.apache.org/jira/browse/DERBY-4009
         writeScalarString(CodePoint.EXTNAM, extnam.substring(0, extnamTruncateLength), 0,
                 NetConfiguration.EXTNAM_MAXSIZE, SQLState.NET_EXTNAM_TOO_LONG);
     }
@@ -485,6 +493,8 @@ private void buildRDBNAM(String rdbnam, boolean dontSendOnConversionError) throw
         // see if we can optimize
         if (dontSendOnConversionError) {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
                 netAgent_.getCurrentCcsidManager().convertFromJavaString(rdbnam, netAgent_);
             } catch (SqlException se)  {
                 netAgent_.exceptionConvertingRdbnam = se;
@@ -506,6 +516,8 @@ private void buildRDBNAM(String rdbnam, boolean dontSendOnConversionError) throw
         // connect request along with the RDBNAM.
         int maxRDBlength =
                  NetConfiguration.RDBNAM_MAX_LEN;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4009
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         writeScalarString(CodePoint.RDBNAM, rdbnam,
                 NetConfiguration.PKG_IDENTIFIER_FIXED_LEN, //minimum RDBNAM length in bytes
                 maxRDBlength,  
@@ -515,6 +527,7 @@ private void buildRDBNAM(String rdbnam, boolean dontSendOnConversionError) throw
 
     private void buildSECTKN(byte[] sectkn) throws SqlException {
         if (sectkn.length > NetConfiguration.SECTKN_MAXSIZE) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             throw new SqlException(netAgent_.logWriter_, 
                 new ClientMessageId(SQLState.NET_SECTKN_TOO_LONG));
         }
@@ -523,6 +536,8 @@ private void buildSECTKN(byte[] sectkn) throws SqlException {
 
     private void buildUSRID(String usrid) throws SqlException {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4009
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         writeScalarString(CodePoint.USRID, usrid,0,NetConfiguration.USRID_MAXSIZE,
                 SQLState.NET_USERID_TOO_LONG);
     }
@@ -530,6 +545,7 @@ private void buildUSRID(String usrid) throws SqlException {
     private void buildPASSWORD(String password) throws SqlException {
         int passwordLength = password.length();
         if ((passwordLength == 0) ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             throw new SqlException(netAgent_.logWriter_, 
                 new ClientMessageId(SQLState.NET_PASSWORD_TOO_LONG));
         }
@@ -537,8 +553,11 @@ private void buildPASSWORD(String password) throws SqlException {
             // remember the position of password in order to
             // mask it out in trace (see Request.sendBytes()).
             passwordIncluded_ = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
             passwordStart_ = buffer.position() + 4;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4009
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         writeScalarString(CodePoint.PASSWORD, password, 0, NetConfiguration.PASSWORD_MAXSIZE,
                 SQLState.NET_PASSWORD_TOO_LONG);
         if (netAgent_.logWriter_ != null) {
@@ -605,6 +624,7 @@ private void buildMGRLVLLS(int agent,
         writeCodePoint4Bytes(CodePoint.SQLAM, sqlam);
         writeCodePoint4Bytes(CodePoint.RDB, rdb);
         writeCodePoint4Bytes(CodePoint.SECMGR, secmgr);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         writeCodePoint4Bytes(CodePoint.UNICODEMGR, unicodemgr);
         
         if (netAgent_.netConnection_.isXAConnection()) {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetCursor.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetCursor.java
index b7a4de60c2..704376b99d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetCursor.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetCursor.java
@@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.sanity.SanityManager;
 
 class NetCursor extends Cursor {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     NetResultSet netResultSet_;
     private NetAgent netAgent_;
@@ -57,6 +58,7 @@ class NetCursor extends Cursor {
 
     // key = column position, value = index into extdtaData_
     HashMap<Integer, Integer> extdtaPositions_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
     /**
      * Queue to hold EXTDTA data that hasn't been correlated to its
@@ -79,6 +81,7 @@ class NetCursor extends Cursor {
         super(netAgent);
         netAgent_ = netAgent;
         maximumRowSize_ = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         extdtaPositions_ = new HashMap<Integer, Integer>();
         extdtaData_ = new ArrayList<byte[]>();
     }
@@ -146,10 +149,12 @@ boolean calculateColumnOffsetsForRow_(int rowIndex,
             return false;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1382
         if (hasLobs_) {
             extdtaPositions_.clear();  // reset positions for this row
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1313
         NetSqlca[] netSqlca = this.parseSQLCARD(qrydscTypdef_);
         // If we don't have at least one byte in the buffer for the DA null indicator,
         // then we need to send a CNTQRY request to fetch the next block of data.
@@ -164,11 +169,13 @@ boolean calculateColumnOffsetsForRow_(int rowIndex,
                     throw new SqlException(netAgent_.logWriter_, 
                             netSqlca[i]);
                 } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
                     if (sqlcode == SqlCode.END_OF_DATA.getCode()) {
                         setAllRowsReceivedFromServer(true);
                         if (netResultSet_ != null && 
                                 netSqlca[i].containsSqlcax()) {
                             netResultSet_.setRowCountEvent(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                     netSqlca[i].getRowCount());
                         }
                     } else if (netResultSet_ != null && sqlcode > 0) {
@@ -206,6 +213,7 @@ boolean calculateColumnOffsetsForRow_(int rowIndex,
         // since it's only resetting nextRowPosition_ to position_ and position_ will
         // not change again from this point.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (allRowsReceivedFromServer() &&
             (position_ == lastValidBytePosition_)) {
             markNextRowPosition();
@@ -216,6 +224,7 @@ boolean calculateColumnOffsetsForRow_(int rowIndex,
         // If data flows....
         if (daNullIndicator == 0x0) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (SanityManager.DEBUG && receivedDeleteHoleWarning) {
         SanityManager.THROWASSERT("Delete hole warning received: nulldata expected");
         }
@@ -330,6 +339,7 @@ boolean calculateColumnOffsetsForRow_(int rowIndex,
             columnDataComputedLength_ = columnDataComputedLength;
             isNull_ = columnDataIsNull;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
             if (!allRowsReceivedFromServer()) {
                 calculateLobColumnPositionsForRow();
                 // Flow another CNTQRY if we are blocking, are using rtnextrow, and expect
@@ -348,6 +358,7 @@ boolean calculateColumnOffsetsForRow_(int rowIndex,
             }
         } else {
             if (netResultSet_ != null && netResultSet_.scrollable_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (receivedDeleteHoleWarning) {
             setIsUpdataDeleteHole(rowIndex, true);
         } else {
@@ -367,6 +378,7 @@ boolean calculateColumnOffsetsForRow_(int rowIndex,
         // the flag for allRowsReceivedFromServer_ is set, we still want to continue to parse through
         // the data in the dataBuffer.
         // But in the case where fixed row protocol is used,
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (!blocking_ && allRowsReceivedFromServer() &&
             daNullIndicator == 0xFF) {
             return false;
@@ -408,6 +420,7 @@ private int readFdocaOneByte() throws DisconnectException, SqlException {
     // If position is already at the end of the buffer, send CNTQRY to get more data.
     private int readFdocaOneByte(int index)
             throws DisconnectException, SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         checkForSplitRowAndComplete(1, index);
         return dataBuffer_[position_++] & 0xff;
@@ -419,6 +432,7 @@ private int readFdocaOneByte(int index)
     // CNTQRY to get more data.
     private byte[] readFdocaBytes(int length)
             throws DisconnectException, SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         checkForSplitRowAndComplete(length);
 
@@ -434,6 +448,7 @@ private byte[] readFdocaBytes(int length)
     // 2 bytes goes past the lastValidBytePosition, send CNTQRY to get more data.
     private int readFdocaTwoByteLength()
             throws DisconnectException, SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         checkForSplitRowAndComplete(2);
         return
@@ -456,6 +471,7 @@ private int readFdocaTwoByteLength(int index)
     // returns the number of bytes skipped
     private int skipFdocaBytes(int length)
             throws DisconnectException, SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         checkForSplitRowAndComplete(length);
         position_ += length;
@@ -516,11 +532,13 @@ void calculateLobColumnPositionsForRow() {
         int currentPosition = 0;
 
         for (int i = 0; i < columns_; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
             if ((isNonTrivialDataLob(i)) 
                 && (locator(i + 1) == Lob.INVALID_LOCATOR))
             // key = column position, data = index to corresponding data in extdtaData_
             // ASSERT: the server always returns the EXTDTA objects in ascending order
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 extdtaPositions_.put(i + 1, currentPosition++);
             }
         }
@@ -531,6 +549,7 @@ private boolean isNonTrivialDataLob(int index) {
         long length = 0L;
 
         if (isNull_[index] ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 (jdbcTypes_[index] != ClientTypes.BLOB &&
                 jdbcTypes_[index] != ClientTypes.CLOB)) {
             return false;
@@ -608,6 +627,7 @@ private NetSqlca[] parseSQLCAGRP(Typdef typdef)
         parseSQLCAXGRP(typdef, netSqlca);
 
         NetSqlca[] sqlCa = parseSQLDIAGGRP();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1313
 
         NetSqlca[] ret_val;
         if (sqlCa != null) {
@@ -704,11 +724,13 @@ private void parseSQLCAXGRP(Typdef typdef, NetSqlca netSqlca) throws DisconnectE
 
         netSqlca.setSqlerrd(sqlerrd);
         netSqlca.setSqlwarnBytes(sqlwarn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         netSqlca.setSqlerrmcBytes(sqlerrmc);
     }
 
     // SQLDIAGGRP : FDOCA EARLY GROUP
     private NetSqlca[] parseSQLDIAGGRP() throws DisconnectException, SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1313
         if (readFdocaOneByte() == CodePoint.NULLDATA) {
             return null;
         }
@@ -793,6 +815,7 @@ private void parseSQLDIAGCN() throws DisconnectException, SqlException {
     // SQLDCPNAM_s; PROTOCOL TYPE NVCS; ENVLID 0x33; Length Override 255
     // SQLDCXGRP; PROTOCOL TYPE N-GDA; ENVLID 0xD3; Length Override 1
     private NetSqlca parseSQLDCGRP() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException, SqlException {
         
         int sqldcCode = readFdocaInt(); // SQLCODE
@@ -814,6 +837,7 @@ private NetSqlca parseSQLDCGRP()
         String sqldcMsg = parseVCS(qrydscTypdef_); // MESSAGE_TEXT
 
         if (sqldcMsg != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             sqlca.setSqlerrmcBytes(sqldcMsg.getBytes());
         }
 
@@ -864,6 +888,7 @@ private String parseVCS(Typdef typdefInEffect) throws DisconnectException, SqlEx
 
     // This is not used for column data.
     private String readFdocaString(int length, Charset encoding)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
             throws SqlException {
         if (length == 0) {
             return null;
@@ -887,9 +912,11 @@ private byte[] findExtdtaData(int column) {
 
         // locate the EXTDTA bytes, if any
         Integer extdtaQueuePosition = extdtaPositions_.get(column);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
         if (extdtaQueuePosition != null) {
             //  found, get the data
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             data = extdtaData_.get(extdtaQueuePosition);
         }
 
@@ -914,6 +941,7 @@ protected int locator(int column)
         // Zero is not a valid locator, it indicates a zero length value
         if ((locator == 0x8000) || (locator == 0x8002) || (locator == 0x8004) || 
                 (locator == 0x8006) || (locator == 0x8008) ||(locator == 0)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
             return Lob.INVALID_LOCATOR;
         } else {
             return locator;
@@ -925,6 +953,7 @@ protected int locator(int column)
      */
     public ClientBlob getBlobColumn_(
             int column,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Agent agent,
             boolean toBePublished) throws SqlException {
 
@@ -935,6 +964,7 @@ public ClientBlob getBlobColumn_(
         // Check for locator
         int locator = locator(column);
         if (locator > 0) { // Create locator-based LOB object
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return new ClientBlob(agent, locator);
         }
         
@@ -956,6 +986,7 @@ public ClientBlob getBlobColumn_(
                 dataOffset = 1;
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             blob = new ClientBlob(data, agent, dataOffset);
         } else {
             blob = new ClientBlob(new byte[0], agent, 0);
@@ -970,16 +1001,21 @@ public ClientBlob getBlobColumn_(
      */
     public ClientClob getClobColumn_(
             int column,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Agent agent,
             boolean toBePublished) throws SqlException {
 
         // Only inform the tracker if the Clob is published to the user.
         if (toBePublished) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
             if ( netResultSet_ != null ) { netResultSet_.markLOBAsPublished(column); }
         }
         // Check for locator
         int locator = locator(column);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2604
         if (locator > 0) { // Create locator-based LOB object
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return new ClientClob(agent, locator);
         }
         
@@ -1000,6 +1036,7 @@ public ClientClob getClobColumn_(
             } else {
                 dataOffset = 1;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
             clob = new ClientClob(agent, data, charset_[index], dataOffset);
         } else {
             // the locator is not valid, it is a zero-length LOB
@@ -1010,6 +1047,7 @@ public ClientClob getClobColumn_(
     }
 
     // this is really an event-callback from NetStatementReply.parseSQLDTARDarray()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void initializeColumnInfoArrays(
             Typdef typdef,
             int columnCount) throws DisconnectException {
@@ -1027,6 +1065,7 @@ protected void getMoreData_() throws SqlException {
         // reset the dataBuffer_ before getting more data if cursor is foward-only.
         // getMoreData() is only called in Cursor.next() when current position is
         // equal to lastValidBytePosition_.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (netResultSet_.resultSetType_ == ResultSet.TYPE_FORWARD_ONLY) {
             resetDataBuffer();
         }
@@ -1101,10 +1140,12 @@ private void checkAndThrowReceivedEndqryrm() throws SqlException {
             SqlException sqlException = null;
             int sqlcode = Utils.getSqlcodeFromSqlca(
                 netResultSet_.queryTerminatingSqlca_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
             if (sqlcode < 0) {
                 sqlException = new SqlException(agent_.logWriter_, netResultSet_.queryTerminatingSqlca_);
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
                 sqlException = new SqlException(agent_.logWriter_, 
                     new ClientMessageId(SQLState.NET_QUERY_PROCESSING_TERMINATED));
             }
@@ -1155,6 +1196,7 @@ private int[] allocateColumnDataPositionArray(int row) {
             columnDataPosition = new int[columns_];
             columnDataPositionCache_.add(columnDataPosition);
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             columnDataPosition = columnDataPositionCache_.get(row);
         }
         return columnDataPosition;
@@ -1166,6 +1208,7 @@ private int[] allocateColumnDataComputedLengthArray(int row) {
             columnDataComputedLength = new int[columns_];
             columnDataLengthCache_.add(columnDataComputedLength);
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             columnDataComputedLength = columnDataLengthCache_.get(row);
         }
         return columnDataComputedLength;
@@ -1177,6 +1220,7 @@ private boolean[] allocateColumnDataIsNullArray(int row) {
             columnDataIsNull = new boolean[columns_];
             columnDataIsNullCache_.add(columnDataIsNull);
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             columnDataIsNull = columnDataIsNullCache_.get(row);
         }
         return columnDataIsNull;
@@ -1193,6 +1237,7 @@ protected int getDecimalLength(int index) {
      * rows are received from the server
      */
     public final void setAllRowsReceivedFromServer(boolean b) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (b && qryclsimpEnabled_) {
             netResultSet_.markClosedOnServer();
         }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetDatabaseMetaData.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetDatabaseMetaData.java
index 64b7d885f2..efd4fd6be1 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetDatabaseMetaData.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetDatabaseMetaData.java
@@ -26,6 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.am.SqlException;
 
 class NetDatabaseMetaData extends ClientDatabaseMetaData {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     NetDatabaseMetaData(NetAgent netAgent, NetConnection netConnection) {
         // Consider setting product level during parse
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetLogWriter.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetLogWriter.java
index 93ba234c24..a3728e822f 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetLogWriter.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetLogWriter.java
@@ -132,6 +132,7 @@ public NetLogWriter(PrintWriter printWriter, int traceLevel) {
         // Initialize the codepoint name table if not previously initialized.
         // This is done lazily so that it is not created if the trace isn't used (save some init time).
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (codePointNameTable__ == null) {
             initCodePointTable();
         }
@@ -190,6 +191,7 @@ public void traceConnectsResetExit(ClientConnection connection) {
     // The type is needed to indicate if the data is part of the send or receive buffer.
     // The class name, method name, and trcPt number are also written to the trace.
     // Not much checking is performed on the parameters.  This is done to help performance.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     synchronized void traceProtocolFlow(byte[] buff,
                                                int offset,
                                                int len,
@@ -197,11 +199,13 @@ synchronized void traceProtocolFlow(byte[] buff,
                                                String className,
                                                String methodName,
                                                int tracepoint) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (!loggingEnabled(BasicClientDataSource.TRACE_PROTOCOL_FLOWS)) {
             return;
         }
         synchronized (printWriter_) {
             tracepoint("[net]", tracepoint, className, methodName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
             int fullLen = len;
             boolean printColPos = true;
@@ -348,6 +352,7 @@ synchronized void traceProtocolFlow(byte[] buff,
     // Gets the int value of the two byte unsigned codepoint.
     private static int getCodePoint(byte[] buff, int offset) {
         return ((buff[offset++] & 0xff) << 8) +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 (buff[offset] & 0xff);
     }
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetPackageReply.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetPackageReply.java
index 3c7f236016..28b3683f4e 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetPackageReply.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetPackageReply.java
@@ -23,6 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 import org.apache.derby.client.am.DisconnectException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetPackageReply extends NetConnectionReply {
     NetPackageReply(NetAgent netAgent, int bufferSize) {
         super(netAgent, bufferSize);
@@ -112,6 +113,7 @@ protected void parseRDBUPDRM() throws DisconnectException {
             if (peekCP == CodePoint.RDBNAM) {
                 foundInPass = true;
                 rdbnamReceived = checkAndGetReceivedFlag(rdbnamReceived);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 parseRDBNAM(true);
                 peekCP = peekCodePoint();
             }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetPackageRequest.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetPackageRequest.java
index 94a2c59a1e..689dcebce8 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetPackageRequest.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetPackageRequest.java
@@ -124,6 +124,7 @@ void buildPKGNAMCSN(Section section) throws SqlException {
                 // Mark the beginning of PKGNAMCSN bytes.
                 markForCachingPKGNAMCSN();
                 buildCommonPKGNAMinfo(section);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 writeScalarPaddedBytes(
                         Configuration.getDncPackageConsistencyToken(),
                         NetConfiguration.PKGCNSTKN_FIXED_LEN,
@@ -141,6 +142,7 @@ void buildPKGNAMCSN(Section section) throws SqlException {
     private void storePKGNAMCBytes(Section section) {
         // Get the locaton where we started writing PKGNAMCSN
         int startPos = popMarkForCachingPKGNAMCSN();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         byte[] b = new byte[buffer.position() - startPos];
         buffer.position(startPos);
         buffer.get(b);
@@ -165,6 +167,7 @@ private boolean checkPKGNAMlengths(String identifier,
         if (length > maxIdentifierLength) {
             throw new SqlException(netAgent_.logWriter_,
                 new ClientMessageId(SQLState.LANG_IDENTIFIER_TOO_LONG),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 identifier, maxIdentifierLength);
         }
 
@@ -176,6 +179,7 @@ private void buildNOCMorNOCS(String string) throws SqlException {
             write2Bytes(0xffff);
         } else {
             if (netAgent_.typdef_.isCcsidMbcSet()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                 byte[] sqlBytes =
                     string.getBytes(netAgent_.typdef_.getCcsidMbcEncoding());
                 write1Byte(0x00);
@@ -248,7 +252,9 @@ protected void buildSQLATTRcommandData(String sql) throws SqlException {
     }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void encryptDataStream(int lengthLocation) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         byte[] clearedBytes = new byte[buffer.position() - lengthLocation];
         buffer.position(lengthLocation);
         buffer.get(clearedBytes);
@@ -261,6 +267,7 @@ void encryptDataStream(int lengthLocation) throws SqlException {
                         netAgent_.netConnection_.getTargetPublicKey(),
                         netAgent_.netConnection_.getTargetPublicKey());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         buffer.position(lengthLocation);
         writeBytes(encryptedBytes);
 
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetPreparedStatement.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetPreparedStatement.java
index 67c780e6d3..1674779cc2 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetPreparedStatement.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetPreparedStatement.java
@@ -29,6 +29,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.am.MaterialPreparedStatement;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetPreparedStatement extends NetStatement
         implements MaterialPreparedStatement {
 
@@ -36,6 +37,7 @@ class NetPreparedStatement extends NetStatement
     /*final*/
     ClientPreparedStatement preparedStatement_;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     // Relay constructor for NetCallableStatement.
     NetPreparedStatement(ClientPreparedStatement statement,
@@ -91,8 +93,10 @@ private void initNetPreparedStatement(ClientPreparedStatement statement) {
      * @throws SqlException
      *
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
     NetPreparedStatement(NetAgent netAgent, NetConnection netConnection, String sql, int type, int concurrency, int holdability, int autoGeneratedKeys, String[] columnNames, 
             int[] columnIndexes,  ClientPooledConnection cpc) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         this(ClientAutoloadedDriver.getFactory().newPreparedStatement(netAgent,
                 netConnection, sql, type, concurrency, holdability,
                 autoGeneratedKeys, columnNames, columnIndexes, cpc),
@@ -133,8 +137,10 @@ void resetNetPreparedStatement(NetAgent netAgent, NetConnection netConnection, S
     NetPreparedStatement(NetAgent netAgent,
                          NetConnection netConnection,
                          String sql,
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
                          Section section,ClientPooledConnection cpc) 
                          throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         this(ClientAutoloadedDriver.getFactory().newPreparedStatement(netAgent,
                 netConnection, sql, section,cpc),
                 netAgent,
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSet.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSet.java
index 28062ea6b6..ccf384ca30 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSet.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSet.java
@@ -29,6 +29,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetResultSet extends ClientResultSet {
     // Alias for (NetConnection) super.statement.connection
     private final NetConnection netConnection_;
@@ -146,10 +147,12 @@ protected void parseRowset_() throws SqlException {
         //    the end of data is returned or when an error occurs.  all successfully fetched rows
         //    are returned to the user.  the specific error is not returned until the next fetch.
         while (rowsReceivedInCurrentRowset_ != fetchSize_ &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
                 !netCursor_.allRowsReceivedFromServer() && !isRowsetCursor_ &&
                 sensitivity_ != sensitivity_sensitive_dynamic__ &&
                 sensitivity_ != sensitivity_sensitive_static__) {
             flowFetchToCompleteRowset();
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
             while (netCursor_.calculateColumnOffsetsForRow_(row, true)) {
                 rowsReceivedInCurrentRowset_++;
                 row++;
@@ -172,6 +175,7 @@ void flowFetchToCompleteRowset() throws DisconnectException {
         try {
             agent_.beginWriteChain(statement_);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
             writeScrollableFetch_((generatedSection_ == null) ? statement_.getSection() : generatedSection_,
                     fetchSize_ - rowsReceivedInCurrentRowset_,
                     scrollOrientation_relative__,
@@ -189,6 +193,7 @@ void flowFetchToCompleteRowset() throws DisconnectException {
 
     // ------------------------------- abstract box car methods --------------------------------------
     public void writeFetch_(Section section) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetType_ == ResultSet.TYPE_FORWARD_ONLY && fetchSize_ != 0 &&
                 rowsYetToBeReceivedForRowset_ > 0) {
             netAgent_.resultSetRequest_.writeFetch(this,
@@ -255,6 +260,7 @@ public void readCursorClose_() throws SqlException {
      * @exception SqlException
      */
     protected void preClose_() throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (netCursor_.getQryclsimpEnabled()) {
             netCursor_.scanDataBufferForEndOfData();
         }
@@ -264,9 +270,11 @@ protected void preClose_() throws SqlException {
     // common can we make this the common layer fetch method.  Called by the
     // read/skip Fdoca bytes methods in the net whenever data reads exhaust the
     // internal buffer used by this reply.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void flowFetch() throws DisconnectException, SqlException {
         agent_.beginWriteChain(statement_);
         writeFetch_((generatedSection_ == null) ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-6082
                 statement_.getSection() :
                 generatedSection_);
         agent_.flow(statement_);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSet42.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSet42.java
index 8d1fadeaad..c4917e2ce1 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSet42.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSet42.java
@@ -28,6 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.am.Utils42;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 class NetResultSet42 extends NetResultSet
 {
     
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSetReply.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSetReply.java
index 410357baec..f3715cd606 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSetReply.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSetReply.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.reference.SQLState;
 import org.apache.derby.shared.common.reference.MessageId;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetResultSetReply extends NetStatementReply
     implements ResultSetReplyInterface {
 
@@ -113,6 +114,7 @@ private void parseCNTQRYreply(ResultSetCallbackInterface resultSetI,
 
                 int ddmLength = getDdmLength();
                 ensureBLayerDataInBuffer(ddmLength);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 ((ClientResultSet) resultSetI).expandRowsetSqlca();
                 NetSqlca sqlca = parseSQLCARDrow(
                     ((ClientResultSet) resultSetI).rowsetSqlca_);
@@ -126,6 +128,7 @@ private void parseCNTQRYreply(ResultSetCallbackInterface resultSetI,
                 }
 
                 peekCP = peekCodePoint();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
                 if (peekCP == CodePoint.SQLCARD) {
                     NetSqlca netSqlca = parseSQLCARD(((ClientResultSet) resultSetI).rowsetSqlca_);
                     resultSetI.completeSqlca(netSqlca);
@@ -134,6 +137,7 @@ private void parseCNTQRYreply(ResultSetCallbackInterface resultSetI,
                     parseRDBUPDRM();
                     peekCP = peekCodePoint();
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
                 if (peekCP == CodePoint.PBSD) {
                     parsePBSD();
                 }
@@ -148,6 +152,7 @@ private void parseCNTQRYreply(ResultSetCallbackInterface resultSetI,
         if (peekCP == CodePoint.EXTDTA) {
             found = true;
             do {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 copyEXTDTA((NetCursor) ((ClientResultSet) resultSetI).cursor_);
                 if (longBufferForDecryption_ != null) {//encrypted EXTDTA
                     buffer_ = longBufferForDecryption_;
@@ -163,6 +168,7 @@ private void parseCNTQRYreply(ResultSetCallbackInterface resultSetI,
 
         if (peekCP == CodePoint.SQLCARD) {
             found = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ((ClientResultSet) resultSetI).expandRowsetSqlca();
             NetSqlca netSqlca =
                 parseSQLCARD(((ClientResultSet)resultSetI).rowsetSqlca_);
@@ -190,6 +196,7 @@ private void parseCNTQRYreply(ResultSetCallbackInterface resultSetI,
         if (peekCP == CodePoint.RDBUPDRM) {
             found = true;
             parseRDBUPDRM();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
             peekCP = peekCodePoint();
         }
 
@@ -238,6 +245,8 @@ private void parseCloseError(ResultSetCallbackInterface resultSetI)
 
     private void parseFetchError(ResultSetCallbackInterface resultSetI)
             throws DisconnectException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         int peekCP = peekCodePoint();
         switch (peekCP) {
@@ -359,6 +368,7 @@ private void parseQRYNOPRM(ResultSetCallbackInterface resultSet) throws Disconne
         netAgent_.setSvrcod(svrcod);
         if (svrcod == CodePoint.SVRCOD_WARNING) {
             netAgent_.accumulateReadException(new SqlException(netAgent_.logWriter_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-847
                 new ClientMessageId(SQLState.DRDA_CURSOR_NOT_OPEN)));
         } else {
             agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSetRequest.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSetRequest.java
index 0e211f9da0..aa15544f69 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSetRequest.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetResultSetRequest.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 import org.apache.derby.shared.common.reference.SQLState;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetResultSetRequest extends NetStatementRequest
         implements ResultSetRequestInterface {
 
@@ -45,9 +46,11 @@ public void writeFetch(NetResultSet resultSet,
         //   but qryrowset is sent on EXCSQLSTT for a stored procedure call.
         boolean sendQryrowset =
                 ((NetStatement) resultSet.statement_.getMaterialStatement()).qryrowsetSentOnOpnqry_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         boolean sendRtnextdta = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (sendQryrowset && resultSet.resultSetType_ ==
                 ResultSet.TYPE_FORWARD_ONLY &&
             ((NetCursor) resultSet.cursor_).hasLobs_) {
@@ -96,6 +99,7 @@ public void writeScrollableFetch(NetResultSet resultSet,
         //     * qryrowset is optional.  it is ignored on opnqry.  if not sent on cntqry,
         //       then the fetch is going fetch next row as opposed to fetch next rowset.
         boolean sendQryrowset =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             resultSet.isRowsetCursor_ ||
             (((NetStatement)resultSet.statement_.getMaterialStatement()).
                  qryrowsetSentOnOpnqry_ &&
@@ -126,6 +130,8 @@ public void writePositioningFetch(NetResultSet resultSet,
         // do not send qryrowste if the cursor is a non-rowset, sensitive dynamic cursor
         boolean sendQryrowset =
                 resultSet.isRowsetCursor_ ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 (((NetStatement) resultSet.statement_.getMaterialStatement()).qryrowsetSentOnOpnqry_ &&
                 resultSet.sensitivity_ != resultSet.sensitivity_sensitive_dynamic__);
 
@@ -279,7 +285,9 @@ private void buildOUTOVR(NetResultSet resultSet,
                              ColumnMetaData resultSetMetaData,
                              boolean firstOutovrBuilt,
                              boolean hasLobs) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         if (hasLobs) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2347
             if (!firstOutovrBuilt) {
                 buildOUTOVR(resultSet, resultSetMetaData);
                 resultSet.firstOutovrBuilt_ = true;
@@ -315,6 +323,7 @@ private void buildQRYRTNDTA(int qryrtndta) throws SqlException {
     // Called by NetResultSetRequest.writeScrollableFetch()
     private int computePROTOCOLOrientation(int orientation) throws SqlException {
         switch (orientation) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case ClientResultSet.scrollOrientation_absolute__:
             return CodePoint.QRYSCRABS;
 
@@ -328,6 +337,7 @@ private int computePROTOCOLOrientation(int orientation) throws SqlException {
             return CodePoint.QRYSCRREL;
 
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-847
             throw new SqlException(netAgent_.logWriter_, 
                 new ClientMessageId(SQLState.NET_INVALID_SCROLL_ORIENTATION));
         }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetSqlca.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetSqlca.java
index 5c9dfb3499..fca8d997c8 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetSqlca.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetSqlca.java
@@ -24,10 +24,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.am.Sqlca;
 import org.apache.derby.client.am.ClientConnection;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetSqlca extends Sqlca {
     // these are the same variables that are in the Sqlca except ccsids
     // are a little different
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     NetSqlca(ClientConnection connection,
              int sqlCode,
              String sqlState,
@@ -38,9 +40,11 @@ class NetSqlca extends Sqlca {
         sqlErrpBytes_ = sqlErrpBytes;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     NetSqlca(ClientConnection connection,
             int sqlCode,
             byte[] sqlState,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
             byte[] sqlErrpBytes) {
        super(connection);
        sqlCode_ = sqlCode;
@@ -48,6 +52,7 @@ class NetSqlca extends Sqlca {
        sqlErrpBytes_ = sqlErrpBytes;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void setSqlerrd(int[] sqlErrd) {
         sqlErrd_ = sqlErrd;
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetSqldta.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetSqldta.java
index e32da0917d..1f95fc59f1 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetSqldta.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetSqldta.java
@@ -25,12 +25,14 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 
 class NetSqldta extends NetCursor {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     NetSqldta(NetAgent netAgent) {
         super(netAgent);
     }
 
     public boolean next() throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (allRowsReceivedFromServer()) {
             return false;
         } else {
@@ -128,6 +130,7 @@ protected boolean calculateColumnOffsetsForRow() {
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (!allRowsReceivedFromServer()) {
             calculateLobColumnPositionsForRow();
         }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetStatement.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetStatement.java
index 9a32895fb0..cf8eeac529 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetStatement.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetStatement.java
@@ -30,9 +30,11 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.ClientAutoloadedDriver;
 
 class NetStatement implements MaterialStatement {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     ClientStatement statement_;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     // Alias for (NetConnection) statement_.connection
     NetConnection netConnection_;
@@ -59,6 +61,7 @@ private void initNetStatement() {
     }
 
     // Relay constructor for NetPreparedStatement.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     NetStatement(
             ClientStatement statement,
             NetAgent netAgent,
@@ -85,6 +88,7 @@ private void initNetStatement(
         netAgent_ = netAgent;
         netConnection_ = netConnection;
         statement_ = statement;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         statement_.setMaterialStatement(this);
     }
 
@@ -94,7 +98,9 @@ public void reset_() {
 
     // Called by abstract Connection.createStatement().newStatement() for jdbc 2 statements with scroll attributes
     NetStatement(NetAgent netAgent, NetConnection netConnection, int type, int concurrency, int holdability) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         this(ClientAutoloadedDriver.getFactory().newStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                  netAgent,
                  netConnection,
                  type,
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetStatementReply.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetStatementReply.java
index 98da4dda20..ca996ed473 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetStatementReply.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetStatementReply.java
@@ -375,6 +375,7 @@ private void parseResultSetProcedure(StatementCallbackInterface statementI)
 
         // the result set summary component consists of a result set reply message.
         List<Section> sectionAL = parseRSLSETRM();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // following the RSLSETRM is an SQLCARD or an SQLDTARD.  check for a
         // TYPDEFNAM or TYPDEFOVR before looking for these objects.
@@ -408,6 +409,7 @@ private void parseResultSetProcedure(StatementCallbackInterface statementI)
         NetResultSet[] resultSets = new NetResultSet[numberOfResultSets];
         for (int i = 0; i < numberOfResultSets; i++) {
             // parse the result set component of the stored procedure reply.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             NetResultSet netResultSet =
                     parseResultSetCursor(statementI, sectionAL.get(i));
             resultSets[i] = netResultSet;
@@ -430,10 +432,12 @@ private void parseResultSetProcedure(StatementCallbackInterface statementI)
     // SQL Column Information Reply data object, followed by a Query Descriptor.
     // There may also be Query Data or an End of Query Reply Message.
     private NetResultSet parseResultSetCursor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             StatementCallbackInterface statementI,
             Section section) throws DisconnectException {
         // The first item returne is an OPNQRYRM.
         NetResultSet netResultSet = parseOPNQRYRM(statementI, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
 
         // The next to be returned is an OBJDSS so check for any TYPDEF overrides.
         int peekCP = parseTypdefsOrMgrlvlovrs();
@@ -477,6 +481,7 @@ private NetResultSet parseResultSetCursor(
     private void parseOpenQuery(StatementCallbackInterface statementI)
             throws DisconnectException {
         NetResultSet netResultSet = parseOPNQRYRM(statementI, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
 
         NetSqlca sqlca = null;
         int peekCP = peekCodePoint();
@@ -485,6 +490,7 @@ private void parseOpenQuery(StatementCallbackInterface statementI)
             peekCP = parseTypdefsOrMgrlvlovrs();
 
             if (peekCP == CodePoint.SQLDARD) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 ColumnMetaData columnMetaData = ClientAutoloadedDriver.getFactory().newColumnMetaData(netAgent_.logWriter_);
                 NetSqlca netSqlca = parseSQLDARD(columnMetaData, false);  // false means do not skip SQLDARD bytes
 
@@ -532,6 +538,7 @@ private void parseOpenQuery(StatementCallbackInterface statementI)
         statementI.completeOpenQuery(sqlca, netResultSet);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void parseEndQuery(ResultSetCallbackInterface resultSetI)
             throws DisconnectException {
         parseENDQRYRM(resultSetI);
@@ -541,6 +548,7 @@ void parseEndQuery(ResultSetCallbackInterface resultSetI)
     }
 
     private void parseOpenQueryFailure(StatementCallbackInterface statementI)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         parseOPNQFLRM(statementI);
         parseTypdefsOrMgrlvlovrs();
@@ -687,6 +695,10 @@ private void parseOpenQueryError(StatementCallbackInterface statementI)
     }
 
     private void parseExecuteError(StatementCallbackInterface statementI)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         int peekCP = peekCodePoint();
         switch (peekCP) {
@@ -724,6 +736,7 @@ private void parseExecuteError(StatementCallbackInterface statementI)
     }
 
     private void parseExecuteSetStatementError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             StatementCallbackInterface statement) throws DisconnectException {
         int peekCP = peekCodePoint();
         switch (peekCP) {
@@ -781,6 +794,7 @@ private void parseExecuteSetStatementError(
      */
     private NetResultSet parseOPNQRYRM(StatementCallbackInterface statementI,
                                          boolean isOPNQRYreply)
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         throws DisconnectException
     {
         // these need to be initialized to the correct default values.
@@ -901,15 +915,19 @@ private NetResultSet parseOPNQRYRM(StatementCallbackInterface statementI,
 
         // hack for now until event methods are used below
         ClientStatement statement = (ClientStatement) statementI;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         // if there is a cached Cursor object, then use the cached cursor object.
         NetResultSet rs = null;
         if (statement.cachedCursor_ != null) {
             statement.cachedCursor_.resetDataBuffer();
             ((NetCursor) statement.cachedCursor_).extdtaData_.clear();
+//IC see: https://issues.apache.org/jira/browse/DERBY-796
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 rs = (NetResultSet)ClientAutoloadedDriver.getFactory().newNetResultSet
                         (netAgent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         (NetStatement) statement.getMaterialStatement(),
                         statement.cachedCursor_,
                         qryprctyp, //protocolType, CodePoint.FIXROWPRC | 
@@ -929,8 +947,10 @@ private NetResultSet parseOPNQRYRM(StatementCallbackInterface statementI,
             }
         } else {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 rs = (NetResultSet)ClientAutoloadedDriver.getFactory().newNetResultSet
                         (netAgent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         (NetStatement) statement.getMaterialStatement(),
                         new NetCursor(netAgent_, qryprctyp),
                         qryprctyp, //protocolType, CodePoint.FIXROWPRC | 
@@ -950,8 +970,10 @@ private NetResultSet parseOPNQRYRM(StatementCallbackInterface statementI,
         }
 
         // QRYCLSIMP only applies to OPNQRY, not EXCSQLSTT
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         final boolean qryclsimp =
             isOPNQRYreply &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             (rs.resultSetType_ == ResultSet.TYPE_FORWARD_ONLY) &&
             netAgent_.netConnection_.serverSupportsQryclsimp();
         rs.netCursor_.setQryclsimpEnabled(qryclsimp);
@@ -1087,8 +1109,10 @@ private void parseQRYPOPRM() throws DisconnectException {
 
         netAgent_.setSvrcod(svrcod);
         agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
             new ClientMessageId(SQLState.DRDA_CONNECTION_TERMINATED),
             MessageUtil.getCompleteMessage(MessageId.CONN_DRDA_QRYOPEN,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 MessageUtil.CLIENT_MESSAGE_RESOURCE_NAME,
                 (Object [])null)));
     }
@@ -1162,6 +1186,7 @@ private List<Section> parseRSLSETRM() throws DisconnectException {
         int svrcod = CodePoint.SVRCOD_INFO;
         boolean pkgsnlstReceived = false;
         List<Section> pkgsnlst = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         parseLengthAndMatchCodePoint(CodePoint.RSLSETRM);
         pushLengthOnCollectionStack();
@@ -1209,6 +1234,7 @@ private List<Section> parseRSLSETRM() throws DisconnectException {
     //   FDODSC - required
     //   FDODTA - required
     private NetSqlca parseSQLDTARD(NetSqldta netSqldta)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         boolean fdodscReceived = false;
         boolean fdodtaReceived = false;
@@ -1314,6 +1340,7 @@ private void parseSQLDTARDarray(NetCursor cursor, boolean skipBytes) throws Disc
                 // i.e. from integer to char.
                 int columns = peekTotalColumnCount(tripletLength);
                 // peek ahead to get the total number of columns.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 cursor.initializeColumnInfoArrays(
                     netAgent_.targetTypdef_, columns);
                 columnCount += parseSQLDTAGRPdataLabelsAndUpdateColumn(cursor, columnCount, tripletLength);
@@ -1462,12 +1489,14 @@ private void checkFastRLO(int[][] rlo) throws DisconnectException {
     // DSCERRCD_42 - RLO fails to reference a required GDA or RLO.
     private void descriptorErrorDetected() throws DisconnectException {
         agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
             new ClientMessageId(SQLState.DRDA_CONNECTION_TERMINATED),
             MessageUtil.getCompleteMessage(MessageId.CONN_DRDA_INVALIDFDOCA,
                 SqlException.CLIENT_MESSAGE_RESOURCE_NAME,
                 (Object [])null)));
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void parseQRYDTA(NetResultSet netResultSet) throws DisconnectException {
         parseLengthAndMatchCodePoint(CodePoint.QRYDTA);
         if (longValueForDecryption_ == null) {
@@ -1497,6 +1526,7 @@ void parseQRYDTA(NetResultSet netResultSet) throws DisconnectException {
     }
 
     private NetSqlca parseFDODTA(NetCursor netCursor)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         parseLengthAndMatchCodePoint(CodePoint.FDODTA);
         int ddmLength = getDdmLength();
@@ -1510,6 +1540,7 @@ private NetSqlca parseFDODTA(NetCursor netCursor)
     }
 
     private void parseFastSQLDTARDdata(NetCursor netCursor)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         netCursor.dataBufferStream_ = getFastData(netCursor.dataBufferStream_);
         netCursor.dataBuffer_ = netCursor.dataBufferStream_.toByteArray();
@@ -1538,6 +1569,7 @@ private void parseSQLDTARDdata(NetCursor netCursor)
         netCursor.lastValidBytePosition_ = netCursor.dataBuffer_.length;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void copyEXTDTA(NetCursor netCursor) throws DisconnectException {
         try {
             parseLengthAndMatchCodePoint(CodePoint.EXTDTA);
@@ -1550,8 +1582,10 @@ void copyEXTDTA(NetCursor netCursor) throws DisconnectException {
                 longValueForDecryption_ = null;
             }
             netCursor.extdtaData_.add(data);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (OutOfMemoryError e) {
             agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                 new ClientMessageId(SQLState.NET_LOB_DATA_TOO_LARGE_FOR_JVM), e));
         }
     }
@@ -1565,6 +1599,7 @@ void copyEXTDTA(NetCursor netCursor) throws DisconnectException {
     //
     // Only called for generated secctions from a callable statement.
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     Section parsePKGNAMCSN(boolean skip) throws DisconnectException {
         parseLengthAndMatchCodePoint(CodePoint.PKGNAMCSN);
         if (skip) {
@@ -1627,6 +1662,7 @@ Section parsePKGNAMCSN(boolean skip) throws DisconnectException {
                             : NetConfiguration.PKG_IDENTIFIER_MAX_LEN);
             if (scldtaLen < NetConfiguration.PKG_IDENTIFIER_FIXED_LEN || 
             		scldtaLen > maxRDBlength) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
                 agent_.accumulateChainBreakingReadExceptionAndThrow(
                     new DisconnectException(agent_,
                         new ClientMessageId(
@@ -1645,6 +1681,8 @@ Section parsePKGNAMCSN(boolean skip) throws DisconnectException {
             if (scldtaLen < 18 || scldtaLen > 255) {
                 agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
                     new ClientMessageId(SQLState.NET_SQLCDTA_INVALID_FOR_RDBCOLID),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     scldtaLen));
                 return null;
             }
@@ -1658,6 +1696,7 @@ Section parsePKGNAMCSN(boolean skip) throws DisconnectException {
             if (scldtaLen < 18 || scldtaLen > 255) {
                 agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
                     new ClientMessageId(SQLState.NET_SQLCDTA_INVALID_FOR_PKGID),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     scldtaLen));
                 return null; // To make compiler happy.
             }
@@ -1673,6 +1712,7 @@ Section parsePKGNAMCSN(boolean skip) throws DisconnectException {
         } else {
             agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
                 new ClientMessageId(SQLState.NET_PGNAMCSN_INVALID_AT_SQLAM),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 ddmLength, netAgent_.targetSqlam_));
             return null;  // To make compiler happy.
         }
@@ -1765,6 +1805,7 @@ private long parseFastQRYINSID() throws DisconnectException {
     // within one or more packages.
     private List<Section> parsePKGSNLST() throws DisconnectException {
         ArrayList<Section> pkgsnlst = new ArrayList<Section>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         parseLengthAndMatchCodePoint(CodePoint.PKGSNLST);
         pushLengthOnCollectionStack();
@@ -1782,6 +1823,7 @@ private NetSqlca parseSQLDARD(ColumnMetaData columnMetaData,
     }
 
     private int parseSQLRSLRD(List<Section> sections)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             throws DisconnectException {
         parseLengthAndMatchCodePoint(CodePoint.SQLRSLRD);
         return parseSQLRSLRDarray(sections);
@@ -1883,6 +1925,7 @@ private NetSqlca parseSQLDARDarray(ColumnMetaData columnMetaData,
     // information about result sets returned as reply data in the response to
     // an EXCSQLSTT command that invokes a stored procedure
     private int parseSQLRSLRDarray(List<Section> sections)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             throws DisconnectException {
         int numOfResultSets = parseSQLNUMROW();
         for (int i = 0; i < numOfResultSets; i++) {
@@ -1909,6 +1952,7 @@ private int parseSQLRSLRDarray(List<Section> sections)
     // procedure
     private ColumnMetaData parseSQLCINRDarray() throws DisconnectException {
         ColumnMetaData columnMetaData = ClientAutoloadedDriver.getFactory().newColumnMetaData(netAgent_.logWriter_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         parseSQLDHROW(columnMetaData);
 
@@ -2030,6 +2074,7 @@ private void parseSQLDAGRP(ColumnMetaData columnMetaData,
         columnMetaData.nullable_[columnNumber] = Utils.isSqlTypeNullable(sqlType);
         columnMetaData.sqlCcsid_[columnNumber] = ccsid;
         columnMetaData.types_[columnNumber] =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientTypes.mapDERBYTypeToDriverType(
                 true, sqlType, columnLength, ccsid);
             // true means isDescribed
@@ -2048,6 +2093,7 @@ private void parseSQLUDTGRP(ColumnMetaData columnMetaData,
     {
         int jdbcType = columnMetaData.types_[columnNumber];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (!(jdbcType == ClientTypes.JAVA_OBJECT) ||
             !netAgent_.netConnection_.serverSupportsUDTs()) {
 
@@ -2299,6 +2345,7 @@ private String parseFastVCMorVCS() throws DisconnectException {
         int vcs_length = readFastUnsignedShort();
         if (vcm_length > 0 && vcs_length > 0) {
             agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
                 new ClientMessageId(SQLState.NET_VCM_VCS_LENGTHS_INVALID)));
         } else if (vcs_length > 0) {
             stringToBeSet = readFastString(vcs_length, netAgent_.targetTypdef_.getCcsidSbcEncoding());
@@ -2317,6 +2364,7 @@ private String parseVCMorVCS() throws DisconnectException {
         int vcs_length = readUnsignedShort();
         if (vcm_length > 0 && vcs_length > 0) {
             agent_.accumulateChainBreakingReadExceptionAndThrow(new DisconnectException(agent_,
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
                 new ClientMessageId(SQLState.NET_VCM_VCS_LENGTHS_INVALID)));
         } else if (vcs_length > 0) {
             stringToBeSet = readString(vcs_length, netAgent_.targetTypdef_.getCcsidSbcEncoding());
@@ -2332,6 +2380,7 @@ private int calculateResultSetType(int qryattscr, int qryattsns, int defaultType
         // but we will set it to the default.
 
         if (qryattscr == 0xF0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return ResultSet.TYPE_FORWARD_ONLY;
         }
 
@@ -2349,6 +2398,7 @@ private int calculateResultSetConcurrency(int qryattupd, int defaultConcurrency)
         // we want to set it to the actual concurrency.
         switch (qryattupd) {
         case CodePoint.QRYRDO:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return ResultSet.CONCUR_READ_ONLY;
         case CodePoint.QRYUPD:
             return ResultSet.CONCUR_UPDATABLE;
@@ -2359,6 +2409,8 @@ private int calculateResultSetConcurrency(int qryattupd, int defaultConcurrency)
 
     private int calculateResultSetHoldability(int sqlcsrhld) {
         if (sqlcsrhld == 0xF0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return ResultSet.CLOSE_CURSORS_AT_COMMIT;
         } else {
             return ResultSet.HOLD_CURSORS_OVER_COMMIT;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetStatementRequest.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetStatementRequest.java
index 557e707f8c..34ca625ccd 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetStatementRequest.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetStatementRequest.java
@@ -51,6 +51,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 // For performance, should we worry about the ordering of our DDM command parameters
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetStatementRequest extends NetPackageRequest
     implements StatementRequestInterface {
 
@@ -65,7 +66,10 @@ class NetStatementRequest extends NetPackageRequest
     // is still needed for non-promototed LOBs
     private final HashMap<Integer, Object> promototedParameters_ =
             new HashMap<Integer, Object>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
     NetStatementRequest(NetAgent netAgent, int bufferSize) {
         super(netAgent, bufferSize);
     }
@@ -177,6 +181,7 @@ public void writeOpenQuery(NetPreparedStatement materialPreparedStatement,
                                int fetchSize,
                                int resultSetType,
                                int numInputColumns,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                ColumnMetaData parameterMetaData,
                                Object[] inputs) throws SqlException {
         boolean sendQryrowset = checkSendQryrowset(fetchSize, resultSetType);
@@ -282,6 +287,7 @@ public void writeExecuteCall(NetStatement materialStatement,
         boolean sendQryrowset = true;
         fetchSize = (fetchSize == 0) ?
             Configuration.defaultFetchSize : fetchSize;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         boolean sendPrcnam = (procedureName != null) ? true : false;
         int numParameters = (parameterMetaData != null) ? parameterMetaData.columns_ : 0;
@@ -324,6 +330,7 @@ public void writeExecuteCall(NetStatement materialStatement,
     // Write the message to execute an SQL Set Statement.
 /*
   public void writeSetGenericSQLSetInfo (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
          SetGenericSQLSetPiggybackCommand setGenericSQLSetPiggybackCommand,
          JDBCSection section) throws SqlException
   {
@@ -368,6 +375,7 @@ private void buildOPNQRY(Section section,
         // Tell the server to close forward-only result sets
         // implicitly when they are exhausted. The server will ignore
         // this parameter if the result set is scrollable.
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (netAgent_.netConnection_.serverSupportsQryclsimp()) {
             buildQRYCLSIMP();
         }
@@ -539,6 +547,7 @@ private boolean buildSQLDTAcommandData(int numInputColumns,
 
         int[][] protocolTypesAndLengths = allocateLidAndLengthsArray(parameterMetaData);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         Hashtable protocolTypeToOverrideLidMapping = null;
         ArrayList mddOverrideArray = null;
         protocolTypeToOverrideLidMapping =
@@ -575,6 +584,7 @@ private boolean buildSQLDTAcommandData(int numInputColumns,
     private void buildFDODSC(int numColumns,
                              int[][] protocolTypesAndLengths,
                              boolean overrideExists,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                              Hashtable overrideMap,
                              ArrayList overrideArray) throws SqlException {
         markLengthBytes(CodePoint.FDODSC);
@@ -588,6 +598,7 @@ private void buildFDODSC(int numColumns,
     private void buildSQLDTA(int numColumns,
                                int[][] lidAndLengthOverrides,
                                boolean overrideExists,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                Hashtable overrideMap,
                                ArrayList overrideArray) throws SqlException {
         // mdd overrides need to be built first if any before the descriptors are built.
@@ -609,6 +620,7 @@ private void buildSQLDTA(int numColumns,
     private void buildSQLDTAGRP(int numVars,
                                   int[][] lidAndLengthOverrides,
                                   boolean mddRequired,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                   Hashtable overrideMap) throws SqlException {
         int n = 0;
         int offset = 0;
@@ -647,6 +659,7 @@ protected void buildOUTOVR(ClientResultSet resultSet,
     }
 
     private int[][] calculateOUTOVRLidAndLengthOverrides(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             ClientResultSet resultSet,
             ColumnMetaData resultSetMetaData) {
 
@@ -664,6 +677,7 @@ private int[][] calculateOUTOVRLidAndLengthOverrides(
  
                 case Types.CLOB:
                     lidAndLengths[i][0] = (resultSetMetaData.nullable_[i])
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
                             ? DRDAConstants.DRDA_TYPE_NCLOBLOC
                             : DRDAConstants.DRDA_TYPE_CLOBLOC;
                     lidAndLengths[i][1] = 4;
@@ -675,6 +689,7 @@ private int[][] calculateOUTOVRLidAndLengthOverrides(
     }
 
     private void buildSQLDTARD(int numColumns, int[][] lidAndLengthOverrides)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         buildSQLCADTA(numColumns, lidAndLengthOverrides);
         writeBytes(FdocaConstants.SQLDTARD_RLO_TOSEND);
@@ -711,6 +726,7 @@ private void buildFDODTA(int numVars,
                     }
 
                     switch (protocolTypesAndLengths[i][0] | 0x01) {  // mask out null indicator
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                     case DRDAConstants.DRDA_TYPE_NVARMIX:
                     case DRDAConstants.DRDA_TYPE_NLONGMIX:
                         // What to do for server that don't understand 1208 (UTF-8)
@@ -726,6 +742,7 @@ private void buildFDODTA(int numVars,
                         }
                         break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                     case DRDAConstants.DRDA_TYPE_NVARCHAR:
                     case DRDAConstants.DRDA_TYPE_NLONG:
                         o = retrievePromotedParameterIfExists(i);
@@ -744,6 +761,7 @@ private void buildFDODTA(int numVars,
                     case DRDAConstants.DRDA_TYPE_NBOOLEAN:
                         writeBoolean(((Boolean) inputs[i]).booleanValue());
                         break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                     case DRDAConstants.DRDA_TYPE_NINTEGER:
                         writeIntFdocaData(((Integer) inputs[i]).intValue());
                         break;
@@ -757,6 +775,7 @@ private void buildFDODTA(int numVars,
                         writeDouble(((Double) inputs[i]).doubleValue());
                         break;
                     case DRDAConstants.DRDA_TYPE_NDECIMAL:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         writeBigDecimal((BigDecimal) inputs[i],
                                 (protocolTypesAndLengths[i][1] >> 8) & 0xff, // described precision not actual
                                 protocolTypesAndLengths[i][1] & 0xff); // described scale, not actual
@@ -813,6 +832,7 @@ private void buildFDODTA(int numVars,
                     case DRDAConstants.DRDA_TYPE_NUDT:
                         writeUDT( inputs[i] );
                         break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                     case DRDAConstants.DRDA_TYPE_NLOBCSBCS:
                     case DRDAConstants.DRDA_TYPE_NLOBCDBCS:
                         // check for a promoted Clob
@@ -820,6 +840,7 @@ private void buildFDODTA(int numVars,
                         if (o == null) {
                             try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                 Clob c = (Clob) inputs[i];
                                 
                                 if(c instanceof ClientClob &&
@@ -845,12 +866,14 @@ private void buildFDODTA(int numVars,
                         }
                         
                         break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                     case DRDAConstants.DRDA_TYPE_NLOBBYTES:
                         // check for a promoted Clob
                         o = retrievePromotedParameterIfExists(i);
                         if (o == null) {
                             try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                 Blob b = (Blob) inputs[i];
                                 
                                 if(b instanceof ClientBlob &&
@@ -864,6 +887,7 @@ private void buildFDODTA(int numVars,
                                 }
                                 
                             } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
                                 throw new SqlException(netAgent_.logWriter_, 
                                     new ClientMessageId(SQLState.NET_ERROR_GETTING_BLOB_LENGTH),
                                     e);
@@ -875,12 +899,14 @@ private void buildFDODTA(int numVars,
                                          i);
                         }
                         break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                     case DRDAConstants.DRDA_TYPE_NLOBCMIXED:
                         // check for a promoted Clob
                         o = retrievePromotedParameterIfExists(i);
                         if (o == null) {
                             
                             final ClientClob c = (ClientClob) inputs[i];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
                             if (c.isString()) {
                                 setFDODTALobLength(protocolTypesAndLengths, 
@@ -900,16 +926,22 @@ private void buildFDODTA(int numVars,
                             
                         } else { // use promoted Clob
                             setFDODTALob(netAgent_.netConnection_.getSecurityMechanism(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                          (ClientClob) o,
                                          protocolTypesAndLengths,
                                          i);
                         }
 
                         break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2506
                     case DRDAConstants.DRDA_TYPE_NLOBLOC:
                         //The FD:OCA data or the FDODTA contains the locator
                         //value corresponding to the LOB. write the integer
                         //value representing the locator here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         writeIntFdocaData(((ClientBlob)inputs[i]).
                                 getLocator());
                         break;
@@ -923,6 +955,7 @@ private void buildFDODTA(int numVars,
                     default:
                         throw new SqlException(netAgent_.logWriter_, 
                             new ClientMessageId(SQLState.NET_UNRECOGNIZED_JDBC_TYPE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                                protocolTypesAndLengths[i][0], numVars, i);
                     }
                 }
@@ -970,6 +1003,7 @@ private void buildEXTDTA(ColumnMetaData parameterMetaData,
                     }
 
                     // the follow types are possible due to promotion to BLOB
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     if (parameterType == ClientTypes.BLOB
                             || parameterType == ClientTypes.BINARY
                             || parameterType == ClientTypes.VARBINARY
@@ -989,7 +1023,10 @@ private void buildEXTDTA(ColumnMetaData parameterMetaData,
                                         b.getBinaryStream(),
                                         writeNullByte,
                                         index + 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
                                 throw new SqlException(netAgent_.logWriter_, 
                                     new ClientMessageId(SQLState.NET_ERROR_GETTING_BLOB_LENGTH),
                                     e);
@@ -1023,6 +1060,7 @@ private void buildEXTDTA(ColumnMetaData parameterMetaData,
                             writeScalarStream(chainFlag,
                                     chainedWithSameCorrelator,
                                     CodePoint.EXTDTA,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                     (int) ((ClientBlob) b).length(),
                                     ((ClientBlob) b).getBinaryStream(),
                                     writeNullByte,
@@ -1051,6 +1089,7 @@ else if (
                                         c.getCharacterStream(),
                                         writeNullByte,
                                         index + 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             } catch (SQLException e) {
                                 throw new SqlException(netAgent_.logWriter_, 
                                     new ClientMessageId(SQLState.NET_ERROR_GETTING_BLOB_LENGTH),
@@ -1152,6 +1191,7 @@ private Object retrievePromotedParameterIfExists(int index) {
         if (promototedParameters_.isEmpty()) {
             return null;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return promototedParameters_.get(index);
     }
 
@@ -1171,6 +1211,7 @@ private int calculateColumnsInSQLDTAGRPtriplet(int numVars) {
     // precision and scale (Kathey Marsden 10/11)
     // backburner: after refactoring this, later on, think about replacing case statements with table lookups
     private Hashtable computeProtocolTypesAndLengths(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             Object[] inputRow,
             ColumnMetaData parameterMetaData,
             int[][] lidAndLengths,
@@ -1203,10 +1244,12 @@ private Hashtable computeProtocolTypesAndLengths(
                 if (jdbcType == 0) {
                     throw new SqlException(netAgent_.logWriter_, 
                         new ClientMessageId(SQLState.NET_INVALID_JDBC_TYPE_FOR_PARAM),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         i);
                 }
 
                 switch (jdbcType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 case Types.CHAR:
                 case Types.VARCHAR:
                     // lid: PROTOCOL_TYPE_NVARMIX, length override: 32767 (max)
@@ -1216,10 +1259,12 @@ private Hashtable computeProtocolTypesAndLengths(
                     // assumes UTF-8 characters at most 3 bytes long
                     // Flow the String as a VARCHAR
                     if (s == null || s.length() <= 32767 / 3) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NVARMIX;
                         lidAndLengths[i][1] = 32767;
                     } else {
                         // Flow the data as CLOB data if the data too large to for LONGVARCHAR
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                         byte[] ba = s.getBytes(Typdef.UTF8ENCODING);
                         ByteArrayInputStream bais = new ByteArrayInputStream(ba);
                         ClientClob c = new ClientClob(
@@ -1245,6 +1290,7 @@ private Hashtable computeProtocolTypesAndLengths(
                 case Types.INTEGER:
                     // lid: PROTOCOL_TYPE_NINTEGER, length override: 4
                     // dataFormat: Integer
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                     lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NINTEGER;
                     lidAndLengths[i][1] = 4;
                     break;
@@ -1264,11 +1310,13 @@ private Hashtable computeProtocolTypesAndLengths(
                         lidAndLengths[i][1] = 2;
                         if (inputRow[i] instanceof Boolean) {
                             Boolean bool = (Boolean) inputRow[i];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                             inputRow[i] = Short.valueOf(
                                     bool.booleanValue() ? (short) 1 : 0);
                         }
                     }
                     break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 case Types.SMALLINT:
                 case Types.TINYINT:
                     // lid: PROTOCOL_TYPE_NSMALL,  length override: 2
@@ -1300,6 +1348,7 @@ private Hashtable computeProtocolTypesAndLengths(
                     int scale;
                     int precision;
                     
+//IC see: https://issues.apache.org/jira/browse/DERBY-3126
                     if (bigDecimal == null)
                     {
                         scale = 0;
@@ -1318,11 +1367,13 @@ private Hashtable computeProtocolTypesAndLengths(
                         scale = bigDecimal.scale();
                         precision = Utils.computeBigDecimalPrecision(bigDecimal);
                     }                    
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                     lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NDECIMAL;
                     lidAndLengths[i][1] = (precision << 8) + // use precision above
                         (scale << 0);
                     
                     break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 case Types.DATE:
                     // for input, output, and inout parameters
                     // lid: PROTOCOL_TYPE_NDATE, length override: 8
@@ -1359,6 +1410,7 @@ private Hashtable computeProtocolTypesAndLengths(
                         lidAndLengths[i][1] = 32767;
                     } else {
                         // Flow the data as CLOB data if the data too large to for LONGVARCHAR
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
                         byte[] ba = s.getBytes(Typdef.UTF8ENCODING);
                         ByteArrayInputStream bais = new ByteArrayInputStream(ba);
                         ClientClob c = new ClientClob(
@@ -1368,7 +1420,11 @@ private Hashtable computeProtocolTypesAndLengths(
                         // Place the new Lob in the promototedParameter_ collection for
                         // NetStatementRequest use
                         promototedParameters_.put(i, c);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NLOBCMIXED;
                         lidAndLengths[i][1] = buildPlaceholderLength(c.length());
                     }
@@ -1377,6 +1433,7 @@ private Hashtable computeProtocolTypesAndLengths(
                 case Types.VARBINARY:
                     byte[] ba = (byte[]) inputRow[i];
                     if (ba == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NVARBYTE;
                         lidAndLengths[i][1] = 32767;
                     } else if (ba.length <= 32767) {
@@ -1391,10 +1448,12 @@ private Hashtable computeProtocolTypesAndLengths(
                         // NetStatementRequest use
                         promototedParameters_.put(i, b);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NLOBBYTES;
                         lidAndLengths[i][1] = buildPlaceholderLength(ba.length);
                     }
                     break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 case Types.LONGVARBINARY:
                     ba = (byte[]) inputRow[i];
                     if (ba == null) {
@@ -1406,16 +1465,22 @@ private Hashtable computeProtocolTypesAndLengths(
                     } else {
                         // Promote to a BLOB. Only reach this path in the absensce of describe information.
                         ClientBlob b = new ClientBlob(ba, netAgent_, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
                         // inputRow[i] = b;
                         // Place the new Lob in the promototedParameter_ collection for
                         // NetStatementRequest use
                         promototedParameters_.put(i, b);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NLOBBYTES;
                         lidAndLengths[i][1] = buildPlaceholderLength(ba.length);
                     }
                     break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 case Types.JAVA_OBJECT:
                     lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NUDT;
                     lidAndLengths[i][1] = 32767;
@@ -1432,6 +1497,7 @@ private Hashtable computeProtocolTypesAndLengths(
                         //Here the LID local identifier in the FDODSC
                         //FD:OCA descriptor should be initialized as
                         //to contain a BLOB locator.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2506
                         lidAndLengths[i][0] = 
                                     DRDAConstants.DRDA_TYPE_NLOBLOC;
                         lidAndLengths[i][1] = 4;
@@ -1439,6 +1505,7 @@ private Hashtable computeProtocolTypesAndLengths(
                         lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NLOBBYTES;
                         try {
                             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             if( b instanceof ClientBlob &&
                                 ( (ClientBlob) b).willBeLayerBStreamed() ){
                                 
@@ -1449,7 +1516,9 @@ private Hashtable computeProtocolTypesAndLengths(
                                 lidAndLengths[i][1] = buildPlaceholderLength(b.length());
                                 
                             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
                             throw new SqlException(netAgent_.logWriter_, 
                                 new ClientMessageId(SQLState.NET_ERROR_GETTING_BLOB_LENGTH), e);
                         }
@@ -1473,13 +1542,17 @@ private Hashtable computeProtocolTypesAndLengths(
                             //Here the LID local identifier in the FDODSC
                             //FD:OCA descriptor should be initialized as
                             //to contain a CLOB locator.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2506
                             lidAndLengths[i][0] = 
                                     DRDAConstants.DRDA_TYPE_NCLOBLOC;
                             lidAndLengths[i][1] = 4;
                         } else if (isExternalClob) {
                             try {
                                 lobLength = c.length();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                             } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
                                 throw new SqlException(netAgent_.logWriter_, 
                                     new ClientMessageId(SQLState.NET_ERROR_GETTING_BLOB_LENGTH),
                                     e);
@@ -1496,11 +1569,13 @@ private Hashtable computeProtocolTypesAndLengths(
                         }
                         
                         if (c == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                             lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NLOBCMIXED;
                             lidAndLengths[i][1] = buildPlaceholderLength(lobLength);
                         } else if (isExternalClob) {
                             lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NLOBCDBCS;
                             lidAndLengths[i][1] = buildPlaceholderLength(lobLength);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         } else if (((ClientClob) c).isCharacterStream()) {
                             lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NLOBCDBCS;
                             
@@ -1513,6 +1588,7 @@ private Hashtable computeProtocolTypesAndLengths(
                                 lidAndLengths[i][1] = buildPlaceholderLength(lobLength);
                             }
                             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         } else if (((ClientClob) c).isUnicodeStream()) {
                             lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NLOBCMIXED;
                             
@@ -1525,6 +1601,7 @@ private Hashtable computeProtocolTypesAndLengths(
                                 lidAndLengths[i][1] = buildPlaceholderLength(lobLength);
                             }
                             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         } else if (((ClientClob) c).isAsciiStream()) {
                             lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NLOBCSBCS;
 
@@ -1537,6 +1614,7 @@ private Hashtable computeProtocolTypesAndLengths(
                                 lidAndLengths[i][1] = buildPlaceholderLength(lobLength);
                             }
                             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                         } else if (((ClientClob) c).isString()) {
                             lidAndLengths[i][0] = DRDAConstants.DRDA_TYPE_NLOBCMIXED;
                             
@@ -1555,6 +1633,7 @@ private Hashtable computeProtocolTypesAndLengths(
                 default :
                     throw new SqlException(netAgent_.logWriter_, 
                         new ClientMessageId(SQLState.UNRECOGNIZED_JAVA_SQL_TYPE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         jdbcType);
                 }
 
@@ -1564,6 +1643,8 @@ private Hashtable computeProtocolTypesAndLengths(
             }
             return overrideMap;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         catch ( SQLException se )
         {
             throw new SqlException(se);
@@ -1639,6 +1720,7 @@ void buildQRYROWSET(int fetchSize) throws SqlException {
     //   prcnam can not be 0 length or > 255 length, SQLException will be thrown.
     private void buildPRCNAM(String prcnam) throws SqlException {
         if (prcnam == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
             throw new SqlException(netAgent_.logWriter_, 
                 new ClientMessageId(SQLState.NET_NULL_PROCEDURE_NAME));
         }
@@ -1647,6 +1729,7 @@ private void buildPRCNAM(String prcnam) throws SqlException {
         if ((prcnamLength == 0) || (prcnamLength > 255)) {
             throw new SqlException(netAgent_.logWriter_, 
                 new ClientMessageId(SQLState.NET_PROCEDURE_NAME_LENGTH_OUT_OF_RANGE),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 prcnamLength, 255);
         }
 
@@ -1782,6 +1865,7 @@ private void buildTYPSQLDA(int typeSqlda) throws SqlException {
      * non-scrollable query upon end of data (SQLSTATE 02000).
      */
     private void buildQRYCLSIMP() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         writeScalar1Byte(CodePoint.QRYCLSIMP, CodePoint.QRYCLSIMP_YES);
     }
 
@@ -1791,6 +1875,7 @@ private void setFDODTALobLength(int[][] protocolTypesAndLengths, int i, long dat
             writeShort((short) dataLength);
         } else if (protocolTypesAndLengths[i][1] == 0x8004) {
             writeInt((int) dataLength);  // 4 bytes to encode the length
+//IC see: https://issues.apache.org/jira/browse/DERBY-1595
         } else if (protocolTypesAndLengths[i][1] == 0x8006) {
             writeLong6Bytes(dataLength); // 6 bytes to encode the length
         } else if (protocolTypesAndLengths[i][1] == 0x8008) {
@@ -1809,6 +1894,8 @@ private void setFDODTALobLengthUnknown(int i) throws SqlException {
         short v = 1;
         writeShort( v <<= 15 );
         if (extdtaPositions_ == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             extdtaPositions_ = new ArrayList<Integer>();
         }
         
@@ -1821,6 +1908,7 @@ private boolean checkSendQryrowset(int fetchSize,
         // as many rows as fit in the query block.
         // if the cursor is scrollable, send qryrowset if it is supported by the server
         boolean sendQryrowset = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetType != ResultSet.TYPE_FORWARD_ONLY) {
             sendQryrowset = true;
         }
@@ -1829,7 +1917,9 @@ private boolean checkSendQryrowset(int fetchSize,
 
     private int checkFetchsize(int fetchSize, int resultSetType) {
         // if fetchSize is not set for scrollable cursors, set it to the default fetchSize
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         if (resultSetType != ResultSet.TYPE_FORWARD_ONLY && fetchSize == 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             fetchSize = Configuration.defaultFetchSize;
         }
         return fetchSize;
@@ -1840,6 +1930,7 @@ private int calculateResultSetFlags() {
     }
 
     public void writeSetSpecialRegister(Section section, ArrayList sqlsttList)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException {
         buildEXCSQLSET(section);
 
@@ -1871,6 +1962,7 @@ private void setFDODTALob(int securityMechanism,
                               Lob lob,
                               int[][] protocolTypesAndLengths,
                               int i) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         throws SqlException, SQLException{
         
         if( lob.willBeLayerBStreamed() ) {
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetXACallInfo.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetXACallInfo.java
index 9f25b2dfb0..58c3a7ce54 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetXACallInfo.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetXACallInfo.java
@@ -43,11 +43,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import javax.transaction.xa.Xid;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetXACallInfo {
     Xid xid_;                         // current xid
     int xaFlags_;                     // current xaFlags
     /** XA transaction timeout in milliseconds. The value less than 0 means
       * that the time out is not specified. The value 0 means infinite timeout. */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
     long xaTimeoutMillis_;
     // may not be needed!!!~~~
     int xaFunction_;                  // queued XA function being performed
@@ -73,15 +75,19 @@ public NetXACallInfo() {
         xaRetVal_ = 0;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     NetXACallInfo(Xid xid, int flags, NetXAConnection actualConn) {
         xid_ = xid;
         xaFlags_ = flags;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
         xaTimeoutMillis_ = -1;
         actualConn_ = actualConn;
         xaRetVal_ = 0;
     }
 
     void saveConnectionVariables() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1192
         in_ = actualConn_.getNetConnection().getInputStream();
         out_ = actualConn_.getNetConnection().getOutputStream();
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnection.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnection.java
index 5671657dec..25edc196f3 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnection.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnection.java
@@ -70,6 +70,7 @@ public NetXAConnection(
             boolean isXAConn,
             ClientPooledConnection cpc) throws SqlException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
         netCon = createNetConnection(logWriter, user, password,
                 dataSource, rmId, isXAConn,cpc);
         checkPlatformVersion();
@@ -99,6 +100,7 @@ private void readLocalXARollback_() throws SqlException {
         netCon.netAgent_.netConnectionReply_.readLocalXARollback(netCon);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void writeTransactionStart(ClientStatement statement)
             throws SqlException {
         //KATHEY  remove below after checking that we don't need it.
@@ -125,9 +127,11 @@ void writeTransactionStart(ClientStatement statement)
         return;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void writeCommit() throws SqlException {
         // this logic must be in sync with willAutoCommitGenerateFlow() logic
         int xaState = netCon.getXAState();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1192
         if (xaState == netCon.XA_T0_NOT_ASSOCIATED){
             netCon.xares_.callInfoArray_[
                     netCon.xares_.conn_.currXACallInfoOffset_
@@ -136,10 +140,12 @@ void writeCommit() throws SqlException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readCommit() throws SqlException {
         int xaState = netCon.getXAState();
         NetXACallInfo callInfo = netCon.xares_.callInfoArray_
                 [netCon.currXACallInfoOffset_];
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
         callInfo.xaRetVal_ = XAResource.XA_OK; // initialize XARETVAL
         if (xaState == netCon.XA_T0_NOT_ASSOCIATED) {
             readLocalXACommit_();
@@ -154,6 +160,7 @@ void readCommit() throws SqlException {
         }        
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void writeRollback() throws SqlException {
       netCon.xares_.callInfoArray_[
                 netCon.xares_.conn_.currXACallInfoOffset_
@@ -164,6 +171,7 @@ void writeRollback() throws SqlException {
     void readRollback() throws SqlException {
         NetXACallInfo callInfo = netCon.xares_.callInfoArray_
                 [netCon.currXACallInfoOffset_];
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
         callInfo.xaRetVal_ = XAResource.XA_OK; // initialize XARETVAL
         readLocalXARollback_();
 
@@ -193,6 +201,7 @@ private void checkPlatformVersion() throws SqlException {
 
         supportedVersion = 8;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1192
         if (netCon.xaHostVersion_ >= supportedVersion) { 
             // supported version, return
             return;
@@ -203,6 +212,7 @@ private void checkPlatformVersion() throws SqlException {
         platform = "Linux, Unix, Windows";
         throw new SqlException(netCon.agent_.logWriter_, 
             new ClientMessageId(SQLState.NET_WRONG_XA_VERSION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
             platform, supportedVersion, netCon.xaHostVersion_);
     }
     
@@ -226,15 +236,22 @@ private void checkPlatformVersion() throws SqlException {
      *
      */
     private NetConnection createNetConnection (
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
             LogWriter logWriter,
             String user,
             String password,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             BasicClientDataSource dataSource,
             int rmId,
             boolean isXAConn,
             ClientPooledConnection cpc) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return (NetConnection)ClientAutoloadedDriver.getFactory().newNetConnection
+//IC see: https://issues.apache.org/jira/browse/DERBY-1028
             (logWriter, user, password,dataSource, rmId, isXAConn,cpc);
     }
 }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnectionReply.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnectionReply.java
index 4267911559..5011ca149d 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnectionReply.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnectionReply.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.am.ConnectionCallbackInterface;
 import org.apache.derby.client.am.DisconnectException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetXAConnectionReply extends NetResultSetReply {
     NetXAConnectionReply(NetAgent netAgent, int bufferSize) {
         super(netAgent, bufferSize);
@@ -60,6 +61,7 @@ public void readLocalXARollback(ConnectionCallbackInterface connection) throws D
         connection.completeLocalRollback();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readXaStartUnitOfWork(NetConnection conn) throws DisconnectException {
         startSameIdChainParse();
         parseSYNCCTLreply(conn);
@@ -85,6 +87,7 @@ int readXaEndUnitOfWork(NetConnection conn) throws DisconnectException {
         parseSYNCCTLreply(conn);
         endOfSameIdChainData();
         if (xaFlags == XAResource.TMFAIL) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             return XAException.XA_RBROLLBACK;
         }
         return XAResource.XA_OK;
@@ -98,6 +101,7 @@ int readXaPrepare(NetConnection conn) throws DisconnectException {
         return synctype;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readXaCommit(NetConnection conn) throws DisconnectException {
         startSameIdChainParse();
         parseSYNCCTLreply(conn);
@@ -115,6 +119,7 @@ int readXaRollback(NetConnection conn) throws DisconnectException {
         NetXACallInfo callInfo = conn.xares_.callInfoArray_[conn.currXACallInfoOffset_];
         conn.completeLocalRollback();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return XAResource.XA_OK;
     }
 
@@ -176,6 +181,7 @@ int parseSYNCCRD(ConnectionCallbackInterface connection) throws DisconnectExcept
 
             if (peekCP == CodePoint.PRPHRCLST) {
                 foundInPass = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 conn.setIndoubtTransactions(parseIndoubtList());
                 peekCP = peekCodePoint();
             }
@@ -198,6 +204,7 @@ int parseXARETVAL() throws DisconnectException {
     }
 
     // Process XA return value
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     byte parseSYNCTYPE() throws DisconnectException {
         parseLengthAndMatchCodePoint(CodePoint.SYNCTYPE);
         return readByte();
@@ -221,6 +228,7 @@ int parseSYNCCTLreply(ConnectionCallbackInterface connection)
             //JCFTMP, need to null out the client list?
             peekCP = peekCodePoint();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
         if (peekCP == CodePoint.PBSD) {
             parsePBSD();
         }
@@ -272,6 +280,7 @@ int parseXIDCNT() throws DisconnectException {
         return readUnsignedShort();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     Xid parseXID() throws DisconnectException {
         parseLengthAndMatchCodePoint(CodePoint.XID);
         int formatId = readInt();
@@ -280,9 +289,11 @@ Xid parseXID() throws DisconnectException {
         byte[] gtrid = readBytes(gtridLen);
         byte[] bqual = readBytes(bqualLen);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         return new ClientXid(formatId, gtrid, bqual);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     List<Xid> parseIndoubtList()
             throws DisconnectException {
         peekCodePoint();
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnectionRequest.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnectionRequest.java
index ce7e369c89..0779f1628c 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnectionRequest.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetXAConnectionRequest.java
@@ -26,7 +26,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 import org.apache.derby.client.am.SqlException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class NetXAConnectionRequest extends NetResultSetRequest {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
     NetXAConnectionRequest(NetAgent netAgent, int bufferSize) {
         super(netAgent, bufferSize);
     }
@@ -54,6 +57,7 @@ public void writeXaStartUnitOfWork(NetConnection conn) throws SqlException {
         Xid xid = callInfo.xid_;
         int xaFlags = callInfo.xaFlags_;
         long xaTimeout = callInfo.xaTimeoutMillis_;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
 
         // create DSS command with reply.
         createCommand();
@@ -79,6 +83,7 @@ public void writeXaStartUnitOfWork(NetConnection conn) throws SqlException {
         // DERBY-4232: The DRDA spec says that SYNCCTL should only have a
         // timeout property if TMNOFLAGS is specified.
         if (xaTimeout >= 0 && xaFlags == XAResource.TMNOFLAGS) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
             writeXATimeout(CodePoint.TIMEOUT, xaTimeout);
         }
 
@@ -248,6 +253,7 @@ void writeXID(int codepoint, Xid xid) throws SqlException {
         write4Bytes(gtrid.length);
         write4Bytes(bqual.length);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         writeBytes(gtrid);
         writeBytes(bqual);
 
@@ -261,6 +267,7 @@ void writeXAFlags(int codepoint, int xaFlags) {
     }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
     void writeXATimeout(int codepoint, long xaTimeout) {
         writeScalar8Bytes(codepoint, xaTimeout);
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/NetXAResource.java b/java/org.apache.derby.client/org/apache/derby/client/net/NetXAResource.java
index 7d10043ec2..a73ed59cc9 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/NetXAResource.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/NetXAResource.java
@@ -78,6 +78,7 @@ public class NetXAResource implements XAResource {
     private static final String XAFUNCSTR_START = "XAResource.start()";
 
     SqlException exceptionsOnXA = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     NetXAConnection netXAConn_;
     NetConnection conn_;
@@ -91,6 +92,7 @@ public class NetXAResource implements XAResource {
     private int timeoutSeconds = 0;
 
     public NetXAResource(XAConnection xaconn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                          NetXAConnection conn) {
         conn_ = conn.getNetConnection();
         netXAConn_ = conn;
@@ -101,12 +103,14 @@ public NetXAResource(XAConnection xaconn,
 
         // construct the NetXACallInfo object for the array.
         for (int i = 0; i < INITIAL_CALLINFO_ELEMENTS; ++i) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             callInfoArray_[i] = new NetXACallInfo(null, XAResource.TMNOFLAGS,
                     null);
         }
 
         // initialize the first XACallInfo element with the information from the
         //  primary connection
+//IC see: https://issues.apache.org/jira/browse/DERBY-1192
         callInfoArray_[0].actualConn_ = conn;
         // ~~~ save conn_ connection variables in callInfoArray_[0]
         callInfoArray_[0].saveConnectionVariables();
@@ -129,6 +133,7 @@ public void commit(Xid xid, boolean onePhase) throws XAException {
         callInfo.xaFlags_ = (onePhase ? XAResource.TMONEPHASE :
                 XAResource.TMNOFLAGS);
         callInfo.xid_ = xid;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
         callInfo.xaRetVal_ = XAResource.XA_OK; // initialize XARETVAL
         try {
             netAgent.beginWriteChainOutsideUOW();
@@ -208,6 +213,7 @@ public void end(Xid xid, int flags) throws XAException {
         NetXACallInfo callInfo = callInfoArray_[conn_.currXACallInfoOffset_];
         callInfo.xaFlags_ = flags;
         callInfo.xid_ = xid;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
         callInfo.xaRetVal_ = XAResource.XA_OK; // initialize XARETVAL
         try {
             netAgent.beginWriteChainOutsideUOW();
@@ -231,6 +237,7 @@ public void end(Xid xid, int flags) throws XAException {
             // is changed by setXaStateForXAException inside the call
             // to throwXAException according the error code of the XAException
             // to be thrown.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throwXAException(rc);
         }else {
             conn_.setXAState(ClientConnection.XA_T0_NOT_ASSOCIATED);
@@ -259,6 +266,7 @@ public void forget(Xid xid) throws XAException {
         }
         NetXACallInfo callInfo = callInfoArray_[conn_.currXACallInfoOffset_];
         callInfo.xid_ = xid;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
         callInfo.xaRetVal_ = XAResource.XA_OK; // initialize XARETVAL
         try {
             // flow the required PROTOCOL to the server
@@ -273,12 +281,14 @@ public void forget(Xid xid) throws XAException {
             netAgent.netConnectionReply_.readXaForget(netAgent.netConnection_);
 
             netAgent.endReadChain();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
             if (callInfo.xaRetVal_ != XAResource.XA_OK) { // xaRetVal has possible error, format it
                 callInfo.xaFunction_ = XAFUNC_FORGET;
                 rc = xaRetValErrorAccumSQL(callInfo, rc);
                 callInfo.xaRetVal_ = XAResource.XA_OK; // re-initialize XARETVAL
             }
         } catch (SqlException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
             throwXAException(getSqlExceptionXAErrorCode(sqle));
         }
@@ -308,6 +318,7 @@ public int getTransactionTimeout() throws XAException {
         }
 
         if (conn_.agent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
             conn_.agent_.logWriter_.traceExit(this, "getTransactionTimeout", timeoutSeconds);
         }
         return timeoutSeconds;
@@ -341,6 +352,7 @@ public int prepare(Xid xid) throws XAException { // public interface for prepare
         int rc = XAResource.XA_OK;
         NetXACallInfo callInfo = callInfoArray_[conn_.currXACallInfoOffset_];
         callInfo.xid_ = xid;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
         callInfo.xaRetVal_ = XAResource.XA_OK; // initialize XARETVAL
         try {
             netAgent.beginWriteChainOutsideUOW();
@@ -350,6 +362,7 @@ public int prepare(Xid xid) throws XAException { // public interface for prepare
 
             // read the reply to the prepare
             rc = netAgent.netConnectionReply_.readXaPrepare(conn_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
             if ((callInfo.xaRetVal_ != XAResource.XA_OK) &&
                     (callInfo.xaRetVal_ != XAException.XA_RDONLY)) { // xaRetVal has possible error, format it
                 callInfo.xaFunction_ = XAFUNC_PREPARE;
@@ -363,7 +376,9 @@ public int prepare(Xid xid) throws XAException { // public interface for prepare
             exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-960
         if ((rc != XAResource.XA_OK ) && (rc != XAResource.XA_RDONLY)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throwXAException(rc);
         }
         if (conn_.agent_.loggingEnabled()) {
@@ -403,6 +418,7 @@ public Xid[] recover(int flag) throws XAException {
 
         NetXACallInfo callInfo = callInfoArray_[conn_.currXACallInfoOffset_];
         callInfo.xaFlags_ = flag;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
         callInfo.xaRetVal_ = XAResource.XA_OK; // initialize XARETVAL
         try {
             netAgent.beginWriteChainOutsideUOW();
@@ -417,6 +433,7 @@ public Xid[] recover(int flag) throws XAException {
             }
             netAgent.endReadChain();
             xidList = conn_.getIndoubtTransactionIds();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         } catch (SqlException sqle) {
             rc = getSqlExceptionXAErrorCode(sqle);
@@ -455,6 +472,7 @@ public void rollback(Xid xid) throws XAException {
         // update the XACallInfo
         NetXACallInfo callInfo = callInfoArray_[conn_.currXACallInfoOffset_];
         callInfo.xid_ = xid;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
         callInfo.xaRetVal_ = XAResource.XA_OK; // initialize XARETVAL
         try {
             netAgent.beginWriteChainOutsideUOW();
@@ -463,6 +481,7 @@ public void rollback(Xid xid) throws XAException {
             // read the reply to the rollback
             rc = netAgent.netConnectionReply_.readXaRollback(conn_);
             netAgent.endReadChain();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
             if (callInfo.xaRetVal_ != XAResource.XA_OK) { // xaRetVal has possible error, format it
                 callInfo.xaFunction_ = XAFUNC_END;
                 rc = xaRetValErrorAccumSQL(callInfo, rc);
@@ -500,6 +519,7 @@ public void rollback(Xid xid) throws XAException {
      */
     public boolean setTransactionTimeout(int seconds) throws XAException {
         if (conn_.agent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
             conn_.agent_.logWriter_.traceEntry(this, "setTransactionTimeout");
         }
         if (seconds < 0) {
@@ -539,6 +559,8 @@ public synchronized void start(Xid xid, int flags) throws XAException {
         if (conn_.agent_.loggingEnabled()) {
             conn_.agent_.logWriter_.traceEntry(this, "start", xid, flags);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-339
+//IC see: https://issues.apache.org/jira/browse/DERBY-246
         if (conn_.isPhysicalConnClosed()) {
             connectionClosedFailure();
         }
@@ -546,10 +568,12 @@ public synchronized void start(Xid xid, int flags) throws XAException {
         // DERBY-1025 - Flow an auto-commit if in auto-commit mode before 
         // entering a global transaction
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             if(conn_.autoCommit_)
                 conn_.flowAutoCommit();
         } catch (SqlException sqle) {
             rc = getSqlExceptionXAErrorCode(sqle);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
         } 
 
@@ -558,8 +582,10 @@ public synchronized void start(Xid xid, int flags) throws XAException {
         callInfo.xaFlags_ = flags;
         callInfo.xid_ = xid;
         callInfo.xaRetVal_ = XAResource.XA_OK; // initialize XARETVAL
+//IC see: https://issues.apache.org/jira/browse/DERBY-1024
 
         // check and setup the transaction timeout settings
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
         if (flags == TMNOFLAGS) {
             if (timeoutSeconds == Integer.MAX_VALUE) {
                 // Disable the transaction timeout.
@@ -591,15 +617,27 @@ public synchronized void start(Xid xid, int flags) throws XAException {
             // Setting this is currently required to avoid client from sending
             // commit for autocommit.
             if (rc == XAResource.XA_OK) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                 conn_.setXAState(ClientConnection.XA_T1_ASSOCIATED);
             }
 
         } catch (SqlException sqle) {
             rc = getSqlExceptionXAErrorCode(sqle);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
         }
 
         if (rc != XAResource.XA_OK) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throwXAException(rc);
         }
     }
@@ -607,6 +645,7 @@ public synchronized void start(Xid xid, int flags) throws XAException {
     private String getXAExceptionText(int rc) {
         String xaExceptionText;
         switch (rc) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         case XAException.XA_RBROLLBACK:
             xaExceptionText = "XA_RBROLLBACK";
             break;
@@ -688,12 +727,15 @@ private String getXAExceptionText(int rc) {
 
     private void throwXAException(int rc)
             throws XAException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         StringBuilder xaExceptionText = new StringBuilder(64);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
         xaExceptionText.append(getXAExceptionText(rc));
         // save the SqlException chain to add it to the XAException
         SqlException sqlExceptions = exceptionsOnXA;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
         while (exceptionsOnXA != null) { // one or more SqlExceptions received, format them
             xaExceptionText.append(" : ").append(exceptionsOnXA.getMessage());
@@ -721,11 +763,13 @@ private void throwXAException(int rc)
      * @throws XAException
      */
     private void setXaStateForXAException(int rc) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         switch (rc)
         {
             // Reset to T0, not  associated for XA_RB*, RM*
            // XAER_RMFAIL and XAER_RMERR will be fatal to the connection
            // but that is not dealt with here
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
            case XAException.XAER_RMFAIL:
            case XAException.XAER_RMERR:
            case XAException.XA_RBROLLBACK:
@@ -736,6 +780,7 @@ private void setXaStateForXAException(int rc) {
            case XAException.XA_RBPROTO:
            case XAException.XA_RBTIMEOUT:
            case XAException.XA_RBTRANSIENT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                conn_.setXAState(ClientConnection.XA_T0_NOT_ASSOCIATED);
            break;
             // No change for other XAExceptions
@@ -764,6 +809,22 @@ public boolean isSameRM(XAResource xares) throws XAException {
         if (conn_.agent_.loggingEnabled()) {
             conn_.agent_.logWriter_.traceEntry(this, "isSameRM", xares);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-339
+//IC see: https://issues.apache.org/jira/browse/DERBY-246
+//IC see: https://issues.apache.org/jira/browse/DERBY-339
+//IC see: https://issues.apache.org/jira/browse/DERBY-246
+//IC see: https://issues.apache.org/jira/browse/DERBY-339
+//IC see: https://issues.apache.org/jira/browse/DERBY-246
+//IC see: https://issues.apache.org/jira/browse/DERBY-339
+//IC see: https://issues.apache.org/jira/browse/DERBY-246
+//IC see: https://issues.apache.org/jira/browse/DERBY-339
+//IC see: https://issues.apache.org/jira/browse/DERBY-246
+//IC see: https://issues.apache.org/jira/browse/DERBY-339
+//IC see: https://issues.apache.org/jira/browse/DERBY-246
+//IC see: https://issues.apache.org/jira/browse/DERBY-339
+//IC see: https://issues.apache.org/jira/browse/DERBY-246
+//IC see: https://issues.apache.org/jira/browse/DERBY-339
+//IC see: https://issues.apache.org/jira/browse/DERBY-246
         if (conn_.isPhysicalConnClosed()) {
             connectionClosedFailure();
         }
@@ -846,10 +907,13 @@ public static boolean xidsEqual(Xid xid1, Xid xid2) { // determine if the 2 xids
 
 
     private void connectionClosedFailure() throws XAException { // throw an XAException XAER_RMFAIL, with a chained SqlException - closed
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         exceptionsOnXA = Utils.accumulateSQLException
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
                 (new SqlException(null, 
                         new ClientMessageId(SQLState.NO_CURRENT_CONNECTION)),
                         exceptionsOnXA);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         throwXAException(XAException.XAER_RMFAIL);
     }
 
@@ -883,6 +947,7 @@ protected int xaRetValErrorAccumSQL(NetXACallInfo callInfo, int currentRC) {
             // create an SqlException to report this error within
             SqlException accumSql = new SqlException(conn_.netAgent_.logWriter_,
                 new ClientMessageId(SQLState.NET_XARETVAL_ERROR),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                 SqlCode.queuedXAError,
                 getXAFuncStr(callInfo.xaFunction_),
                 getXAExceptionText(rc));
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/OpenSocketAction.java b/java/org.apache.derby.client/org/apache/derby/client/net/OpenSocketAction.java
index bad6eac719..25e8a82b0a 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/OpenSocketAction.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/OpenSocketAction.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.BasicClientDataSource;
 import org.apache.derby.shared.common.drda.NaiveTrustManager;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class OpenSocketAction implements PrivilegedExceptionAction<Socket> {
     private String server_;
     private int port_;
@@ -52,6 +53,7 @@ class OpenSocketAction implements PrivilegedExceptionAction<Socket> {
 
     @Override
     public Socket run()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         throws UnknownHostException,
                IOException,
                NoSuchAlgorithmException,
@@ -64,7 +66,9 @@ public Socket run()
         
         SocketFactory sf;
         switch (clientSSLMode_) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         case BasicClientDataSource.SSL_BASIC:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             Properties sslProperties = getSSLProperties();
             sf = NaiveTrustManager.getSocketFactory(sslProperties);
             break;
@@ -80,6 +84,7 @@ public Socket run()
             sf = SocketFactory.getDefault();
             break;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (clientSSLMode_ == BasicClientDataSource.SSL_BASIC ||
             clientSSLMode_ == BasicClientDataSource.SSL_PEER_AUTHENTICATION){
         	//DERBY-6764(analyze impact of poodle security alert on Derby 
@@ -126,6 +131,7 @@ public Socket run()
      */
     private Properties getSSLProperties()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         Properties retval = new Properties();
         
         String keyStoreProp = System.getProperty(NaiveTrustManager.SSL_KEYSTORE);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/PublicBufferOutputStream.java b/java/org.apache.derby.client/org/apache/derby/client/net/PublicBufferOutputStream.java
index dcaa5bd438..e2f31fc930 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/PublicBufferOutputStream.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/PublicBufferOutputStream.java
@@ -26,6 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * A ByteArrayOutputStream which gives a direct reference of the buffer array
  */
 class PublicBufferOutputStream extends ByteArrayOutputStream {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     PublicBufferOutputStream() {
         super();
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/Reply.java b/java/org.apache.derby.client/org/apache/derby/client/net/Reply.java
index e7093e9ce6..b83e9574c1 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/Reply.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/Reply.java
@@ -36,6 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.reference.SQLState;
 import org.apache.derby.shared.common.reference.MessageId;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class Reply {
     protected Agent agent_;
     protected NetAgent netAgent_; //cheat-link to (NetAgent) agent_
@@ -67,6 +68,7 @@ class Reply {
     private int peekedNumOfExtendedLenBytes_ = 0;
     private int currentPos_ = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final static int END_OF_COLLECTION = -1;
     final static int END_OF_SAME_ID_CHAIN = -2;
 
@@ -81,6 +83,7 @@ final void initialize() {
         pos_ = 0;
         count_ = 0;
         topDdmCollectionStack_ = Reply.EMPTY_STACK;
+//IC see: https://issues.apache.org/jira/browse/DERBY-823
         Arrays.fill(ddmCollectionLenStack_, 0);
         ddmScalarLen_ = 0;
         dssLength_ = 0;
@@ -170,7 +173,9 @@ private int fill(int minimumBytesNeeded) throws DisconnectException {
             try {
                 // oops, we shouldn't expose the agent's input stream here, collapse this into a read method on the agent
                 actualBytesRead = netAgent_.getInputStream().read(buffer_, count_, buffer_.length - count_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             } catch (IOException ioe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
                 netAgent_.throwCommunicationsFailure(ioe);
             } finally {
                 if (agent_.loggingEnabled()) {
@@ -196,6 +201,7 @@ private int fill(int minimumBytesNeeded) throws DisconnectException {
                 netAgent_.accumulateChainBreakingReadExceptionAndThrow(
                     new DisconnectException(netAgent_,
                         new ClientMessageId(SQLState.NET_INSUFFICIENT_DATA),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                         minimumBytesNeeded, totalBytesRead));
             }
         }
@@ -206,6 +212,7 @@ private int fill(int minimumBytesNeeded) throws DisconnectException {
     // The data will be in the buffer after this method is called.
     // Now returns the total bytes read for decryption, use to return void.
     private int ensureALayerDataInBuffer(int desiredDataSize)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         int totalBytesRead = 0;
         // calulate the the number of bytes in the buffer.
@@ -237,6 +244,7 @@ protected final void ensureBLayerDataInBuffer(int desiredDataSize) throws Discon
     // copying out the data into some other storage.  any extended dss header
     // info will be removed in the copying process.
     private void compressBLayerData(int continueDssHeaderCount)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         int tempPos = 0;
 
@@ -305,6 +313,7 @@ private void compressBLayerData(int continueDssHeaderCount)
                 bytesToShift = dssLength_;
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-823
             tempPos -= (bytesToShift - 2);
             System.arraycopy(buffer_, tempPos - shiftSize, buffer_, tempPos , bytesToShift);
         }
@@ -399,6 +408,7 @@ private void readDssHeader() throws DisconnectException {
 
 
     private void decryptData(int gdsFormatter, int oldDssLength)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws DisconnectException {
         boolean readHeader;
 
@@ -511,6 +521,7 @@ private void decryptData(int gdsFormatter, int oldDssLength)
                 }
                 if (flag) {
                     int firstLobLength = ((clearedByte[0] & 0xFF) << 8) +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5017
                         ((clearedByte[1] & 0xFF) << 0);
                     if (oldCount - oldDssLength < 6) {
                         int totalBytesRead = fill(6); //sometimes the 2nd EXTDTA doesn't come back, need to fetch again to get it
@@ -574,6 +585,7 @@ private void decryptData(int gdsFormatter, int oldDssLength)
     }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     final int readUnsignedShort() throws DisconnectException {
         // should we be checking dss lengths and ddmScalarLengths here
         // if yes, i am not sure this is the correct place if we should be checking
@@ -583,6 +595,7 @@ final int readUnsignedShort() throws DisconnectException {
                 ((buffer_[pos_++] & 0xff) << 0);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     final short readShort() throws DisconnectException {
         // should we be checking dss lengths and ddmScalarLengths here
         ensureBLayerDataInBuffer(2);
@@ -594,6 +607,7 @@ final short readShort() throws DisconnectException {
         return s;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     final int readInt() throws DisconnectException {
         // should we be checking dss lengths and ddmScalarLengths here
         ensureBLayerDataInBuffer(4);
@@ -604,6 +618,7 @@ final int readInt() throws DisconnectException {
         return i;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     final int[] readUnsignedShortList() throws DisconnectException {
         int len = ddmScalarLen_;
         ensureBLayerDataInBuffer(len);
@@ -632,6 +647,7 @@ final byte readByte() throws DisconnectException {
         return (byte) (buffer_[pos_++] & 0xff);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
     final String readString(int length, Charset encoding)
             throws DisconnectException {
         ensureBLayerDataInBuffer(length);
@@ -645,12 +661,15 @@ final String readString() throws DisconnectException {
         int len = ddmScalarLen_;
         ensureBLayerDataInBuffer(len);
         adjustLengths(len);
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         String result = netAgent_.getCurrentCcsidManager()
                             .convertToJavaString(buffer_, pos_, len);
         pos_ += len;
         return result;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     final byte[] readBytes(int length) throws DisconnectException {
         ensureBLayerDataInBuffer(length);
         adjustLengths(length);
@@ -661,6 +680,7 @@ final byte[] readBytes(int length) throws DisconnectException {
         return b;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     final byte[] readBytes() throws DisconnectException {
         int len = ddmScalarLen_;
         ensureBLayerDataInBuffer(len);
@@ -672,6 +692,7 @@ final byte[] readBytes() throws DisconnectException {
         return b;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     final void skipBytes(int length) throws DisconnectException {
         ensureBLayerDataInBuffer(length);
         adjustLengths(length);
@@ -687,6 +708,7 @@ final void skipBytes() throws DisconnectException {
 
     // This will be the new and improved getData that handles all QRYDTA/EXTDTA
     // Returns the stream so that the caller can cache it
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     final ByteArrayOutputStream getData(ByteArrayOutputStream existingBuffer) throws DisconnectException {
         boolean readHeader;
         int copySize;
@@ -886,6 +908,7 @@ final void doSyntaxrmSemantics(int syntaxErrorCode) throws DisconnectException {
                 new ClientMessageId(SQLState.DRDA_CONNECTION_TERMINATED),
                 SqlException.getMessageUtil().getTextMessage(
                     MessageId.CONN_DRDA_DATASTREAM_SYNTAX_ERROR,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     syntaxErrorCode));
             
         // if we are communicating to an older server, we may get a SYNTAXRM on
@@ -1091,6 +1114,7 @@ protected final void endOfSameIdChainData() throws DisconnectException {
         netAgent_.targetSqlam_ = netAgent_.orignalTargetSqlam_;
 
         if (this.topDdmCollectionStack_ != Reply.EMPTY_STACK) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
             agent_.accumulateChainBreakingReadExceptionAndThrow(
                 new DisconnectException(agent_, 
                 new ClientMessageId(SQLState.NET_COLLECTION_STACK_NOT_EMPTY)));
@@ -1178,6 +1202,10 @@ final int readFastInt() throws DisconnectException {
     }
 
     final String readFastString(int length) throws DisconnectException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         String result = netAgent_.getCurrentCcsidManager()
                             .convertToJavaString(buffer_, pos_, length);
         pos_ += length;
@@ -1207,6 +1235,7 @@ final void readFastIntArray(int[] array) throws DisconnectException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
     final String readFastString(int length, Charset encoding) {
         String s = new String(buffer_, pos_, length, encoding);
         pos_ += length;
@@ -1225,6 +1254,7 @@ final byte[] readFastLDBytes() throws DisconnectException {
         return b;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     final long readFastLong() throws DisconnectException {
         long l = SignedBinary.getLong(buffer_, pos_);
         pos_ += 8;
@@ -1250,6 +1280,7 @@ final int getFastSkipSQLCARDrowLength() {
 
     // The only difference between this method and the original getData() method is this method
     // is not doing an ensureALayerDataInBuffer
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     final ByteArrayOutputStream getFastData(ByteArrayOutputStream existingBuffer) throws DisconnectException {
         boolean readHeader;
         int copySize;
@@ -1307,6 +1338,8 @@ final protected void matchCodePoint(int expectedCodePoint) throws DisconnectExce
             agent_.accumulateChainBreakingReadExceptionAndThrow(
                 new DisconnectException(agent_, 
                     new ClientMessageId(SQLState.NET_NOT_EXPECTED_CODEPOINT), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     actualCodePoint, expectedCodePoint));
         }
     }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/Request.java b/java/org.apache.derby.client/org/apache/derby/client/net/Request.java
index 33d0efb0c3..6e6447d231 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/Request.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/Request.java
@@ -44,6 +44,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.error.ExceptionUtil;
 
 class Request {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     // byte array buffer used for constructing requests.
     // currently requests are built starting at the beginning of the buffer.
@@ -81,8 +82,11 @@ class Request {
     // construct a request object specifying the minimum buffer size
     // to be used to buffer up the built requests.  also specify the ccsid manager
     // instance to be used when building ddm character data.
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
     Request(NetAgent netAgent, int minSize) {
         netAgent_ = netAgent;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         buffer = ByteBuffer.allocate(minSize);
         clearBuffer();
     }
@@ -110,6 +114,7 @@ final void initialize() {
     // will be expanded by the larger of (2 * current size) or (current size + length).
     // the data from the previous buffer is copied into the larger buffer.
     private final void ensureLength(int length) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         if (length > buffer.remaining()) {
             int newLength =
                 Math.max(buffer.capacity() * 2, buffer.position() + length);
@@ -173,6 +178,7 @@ private final void buildDss(boolean dssHasSameCorrelator,
 
         // RQSDSS header is 6 bytes long: (ll)(Cf)(rc)
         ensureLength(6);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
 
         // Save the position of the length bytes, so they can be updated with a
         // different value at a later time.
@@ -193,6 +199,7 @@ private final void buildDss(boolean dssHasSameCorrelator,
             }
         }
         buffer.put((byte) dssType);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
 
         // Write the request correlation id (two bytes, token rc).
         // use method that writes a short
@@ -219,14 +226,17 @@ final void writeScalarStream(boolean chained,
     }
     
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     final void writeScalarStream(boolean chained,
                                  boolean chainedWithSameCorrelator,
                                  int codePoint,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1595
                                  long length,
                                  InputStream in,
                                  boolean writeNullByte,
                                  int parameterIndex) throws DisconnectException, SqlException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (netAgent_.netConnection_.getSecurityMechanism() == NetConfiguration.SECMEC_EUSRIDDTA ||
             netAgent_.netConnection_.getSecurityMechanism() == NetConfiguration.SECMEC_EUSRPWDDTA) {
             // DERBY-4706
@@ -235,10 +245,12 @@ final void writeScalarStream(boolean chained,
             // state.
             // Throw an exception for now until we're positive the code can be
             // ditched, later this comment/code itself can also be removed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4706
             throw new SqlException(netAgent_.logWriter_,
                     new ClientMessageId(SQLState.NOT_IMPLEMENTED),
                     "encrypted scalar streams");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         }else{
             
             writePlainScalarStream(chained,
@@ -271,24 +283,32 @@ final void writeScalarStream(boolean chained,
      * @throws DisconnectException if a severe error condition is encountered,
      *      causing the connection to be broken
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     final private void writePlainScalarStream(boolean chained,
                                               boolean chainedWithSameCorrelator,
                                               int codePoint,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1595
                                               long length,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                               InputStream in,
                                               boolean writeNullByte,
                                               int parameterIndex) throws DisconnectException, SqlException {
         // We don't have the metadata available when we create this request
         // object, so we have to check here if we are going to write the status
         // byte or not.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         final boolean writeEXTDTAStatusByte =
                 netAgent_.netConnection_.serverSupportsEXTDTAAbort();
 
         // If the Derby specific status byte is sent, the number of bytes to
         // send differs from the number of bytes to read (off by one byte).
+//IC see: https://issues.apache.org/jira/browse/DERBY-1595
         long leftToRead = length;
         long bytesToSend = writeEXTDTAStatusByte ? leftToRead + 1 : leftToRead;
         int extendedLengthByteCount = prepScalarStream(chained,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                                                        chainedWithSameCorrelator,
                                                        writeNullByte,
                                                        bytesToSend);
@@ -304,6 +324,7 @@ final private void writePlainScalarStream(boolean chained,
             bytesToRead--;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         buildLengthAndCodePointForLob(codePoint,
                                       bytesToSend,
                                       writeNullByte,
@@ -313,6 +334,7 @@ final private void writePlainScalarStream(boolean chained,
         do {
             do {
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
                     bytesRead =
                         in.read(buffer.array(), buffer.position(), bytesToRead);
                 } catch (IOException ioe) {
@@ -340,6 +362,7 @@ final private void writePlainScalarStream(boolean chained,
                     padScalarStreamForError(leftToRead, bytesToRead,
                             writeEXTDTAStatusByte, status);
                     // set with SQLSTATE 01004: The value of a string was truncated when assigned to a host variable.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     netAgent_.accumulateReadException(
                             new SqlException(
                             netAgent_.logWriter_,
@@ -349,10 +372,12 @@ final private void writePlainScalarStream(boolean chained,
                     return;
                 }
                 if (bytesRead == -1) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
                     status = DRDAConstants.STREAM_TOO_SHORT;
                     padScalarStreamForError(leftToRead, bytesToRead,
                             writeEXTDTAStatusByte, status);
                     // set with SQLSTATE 01004: The value of a string was truncated when assigned to a host variable.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     netAgent_.accumulateReadException(
                         new SqlException(netAgent_.logWriter_,
                             new ClientMessageId(SQLState.NET_PREMATURE_EOS),
@@ -360,6 +385,7 @@ final private void writePlainScalarStream(boolean chained,
                     return;
                 } else {
                     bytesToRead -= bytesRead;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
                     buffer.position(buffer.position() + bytesRead);
                     leftToRead -= bytesRead;
                 }
@@ -371,8 +397,10 @@ final private void writePlainScalarStream(boolean chained,
         // check to make sure that the specified length wasn't too small
         try {
             if (in.read() != -1) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
                 status = DRDAConstants.STREAM_TOO_LONG;
                 // set with SQLSTATE 01004: The value of a string was truncated when assigned to a host variable.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 netAgent_.accumulateReadException(new SqlException(
                         netAgent_.logWriter_,
                         new ClientMessageId(
@@ -385,9 +413,12 @@ final private void writePlainScalarStream(boolean chained,
                     netAgent_.logWriter_,
                     new ClientMessageId(
                         SQLState.NET_EXCEPTION_ON_STREAMLEN_VERIFICATION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     e, parameterIndex, e.getMessage()));
         }
         // Write the status byte to the send buffer.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         if (writeEXTDTAStatusByte) {
             writeEXTDTAStatus(status);
         }
@@ -417,9 +448,11 @@ final private void writePlainScalarStream(boolean chained,
      * @throws DisconnectException if a severe error condition is encountered,
      *      causing the connection to be broken
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     final private void writePlainScalarStream(boolean chained,
                                               boolean chainedWithSameCorrelator,
                                               int codePoint,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                               InputStream in,
                                               boolean writeNullByte,
                                               int parameterIndex)
@@ -435,6 +468,7 @@ final private void writePlainScalarStream(boolean chained,
 
         flushExistingDSS();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         ensureLength(DssConstants.MAX_DSS_LEN - buffer.position());
         
         buildDss(true,
@@ -446,6 +480,7 @@ final private void writePlainScalarStream(boolean chained,
         
         int spareInDss;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (writeNullByte) {
             spareInDss = DssConstants.MAX_DSS_LEN - 6 - 4 - 1;
         } else {
@@ -460,6 +495,7 @@ final private void writePlainScalarStream(boolean chained,
             int bytesRead = 0;
             
             while( ( bytesRead = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
                      in.read(buffer.array(), buffer.position(), spareInDss)
                      ) > -1 ) {
                 
@@ -473,6 +509,7 @@ final private void writePlainScalarStream(boolean chained,
                     
                     flushScalarStreamSegment();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
                     buffer.putShort((short) 0xFFFF);
                     
                     spareInDss = DssConstants.MAX_DSS_LEN - 2;
@@ -481,6 +518,7 @@ final private void writePlainScalarStream(boolean chained,
                 
             }
         } catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             if (writeEXTDTAStatusByte) {
                 writeEXTDTAStatus(DRDAConstants.STREAM_READ_ERROR);
             }
@@ -488,12 +526,15 @@ final private void writePlainScalarStream(boolean chained,
                 new SqlException(netAgent_.logWriter_,
                                  new ClientMessageId(SQLState.NET_EXCEPTION_ON_READ),
                                  e, parameterIndex, e.getMessage());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
 
             netAgent_.accumulateReadException(sqlex);
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     return;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         if (writeEXTDTAStatusByte) {
             writeEXTDTAStatus(DRDAConstants.STREAM_OK);
         }
@@ -511,10 +552,13 @@ final void writeScalarStream(boolean chained,
                                  boolean writeNullByte,
                                  int parameterIndex) throws DisconnectException, 
                                                             SqlException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1388
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
 
         writeScalarStream(chained,
                           chainedWithSameCorrelator,
                           codePoint,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1595
                           length * 2L,
                           EncodedInputStream.createUTF16BEStream(r),
                           writeNullByte,
@@ -525,6 +569,8 @@ final void writeScalarStream(boolean chained,
     final void writeScalarStream(boolean chained,
                                  boolean chainedWithSameCorrelator,
                                  int codePoint,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                  Reader r,
                                  boolean writeNullByte,
                                  int parameterIndex) throws DisconnectException, 
@@ -545,6 +591,7 @@ final void writeScalarStream(boolean chained,
     private final int prepScalarStream(boolean chained,
                                          boolean chainedWithSameCorrelator,
                                          boolean writeNullByte,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1595
                                          long leftToRead)
             throws DisconnectException {
         int nullIndicatorSize = writeNullByte ? 1 : 0;
@@ -553,6 +600,7 @@ private final int prepScalarStream(boolean chained,
 
         // flush the existing DSS segment if this stream will not fit in the send buffer
         if ((10 + extendedLengthByteCount + nullIndicatorSize +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
                 leftToRead + buffer.position()) > DssConstants.MAX_DSS_LEN) {
             try {
                 if (simpleDssFinalize) {
@@ -598,7 +646,10 @@ private final void flushExistingDSS() throws DisconnectException {
                 finalizePreviousChainedDss(true);
             }
             sendBytes(netAgent_.getOutputStream());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (IOException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             netAgent_.throwCommunicationsFailure(e);
         }
         
@@ -614,6 +665,7 @@ private final int flushScalarStreamSegment(long leftToRead,
         // either at end of data, end of dss segment, or both.
         if (leftToRead != 0) {
             // 32k segment filled and not at end of data.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
             if ((Math.min(2 + leftToRead, 32767)) > buffer.remaining()) {
                 try {
                     sendBytes(netAgent_.getOutputStream());
@@ -623,6 +675,7 @@ private final int flushScalarStreamSegment(long leftToRead,
             }
             dssLengthLocation_ = buffer.position();
             buffer.putShort((short) 0xFFFF);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1595
             newBytesToRead = (int)Math.min(leftToRead, 32765L);
         }
 
@@ -633,10 +686,18 @@ private final int flushScalarStreamSegment() throws DisconnectException {
         
         try {
             sendBytes(netAgent_.getOutputStream());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (IOException ioe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
             netAgent_.throwCommunicationsFailure(ioe);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         dssLengthLocation_ = buffer.position();
         return DssConstants.MAX_DSS_LEN;
     }
@@ -663,10 +724,12 @@ private final int flushScalarStreamSegment() throws DisconnectException {
     private final void padScalarStreamForError(long leftToRead,
                                                  int bytesToRead,
                                                  boolean writeStatus,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
                                                  byte status)
             throws DisconnectException {
         do {
             do {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
                 buffer.put((byte) 0x0); // use 0x0 as the padding byte
                 bytesToRead--;
                 leftToRead--;
@@ -676,6 +739,7 @@ private final void padScalarStreamForError(long leftToRead,
         } while (leftToRead > 0);
 
         // Append the EXTDTA status flag if appropriate.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         if (writeStatus) {
             writeEXTDTAStatus(status);
         }
@@ -684,6 +748,7 @@ private final void padScalarStreamForError(long leftToRead,
     private final void writeExtendedLengthBytes(int extendedLengthByteCount, long length) {
         int shiftSize = (extendedLengthByteCount - 1) * 8;
         for (int i = 0; i < extendedLengthByteCount; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
             buffer.put((byte) (length >>> shiftSize));
             shiftSize -= 8;
         }
@@ -699,6 +764,7 @@ private final void finalizePreviousChainedDss(
 
         finalizeDssLength();
         int pos = dssLengthLocation_ + 3;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         byte value = buffer.get(pos);
         value |= 0x40;
         if (dssHasSameCorrelator) // for blobs
@@ -760,6 +826,7 @@ private final void finalizeDssLength() {
             // new end of the data.
             int dataByte = buffer.position() - 1;
             int shiftOffset = contDssHeaderCount * 2;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
             ensureLength(shiftOffset);
             buffer.position(buffer.position() + shiftOffset);
 
@@ -775,6 +842,7 @@ private final void finalizeDssLength() {
 
                 // perform the shift
                 dataByte -= dataToShift;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
                 byte[] array = buffer.array();
                 System.arraycopy(array, dataByte + 1,
                         array, dataByte + shiftOffset + 1, dataToShift);
@@ -792,6 +860,7 @@ private final void finalizeDssLength() {
                 }
 
                 // insert the header's length bytes
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
                 buffer.putShort(dataByte + shiftOffset - 1,
                                 (short) twoByteContDssHeader);
 
@@ -809,6 +878,7 @@ private final void finalizeDssLength() {
         }
 
         // insert the length bytes in the 6 byte dss header.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         buffer.putShort(dssLengthLocation_, (short) totalSize);
     }
 
@@ -820,6 +890,7 @@ private final void finalizeDssLength() {
     // Note: this mechanism handles extended length ddms.
     protected final void markLengthBytes(int codePoint) {
         ensureLength(4);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
 
         // save the location of length bytes in the mark stack.
         mark();
@@ -868,6 +939,7 @@ protected final void updateLengthBytes() throws SqlException {
 
             // ensure there is enough room in the buffer for the extended length bytes.
             ensureLength(extendedLengthByteCount);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
 
             // calculate the length to be placed in the extended length bytes.
             // this length does not include the 4 byte llcp.
@@ -875,6 +947,7 @@ protected final void updateLengthBytes() throws SqlException {
 
             // shift the data to the right by the number of extended length bytes needed.
             int extendedLengthLocation = lengthLocation + 4;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
             byte[] array = buffer.array();
             System.arraycopy(array,
                     extendedLengthLocation,
@@ -901,6 +974,7 @@ protected final void updateLengthBytes() throws SqlException {
         }
 
         // write the 2 byte length field (2 bytes before codepoint).
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         buffer.putShort(lengthLocation, (short) length);
     }
 
@@ -925,6 +999,7 @@ private final int calculateExtendedLengthByteCount(long ddmSize) //throws SqlExc
 
     // insert the padByte into the buffer by length number of times.
     private final void padBytes(byte padByte, int length) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         ensureLength(length);
         for (int i = 0; i < length; i++) {
             buffer.put(padByte);
@@ -941,6 +1016,7 @@ final void write1Byte(int value) {
     final void buildTripletHeader(int tripletLength,
                                   int tripletType,
                                   int tripletId) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         ensureLength(3);
         buffer.put((byte) tripletLength);
         buffer.put((byte) tripletType);
@@ -965,6 +1041,7 @@ final void writeLidAndLengths(int[][] lidAndLengthOverrides,
                                   int count,
                                   int offset,
                                   boolean mddRequired,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                                   Hashtable map) {
         if (!mddRequired) {
             writeLidAndLengths(lidAndLengthOverrides, count, offset);
@@ -972,6 +1049,7 @@ final void writeLidAndLengths(int[][] lidAndLengthOverrides,
         // if mdd overrides are required, lookup the protocolType in the map, and substitute
         // the protocolType with the override lid.
         else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
             ensureLength(count * 3);
             int protocolType, overrideLid;
             Object entry;
@@ -979,8 +1057,10 @@ final void writeLidAndLengths(int[][] lidAndLengthOverrides,
                 protocolType = lidAndLengthOverrides[offset][0];
                 // lookup the protocolType in the protocolType->overrideLid map
                 // if an entry exists, replace the protocolType with the overrideLid
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                 entry = map.get(protocolType);
                 overrideLid = (entry == null) ? protocolType : ((Integer) entry).intValue();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
                 buffer.put((byte) overrideLid);
                 buffer.putShort((short) lidAndLengthOverrides[offset][1]);
             }
@@ -991,6 +1071,7 @@ final void writeLidAndLengths(int[][] lidAndLengthOverrides,
 
     // insert a big endian unsigned 2 byte value into the buffer.
     final void write2Bytes(int value) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         writeShort((short) value);
     }
 
@@ -1064,6 +1145,7 @@ final void writeScalar8Bytes(int codePoint, long value) {
     // passed in as an argument (this value is NOT incremented by 4 before being
     // inserted).
     final void writeLengthCodePoint(int length, int codePoint) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         ensureLength(4);
         buffer.putShort((short) length);
         buffer.putShort((short) codePoint);
@@ -1105,11 +1187,14 @@ final void writeScalarString(int codePoint, String string, int byteMinLength,
         
         /* Grab the current CCSID MGR from the NetAgent */ 
         CcsidManager currentCcsidMgr = netAgent_.getCurrentCcsidManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
 
         // We don't know the length of the string yet, so set it to 0 for now.
         // Will be updated later.
         int lengthPos = buffer.position();
         writeLengthCodePoint(0, codePoint);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5068
 
         int stringByteLength = encodeString(string);
         if (stringByteLength > byteLengthLimit) {
@@ -1159,6 +1244,7 @@ private int encodeString(String string) throws SqlException {
     // the length of the llcp.  This method does not handle scenarios which
     // require extended length bytes.
     final void writeScalarBytes(int codePoint, byte[] buff) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         writeScalarBytes(codePoint, buff, 0, buff.length);
     }
 
@@ -1170,6 +1256,7 @@ final void writeScalarBytes(int codePoint, byte[] buff) {
     // the length will contain the length of the data plus the length of the llcp.
     // This method does not handle scenarios which require extended length bytes.
     final void writeScalarBytes(int codePoint, byte[] buff, int start, int length) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         writeLengthCodePoint(length + 4, codePoint);
         ensureLength(length);
         buffer.put(buff, start, length);
@@ -1180,6 +1267,7 @@ final void writeScalarBytes(int codePoint, byte[] buff, int start, int length) {
     // Not: this method is not to be used for truncation and buff.length
     // must be <= paddedLength.
     final void writeScalarPaddedBytes(byte[] buff, int paddedLength, byte padByte) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         writeBytes(buff);
         padBytes(padByte, paddedLength - buff.length);
     }
@@ -1197,6 +1285,7 @@ private void sendBytes(OutputStream socketOutputStream)
             throws IOException {
         try {
             netAgent_.markWriteChainAsDirty();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
             socketOutputStream.write(buffer.array(), 0, buffer.position());
             socketOutputStream.flush();
         } finally {
@@ -1206,6 +1295,7 @@ private void sendBytes(OutputStream socketOutputStream)
                 passwordIncluded_ = false;
             }
             if (netAgent_.loggingEnabled()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
                 ((NetLogWriter) netAgent_.logWriter_).traceProtocolFlow(
                         buffer.array(),
                         0,
@@ -1229,6 +1319,7 @@ private final void maskOutPassword() {
                 mask.append(maskChar);
             }
             // try to write mask over password.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5068
             buffer.position(passwordStart_);
             encodeString(mask.toString());
         } catch (SqlException sqle) {
@@ -1268,6 +1359,7 @@ void writeInt(int v) {
      *      represented by six bytes.
      */
     final void writeLong6Bytes(long v) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         ensureLength(6);
         buffer.putShort((short) (v >> 32));
         buffer.putInt((int) v);
@@ -1307,6 +1399,7 @@ protected void writeDouble(double v) {
     }
 
     // insert a java.math.BigDecimal into the buffer.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     final void writeBigDecimal(BigDecimal v,
                                int declaredPrecision,
                                int declaredScale) throws SqlException {
@@ -1318,12 +1411,14 @@ final void writeBigDecimal(BigDecimal v,
     }
 
     final void writeDate(DateTimeValue date) throws SqlException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
         ensureLength(10);
         DateTime.dateToDateBytes(buffer.array(), buffer.position(), date);
         buffer.position(buffer.position() + 10);
     }
 
     final void writeTime(DateTimeValue time) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         ensureLength(8);
         DateTime.timeToTimeBytes(buffer.array(), buffer.position(), time);
         buffer.position(buffer.position() + 8);
@@ -1332,6 +1427,7 @@ final void writeTime(DateTimeValue time) {
     final void writeTimestamp(DateTimeValue timestamp) throws SqlException {
         boolean supportsTimestampNanoseconds = netAgent_.netConnection_.serverSupportsTimestampNanoseconds();
         int length = DateTime.getTimestampLength( supportsTimestampNanoseconds );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         ensureLength(length);
         DateTime.timestampToTimestampBytes(
                 buffer.array(), buffer.position(),
@@ -1342,6 +1438,7 @@ final void writeTimestamp(DateTimeValue timestamp) throws SqlException {
     // insert a java boolean into the buffer.  the boolean is written
     // as a signed byte having the value 0 or 1.
     final void writeBoolean(boolean v) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         write1Byte(v ? 1 : 0);
     }
 
@@ -1350,6 +1447,7 @@ final void writeBoolean(boolean v) {
     // should this throw SqlException
     // Will write a varchar mixed or single
     //  this was writeLDString
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
     final void writeSingleorMixedCcsidLDString(String s, Charset encoding) throws SqlException {
         byte[] b = s.getBytes(encoding);
         if (b.length > 0x7FFF) {
@@ -1357,6 +1455,7 @@ final void writeSingleorMixedCcsidLDString(String s, Charset encoding) throws Sq
                 new ClientMessageId(SQLState.LANG_STRING_TOO_LONG),
                 "32767");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         writeLDBytes(b);
     }
 
@@ -1377,6 +1476,7 @@ private final void writeLDBytesX(int ldSize, byte[] bytes) {
     // private helper method for writing just a subset of a byte array
     private final void writeLDBytesXSubset( int ldSize, int bytesToCopy, byte[] bytes )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         writeShort((short) ldSize);
         writeBytes(bytes, bytesToCopy);
     }
@@ -1389,6 +1489,8 @@ final void writeUDT( Object val ) throws SqlException
         
         try
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5786
+//IC see: https://issues.apache.org/jira/browse/DERBY-4491
             PublicBufferOutputStream pbos = new PublicBufferOutputStream();
             ObjectOutputStream oos = new ObjectOutputStream( pbos );
 
@@ -1403,6 +1505,7 @@ final void writeUDT( Object val ) throws SqlException
                 (
                  netAgent_.logWriter_, 
                  new ClientMessageId (SQLState.NET_MARSHALLING_UDT_ERROR),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                  e,
                  e.getMessage()
                  );
@@ -1423,6 +1526,7 @@ final void writeUDT( Object val ) throws SqlException
     }
 
     private void buildLengthAndCodePointForLob(int codePoint,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1595
                                                long leftToRead,
                                                boolean writeNullByte,
                                                int extendedLengthByteCount) throws DisconnectException {
@@ -1472,10 +1576,12 @@ private void buildLengthAndCodePointForLob(int codePoint,
      * @throws DisconnectException if flushing the buffer fails
      */
     private void writeEXTDTAStatus(byte flag)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             throws DisconnectException {
         // Write the status byte to the send buffer.
         // Make sure we have enough space for the status byte.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5210
         if (buffer.remaining() == 0) {
             flushScalarStreamSegment(1, 0); // Trigger a flush.
         }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetReply.java b/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetReply.java
index 245f7cfcce..a3512fd404 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetReply.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetReply.java
@@ -26,6 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.am.SqlException;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class ResultSetReply extends StatementReply {
     private ResultSetReplyInterface materialResultSetReply_;
 
@@ -37,6 +38,7 @@ class ResultSetReply extends StatementReply {
         materialResultSetReply_ = materialResultSetReply;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readFetch(ResultSetCallbackInterface resultSet) throws SqlException {
         materialResultSetReply_.readFetch(resultSet);
         agent_.checkForChainBreakingException_();
@@ -55,6 +57,7 @@ public void readPositioningFetch(ResultSetCallbackInterface resultSet) throws Sq
         agent_.checkForChainBreakingException_();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readCursorClose(ResultSetCallbackInterface resultSet)
             throws SqlException {
         materialResultSetReply_.readCursorClose(resultSet);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetReplyInterface.java b/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetReplyInterface.java
index 145ccd07c8..11f680a5a4 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetReplyInterface.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetReplyInterface.java
@@ -27,6 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 interface ResultSetReplyInterface {
     public void readFetch(ResultSetCallbackInterface resultSet)
             throws DisconnectException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
     public void readScrollableFetch(ResultSetCallbackInterface resultSet)
             throws DisconnectException;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetRequestInterface.java b/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetRequestInterface.java
index 77bfd3508d..43fbe37f24 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetRequestInterface.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/ResultSetRequestInterface.java
@@ -35,6 +35,8 @@ public void writeFetch(NetResultSet resultSet,
                            int fetchSize) throws SqlException;
 
     public void writeScrollableFetch(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         NetResultSet resultSet,
         Section section,
         int fetchSize,
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/StatementReply.java b/java/org.apache.derby.client/org/apache/derby/client/net/StatementReply.java
index 700e94fb45..66013fe842 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/StatementReply.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/StatementReply.java
@@ -26,6 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.client.am.SqlException;
 import org.apache.derby.client.am.StatementCallbackInterface;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 class StatementReply extends ConnectionReply {
     private StatementReplyInterface materialStatementReply_;
 
@@ -36,6 +37,7 @@ class StatementReply extends ConnectionReply {
         materialStatementReply_ = materialStatementReply;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     void readPrepareDescribeOutput(StatementCallbackInterface statement)
             throws SqlException {
         materialStatementReply_.readPrepareDescribeOutput(statement);
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/StatementRequestInterface.java b/java/org.apache.derby.client/org/apache/derby/client/net/StatementRequestInterface.java
index 154a239e4d..d58ca9757f 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/StatementRequestInterface.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/StatementRequestInterface.java
@@ -51,6 +51,7 @@ public void writeOpenQuery(NetStatement materialStatement,
 
     public void writeExecute(NetPreparedStatement materialPreparedStatement,
                              Section section,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                              ColumnMetaData parameterMetaData,
                              Object[] inputs,
                              int numInputColumns,
@@ -90,5 +91,6 @@ public void writeExecuteCall(NetStatement materialStatement,
 
 
     public void writeSetSpecialRegister(Section section, ArrayList sqlsttList)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             throws SqlException;
 }
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/Typdef.java b/java/org.apache.derby.client/org/apache/derby/client/net/Typdef.java
index ff27b92c84..1b3ba84e81 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/Typdef.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/Typdef.java
@@ -984,6 +984,7 @@ boolean isCcsidSbcSet() {
     }
 
     // analyze exception handling some more here
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
     Charset getCcsidSbcEncoding() throws DisconnectException {
         if (ccsidSbcEncoding_ == null) {
             ccsidSbcEncoding_ = UTF8ENCODING;
@@ -1028,6 +1029,7 @@ boolean isCcsidMbcSet() {
     }
 
     // analyze exception handling some more here
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
     Charset getCcsidMbcEncoding() throws DisconnectException {
         if (ccsidMbcEncoding_ == null) {
             ccsidMbcEncoding_ = UTF8ENCODING;
@@ -1038,6 +1040,7 @@ Charset getCcsidMbcEncoding() throws DisconnectException {
     public Object clone() {
         try {
             return super.clone();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         } catch (CloneNotSupportedException e) {
             return null; // this shouldn't happen since we implement the cloneable interface
         }
@@ -1055,6 +1058,7 @@ void updateColumn(NetCursor netCursor,
         }
 
         if (sda == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
             netAgent_.accumulateChainBreakingReadExceptionAndThrow(
                 new DisconnectException(netAgent_,
                     new ClientMessageId(SQLState.NET_INVALID_FDOCA_ID)));
@@ -1069,6 +1073,7 @@ void updateColumn(NetCursor netCursor,
         //    The typdef object should store the java encoding,
         switch (sda.ccsid_) {
         case CCSIDSBC:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
             netCursor.charset_[columnIndex] = getCcsidSbcEncoding();
             netCursor.ccsid_[columnIndex] = this.ccsidSbc_;
             break;
@@ -1102,6 +1107,7 @@ void updateColumn(NetCursor netCursor,
             // otherwise the sda.ccsid_ is a placeholder:
             //  CCSIDMBC, CCSIDDDBC, CCSIDSBC to indicate that
             // the actual ccsid is the connection's ccsid (in protocol lingo the connection's typdef ccsid).
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
             netCursor.charset_[columnIndex] = UTF8ENCODING;
             netCursor.ccsid_[columnIndex] = sda.ccsid_;
             break;
diff --git a/java/org.apache.derby.client/org/apache/derby/client/net/Utf8CcsidManager.java b/java/org.apache.derby.client/org/apache/derby/client/net/Utf8CcsidManager.java
index ca484ea94c..32bd78ea00 100644
--- a/java/org.apache.derby.client/org/apache/derby/client/net/Utf8CcsidManager.java
+++ b/java/org.apache.derby.client/org/apache/derby/client/net/Utf8CcsidManager.java
@@ -64,6 +64,7 @@ public Utf8CcsidManager() {
     }
     
     public byte[] convertFromJavaString(String sourceString, Agent agent)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5068
             throws SqlException {
         try {
             ByteBuffer buf = encoder.encode(CharBuffer.wrap(sourceString));
@@ -91,10 +92,12 @@ public byte[] convertFromJavaString(String sourceString, Agent agent)
      * Offset and numToConvert are given in terms of bytes! Not characters!
      */
     public String convertToJavaString(byte[] sourceBytes, int offset, int numToConvert) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6231
         return new String(sourceBytes, offset, numToConvert, UTF8_CHARSET);
     }
 
     public void startEncoding() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5068
         encoder.reset();
     }
 
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/drda/NaiveTrustManager.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/drda/NaiveTrustManager.java
index 26ede59248..36e52ca2b2 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/drda/NaiveTrustManager.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/drda/NaiveTrustManager.java
@@ -71,6 +71,7 @@ private NaiveTrustManager()
      **/
     public static SocketFactory getSocketFactory(Properties sslProperties)
         throws java.security.NoSuchAlgorithmException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3096
                java.security.KeyManagementException,
                java.security.NoSuchProviderException,
                java.security.KeyStoreException,
@@ -85,6 +86,7 @@ public static SocketFactory getSocketFactory(Properties sslProperties)
         SSLContext ctx = SSLContext.getInstance("TLS");
         
         if (ctx.getProvider().getName().equals("SunJSSE") &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             (sslProperties.getProperty(SSL_KEYSTORE) != null) &&
             (sslProperties.getProperty(SSL_KEYSTORE_PASSWORD) != null)) {
             
@@ -94,6 +96,7 @@ public static SocketFactory getSocketFactory(Properties sslProperties)
             // peerAuthentication, we have to provide one working the
             // same way as the default one.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             String keyStore = sslProperties.getProperty(SSL_KEYSTORE);
             String keyStorePassword = sslProperties.getProperty(SSL_KEYSTORE_PASSWORD);
             
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/DerbySQLIntegrityConstraintViolationException.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/DerbySQLIntegrityConstraintViolationException.java
index 8f5f4cff9a..1706200897 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/DerbySQLIntegrityConstraintViolationException.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/DerbySQLIntegrityConstraintViolationException.java
@@ -36,6 +36,7 @@ public  DerbySQLIntegrityConstraintViolationException(
 	}
 
        public  DerbySQLIntegrityConstraintViolationException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6803
 			String reason,
 			String SQLState,
 			int vendorCode,
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ErrorStringBuilder.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ErrorStringBuilder.java
index 7f321f2429..66372abb57 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ErrorStringBuilder.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ErrorStringBuilder.java
@@ -92,6 +92,7 @@ public void stackTrace(Throwable t)
 
 			t.printStackTrace(printWriter);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 			if (t instanceof java.sql.SQLException) {
 				Throwable next = ((java.sql.SQLException)t).getNextException();
 				t = (next == null) ? t.getCause() : next;
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ExceptionFactory.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ExceptionFactory.java
index 78bbc7fa3b..a69f7a50c8 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ExceptionFactory.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ExceptionFactory.java
@@ -38,9 +38,11 @@ public abstract class ExceptionFactory {
         // the need for more than one implementation ever arises again, the
         // code below should be changed to load the correct factory for the
         // run-time platform.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6253
         String impl = "org.apache.derby.impl.jdbc.SQLExceptionFactory";
         ExceptionFactory factory = null;
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(impl);
             factory = (ExceptionFactory) clazz.getConstructor().newInstance();
         } catch (Exception e) {
@@ -71,6 +73,7 @@ public static ExceptionFactory getInstance() {
      */
     public abstract SQLException getSQLException(String message, String messageId,
             SQLException next, int severity, Throwable cause, Object... args);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6253
 
     /**
      * Construct an SQLException whose message and severity are derived from
@@ -83,5 +86,6 @@ public abstract SQLException getSQLException(String message, String messageId,
      * @return an SQLException
      */
     public abstract SQLException getSQLException(String messageId,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6253
             SQLException next, Throwable cause, Object... args);
 }
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ExceptionUtil.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ExceptionUtil.java
index ada005c837..9ccf80e258 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ExceptionUtil.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/ExceptionUtil.java
@@ -55,6 +55,7 @@ public class ExceptionUtil
      */
     public static String getSQLStateFromIdentifier(String messageID) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (messageID.length() == 5)
             return messageID;
         return messageID.substring(0, 5);
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/MessageUtils.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/MessageUtils.java
index faccd9fa9b..6bac72e2a2 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/MessageUtils.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/MessageUtils.java
@@ -346,6 +346,7 @@ public static void getLocalizedMessage(int sqlcode, short errmcLen, String sqler
         }
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             msg[0] = formatMessage
               (MessageService.getBundleForLocale(locale, messageId), messageId, arguments, true);
             rc[0] = 0;
@@ -355,6 +356,7 @@ public static void getLocalizedMessage(int sqlcode, short errmcLen, String sqler
             // most likely it does exist in our fake base class _en, so try that.
         } catch (ShutdownException se) {
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         msg[0] = formatMessage
           (MessageService.getBundleForLocale(EN, messageId), messageId, arguments, false);
         rc[0] = 0;
@@ -373,6 +375,7 @@ public static String getLocalizedMessage(Locale locale, String messageId, Object
         String locMsg = null;
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             locMsg = formatMessage
               (MessageService.getBundleForLocale(locale, messageId), messageId, args, true);
             return locMsg;
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/PassThroughException.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/PassThroughException.java
index 6a59e2976b..24c253684e 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/PassThroughException.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/PassThroughException.java
@@ -35,6 +35,7 @@ public final class PassThroughException extends RuntimeException {
      * @param cause the {@code Throwable} to pass through
      */
     public PassThroughException(Throwable cause) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4010
         super(cause);
     }
 
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/PublicAPI.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/PublicAPI.java
index b06099b6ba..6f9f2739dd 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/PublicAPI.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/PublicAPI.java
@@ -39,6 +39,7 @@ public class PublicAPI
         @return a SQLException wrapped around the original exception
 	 */
 	public static SQLException wrapStandardException(StandardException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
         se.markAsPublicAPI();
         return ExceptionFactory.getInstance().getSQLException(
                 se.getMessage(), se.getMessageId(), (SQLException) null,
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/SQLWarningFactory.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/SQLWarningFactory.java
index aa829e1849..550afa2514 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/SQLWarningFactory.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/SQLWarningFactory.java
@@ -51,6 +51,7 @@ public static SQLWarning newSQLWarning(String messageId, Object... args)
     {
 		return new SQLWarning
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
              MessageService.getTextMessage( messageId, args ),
              StandardException.getSQLStateFromIdentifier(messageId),
              ExceptionSeverity.WARNING_SEVERITY
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/StandardException.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/StandardException.java
index 289e261798..562a49857b 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/error/StandardException.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/error/StandardException.java
@@ -83,12 +83,14 @@ protected StandardException(String messageID, Throwable t, Object[] args)
 		this.severity = getSeverityFromIdentifier(messageID);
 		this.sqlState = getSQLStateFromIdentifier(messageID);
 		this.arguments = args;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 		if (t != null) {
 			initCause(t);
 		}
 
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-336
                     SanityManager.ASSERT(messageID != null,
                                          "StandardException with no messageID");
 		}
@@ -153,6 +155,7 @@ public final int getErrorCode() {
 		If you need teh identifier that was used to create the
 		message, then use getMessageId(). getMessageId() will return the
 		string that corresponds to the field in org.apache.derby.shared.common.reference.SQLState.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         @return the 5 character SQL state
 	*/
@@ -167,6 +170,7 @@ public final String getSQLState()
      * @return the next exception
      */
     public final SQLException getNextException() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
         return next;
     }
 
@@ -183,6 +187,7 @@ final void markAsPublicAPI() {
     }
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		Convert a message identifer from org.apache.derby.shared.common.reference.SQLState to
 		a SQLState five character string.
 	 *	@param messageID - the sql state id of the message from Derby
@@ -197,6 +202,7 @@ public static String getSQLStateFromIdentifier(String messageID) {
 
 	/**
 		Get the severity given a message identifier from org.apache.derby.shared.common.reference.SQLState.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         @param messageID The handle on the message
         @return the severity associated with the message
@@ -291,6 +297,7 @@ public	static	StandardException	normalClose()
 	}
 
     public static StandardException
+//IC see: https://issues.apache.org/jira/browse/DERBY-6254
             newException(String messageId, Object... args) {
         return newException(messageId, (Throwable) null, args);
     }
@@ -343,6 +350,7 @@ public static StandardException newException(String messageID,
      * @throws BadMessageArgumentException - always (dummy)
      */
     public static StandardException newException(String messageID, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-336
                                                  Object a1, 
                                                  Object a2,
                                                  Throwable t) 
@@ -369,6 +377,7 @@ public static StandardException newPreLocalizedException( String MessageID,
     {
         StandardException se = new StandardException( MessageID, localizedMessage);
         if( t != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
             se.initCause(t);
         return se;
     }
@@ -387,6 +396,7 @@ public static StandardException newPreLocalizedException( String MessageID,
 	 */
     public static StandardException getArgumentFerry(SQLException se)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
         Throwable cause = se.getCause();
         return (cause instanceof StandardException)
                 ? (StandardException) cause : null;
@@ -406,6 +416,7 @@ private static boolean isVacuousWrapper(Throwable t) {
         // The only interesting information in an InvocationTargetException
         // or a PrivilegedActionException is the cause, so consider them
         // vacuous if they have a cause.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6493
         if (t instanceof InvocationTargetException
                 || t instanceof PrivilegedActionException) {
             return (t.getCause() != null);
@@ -450,6 +461,8 @@ public static StandardException unexpectedUserException(Throwable t)
 		** (38001-38XXX).  If so, then we convert it into a 
 		** StandardException without further ado.
 		*/ 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 		if ((t instanceof SQLException) && (ferry == null))
 		{
 			SQLException sqlex  = (SQLException)t;
@@ -462,6 +475,7 @@ public static StandardException unexpectedUserException(Throwable t)
 				StandardException se = new StandardException(state, sqlex.getMessage());
 				if (sqlex.getNextException() != null)		
 				{	
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 					se.initCause(sqlex.getNextException());
 				}
 				return se;
@@ -506,6 +520,7 @@ public static StandardException unexpectedUserException(Throwable t)
 			** should be seen as a bug.
 			*/
             String detailMessage = t.getMessage();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
 
 			if (detailMessage == null)
 			{
@@ -518,6 +533,7 @@ public static StandardException unexpectedUserException(Throwable t)
 			if (detailMessage.length() == 0) {
 				detailMessage = t.getClass().getName();
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
             else
             {
                 detailMessage = t.getClass().getName() + ": " + detailMessage;
@@ -542,6 +558,7 @@ public static StandardException plainWrapException(Throwable t) {
 
         // If there is no useful information in the top-level throwable,
         // peel it off and only report the cause.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6493
         if (isVacuousWrapper(t)) {
             return plainWrapException(t.getCause());
         }
@@ -559,6 +576,7 @@ public static StandardException plainWrapException(Throwable t) {
 				StandardException se = new StandardException(sqlState, "(" + sqle.getErrorCode()  + ") " + sqle.getMessage());
 				sqle = sqle.getNextException();
 				if (sqle != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 					se.initCause(plainWrapException(sqle));
 				return se;
 			}
@@ -593,6 +611,7 @@ public static StandardException closeException() {
 	*/
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         <P>
 		The message stored in the super class Throwable must be set
 		up object creation. At this time we cannot get any information
@@ -612,6 +631,7 @@ is stored in this class at the first request.
 	*/
 
 	public String getMessage() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
         if (textMessage == null) {
             textMessage = MessageService.getTextMessage(
                                 getMessageId(), getArguments());
@@ -671,6 +691,7 @@ public static StandardException interrupt(InterruptedException ie) {
 
     public static SQLWarning newWarning(String messageId, Object... oa)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
         String      message = MessageService.getTextMessage(messageId, oa);
 		String		state = StandardException.getSQLStateFromIdentifier(messageId);
 		SQLWarning	sqlw = new SQLWarning(message, state, ExceptionSeverity.WARNING_SEVERITY);
@@ -700,6 +721,7 @@ public final boolean isLockTimeout() {
      **/
     public final boolean isSelfDeadlock() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
         return(SQLState.SELF_DEADLOCK.equals(getSQLState()));
     }
 
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java
index 946cadfc75..20834b653a 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageService.java
@@ -73,6 +73,7 @@ public static void setFinder(BundleFinder theFinder) {
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	  <P>
 	  Transform the message from messageID to the actual error, warning, or
 	  info message using the correct locale.
@@ -209,6 +210,7 @@ default locale or base class the one for en_US is returned.
 	public static ResourceBundle getBundleWithEnDefault(String resource, Locale locale)
     {
         ResourceBundle retval = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         retval = getBundle(resource, locale);
 
@@ -268,6 +270,7 @@ private static ResourceBundle getBundle(String resource, Locale locale)
 	*/
 	private static ResourceBundle lookupBundle(String resource, Locale locale)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (JVMInfo.isModuleAware()) { return lookupBundleInModule(resource, locale); }
         else { return ResourceBundle.getBundle(resource, locale); }
 	}
@@ -292,6 +295,7 @@ public static ResourceBundle lookupBundleInModule(String resource, Locale locale
         //
 
         if (resource.contains(CLIENT_MESSAGES)) { moduleName = ModuleUtil.CLIENT_MODULE_NAME; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         else if (resource.contains(SERVER_MESSAGES)) { moduleName = ModuleUtil.SERVER_MODULE_NAME; }
         else if (resource.contains(TOOLS_MESSAGES) || resource.contains(SYSINFO_MESSAGES))
         {
@@ -375,6 +379,7 @@ else if (resource.contains(TOOLS_MESSAGES) || resource.contains(SYSINFO_MESSAGES
      * @return the corresponding resource bundle
      */
     private static PropertyResourceBundle getModuleResourceBundle
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
        (final String resourceName, final Module module)
     {
         try
@@ -397,6 +402,7 @@ public InputStream run() throws IOException
             }
             else { return null; }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         catch (Exception ioe)
         {
             System.out.println(ioe.getMessage());
@@ -412,6 +418,7 @@ public InputStream run() throws IOException
     */
     private static String localizeResourceName(String original, String localeName)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (
             (original == null) ||
             (original.contains(CLIENT_MESSAGES)) ||
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageUtil.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageUtil.java
index 9ba2f378ce..0a12405553 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageUtil.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/i18n/MessageUtil.java
@@ -65,6 +65,7 @@ public MessageUtil(String resourceBundleName)
      * @return the message text with arguments plugged in
      */
     public String getTextMessage(String messageID, Object... args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
         return getCompleteMessage(messageID, args);
     }
     
@@ -137,6 +138,7 @@ public static String getCompleteMessage(Locale locale,
             // we should compose a default message or throw an exception if
             // the message still is not found.
             return formatMessage(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                     MessageService.getBundleWithEnDefault(resourceBundleName, US), 
                     messageId, arguments, composeDefault);
         }
@@ -207,6 +209,7 @@ public static String formatMessage(ResourceBundle bundle, String messageId,
         Object[] arguments, boolean composeDefault) {
 
         String message = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1115
         String badArgsMessage = null;
         
         if (arguments == null)
@@ -219,11 +222,13 @@ public static String formatMessage(ResourceBundle bundle, String messageId,
                 
                 
                 // Ensure that the right number of arguments are passed in.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1115
                 if ( SanityManager.DEBUG )
                 {
                     int numExpected = countParams(message);
                     SanityManager.ASSERT(numExpected == arguments.length,
                         "Number of parameters expected for message id " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-842
                         messageId + " (" + numExpected +
                         ") does not match number of arguments received (" +
                         arguments.length + ")");
@@ -233,6 +238,7 @@ public static String formatMessage(ResourceBundle bundle, String messageId,
                     return MessageFormat.format(message, arguments);
                 }
                 catch (IllegalArgumentException iae) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
                     if ( !composeDefault || SanityManager.DEBUG )
                         throw iae;
                 }
@@ -251,6 +257,7 @@ public static String formatMessage(ResourceBundle bundle, String messageId,
             } 
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1115
         return composeDefaultMessage("UNKNOWN MESSAGE, id " + messageId, arguments);
     }
     
@@ -294,6 +301,7 @@ private static int countParams(String message)
      */
     public static String composeDefaultMessage(String message, Object[] arguments)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1115
         if (message == null)
         {
             message = "UNKNOWN";
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/info/JVMInfo.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/info/JVMInfo.java
index 0120afcce3..bfb5771164 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/info/JVMInfo.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/info/JVMInfo.java
@@ -44,11 +44,14 @@ public abstract class JVMInfo
 		<UL>
 		<LI> 1 - not used was JDK 1.1
 		<LI> 2 - not used, was for JDK 1.2 and 1.3
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         <LI> 4 - not used, was for JDK 1.4.0 or 1.4.1
         <LI> 5 - not used, was for JDK 1.4.2
         <LI> 6 - not used, was for JDK 1.5
+//IC see: https://issues.apache.org/jira/browse/DERBY-6857
         <LI> 7 - not used, was for JDK 1.6
         <LI> 8 - not used, was for JDK 1.7
+//IC see: https://issues.apache.org/jira/browse/DERBY-5948
         <LI> 9 - J2SE_18 - JDK 1.8
 		</UL>
 	*/
@@ -61,6 +64,7 @@ public abstract class JVMInfo
 
     public static int jdbcMajorVersion()
     { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6324
         return 4; 
     }
 
@@ -88,6 +92,7 @@ public static int jdbcMinorVersion()
 		// If we don't recognize that, or if the property is not set, assume
         // version 1.8, which is the lowest level we support.
 		//
+//IC see: https://issues.apache.org/jira/browse/DERBY-6857
         String javaVersion = "1.8";
 		try {
             javaVersion =
@@ -109,6 +114,7 @@ public static int jdbcMinorVersion()
             try {
 
                 // Extract major and minor version out of the spec version.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6518
                 String[] ver = javaVersion.split("[.]");
                 int major = ver.length >= 1 ? Integer.parseInt(ver[0]) : 0;
                 int minor = ver.length >= 2 ? Integer.parseInt(ver[1]) : 0;
@@ -128,6 +134,7 @@ public static int jdbcMinorVersion()
 
 		JDK_ID = id;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         _isModuleAware = (getSystemModulePath() != null);
 	}
 
@@ -153,6 +160,7 @@ public static String derbyVMLevel()
      */
     private static String getSystemProperty(final String name) {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return AccessController
                 .doPrivileged(new java.security.PrivilegedAction<String>() {
                     
@@ -191,6 +199,7 @@ public static final boolean isIBMJVM() {
      */
     public static final boolean isModuleAware()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return _isModuleAware;
     }
 
@@ -212,6 +221,7 @@ public static final String getSystemModulePath()
      */
     public static void javaDump() {
         if (isIBMJVM()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             Class<?> ibmc = null;
             try {
                 ibmc = Class.forName("com.ibm.jvm.Dump");
@@ -240,6 +250,7 @@ public Object run() throws IllegalAccessException,
      * @return true if JNDI is available
      */
     public static boolean hasJNDI() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         try {
             Class.forName("javax.naming.Referenceable");
         } catch (ClassNotFoundException e) {
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java
index 18dae0bff2..dc0db9b6f6 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java
@@ -31,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
   Class to hold a Derby Product version.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 
   This class includes the following product version features.
 
@@ -61,6 +62,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	is represented by a int (2G values) we have plenty of room for encoding. If we assign a given
 	majorVersion.minorVersion.fixPack a 10 year life, then we about the maximum number of individual releases
 	it can have is 10 years * 365 days/year = 3650. Thus with the pre 5.2 scheme we would not expect a 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	5.1.x to have an x &gt; 3650 (approximately). Usually the rate of point releases has been much less than
 	one per day, 5.1.31 is released about 225 days after GA which makes around a point release every 7 days.
 	But in the encoding we need to be conservative. With fix packs the maximum is about 2 per year and fix
@@ -84,6 +86,7 @@ is represented by a int (2G values) we have plenty of room for encoding. If we a
     The encoding number must continue to increase so that the
 	
 		encodedMaintB &gt; encodedMaintA
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		if (fixPackB &gt; fixPackA) || ((fixPackB == fixPackA) &amp;&amp; (bugB &gt; bugA))
 
@@ -365,6 +368,7 @@ public String getProductTechnologyName()
 
 	/**
        Return the fix pack version from the maintenance encoding.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
 
        @return the fix pack version number
 	*/
@@ -553,6 +557,7 @@ else if (isBeta) {
 		Returns a short-hand value for the product version string.
 		Used by Sysinfo.
 		Includes the optional beta designation
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         @param withBuild If true, include the build number
 
@@ -575,9 +580,11 @@ public final Properties run() {
 	}
 	// SECURITY PERMISSION - IP4
 	private Properties loadProperties(String productGenus) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		String resourceName = "/org/apache/derby/info/" + productGenus+"/info.properties";
 			
 		InputStream is = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         if (JVMInfo.isModuleAware())
         {
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Attribute.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Attribute.java
index 4321fe62f3..2d71b3cb2f 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Attribute.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Attribute.java
@@ -46,6 +46,7 @@ public interface Attribute
 {
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		Not an attribute but the root for the JDBC URL that Derby supports.
 	*/
 	String PROTOCOL = "jdbc:derby:";
@@ -112,6 +113,8 @@ public interface Attribute
      * If used, REPLICATION_SLAVE_HOST is a required attribute.
      */
     String REPLICATION_START_MASTER = "startMaster";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3189
+//IC see: https://issues.apache.org/jira/browse/DERBY-2954
 
     /**
      * Attribute name to stop replication master mode for a database.
@@ -154,7 +157,9 @@ public interface Attribute
     String REPLICATION_SLAVE_PORT = "slavePort";
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		The attribute that is used for the database name, from
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		the JDBC notion of jdbc:$subprotocol:$subname
 	*/
 	String DBNAME_ATTR = "databaseName";
@@ -355,6 +360,7 @@ Optional JDBC url attribute (at the database create time only) It can
      * traceLevel.
      * Client driver attribute.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-446
     String CLIENT_TRACE_LEVEL = "traceLevel";
     
     /**
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ClassName.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ClassName.java
index 6ca1975460..5b60d1b4ce 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ClassName.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ClassName.java
@@ -71,6 +71,7 @@ public interface ClassName
 
 	String Storable = "org.apache.derby.iapi.services.io.Storable";
 	String StandardException = "org.apache.derby.shared.common.error.StandardException";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 	String LanguageConnectionContext = "org.apache.derby.iapi.sql.conn.LanguageConnectionContext";
 	String ConstantAction = "org.apache.derby.iapi.sql.execute.ConstantAction";
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/EngineType.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/EngineType.java
index 1f3e490164..b4e6901f00 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/EngineType.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/EngineType.java
@@ -53,4 +53,4 @@ public interface EngineType {
      * If not set defaults to STANDALONE_DB.
      */
     String PROPERTY = "derby.engineType";
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/JDBC40Translation.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/JDBC40Translation.java
index fa50c689c4..2f4675d351 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/JDBC40Translation.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/JDBC40Translation.java
@@ -28,6 +28,7 @@ an intermediary class with hard-coded copies of constants that
         will be available in jdbc 4.0, it becomes possible to refer to
         these constants when compiling against older jdk versions.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
         <p>
         This class also contains some constants shared by the network server and client.
         </p>
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/MessageId.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/MessageId.java
index 47f32a83cd..163543b107 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/MessageId.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/MessageId.java
@@ -63,6 +63,7 @@ public interface MessageId {
     String LOG_DURABILITY_TESTMODE_NO_SYNC_ERR = "L021"; // hint that error could be because 
                                                          // derby.system.durability was set to test
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4072
     String LOG_CHANGED_DB_TO_READ_ONLY        = "L022"; // a permissions error on log caused us
     													// to change db to read only.
     
@@ -93,8 +94,11 @@ public interface MessageId {
      * When the specified overflow page isn't found while streaming from a
      * page overflow chain (large data values, typically BLOB or CLOB).
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2992
     String STORE_STREAM_OVERFLOW_PAGE_NOT_FOUND = "D015";
     String STORE_PAGE_DUMP                  = "D016";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6320
+//IC see: https://issues.apache.org/jira/browse/DERBY-4923
 
 	/*
 	** ClassManager
@@ -113,8 +117,10 @@ public interface MessageId {
 	/*
 	** Connectivity
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-4601
 	String CONN_SHUT_DOWN_ENGINE		    = "J003"; // shutting down Derby Engine
 	String CONN_DATABASE_IDENTITY			= "J004"; // database identity
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 	String CONN_SHUT_DOWN_CLOUDSCAPE		= "J005"; // shut down Derby
     String CONN_DEREGISTER_AUTOLOADEDDRIVER = "J006"; // remove registered AutoloadedDriver
 	String CONN_CREATE_DATABASE				= "J007"; // create database
@@ -127,6 +133,7 @@ public interface MessageId {
 	String CONN_CRYPTO_EXTERNAL_KEY         = "J019"; // external cryptographic key
 	String CONN_BOOT_PASSWORD               = "J020"; // secret cryptographic key
 	String CONN_LOCALE                      = "J021"; // locale for the database
+//IC see: https://issues.apache.org/jira/browse/DERBY-2334
 	String CONN_COLLATION                   = "J031"; // collation info for the character datatypes
 	String CONN_USERNAME_ATTR               = "J022"; // user name
 	String CONN_PASSWORD_ATTR               = "J023"; // user password
@@ -138,7 +145,10 @@ public interface MessageId {
     String CONN_NETWORK_SERVER_CLASS_LOAD   = "J101"; // Cannot load the network server constructor
     String CONN_NETWORK_SERVER_START_EXCEPTION = "J102";
     String CONN_NETWORK_SERVER_SHUTDOWN_EXCEPTION = "J103";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
     String OBJECT_CLOSED                                    = "J104";
+//IC see: https://issues.apache.org/jira/browse/DERBY-847
+//IC see: https://issues.apache.org/jira/browse/DERBY-3902
     String CONN_PRECISION_TOO_LARGE                         = "J105";   
     //  following only used in text we print out - see client.am.SqlException:
     String BATCH_POSITION_ID                                = "J107";
@@ -165,13 +175,17 @@ public interface MessageId {
     String CONN_DRDA_QRYOPEN                                = "J129";
     String CONN_DRDA_INVALIDFDOCA                           = "J130";
     String CONN_DRDA_DATASTREAM_SYNTAX_ERROR                = "J131";
+//IC see: https://issues.apache.org/jira/browse/DERBY-851
     String CONN_USERNAME_DESCRIPTION                        = "J132";
     String CONN_PASSWORD_DESCRIPTION                        = "J133";
     /**
      * Error message for negative values for the maxStatements property
      * of data sources supporting statement pooling.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3325
+//IC see: https://issues.apache.org/jira/browse/DERBY-3329
     String CONN_NEGATIVE_MAXSTATEMENTS                      = "J134";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
     String CONN_XA_TRANSACTION_TIMED_OUT                    = "J135";
     String CONN_CLOSE_XA_TRANSACTION_ROLLED_BACK            = "J136";
 
@@ -192,25 +206,30 @@ public interface MessageId {
 	*/
 	String CORE_DATABASE_NOT_AVAILABLE	= "I024"; // Database not available
 	String CORE_DRIVER_NOT_AVAILABLE	= "I025"; // JDBC Driver not available
+//IC see: https://issues.apache.org/jira/browse/DERBY-1459
 	String JDBC_DRIVER_REGISTER_ERROR 	= "I026"; // Error while registering driver
     /**
      * At the time InputStream.reset was invoked, either no mark was set or the
      * read ahead limit of the mark was exceeded.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4122
     String STREAM_MARK_UNSET_OR_EXCEEDED                    = "I027";
     /**
      * Error message when the client encounters a read error when reading a
      * user stream, which it is in the process of sending to the server.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
     String STREAM_DRDA_CLIENTSIDE_EXTDTA_READ_ERROR         = "I028";
     /** The stream ended before it was supposed to. */
     String STREAM_PREMATURE_EOF                             = "I029";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4241
 
     /*
      * Monitor
      */
 
     /** Tell user not to edit service.properties. */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5283
     String SERVICE_PROPERTIES_DONT_EDIT                     = "M001";
     /** Informational message, service properties restored. */
     String SERVICE_PROPERTIES_RESTORED                      = "M002";
@@ -232,30 +251,42 @@ public interface MessageId {
      */
     String CANNOT_READ_SECURITY_PROPERTY                     = "M008";
     String CANNOT_CREATE_FILE_OR_DIRECTORY                   = "M009";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
     String CANNOT_GET_CLASSLOADER                            = "M00A";
     String CANNOT_SET_CLASSLOADER                            = "M00B";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
     String CANNOT_SET_DAEMON                                 = "M010";
     /*
      * Misc
      */
     String CAUSED_BY = "N001";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
     /*
      * Replication
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
     String REPLICATION_ERROR_BEGIN                       = "R001";
     String REPLICATION_ERROR_END                         = "R002";
     String REPLICATION_SLAVE_STARTED                     = "R003";
     String REPLICATION_SLAVE_STOPPED                     = "R004";
     String REPLICATION_FATAL_ERROR                       = "R005";
     String REPLICATION_SLAVE_LOST_CONN                   = "R006";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3064
     String REPLICATION_MASTER_STARTED                    = "R007";
     String REPLICATION_MASTER_STOPPED                    = "R008";
     String REPLICATION_LOGSHIPPER_EXCEPTION              = "R009";
     String REPLICATION_MASTER_RECONN                     = "R010";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3361
+//IC see: https://issues.apache.org/jira/browse/DERBY-3356
     String REPLICATION_SLAVE_NETWORK_LISTEN              = "R011";    
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
     String REPLICATION_INVALID_CONNECTION_HANDLE         = "R012";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
     String REPLICATION_ONELINE_MSG_HEADER                = "R013";
     String REPLICATION_FAILOVER_SUCCESSFUL               = "R020";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3254
 
 }
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Module.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Module.java
index 191144b01b..77f2a321d4 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Module.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Module.java
@@ -24,6 +24,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public interface Module {
 
 	String CacheFactory = "org.apache.derby.iapi.services.cache.CacheFactory";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 	String CipherFactoryBuilder = "org.apache.derby.iapi.services.crypto.CipherFactoryBuilder";
 	String ClassFactory = "org.apache.derby.iapi.services.loader.ClassFactory";
 	String DaemonFactory = "org.apache.derby.iapi.services.daemon.DaemonFactory";
@@ -33,5 +34,7 @@ public interface Module {
 	String ResourceAdapter = "org.apache.derby.iapi.jdbc.ResourceAdapter";
     
     String JMX = "org.apache.derby.iapi.services.jmx.ManagementService";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
+//IC see: https://issues.apache.org/jira/browse/DERBY-1387
 
 }
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ModuleUtil.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ModuleUtil.java
index 2ac38adc30..2a907d033a 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ModuleUtil.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/ModuleUtil.java
@@ -85,6 +85,7 @@ public static java.lang.Module derbyModule(String moduleName)
         if (!JVMInfo.isModuleAware()) { return null; }
         
         initModuleInfo();  // find all of the derby modules
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         return _derbyModules.get(moduleName);
     }
@@ -112,6 +113,7 @@ public static String localizationModuleName(String localeString)
      * @return a stream opened on the resource or null if it was not found
      */
     public static InputStream getResourceAsStream(String resourceName)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         throws StandardException
     {
         initModuleInfo();  // find all of the derby modules
@@ -138,6 +140,7 @@ public static InputStream getResourceAsStream(String resourceName)
     private static void initModuleInfo()
     {
         if (_derbyModules != null) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         HashMap<String,java.lang.Module> result = new HashMap<String,java.lang.Module>();
         ServiceLoader<DerbyModuleAPI> loader = ServiceLoader.load(DerbyModuleAPI.class);
@@ -163,6 +166,7 @@ private static void initModuleInfo()
      */
     private static InputStream getResourceAsStream
       (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
          final java.lang.Module module,
          final String resourceName
        )
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Property.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Property.java
index 0d9a3894d1..54342cd07f 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Property.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/Property.java
@@ -52,6 +52,7 @@ public interface Property {
 
 	/**
 		By convention properties that must not be stored any persistent form of
+//IC see: https://issues.apache.org/jira/browse/DERBY-6220
 		service properties start with this prefix. These properties are not documented.
 	*/
 	public static final String PROPERTY_RUNTIME_PREFIX = "derby.__rt.";
@@ -97,7 +98,9 @@ public interface Property {
 	String LOG_BOOT_TRACE = "derby.stream.error.logBootTrace";
     
         /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
 		derby.stream.error.style=<b>The error stream error style.</b>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         <b>rollingFile</b> is the only file currently supported.
 		Takes precendence over derby.stream.error.file.
 		Takes precendence over derby.stream.error.method.
@@ -106,7 +109,9 @@ public interface Property {
 	String ERRORLOG_STYLE_PROPERTY = "derby.stream.error.style";
 
         /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-862
 		derby.stream.error.file=<b>absolute or relative error log filename</b>
+//IC see: https://issues.apache.org/jira/browse/DERBY-205
 		Takes precendence over derby.stream.error.method.
 		Takes precendence over derby.stream.error.field
 	*/
@@ -115,6 +120,7 @@ public interface Property {
 
         /**
 		derby.stream.error.method=
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 			$className.$methodName returning an OutputStream or Writer object
 		Takes precendence over derby.stream.error.field
 	*/
@@ -123,12 +129,14 @@ public interface Property {
 
         /**
 		derby.stream.error.field=
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			className.fieldName returning an OutputStream or Writer object
 	*/
 	
 	String ERRORLOG_FIELD_PROPERTY = "derby.stream.error.field";
 
         /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
 		derby.stream.error.rollingfile.pattern=<b>the pattern</b>
         A pattern consists of a string that includes the following special
         components that will be replaced at runtime:
@@ -200,6 +208,9 @@ public interface Property {
 	* info stream is started.  
 	*/
 	String LOG_FILE_APPEND = "derby.infolog.append";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
 
 	/*
 	** derby.service.* and related properties
@@ -244,6 +255,7 @@ Before creating this service delete any remenants (e.g. the directory)
 	/**
         derby.database.forceDatabaseLock
 		<BR>
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
         Derby attempts to prevent two instances of Derby from booting
         the same database with the use of a file called db.lck inside the 
         database directory.
@@ -272,6 +284,7 @@ Before creating this service delete any remenants (e.g. the directory)
 
         The warning message looks like this:
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
         WARNING: Derby (instance 80000000-00d2-3265-de92-000a0a0a0200) is
         attempting to boot the database /export/home/sky/wombat even though
         Derby (instance 80000000-00d2-3265-8abf-000a0a0a0200) may still be
@@ -284,6 +297,7 @@ Before creating this service delete any remenants (e.g. the directory)
         This warning is primarily a Technical Support aid to determine the 
         cause of corruption. However, if you see this warning, your best 
         choice is to close the connection and exit the JVM. This minimizes the
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
         risk of a corruption. Close all instances of Derby, then restart
         one instance of Derby and shut down the database properly so that
         the db.lck file can be removed. The warning message continues to appear
@@ -397,6 +411,7 @@ Default value for wait timeouts (60 seconds)
 	/**
 		internal use only, passes the database classpathinto the class manager
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6220
         Undocumented.
 	*/
 	String BOOT_DB_CLASSPATH = PROPERTY_RUNTIME_PREFIX + "database.classpath";
@@ -498,6 +513,9 @@ Default value for wait timeouts (60 seconds)
 	public static final String ROW_LOCKING = "derby.storage.rowLocking";
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
 		derby.storage.propertiesId
 		<BR>
 		Stores the id of the conglomerate that holds the per-database
@@ -509,6 +527,7 @@ Default value for wait timeouts (60 seconds)
 	String PROPERTIES_CONGLOM_ID = "derby.storage.propertiesId";
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
        <p>
 		derby.storage.tempDirectory
 		</p>
@@ -606,6 +625,9 @@ Default value for wait timeouts (60 seconds)
 	 */
 	String LOG_ARCHIVE_MODE = "derby.storage.logArchiveMode";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
 
 	/**
 	 *	derby.storage.logDeviceWhenBackedUp
@@ -634,6 +656,7 @@ Default value for wait timeouts (60 seconds)
      * </UL>
      */
     String MODULE_PREFIX = "derby.module.";
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 
     /**
      *  derby.subSubProtocol.xxx
@@ -674,6 +697,7 @@ Default value for wait timeouts (60 seconds)
      * See org.apache.derby.shared.common.info.JVMInfo.JDK_ID
      */
     String MODULE_ENV_JDK_PREFIX = "derby.env.jdk.";
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 
     /**
      * Declare a set of classes that the class for a module or sub sub protocol requires.
@@ -692,6 +716,9 @@ Default value for wait timeouts (60 seconds)
 	 * <p>
 	 * Undocumented.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
 	String	LANG_TD_CACHE_SIZE = "derby.language.tableDescriptorCacheSize";
 	int		LANG_TD_CACHE_SIZE_DEFAULT = 64;
 
@@ -701,6 +728,7 @@ Default value for wait timeouts (60 seconds)
 	 * <p>
 	 * Undocumented.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 	String	LANG_PERMISSIONS_CACHE_SIZE = "derby.language.permissionsCacheSize";
 	int		LANG_PERMISSIONS_CACHE_SIZE_DEFAULT = 64;
 	/**
@@ -742,6 +770,7 @@ Default value for wait timeouts (60 seconds)
 	  be executed before checking whether its plan is stale.  Database.
 	  Dynamic.
 	  <P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6220
 	  Externally visible but undocumented.
 	 */
 	String LANGUAGE_STALE_PLAN_CHECK_INTERVAL =
@@ -866,6 +895,7 @@ Default value for wait timeouts (60 seconds)
      * Undocumented.
      * </p>
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
     String STORAGE_AUTO_INDEX_STATS_DEBUG_KEEP_DISPOSABLE_STATS =
             "derby.storage.indexStats.debug.keepDisposableStats";
 
@@ -877,6 +907,7 @@ Default value for wait timeouts (60 seconds)
       * timeout in seconds. Zero means no timout.
       */
     String PROP_XA_TRANSACTION_TIMEOUT = "derby.jdbc.xaTransactionTimeout";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
 
     /** The default value for XA transaction timeout if the corresponding
       * property is not found in system properties. Zero means no timeout.
@@ -889,6 +920,7 @@ Default value for wait timeouts (60 seconds)
 	public static final String DATABASE_MODULE = "org.apache.derby.database.Database";
 
 	/*
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		Property to enable Grant & Revoke SQL authorization. Introduced in Derby 10.2
 		release. New databases and existing databases (in Derby 10.2) still use legacy
 		authorization by default and by setting this property to true could request for
@@ -1035,6 +1067,7 @@ release. New databases and existing databases (in Derby 10.2) still use legacy
 	/**
 		Property name for specifying log switch interval
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6220
         Undocumented.
 	 */
 	public static final String LOG_SWITCH_INTERVAL = "derby.storage.logSwitchInterval";
@@ -1257,10 +1290,12 @@ release. New databases and existing databases (in Derby 10.2) still use legacy
 	// type should be ignored. The TERRITORY_BASED collation uses the default
 	// collator strength while the four with a colon uses a specific strength.
 	public static final String UCS_BASIC_COLLATION =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2334
 								"UCS_BASIC";
 	public static final String TERRITORY_BASED_COLLATION =
 								"TERRITORY_BASED";
 	public static final String TERRITORY_BASED_PRIMARY_COLLATION =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
 								"TERRITORY_BASED:PRIMARY";
 	public static final String TERRITORY_BASED_SECONDARY_COLLATION =
 								"TERRITORY_BASED:SECONDARY";
@@ -1337,6 +1372,7 @@ release. New databases and existing databases (in Derby 10.2) still use legacy
      * the server, too (i.e. started via API).
      * </p>
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
     String STORAGE_USE_DEFAULT_FILE_PERMISSIONS =
         "derby.storage.useDefaultFilePermissions";
 
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/SQLState.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/SQLState.java
index 5aaa5dfa8c..70d9d8163b 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/SQLState.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/reference/SQLState.java
@@ -41,6 +41,7 @@ The message identifier (ie. the value that matches a field in this class)
 	<PRE>
 		if (se.getMessageId().equals(SQLState.DEADLOCK))
 	</PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
     <P>
 	A utility static method StandardException.getSQLState(String messageId)
 	exists to convert an field from this class into a five character SQLState.
@@ -53,6 +54,7 @@ exists to convert an field from this class into a five character SQLState.
 	is expected to be 7 characters long and the last character determines
 	the state. If the state is seven characters long then only the first
 	five will be seen by the error reporting code and exception.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	</P>
 	<P>
 	If the state is 9 characters long, the last two characters encode
@@ -110,6 +112,7 @@ <LI> <B> ENVIRONMENTAL exception category (the default)</B>
 	  <LI> XBCM ClassManager
 	  <LI> XBCX	Cryptography
 	  <LI> XBM0	Monitor
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
 	  <LI> XBDA Communications
 	  <LI> XCY0 Properties
 	  </UL>
@@ -130,6 +133,8 @@ <LI> <B> ENVIRONMENTAL exception category (the default)</B>
 		<LI> 46000  for SQLJ errors (for now, leave this range empty) </LI>
 		<LI> 38000  SQL3 ranges  </LI>
 		<LI> XD00x  Dependency mgr </LI>
+//IC see: https://issues.apache.org/jira/browse/DERBY-1772
+//IC see: https://issues.apache.org/jira/browse/DERBY-1758
 		<LI> XMLxx  Misc XML errors not covered by SQL standard </LI>
 	  <LI> 
 	  </UL>
@@ -140,11 +145,13 @@ <LI> <B> ENVIRONMENTAL exception category (the default)</B>
 	  <LI> XSCH0 Heap
 	  </UL>
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
 	<LI>Security
 	  <UL>
 	  <LI> XK...
 	  </UL>
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3016
     <LI>Replication
       <UL>
       <LI> XRExx
@@ -167,6 +174,7 @@ public interface SQLState {
 	String SERVICE_MISSING_IMPLEMENTATION		= "XBM02.D";
 	String MISSING_PRODUCT_VERSION				= "XBM05.D";
 	String SERVICE_WRONG_BOOT_PASSWORD			= "XBM06.D";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5283
     String SERVICE_PROPERTIES_MISSING			= "XBM0A.D";
     String SERVICE_PROPERTIES_EDIT_FAILED       = "XBM0B.D";
     String MISSING_FILE_PRIVILEGE               = "XBM0C.D";
@@ -189,7 +197,9 @@ public interface SQLState {
 	String REGISTERED_CLASS_LINAKGE_ERROR		= "XBM0V.S";
 	String REGISTERED_CLASS_INSTANCE_ERROR		= "XBM0W.S";
 	String INVALID_LOCALE_DESCRIPTION			= "XBM0X.D";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2334
 	String INVALID_COLLATION			        = "XBM03.D";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
 	String COLLATOR_NOT_FOUND_FOR_LOCALE        = "XBM04.D";
 	String SERVICE_DIRECTORY_NOT_IN_BACKUP      = "XBM0Y.D";
 	String UNABLE_TO_COPY_FILE_FROM_BACKUP      = "XBM0Z.D";
@@ -201,6 +211,7 @@ public interface SQLState {
 	** Communications
 	*/
     String LOGIN_TIMEOUT                        = "XBDA0.C.1";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
 
 	/*
 	** Upgrade
@@ -221,6 +232,7 @@ public interface SQLState {
 	String GENERATED_CLASS_INSTANCE_ERROR	= "XBCM2.S";
 	String GENERATED_CLASS_NO_SUCH_METHOD	= "XBCM3.S";
 	String GENERATED_CLASS_LIMIT_EXCEEDED	= "XBCM4.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 	/*
 	** Cryptography
@@ -239,6 +251,7 @@ public interface SQLState {
     String ENCRYPTION_NOCHANGE_ALGORITHM     = "XBCXD.S";
     String ENCRYPTION_NOCHANGE_PROVIDER = "XBCXE.S";
     String ENCRYPTION_NO_PROVIDER_CLASS = "XBCXF.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
     String ENCRYPTION_NOT_A_PROVIDER    = "XBCXF.S.1";
     String ENCRYPTION_BAD_PROVIDER      = "XBCXG.S";
     String ENCRYPTION_BAD_ALG_FORMAT    = "XBCXH.S";
@@ -246,6 +259,7 @@ public interface SQLState {
     String ENCRYPTION_BAD_JCE           = "XBCXJ.S";
     String ENCRYPTION_BAD_EXTERNAL_KEY  = "XBCXK.S";
     String ENCRYPTION_UNABLE_KEY_VERIFICATION  = "XBCXL.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-746
     String ENCRYPTION_INVALID_EXKEY_LENGTH          = "XBCXM.S";
     String ENCRYPTION_ILLEGAL_EXKEY_CHARS           = "XBCXN.S";
     String ENCRYPTION_PREPARED_XACT_EXIST             = "XBCXO.S";
@@ -265,6 +279,7 @@ public interface SQLState {
 	String PROPERTY_INVALID_VALUE		= "XCY00.S";
 	String PROPERTY_UNSUPPORTED_CHANGE  = "XCY02.S";
 	String PROPERTY_MISSING				= "XCY03.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 	String PROPERTY_SYNTAX_INVALID		= "XCY04.S";
 	String PROPERTY_CANT_UNDO_NATIVE  = "XCY05.S.2";
 	String PROPERTY_DBO_LACKS_CREDENTIALS  = "XCY05.S.3";
@@ -276,6 +291,7 @@ public interface SQLState {
 	String LOCK_TIMEOUT = "40XL1";
     String LOCK_TIMEOUT_LOG = "40XL1.T.1";
     String SELF_DEADLOCK = "40XL2";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
 
 	/*
 	** Store - access.protocol.Interface statement exceptions
@@ -388,8 +404,11 @@ public interface SQLState {
     String RAWSTORE_CANNOT_CHANGE_LOGDEVICE                     = "XSRS8.S";
     String RAWSTORE_RECORD_VANISHED                             = "XSRS9.S";
     String BACKUP_BLOCKING_OPERATIONS_IN_PROGRESS               = "XSRSA.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
     String BACKUP_OPERATIONS_NOT_ALLOWED                        = "XSRSB.S";
     String RAWSTORE_CANNOT_BACKUP_INTO_DATABASE_DIRECTORY       = "XSRSC.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-304
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 
 	/*
 	** RawStore - Log.Generic statement exceptions
@@ -449,6 +468,7 @@ public interface SQLState {
 	** RawStore - Transactions.Basic transaction exceptions
 	*/
 	String TRANSACTION_PREFIX="40";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1140
 
 	String XACT_PROTOCOL_VIOLATION                              = "40XT0";
 	String XACT_COMMIT_EXCEPTION                                = "40XT1";
@@ -458,6 +478,7 @@ public interface SQLState {
 	String XACT_CANNOT_ACTIVATE_TRANSACTION                     = "40XT6";
 	String XACT_NOT_SUPPORTED_IN_INTERNAL_XACT                  = "40XT7";
 	String XACT_PROTOCOL_VIOLATION_DETAILED                     = "40XT8";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4729
 
 	/*
 	** RawStore - Transactions.Basic system exceptions
@@ -494,8 +515,11 @@ public interface SQLState {
 	String DATA_UNEXPECTED_OVERFLOW_PAGE                        = "XSDAL.S";
     String DATA_SQLDATA_READ_INSTANTIATION_EXCEPTION            = "XSDAM.S";
     String DATA_SQLDATA_READ_ILLEGAL_ACCESS_EXCEPTION           = "XSDAN.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4982
     String DATA_DOUBLE_LATCH_INTERNAL_ERROR                     = "XSDAO.S";
     String DATA_UNEXPECTED_NO_SPACE_ON_PAGE                     = "XSDAP.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6320
+//IC see: https://issues.apache.org/jira/browse/DERBY-4923
 
 	/*
 	** RawStore - Data.Generic transaction exceptions
@@ -511,8 +535,10 @@ public interface SQLState {
 	String DATA_MULTIPLE_JBMS_FORCE_LOCK                        = "XSDB8.D";
 	String DATA_CORRUPT_STREAM_CONTAINER                        = "XSDB9.D";
 	String DATA_OBJECT_ALLOCATION_FAILED                        = "XSDBA.D";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3725
 	String DATA_UNKNOWN_PAGE_FORMAT_2                           = "XSDBB.D";
 	String DATA_BAD_CONTAINERINFO_WRITE                         = "XSDBC.D";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3727
 
 	/*
 	** RawStore - Data.Filesystem statement exceptions
@@ -528,8 +554,10 @@ public interface SQLState {
 	String FILE_READ_ONLY                                       = "XSDFB.S";
 	String FILE_IO_GARBLED                                      = "XSDFD.S";
 	String FILE_UNEXPECTED_EXCEPTION                            = "XSDFF.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
     String BACKUP_FILE_IO_ERROR                                 = "XSDFH.S";
 	String FILE_NEW_PAGE_DURING_RECOVERY                        = "XSDFI.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5886
 	String FILE_CANNOT_REMOVE_ENCRYPT_FILE                      = "XSDFJ.S";
 	String FILE_CANNOT_REMOVE_JAR_FILE                          = "XSDFK.S";
 
@@ -544,6 +572,7 @@ public interface SQLState {
 	String FILE_WRITE_PAGE_EXCEPTION                            = "XSDG1.D";
 	String FILE_BAD_CHECKSUM                                    = "XSDG2.D";
 	String FILE_CONTAINER_EXCEPTION                             = "XSDG3.D";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6504
     String UNABLE_TO_ARRAYCOPY                                  = "XSDG4.D";
 	String FILE_DATABASE_NOT_IN_CREATE                          = "XSDG5.D";
 	String DATA_DIRECTORY_NOT_FOUND_IN_BACKUP                   = "XSDG6.D";
@@ -593,6 +622,7 @@ public interface SQLState {
 	*/
 	String CONNECTIVITY_PREFIX="08";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1140
 
     /*
 	** Language
@@ -671,9 +701,12 @@ public interface SQLState {
 	String LANG_COL_NOT_NULL									   	   = "01503";
 	String LANG_INDEX_DUPLICATE									   	   = "01504";
 	String LANG_VALUE_TRUNCATED                                        = "01505";
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 	String LANG_SYNONYM_UNDEFINED                                      = "01522";
 	String LANG_NULL_ELIMINATED_IN_SET_FUNCTION						   = "01003";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1582
 	String LANG_PRIVILEGE_NOT_REVOKED						   		   = "01006";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 	String LANG_ROLE_NOT_REVOKED                                       = "01007";
 	String LANG_WITH_ADMIN_OPTION_NOT_REVOKED                          = "01008";
 	String LANG_GEN_COL_DROPPED                                         = "01009";
@@ -696,6 +729,7 @@ public interface SQLState {
 	/*
 	** SQL Data exceptions
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-1140
 	String SQL_DATA_PREFIX="22";
 	
 	String LANG_MISSING_PARMS                                          = "07000";
@@ -704,25 +738,33 @@ public interface SQLState {
 	String LANG_STRING_TRUNCATION                                      = "22001";
 	String LANG_CONCAT_STRING_OVERFLOW                                      = "54006";
 	String LANG_OUTSIDE_RANGE_FOR_DATATYPE                             = "22003";
+//IC see: https://issues.apache.org/jira/browse/DERBY-843
+//IC see: https://issues.apache.org/jira/browse/DERBY-1198
     String YEAR_EXCEEDS_MAXIMUM                                        = "22003.S.1";
     String DECIMAL_TOO_MANY_DIGITS                                     = "22003.S.2";
     String NUMERIC_OVERFLOW                                            = "22003.S.3";
     String CLIENT_LENGTH_OUTSIDE_RANGE_FOR_DATATYPE                    = "22003.S.4";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
 
 	String LANG_DATA_TYPE_GET_MISMATCH                                 = "22005"; // same 22005 error
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
     String UNSUPPORTED_ENCODING                                        = "22005.S.1";
     String CHARACTER_CONVERTER_NOT_AVAILABLE                           = "22005.S.2";
+//IC see: https://issues.apache.org/jira/browse/DERBY-845
     String CANT_CONVERT_UNICODE_TO_EBCDIC                              = "22005.S.3";
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
     String NET_UNRECOGNIZED_JDBC_TYPE                                  = "22005.S.4";
     String NET_INVALID_JDBC_TYPE_FOR_PARAM                             = "22005.S.5";
     String UNRECOGNIZED_JAVA_SQL_TYPE                                  = "22005.S.6";
     String CANT_CONVERT_UNICODE_TO_UTF8                                = "22005.S.7";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
 
 	String LANG_DATE_RANGE_EXCEPTION                                   = "22007.S.180";
 	String LANG_DATE_SYNTAX_EXCEPTION                                  = "22007.S.181";
     String LANG_INVALID_FUNCTION_ARGUMENT                              = "22008.S";
     String LANG_SEQUENCE_GENERATOR_EXHAUSTED                              = "2200H.S";
 	String LANG_SUBSTR_START_OR_LEN_OUT_OF_RANGE                        = "22011";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2769
 	String LANG_SUBSTR_START_ADDING_LEN_OUT_OF_RANGE                        = "22011.S.1";
 	String LANG_DIVIDE_BY_ZERO                                         = "22012";
     String LANG_SQRT_OF_NEG_NUMBER                                     = "22013";
@@ -733,26 +775,34 @@ public interface SQLState {
 	String LANG_INVALID_TRIM_CHARACTER                                 = "22020";
 	String LANG_INVALID_ESCAPE_SEQUENCE                                = "22025";
 	String LANG_INVALID_TRIM_SET                                       = "22027";
+//IC see: https://issues.apache.org/jira/browse/DERBY-849
     String LANG_STRING_TOO_LONG                                        = "22028";
 	String LANG_ESCAPE_IS_NULL                                  	   = "22501";
 	String LANG_INVALID_ROW_COUNT_FIRST                                = "2201W";
 	String LANG_INVALID_ROW_COUNT_OFFSET                               = "2201X";
 	String LANG_ROW_COUNT_OFFSET_FIRST_IS_NULL                         = "2201Z";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4208
 
 	/*
 	** Integrity violations.
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-1140
 	String INTEGRITY_VIOLATION_PREFIX="23";
 	
 	String LANG_NULL_INTO_NON_NULL                                     = "23502";
 	String LANG_DUPLICATE_KEY_CONSTRAINT                               = "23505";
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
     String LANG_DEFERRED_DUPLICATE_KEY_CONSTRAINT_T                    = "23506.T.1";
     String LANG_DEFERRED_DUPLICATE_KEY_CONSTRAINT_S                    = "23507.S.1";
 	String LANG_FK_VIOLATION                                           = "23503";
 	String LANG_CHECK_CONSTRAINT_VIOLATED                              = "23513";
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     String LANG_DEFERRED_CHECK_CONSTRAINT_T                            = "23514.T.1";
     String LANG_DEFERRED_CHECK_CONSTRAINT_S                            = "23515.S.1";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     String LANG_DEFERRED_FK_CONSTRAINT_T                               = "23516.T.1";
     String LANG_DEFERRED_FK_CONSTRAINT_S                               = "23517.S.1";
 	// From SQL/XML[2006] spec; there are others, but
@@ -764,9 +814,11 @@ public interface SQLState {
 	String LANG_INVALID_XML_CONTEXT_ITEM                               = "2200V";
 	String LANG_XQUERY_SERIALIZATION_ERROR                             = "2200W";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1149
     String CANNOT_CLOSE_ACTIVE_CONNECTION                              = "25001";
     String INVALID_TRANSACTION_STATE_ACTIVE_CONNECTION                 = "25001.S.1";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
 	String LANG_UNEXPECTED_USER_EXCEPTION                              = "38000";
 	String EXTERNAL_ROUTINE_NO_SQL									   = "38001";
@@ -777,6 +829,8 @@ public interface SQLState {
 	String LANG_SYNTAX_OR_ACCESS_VIOLATION                             = "42000";
 
 	// Fix for Derby-1828 - access rule violations should use SQL state 42
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
 	String AUTH_NO_TABLE_PERMISSION                                    = "42500";
 	String AUTH_NO_TABLE_PERMISSION_FOR_GRANT                          = "42501";
 	String AUTH_NO_COLUMN_PERMISSION                                   = "42502";
@@ -792,8 +846,11 @@ public interface SQLState {
 	String AUTH_USER_IN_READ_AND_WRITE_LISTS                           = "4250C";
 	String AUTH_DUPLICATE_USERS                                        = "4250D";
 	String AUTH_INTERNAL_BAD_UUID                                      = "4250E";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
     String AUTH_ROLE_DBO_ONLY                                          = "4251A";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3333
 	String AUTH_PUBLIC_ILLEGAL_AUTHORIZATION_ID                        = "4251B";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
 	String AUTH_ROLE_GRANT_CIRCULARITY                                 = "4251C";
 	String DBO_ONLY                                                         = "4251D";
 	String HIDDEN_COLUMN                                                         = "4251E";
@@ -817,6 +874,7 @@ public interface SQLState {
 	String LANG_DB2_INVALID_COLS_SPECIFIED                             = "42802";
         String LANG_DB2_INVALID_SELECT_COL_FOR_HAVING = "42803";
 	String LANG_DB2_ADD_UNIQUE_OR_PRIMARY_KEY_ON_NULL_COLS			   = "42831";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3523
 	String LANG_ADD_PRIMARY_KEY_ON_NULL_COLS                           = "42831.S.1";
 	String LANG_DB2_REPLACEMENT_ERROR								   = "42815.S.713";
 	String LANG_DB2_COALESCE_DATATYPE_MISMATCH								   = "42815.S.171";
@@ -832,8 +890,10 @@ public interface SQLState {
 
 	String LANG_NO_AGGREGATES_IN_WHERE_CLAUSE                          = "42903";
 	String LANG_DB2_VIEW_REQUIRES_COLUMN_NAMES                         = "42908";
+//IC see: https://issues.apache.org/jira/browse/DERBY-64
 	String LANG_TABLE_REQUIRES_COLUMN_NAMES                            = "42909";
 	String LANG_DELETE_RULE_VIOLATION		   					       = "42915";
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 	String LANG_SYNONYM_CIRCULAR   		   					           = "42916";
 	String LANG_SYNTAX_ERROR                                           = "42X01";
 	String LANG_LEXICAL_ERROR                                          = "42X02";
@@ -855,8 +915,10 @@ public interface SQLState {
 	String LANG_DUPLICATE_COLUMN_NAME_UPDATE                           = "42X16";
 	String LANG_INVALID_JOIN_ORDER_SPEC                                = "42X17";
 	String LANG_NOT_COMPARABLE                                         = "42818";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5885
 	String LANG_NON_BOOLEAN_WHERE_CLAUSE                               = "42X19.S.1";
 	String LANG_UNTYPED_PARAMETER_IN_WHERE_CLAUSE        = "42X19.S.2";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4079
 	String LANG_INTEGER_LITERAL_EXPECTED                               = "42X20";
 	String LANG_CURSOR_NOT_UPDATABLE                                   = "42X23";
 	String LANG_INVALID_COL_HAVING_CLAUSE                              = "42X24";
@@ -880,7 +942,9 @@ public interface SQLState {
 	String LANG_NOT_STORABLE                                           = "42821";
 	String LANG_NULL_RESULT_SET_META_DATA                              = "42X43";
 	String LANG_INVALID_COLUMN_LENGTH                                  = "42X44";
+//IC see: https://issues.apache.org/jira/browse/DERBY-81
 	String LANG_INVALID_FUNCTION_ARG_TYPE                              = "42X45";
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 	String LANG_AMBIGUOUS_FUNCTION_NAME                                = "42X46";
 	String LANG_AMBIGUOUS_PROCEDURE_NAME                               = "42X47";
 	String LANG_INVALID_PRECISION                                      = "42X48";
@@ -905,6 +969,7 @@ public interface SQLState {
 	//42X67
 	String LANG_NO_FIELD_FOUND                                         = "42X68";
 	String LANG_PRIMITIVE_REFERENCING_EXPRESSION                       = "42X69";
+//IC see: https://issues.apache.org/jira/browse/DERBY-64
 	String LANG_TABLE_DEFINITION_R_C_L_MISMATCH                        = "42X70";
 	String LANG_INVALID_COLUMN_TYPE_CREATE_TABLE                       = "42X71";
 	String LANG_NO_STATIC_FIELD_FOUND                                  = "42X72";
@@ -916,15 +981,19 @@ public interface SQLState {
 	String LANG_ORDER_BY_COLUMN_NOT_FOUND                              = "42X78";
 	String LANG_DUPLICATE_COLUMN_FOR_ORDER_BY                          = "42X79";
 	String LANG_QUALIFIED_COLUMN_NAME_NOT_ALLOWED                      = "42877";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2459
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     String LANG_UNION_ORDER_BY                                         = "42878";
 	String LANG_DISTINCT_ORDER_BY                                      = "42879";
 	String LANG_DISTINCT_ORDER_BY_EXPRESSION                           = "4287A";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6009
     String LANG_TABLE_VALUE_CTOR_RESTRICTION                           = "4287B";
 	String LANG_EMPTY_VALUES_CLAUSE                                    = "42X80";
 	String LANG_EMPTY_COLUMN_LIST                                      = "42X81";
 	String LANG_USING_CARDINALITY_VIOLATION                            = "42X82";
 	String LANG_CANT_DROP_BACKING_INDEX                                = "42X84";
 	String LANG_CONSTRAINT_SCHEMA_MISMATCH                             = "42X85";
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     String LANG_DROP_OR_ALTER_NON_EXISTING_CONSTRAINT                  = "42X86";
     String LANG_ALL_RESULT_EXPRESSIONS_UNTYPED                         = "42X87";
 	String LANG_CONDITIONAL_NON_BOOLEAN                                = "42X88";
@@ -935,8 +1004,10 @@ public interface SQLState {
 	String LANG_INVALID_CREATE_CONSTRAINT_COLUMN_LIST                  = "42X93";
 	String LANG_OBJECT_NOT_FOUND                                       = "42X94";
 	String LANG_DB_CLASS_PATH_HAS_MISSING_JAR                          = "42X96";
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     String LANG_INCONSISTENT_CONSTRAINT_CHARACTERISTICS                = "42X97";
 	String LANG_NO_PARAMS_IN_VIEWS                                     = "42X98";
+//IC see: https://issues.apache.org/jira/browse/DERBY-64
 	String LANG_NO_PARAMS_IN_TABLES                                    = "42X99";
     String LANG_UNASSIGNABLE_GENERATION_CLAUSE                         = "42XA0";
     String LANG_AGGREGATE_IN_GENERATION_CLAUSE                         = "42XA1";
@@ -956,25 +1027,33 @@ public interface SQLState {
     String LANG_SEQ_INVALID_START                                      = "42XAG";    
     String LANG_NEXT_VALUE_FOR_ILLEGAL                                      = "42XAH";    
     String LANG_SEQUENCE_REFERENCED_TWICE                                      = "42XAI";    
+//IC see: https://issues.apache.org/jira/browse/DERBY-4539
     String LANG_DUPLICATE_CS_CLAUSE                                      = "42XAJ";    
     String LANG_TARGET_NOT_BASE_TABLE                                  = "42XAK";    
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
     String LANG_SOURCE_NOT_BASE_OR_VTI                        = "42XAL";    
     String LANG_SAME_EXPOSED_NAME                                       = "42XAM";    
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     String LANG_NOT_NULL_CHARACTERISTICS                               = "42XAN";
     String LANG_NO_SUBQUERIES_IN_MATCHED_CLAUSE         = "42XAO";
     String LANG_NO_SYNONYMS_IN_MERGE                            = "42XAP";
     String LANG_NO_DCL_IN_MERGE                                         = "42XAQ";
     String LANG_SYSTEM_SEQUENCE                                         = "42XAR";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
     String LANG_BAD_DISTINCT_AGG                                         = "42XAS";
     String LANG_INVALID_ROWID_SCOPE                                      = "42XAT";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
     String LANG_INVALID_INPUT_COLUMN_NAME                                = "42XAU";
     String LANG_INVALID_NUMBEROF_HEADER_LINES                            = "42XAV";
     String LANG_INVALID_USER_AGGREGATE_DEFINITION2                     = "42Y00";
 	String LANG_INVALID_CHECK_CONSTRAINT                               = "42Y01";
     // String LANG_NO_ALTER_TABLE_COMPRESS_ON_TARGET_TABLE             = "42Y02";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3610
 	String LANG_NO_SUCH_METHOD_ALIAS                                   = "42Y03.S.0";
 	String LANG_NO_SUCH_PROCEDURE                                      = "42Y03.S.1";
 	String LANG_NO_SUCH_FUNCTION                                       = "42Y03.S.2";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
     String LANG_PROC_USED_AS_FUNCTION                                  = "42Y03.S.3";
     String LANG_FUNCTION_USED_AS_PROC                                  = "42Y03.S.4";
 	String LANG_INVALID_FULL_STATIC_METHOD_NAME                        = "42Y04";
@@ -1059,10 +1138,12 @@ public interface SQLState {
 	String LANG_NO_AGGREGATES_IN_ON_CLAUSE                             = "42Z07";
 	String LANG_NO_BULK_INSERT_REPLACE_WITH_TRIGGER                    = "42Z08";
     String LANG_NO_AGGREGATES_IN_MERGE_MATCHING_CLAUSE                 = "42Z09";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6693
 
 	// MORE GENERIC LANGUAGE STUFF
 	String LANG_UDT_BUILTIN_CONFLICT										   = "42Z10";
     String LANG_STREAM_INVALID_ACCESS                                  = "42Z12.U";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
 
 	// String LANG_UPDATABLE_VTI_BAD_GETMETADATA						   = "42Z14";
 
@@ -1072,8 +1153,10 @@ public interface SQLState {
 	String LANG_MODIFY_COLUMN_INVALID_LENGTH						   = "42Z17";
 	String LANG_MODIFY_COLUMN_FKEY_CONSTRAINT						   = "42Z18";
 	String LANG_MODIFY_COLUMN_REFERENCED							   = "42Z19";
+//IC see: https://issues.apache.org/jira/browse/DERBY-119
 	String LANG_MODIFY_COLUMN_EXISTING_CONSTRAINT					   = "42Z20";
 	String LANG_MODIFY_COLUMN_EXISTING_PRIMARY_KEY					   = "42Z20.S.1";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3523
 
 	String LANG_AI_INVALID_INCREMENT								   = "42Z21";
 	String LANG_AI_INVALID_TYPE										   = "42Z22";
@@ -1106,6 +1189,7 @@ public interface SQLState {
 	String LANG_COLUMN_ID_ARRAY										   = "42Z48.U";
 
 	String LANG_GRANT_REVOKE_WITH_LEGACY_ACCESS                        = "42Z60";
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 
 	// 42Z70 - 42Z7Z: For Derby-specific XML compilation errors
 	// (not defined by SQL/XML standard).
@@ -1131,6 +1215,7 @@ public interface SQLState {
 
     // MORE GENERIC LANGUAGE STUFF
     // String LANG_UPDATABLE_VTI_BAD_GETRESULTSETCONCURRENCY          = "42Z89";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2717
     String LANG_UPDATABLE_VTI_NON_UPDATABLE_RS                        = "42Z90";
     String LANG_SUBQUERY                                              = "42Z91";
     String LANG_REPEATABLE_READ                                       = "42Z92";
@@ -1154,9 +1239,12 @@ public interface SQLState {
     String LANG_XML_NOT_ALLOWED_DJRS                                = "42ZB3";
     String LANG_NOT_TABLE_FUNCTION                                  = "42ZB4";
     String LANG_NO_COSTING_CONSTRUCTOR                              = "42ZB5";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4092
     String LANG_TABLE_FUNCTION_NOT_ALLOWED                   = "42ZB6";
     String LANG_BAD_TABLE_FUNCTION_PARAM_REF                 = "42ZB7";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 	String LANG_NO_SUCH_WINDOW                                         = "42ZC0";
 	String LANG_WINDOW_LIMIT_EXCEEDED                                  = "42ZC1";
 	String LANG_WINDOW_FUNCTION_CONTEXT_ERROR                          = "42ZC2";
@@ -1172,6 +1260,7 @@ public interface SQLState {
 	String LANG_VARARGS_RETURN_RESULT_SETS                  = "42ZCB";
 
     // bad optimizer overrides
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
     String LANG_BAD_ROW_SOURCE_COUNT                  = "42ZCC";
     String LANG_NOT_LEFT_DEEP                                 = "42ZCD";
     String LANG_UNRESOLVED_ROW_SOURCE                    = "42ZCE";
@@ -1187,8 +1276,10 @@ public interface SQLState {
 
 	//following 1 does not match the DB2 sql state, it is a Derby specific behavior which is not compatible with DB2
 	String LANG_OPERATION_NOT_ALLOWED_ON_SESSION_SCHEMA_TABLES = "XCL51.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-180
 
     // error messages for the Lucene plugin
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
     String LUCENE_NOT_A_STRING_TYPE                                  = "42XBA";
     String LUCENE_NO_PRIMARY_KEY                                  = "42XBB";
     String LUCENE_UNSUPPORTED_TYPE                                  = "42XBC";
@@ -1198,10 +1289,15 @@ public interface SQLState {
     String LUCENE_ALREADY_LOADED                                  = "42XBG";
     String LUCENE_ALREADY_UNLOADED                                  = "42XBH";
     String LUCENE_BAD_INDEX                                               = "42XBI";
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
     String LUCENE_BAD_COLUMN_NAME                                   = "42XBJ";
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
     String LUCENE_BAD_VERSION                                           = "42XBK";
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
     String LUCENE_ENCRYPTED_DB                                           = "42XBL";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6596
     String ARGUMENT_MAY_NOT_BE_NULL                                = "42XBM";
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
     String LUCENE_FIELD_KEY_CONFLICT                                = "42XBN";
     String LUCENE_DUPLICATE_FIELD_NAME                                = "42XBO";
     
@@ -1303,9 +1399,12 @@ public interface SQLState {
 	String RTS_PROJECTION_TIME										   = "43X97.U";
 	String RTS_PR													   = "43X98.U";
 	String RTS_ROW_RS												   = "43X99.U";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4079
 	String RTS_RC                                                      = "43X9A.U";
 	String RTS_RC_RS                                                   = "43X9B.U";
 	String RTS_WINDOW_RS                                               = "43X9C.U";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 
 	String RTS_SCALAR_AGG_RS										   = "43Y00.U";
 	String RTS_INDEX_KEY_OPT										   = "43Y01.U";
@@ -1350,6 +1449,7 @@ public interface SQLState {
 	String RTS_REFACTION_DEPENDENT									   = "43Y53.U";
 	String RTS_BEGIN_DEPENDENT_NUMBER								   = "43Y54.U";	
 	String RTS_END_DEPENDENT_NUMBER									   = "43Y55.U";	
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 	String RTS_USER_SUPPLIED_OPTIMIZER_OVERRIDES_FOR_TABLE			   = "43Y56.U";	
 	String RTS_USER_SUPPLIED_OPTIMIZER_OVERRIDES_FOR_JOIN			   = "43Y57.U";
 
@@ -1388,7 +1488,9 @@ public interface SQLState {
 	String LANG_CANT_INVALIDATE_OPEN_RESULT_SET                        = "X0X95.S";
 	String LANG_CANT_CHANGE_ISOLATION_HOLD_CURSOR                      = "X0X03.S";
 	//following three for auto-generated keys feature in JDBC3.0
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
     String INVALID_COLUMN_ARRAY_LENGTH                                 = "X0X0D.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2631
 	String LANG_INVALID_AUTOGEN_COLUMN_POSITION                        = "X0X0E.S";
 	String LANG_INVALID_AUTOGEN_COLUMN_NAME                            = "X0X0F.S";
 
@@ -1412,6 +1514,7 @@ public interface SQLState {
 	String LANG_INVALID_FK_NO_REF_KEY                                  = "X0Y44.S";
 	String LANG_ADD_FK_CONSTRAINT_VIOLATION                            = "X0Y45.S";
 	String LANG_INVALID_FK_NO_REF_TAB                                  = "X0Y46.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
     String LANG_INVALID_FK_REF_KEY                                     = "X0Y47.S";
 	String LANG_SCHEMA_NOT_EMPTY                                       = "X0Y54.S";
 	String LANG_INDEX_ROW_COUNT_MISMATCH                               = "X0Y55.S";
@@ -1419,6 +1522,7 @@ public interface SQLState {
 	String LANG_ADDING_NON_NULL_COLUMN_TO_NON_EMPTY_TABLE              = "X0Y57.S";
 	String LANG_ADD_PRIMARY_KEY_FAILED1                                = "X0Y58.S";
 	String LANG_ADD_CHECK_CONSTRAINT_FAILED                            = "X0Y59.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3523
 	String LANG_NULL_DATA_IN_PRIMARY_KEY_OR_UNIQUE_CONSTRAINT      	   = "X0Y63.S";
 	String LANG_NULL_DATA_IN_PRIMARY_KEY                               = "X0Y63.S.1";
 	String LANG_NO_COMMIT_IN_NESTED_CONNECTION                         = "X0Y66.S";
@@ -1430,6 +1534,7 @@ public interface SQLState {
 	String LANG_NO_BULK_INSERT_REPLACE_WITH_TRIGGER_DURING_EXECUTION   = "X0Y72.S";
 	String LANG_NO_SET_TRAN_ISO_IN_GLOBAL_CONNECTION                   = "X0Y77.S";
 	String LANG_INVALID_CALL_TO_EXECUTE_QUERY		                   = "X0Y78.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1364
     String MULTIPLE_RESULTS_ON_EXECUTE_QUERY = "X0Y78.S.1";
     String USE_EXECUTE_UPDATE_WITH_NO_RESULTS = "X0Y78.S.2";
 	String LANG_INVALID_CALL_TO_EXECUTE_UPDATE		                   = "X0Y79.S";
@@ -1437,15 +1542,21 @@ public interface SQLState {
     String LANG_IGNORE_MISSING_INDEX_ROW_DURING_DELETE                 = "X0Y83.S";
     String LANG_TOO_MUCH_CONTENTION_ON_SEQUENCE                 = "X0Y84.T";
 	String LANG_UNKNOWN_SEQUENCE_PREALLOCATOR                                = "X0Y85.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
     String LANG_NOT_A_SEQUENCE_PREALLOCATOR                            = "X0Y85.S.1";
 	String LANG_CANT_FLUSH_PREALLOCATOR                                = "X0Y86.S";
 	String LANG_BAD_UDA_OR_FUNCTION_NAME                                = "X0Y87.S";
 	String LANG_UNKNOWN_TOOL_NAME                                = "X0Y88.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
     String LANG_UNKNOWN_CUSTOM_TOOL_NAME                              = "X0Y88.S.1";
 	String LANG_BAD_OPTIONAL_TOOL_ARGS                                = "X0Y89.S";
 	String LANG_CANT_INSTANTIATE_CLASS                                = "X0Y90.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
     String LANG_SET_CONSTRAINT_NOT_DEFERRABLE                         = "X0Y91.S";
     String LANG_CANNOT_CHANGE_COLUMN_NAMES                         = "X0Y92.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
 
 	// TEMPORARY EXECUTION RESTRICTIONS
 
@@ -1461,6 +1572,7 @@ public interface SQLState {
 	String LANG_INVALID_COLUMN_POSITION                                 = "XCL14.S";
 	String LANG_INVALID_COMPARE_TO                                     = "XCL15.S";
 	String LANG_RESULT_SET_NOT_OPEN                                    = "XCL16.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-721
     String LANG_STREAM_RETRIEVED_ALREADY = "XCL18.S";
 	String LANG_MISSING_ROW                                            = "XCL19.S";
 	String LANG_CANT_UPGRADE_CATALOGS                                  = "XCL20.S";
@@ -1498,6 +1610,7 @@ public interface SQLState {
 	String LANG_CANT_UPGRADE_DATABASE                                 = "XCL50.S";
 
     String LANG_STATEMENT_CANCELLED_OR_TIMED_OUT                       = "XCL52.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
 
     /*
 	** Language errors that match DB2
@@ -1510,28 +1623,41 @@ public interface SQLState {
 	*/
 	String  INVALID_ROLE_SYS                                        = "4293A";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3073
+//IC see: https://issues.apache.org/jira/browse/DERBY-2207
 
 	/*
 		SQL standard 0A - feature not supported
 	*/
 	String UNSUPPORTED_PREFIX="0A";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1140
 
     String NOT_IMPLEMENTED                                          = "0A000.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1185
     String JDBC_METHOD_NOT_IMPLEMENTED                              = "0A000.S.1";
+//IC see: https://issues.apache.org/jira/browse/DERBY-924
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
+//IC see: https://issues.apache.org/jira/browse/DERBY-970
     String JDBC_METHOD_NOT_SUPPORTED_BY_SERVER                      = "0A000.S.2";
+//IC see: https://issues.apache.org/jira/browse/DERBY-843
+//IC see: https://issues.apache.org/jira/browse/DERBY-1198
     String UNSUPPORTED_HOLDABILITY_PROPERTY                         = "0A000.S.3";
     String CANCEL_NOT_SUPPORTED_BY_SERVER                           = "0A000.S.4";
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
     String SECMECH_NOT_SUPPORTED                                    = "0A000.S.5";
     String DRDA_COMMAND_NOT_IMPLEMENTED                             = "0A000.C.6";
     String DATA_TYPE_NOT_SUPPORTED = "0A000.S.7";
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1393
 
 	
 
 	/*
 	** Authorization and Authentication
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
 	String AUTHORIZATION_SPEC_PREFIX="28";
 	
 	String AUTH_SET_CONNECTION_READ_ONLY_IN_ACTIVE_XACT                = "25501";
@@ -1539,6 +1665,7 @@ public interface SQLState {
 	String AUTH_DDL_WITH_READ_ONLY_CONNECTION                          = "25503";
 	String AUTH_CANNOT_SET_READ_WRITE                                  = "25505";
 	String AUTH_INVALID_USER_NAME                                      = "28502";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
 
 	/*
 	** Dependency manager
@@ -1555,6 +1682,7 @@ public interface SQLState {
 	String NEED_TO_REGISTER_PARAM = "07004";
     String COLUMN_NOT_FOUND = "S0022";
     //String NO_COMMIT_WHEN_AUTO = "XJ007.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
     String NO_SAVEPOINT_ROLLBACK_OR_RELEASE_WHEN_AUTO = "XJ008.S";
     String REQUIRES_CALLABLE_STATEMENT = "XJ009.S";
     String NO_SAVEPOINT_WHEN_AUTO = "XJ010.S";
@@ -1566,8 +1694,10 @@ public interface SQLState {
     String NO_SAVEPOINT_IN_TRIGGER = "XJ017.S";
     String NULL_COLUMN_NAME = "XJ018.S";
     String TYPE_MISMATCH = "XJ020.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
     String UNSUPPORTED_TYPE = "XJ021.S";
     String SET_STREAM_FAILURE = "XJ022.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-562
     String SET_STREAM_INEXACT_LENGTH_DATA = "XJ023.S";
     String NEGATIVE_STREAM_LENGTH = "XJ025.S";
     String NO_AUTO_COMMIT_ON = "XJ030.S";
@@ -1592,8 +1722,11 @@ public interface SQLState {
     String NO_SETXXX_FOR_EXEC_USING = "XJ069.S";
     String BLOB_BAD_POSITION = "XJ070.S";
     String BLOB_NONPOSITIVE_LENGTH = "XJ071.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
     String BLOB_NULL_PATTERN_OR_SEARCH_STR = "XJ072.S";
     String BLOB_ACCESSED_AFTER_COMMIT = "XJ073.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
+//IC see: https://issues.apache.org/jira/browse/DERBY-842
     String INVALID_QUERYTIMEOUT_VALUE = "XJ074.S";
     String BLOB_POSITION_TOO_LARGE = "XJ076.S";
     String BLOB_UNABLE_TO_READ_PATTERN = "XJ077.S";
@@ -1606,6 +1739,7 @@ public interface SQLState {
     String COLUMN_NOT_FROM_BASE_TABLE = "XJ084.U";
     String STREAM_EOF = "XJ085.S";
     String CURSOR_NOT_POSITIONED_ON_INSERT_ROW = "XJ086.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2444
     String POS_AND_LENGTH_GREATER_THAN_LOB = "XJ087.S";
     
     
@@ -1617,6 +1751,7 @@ public interface SQLState {
     String SAVEPOINT_NOT_CREATED_BY_CONNECTION = "XJ097.S";
     String BAD_AUTO_GEN_KEY_VALUE = "XJ098.S";
     String READER_UNDER_RUN = "XJ099.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-842
     String REGOUTPARAM_SCALE_DOESNT_MATCH_SETTER = "XJ100.S";
     String TABLE_NAME_CANNOT_BE_NULL = "XJ103.S";
     String SHARED_KEY_LENGTH_ERROR = "XJ104.S";
@@ -1628,6 +1763,7 @@ public interface SQLState {
     String FOREIGN_TABLE_NAME_IS_NULL = "XJ111.S";
     String SECURITY_EXCEPTION_ENCOUNTERED = "XJ112.S";    
     String UNABLE_TO_OPEN_FILE = "XJ113.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-842
     String CURSOR_INVALID_CURSOR_NAME = "XJ114.S";
     String UNABLE_TO_OPEN_RESULTSET_WITH_REQUESTED_HOLDABILTY = "XJ115.S";
     String TOO_MANY_COMMANDS_FOR_BATCH = "XJ116.S";
@@ -1642,6 +1778,8 @@ public interface SQLState {
     //wrapper related
     String UNABLE_TO_UNWRAP = "XJ128.S";
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-843
+//IC see: https://issues.apache.org/jira/browse/DERBY-1198
     String EXCEEDED_MAX_SECTIONS = "XJ200.S";
     String CURSOR_INVALID_NAME = "XJ202.S";
     String CURSOR_DUPLICATE_NAME = "XJ203.S";
@@ -1653,26 +1791,32 @@ public interface SQLState {
     String STORED_PROC_LOAD_MODULE_NOT_FOUND = "XJ210.S";
     String BATCH_CHAIN_BREAKING_EXCEPTION = "XJ211.S";
     String INVALID_ATTRIBUTE_SYNTAX = "XJ212.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
     String TRACELEVEL_FORMAT_INVALID = "XJ213.C";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
     String IO_ERROR_UPON_LOB_FREE = "XJ214.S";
     String LOB_OBJECT_INVALID = "XJ215.S";
     String LOB_OBJECT_LENGTH_UNKNOWN_YET = "XJ216.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2257
     String LOB_LOCATOR_INVALID = "XJ217.S";
     
     //XN - Network-level messages
     String NET_CONNECTION_RESET_NOT_ALLOWED_IN_UNIT_OF_WORK         = "XN001.S";
     String NET_SECKTKN_NOT_RETURNED                                 = "XN002.U";
     String NET_QUERY_PROCESSING_TERMINATED                          = "XN008.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-848
     String NET_ERROR_GETTING_BLOB_LENGTH                            = "XN009.S";
     String NET_NULL_PROCEDURE_NAME                                  = "XN010.S";
     String NET_PROCEDURE_NAME_LENGTH_OUT_OF_RANGE                   = "XN011.S";
     String NET_WRONG_XA_VERSION                                     = "XN012.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-847
     String NET_INVALID_SCROLL_ORIENTATION                           = "XN013.S";
     String NET_EXCEPTION_ON_READ                                  = "XN014.S";
     String NET_INPUTSTREAM_LENGTH_TOO_SMALL                         = "XN015.S";
     String NET_EXCEPTION_ON_STREAMLEN_VERIFICATION                = "XN016.S";
     String NET_PREMATURE_EOS                                        = "XN017.S";
     String NET_READER_LENGTH_TOO_SMALL                              = "XN018.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
     String NET_XARETVAL_ERROR                                       = "XN019.S";
     String NET_MARSHALLING_UDT_ERROR                     = "XN020.S";
     String NET_UDT_COERCION_ERROR                               = "XN021.S";
@@ -1682,6 +1826,8 @@ public interface SQLState {
     
     // XML - Derby-specific XML errors not covered by
     // SQL standard.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1772
+//IC see: https://issues.apache.org/jira/browse/DERBY-1758
     String LANG_MISSING_XML_CLASSES                                 = "XML00";
     String LANG_UNEXPECTED_XML_EXCEPTION                            = "XML01";
 
@@ -1699,6 +1845,7 @@ public interface SQLState {
     String MALFORMED_URL = "XJ028.C";
     String BOOT_DATABASE_FAILED = "XJ040.C";
     String CREATE_DATABASE_FAILED = "XJ041.C";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
     String CONFLICTING_BOOT_ATTRIBUTES = "XJ048.C";
     String CONFLICTING_CREATE_ATTRIBUTES = "XJ049.C";
 	String CONFLICTING_RESTORE_ATTRIBUTES = "XJ081.C";
@@ -1708,15 +1855,21 @@ public interface SQLState {
     
     // 08004 SQL State means the server rejected the connection request
     String LOGIN_FAILED = "08004";
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
     String NET_CONNECT_AUTH_FAILED                          = "08004.C.1";
     String NET_DATABASE_NOT_FOUND                           = "08004.C.2";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
     String AUTH_DATABASE_CONNECTION_REFUSED                 = "08004.C.3"; 
     //DERBY-1828: AUTH_DATABASE_CONNECTION_REFUSED used to be "04501.C"; 
     String AUTH_SHUTDOWN_NOT_DB_OWNER                       = "08004.C.4";
     String AUTH_ENCRYPT_NOT_DB_OWNER                        = "08004.C.5";
     String AUTH_HARD_UPGRADE_NOT_DB_OWNER                   = "08004.C.6";
     //DERBY-1828: AUTH_x_NOT_DB_OWNER used to be "2850H/I/J.C";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
     String CANNOT_CONNECT_TO_DB_IN_SLAVE_MODE               = "08004.C.7";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3189
+//IC see: https://issues.apache.org/jira/browse/DERBY-2954
     String AUTH_REPLICATION_NOT_DB_OWNER                    = "08004.C.8";
     //DERBY-2109: new state/msg (considered sql state 28101.C not appropriate)
     String AUTH_SHUTDOWN_MISSING_PERMISSION                 = "08004.C.9";
@@ -1727,19 +1880,23 @@ public interface SQLState {
     String NET_CONNECT_SECMEC_INCOMPATIBLE_SCHEME           = "08004.C.12";
     String AUTH_EMPTY_CREDENTIALS                                  = "08004.C.13";
     String AUTH_DECRYPT_NOT_DB_OWNER                        = "08004.C.14";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
 
     // There can be multiple causes for 08003, which according
     // to SQL2003 spec means "connection does not exist"
     // We use a suffix to distinguish them.  Because of the suffix
     // you *must* add a severity code
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
     String NO_CURRENT_CONNECTION = "08003";
     String NOGETCONN_ON_CLOSED_POOLED_CONNECTION = "08003.C.1";
+//IC see: https://issues.apache.org/jira/browse/DERBY-841
     String LOB_METHOD_ON_CLOSED_CONNECTION = "08003.C.2";
     String PHYSICAL_CONNECTION_ALREADY_CLOSED = "08003.C.3";
 
     
     // 08006 means connection exception - connection failure
     String DRDA_CONNECTION_TERMINATED                           = "08006.C";
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
     String CONNECTION_FAILED_ON_RESET                           = "08006.C.1";
    
     // Use this version of SOCKET_EXCEPTION any time *except* when trying to
@@ -1770,15 +1927,20 @@ public interface SQLState {
     String CONNECT_PASSWORD_LENGTH_OUT_OF_RANGE                 = "08001.C.6";
     String CONNECT_USERID_ISNULL                                = "08001.C.7";
     String CONNECT_PASSWORD_ISNULL                              = "08001.C.8";
+//IC see: https://issues.apache.org/jira/browse/DERBY-847
     String NET_DBNAME_TOO_LONG                                  = "08001.C.9";
     String NET_SECTKN_TOO_LONG                                  = "08001.C.10";
     String NET_USERID_TOO_LONG                                  = "08001.C.11";
     String NET_PASSWORD_TOO_LONG                                = "08001.C.12";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4009
     String NET_EXTNAM_TOO_LONG                                  = "08001.C.13";
     String NET_SRVNAM_TOO_LONG                                  = "08001.C.14";    
     
     // database severity
+//IC see: https://issues.apache.org/jira/browse/DERBY-843
+//IC see: https://issues.apache.org/jira/browse/DERBY-1198
     String SHUTDOWN_DATABASE = "08006.D";  
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
     String DROP_DATABASE = "08006.D.1";
         
     //the following 2 exceptions are internal and never get seen by the user.
@@ -1801,14 +1963,17 @@ public interface SQLState {
     String SCROLL_SENSITIVE_NOT_SUPPORTED = "01J10";
     String UNABLE_TO_OBTAIN_MESSAGE_TEXT_FROM_SERVER  = "01J12";
     String NUMBER_OF_ROWS_TOO_LARGE_FOR_INT = "01J13";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
 	String SQL_AUTHORIZATION_WITH_NO_AUTHENTICATION = "01J14";
 	String PASSWORD_EXPIRES_SOON = "01J15";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5647
 	String DBO_PASSWORD_EXPIRES_SOON = "01J16";
     String AUTH_ENCRYPT_ALREADY_BOOTED = "01J17";
 
     String CURSOR_OPERATION_CONFLICT = "01001";
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 
     //following are no applicable severity
     String JAVA_EXCEPTION = "XJ001.U";
@@ -1817,9 +1982,11 @@ public interface SQLState {
     /*
      ** Messages whose SQL states are prescribed by DRDA
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-846
     String DRDA_NO_AUTOCOMMIT_UNDER_XA                              = "2D521.S.1";
     String DRDA_INVALID_XA_STATE_ON_COMMIT_OR_ROLLBACK              = "2D521.S.2"; 
     String DRDA_CURSOR_NOT_OPEN                                     = "24501.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-847
 
     // 58009 means connection is terminated by a DRDA-protocol error.  This can be caused by any number
     // of reasons, so this SQL State has a lot of instances. Exceptions that are 
@@ -1838,6 +2005,7 @@ public interface SQLState {
     String NET_DSS_CHAINED_WITH_SAME_ID                             = "58009.C.16";
     String NET_PREMATURE_EOS_DISCONNECT                             = "58009.C.17";
     String NET_INVALID_FDOCA_ID                                     = "58009.C.18";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1350
     String NET_SECTKN_NOT_RETURNED                                  = "58009.C.19";
     String NET_NVCM_NVCS_BOTH_NON_NULL                              = "58009.C.20";
     String NET_SQLCDTA_INVALID_FOR_RDBNAM                           = "58009.C.21";
@@ -1882,9 +2050,12 @@ public interface SQLState {
 	String DELIMITERS_ARE_NOT_MUTUALLY_EXCLUSIVE                   ="XIE0J.S";
 	String PERIOD_AS_CHAR_DELIMITER_NOT_ALLOWED                    ="XIE0K.S";
 	String TABLE_NOT_FOUND                                         ="XIE0M.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
 	String IMPORTFILE_HAS_INVALID_HEXSTRING                        ="XIE0N.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
 	String LOB_DATA_FILE_NOT_FOUND                                 ="XIE0P.S";
 	String LOB_DATA_FILE_NULL                                      ="XIE0Q.S";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2193
 	String UNEXPECTED_IMPORT_ERROR                       ="XIE0R.S";
 	String DATA_FILE_EXISTS		                     ="XIE0S.S";
 	String LOB_DATA_FILE_EXISTS                          ="XIE0T.S";
@@ -1894,6 +2065,7 @@ public interface SQLState {
     /*
     ** Security XK...
     */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
     String POLICY_NOT_RELOADED                                     ="XK000.S";
     String NO_SUCH_USER                                                  ="XK001.S";
 
@@ -1901,13 +2073,18 @@ public interface SQLState {
     ** Replication XRExx
     */
     String LOGMODULE_DOES_NOT_SUPPORT_REPLICATION                  = "XRE00";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3016
     String REPLICATION_LOG_CORRUPTED                               = "XRE01";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2921
     String REPLICATION_MASTER_SLAVE_VERSION_MISMATCH               = "XRE02";
     String REPLICATION_UNEXPECTED_EXCEPTION                        = "XRE03";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
     String REPLICATION_CONNECTION_EXCEPTION                        = "XRE04.C.1";
     String REPLICATION_CONNECTION_LOST                             = "XRE04.C.2";
     String REPLICATION_LOG_OUT_OF_SYNCH                            = "XRE05.C";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3064
     String REPLICATION_MASTER_TIMED_OUT                            = "XRE06";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3392
     String REPLICATION_NOT_IN_MASTER_MODE                          = "XRE07";
     String REPLICATION_SLAVE_STARTED_OK                            = "XRE08";
     String CANNOT_START_SLAVE_ALREADY_BOOTED                       = "XRE09.C";
@@ -1917,6 +2094,7 @@ public interface SQLState {
     String REPLICATION_FAILOVER_SUCCESSFUL                         = "XRE20.D";
     String REPLICATION_FAILOVER_UNSUCCESSFUL                       = "XRE21.C";
     String REPLICATION_MASTER_ALREADY_BOOTED                       = "XRE22.C";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3551
     String REPLICATION_UNLOGGED_OPERATIONS_IN_PROGRESS             = "XRE23";
     String REPLICATION_NOT_IN_SLAVE_MODE                           = "XRE40";
     String SLAVE_OPERATION_DENIED_WHILE_CONNECTED                  = "XRE41.C";
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/AssertFailure.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/AssertFailure.java
index d359446357..2f292a283c 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/AssertFailure.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/AssertFailure.java
@@ -68,6 +68,7 @@ public class AssertFailure extends RuntimeException {
      * additional information about what went wrong.
      **/
     public AssertFailure(String message, Throwable nestedError) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2579
         super(message, nestedError);
         threadDump = dumpThreads();
     }
@@ -130,6 +131,7 @@ public void printStackTrace(PrintWriter s) {
      * Tells if generating a thread dump is supported in the running JVM.
      */
     private boolean supportsThreadDump() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5256
         try {
             // This checks that we are on a jvm >= 1.5 where we
             // can actually do threaddumps.
@@ -154,6 +156,7 @@ private boolean supportsThreadDump() {
      */
     private String dumpThreads() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5256
         if (!supportsThreadDump()) {
             return "(Skipping thread dump because it is not " +
                     "supported on JVM 1.4)";
@@ -166,6 +169,7 @@ private String dumpThreads() {
         // Load the class and method we need with reflection.
         final Method m;
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             Class<?> c = Class.forName(
                     "org.apache.derby.shared.common.sanity.ThreadDump");
             m = c.getMethod("getStackDumpString", new Class[] {});
@@ -179,6 +183,7 @@ private String dumpThreads() {
         //Try to get a thread dump and deal with various situations.
         try {
             String dump = (String) AccessController.doPrivileged
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             (new PrivilegedExceptionAction<Object>(){
                 public Object run() throws
                         IllegalArgumentException,
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/SanityManager.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/SanityManager.java
index 6a19b6387b..f897d345e7 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/SanityManager.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/sanity/SanityManager.java
@@ -155,6 +155,7 @@ public static final void THROWASSERT(String msgIfFail) {
 		// XXX (nat) Hmm, should we check ASSERT here?  The caller is
 		// not expecting this function to return, whether assertions
 		// are compiled in or not.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2580
 		THROWASSERT(msgIfFail, null);
 	}
 
@@ -170,6 +171,7 @@ public static final void THROWASSERT(String msgIfFail) {
 	 * @see org.apache.derby.shared.common.sanity.AssertFailure
 	 */
 	public static final void THROWASSERT(String msg, Throwable t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2580
 		AssertFailure af = new AssertFailure("ASSERT FAILED " + msg, t);
 		if (DEBUG) {
 			if (DEBUG_ON("AssertFailureTrace")) {
@@ -191,6 +193,7 @@ public static final void THROWASSERT(String msg, Throwable t) {
 	 * @see org.apache.derby.shared.common.sanity.AssertFailure
 	 */
 	public static final void THROWASSERT(Throwable t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2580
 		THROWASSERT(t.toString(), t);
 	}
 
@@ -249,6 +252,7 @@ public static final boolean DEBUG_ON(String flag) {
 			if (AllDebugOn) return true;
 			else if (AllDebugOff) return false;
 			else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					Boolean flagValue = DebugFlags.get(flag);
 					if (! DEBUGDEBUG.equals(flag)) {
 						if (DEBUG_ON(DEBUGDEBUG)) {
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/security/SystemPermission.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/security/SystemPermission.java
index d9b4931a4d..45e16e65ee 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/security/SystemPermission.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/security/SystemPermission.java
@@ -120,12 +120,14 @@ final public class SystemPermission extends BasicPermission {
         LEGAL_ACTIONS.add(CONTROL);
         LEGAL_ACTIONS.add(MONITOR);
         LEGAL_ACTIONS.add(SHUTDOWN);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         LEGAL_ACTIONS.add( USE_DERBY_INTERNALS );
     }
     
     /** Constant representing {@code SystemPermission("engine, "monitor")}. */
     public static final SystemPermission ENGINE_MONITOR =
             new SystemPermission(ENGINE, MONITOR);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
 
     /**
      * Actions for this permission.
@@ -147,6 +149,7 @@ final public class SystemPermission extends BasicPermission {
      * @see BasicPermission#BasicPermission(String)
      */
     public SystemPermission(String name, String actions) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         super( name );
         validateNameAndActions(name, actions);
     }
@@ -282,6 +285,8 @@ public boolean implies(Permission permission)
     private static int getActionMask(String actions) {
         
         int mask = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
+//IC see: https://issues.apache.org/jira/browse/DERBY-3491
         StringTokenizer st = new StringTokenizer(actions, ",");
         while (st.hasMoreTokens()) {
             int validAction = LEGAL_ACTIONS.indexOf(st.nextElement());
@@ -411,6 +416,7 @@ private void readObject(ObjectInputStream s)
     @Override
     public String toString()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return getClass().getName() +
             "( " +
             doubleQuote( getName() ) +
diff --git a/java/org.apache.derby.commons/org/apache/derby/shared/common/util/ArrayUtil.java b/java/org.apache.derby.commons/org/apache/derby/shared/common/util/ArrayUtil.java
index 455cfe884b..ec43c0c535 100644
--- a/java/org.apache.derby.commons/org/apache/derby/shared/common/util/ArrayUtil.java
+++ b/java/org.apache.derby.commons/org/apache/derby/shared/common/util/ArrayUtil.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
   Utility class for constructing and reading and writing arrays from/to
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
   formatId streams and for performing other operations on arrays.
  
   @version 0.1
@@ -60,6 +61,7 @@ public abstract class ArrayUtil
      */
     public  static <T> T[] copy( T[] original )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return (original == null) ?
                 null :
                 Arrays.copyOf(original, original.length);
@@ -86,6 +88,7 @@ public  static  boolean[]   copy( boolean[] original )
      */
     public  static  byte[]   copy( byte[] original )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
         return (original == null) ? null : (byte[]) original.clone();
     }
 
@@ -110,6 +113,7 @@ public  static  int[]   copy( int[] original )
      */
     public  static  long[]   copy( long[] original )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
         return (original == null) ? null : (long[]) original.clone();
     }
 
@@ -146,6 +150,7 @@ public  static  int[][]   copy2( int[][] original )
      */
     @SafeVarargs
     public static <T> List<T> asReadOnlyList(T... array) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         if (array == null) {
             return Collections.emptyList();
         } else {
@@ -360,6 +365,7 @@ public static String toString(int[] value)
     {
         if (value == null || value.length == 0)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
             return "null";
         }
         else
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/DefaultInfo.java b/java/org.apache.derby.engine/org/apache/derby/catalog/DefaultInfo.java
index ef18932b7b..1f0e7444a8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/DefaultInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/DefaultInfo.java
@@ -22,6 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.derby.catalog;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
  <p>An interface for describing a default for a column or parameter in Derby systems.</p>
  */
 public interface DefaultInfo
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/DependableFinder.java b/java/org.apache.derby.engine/org/apache/derby/catalog/DependableFinder.java
index 0493996350..3c1881bea5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/DependableFinder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/DependableFinder.java
@@ -52,6 +52,7 @@ public interface DependableFinder
 	  */
     public	Dependable	getDependable(DataDictionary dd,
             UUID dependableObjectID) throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
 
 	/**
 	  * The name of the class of Dependables as a "SQL Object" which this
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/GetProcedureColumns.java b/java/org.apache.derby.engine/org/apache/derby/catalog/GetProcedureColumns.java
index 4d757e2b5c..90a41ef6d2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/GetProcedureColumns.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/GetProcedureColumns.java
@@ -39,11 +39,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
     <P>This class is called from a Query constructed in 
     java/org.apache.derby.impl.jdbc/metadata.properties:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
     The VTI will return columns 3-14, an extra column to the specification
     METHOD_ID is returned to distinguish between overloaded methods.
     </P>
     
   <OL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         <LI><B>PROCEDURE_CAT</B> String =&gt; procedure catalog (may be null)
         <LI><B>PROCEDURE_SCHEM</B> String =&gt; procedure schema (may be null)
         <LI><B>PROCEDURE_NAME</B> String =&gt; procedure name
@@ -57,6 +59,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
       <LI> procedureColumnReturn - procedure return value
       <LI> procedureColumnResult - result column in ResultSet
       </UL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
   <LI><B>DATA_TYPE</B> int =&gt; SQL type from java.sql.Types
         <LI><B>TYPE_NAME</B> String =&gt; SQL type name, for a UDT type the
   type name is fully qualified
@@ -83,6 +86,7 @@ private int translate(int val) {
 		if (!isFunction) { return val; }
 		switch (val) {
 		case DatabaseMetaData.procedureColumnUnknown:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             return DatabaseMetaData.functionColumnUnknown;
 		case DatabaseMetaData.procedureColumnIn:
             return DatabaseMetaData.functionColumnIn;
@@ -132,6 +136,7 @@ public GetProcedureColumns(AliasInfo aliasInfo, String aliasType) throws SQLExce
 		// compile time aliasInfo will be null.
 		if (aliasInfo != null) {
 			isProcedure = aliasType.equals("P");
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
 			isFunction = aliasType.equals("F");
 			procedure = (RoutineAliasInfo) aliasInfo;
 			method_count = (short) procedure.getParameterCount();
@@ -150,6 +155,7 @@ public GetProcedureColumns(AliasInfo aliasInfo, String aliasType) throws SQLExce
 		}
 
 		if (isFunction) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             nullable = (short) DatabaseMetaData.functionNullable;
 			sqlType = procedure.getReturnType();
 			columnName = "";  // COLUMN_NAME is VARCHAR NOT NULL
@@ -171,6 +177,7 @@ public boolean next() throws SQLException {
             
 			sqlType      = tableFunctionReturnType.getRowTypes()[ idx ];
 			columnName   = tableFunctionReturnType.getRowColumnNames()[ idx ];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             columnType   = (short) DatabaseMetaData.functionColumnResult;
 		}
 		else if (paramCursor > -1) {
@@ -197,6 +204,7 @@ public String getString(int column) throws SQLException
         {
 		case 1: // COLUMN_NAME:
 			return columnName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
 
 		case 4: //_TYPE_NAME: 
                return sqlType.getTypeName();
@@ -219,6 +227,7 @@ public int getInt(int column) throws SQLException
     {
         switch (column) 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-137
         case 3: // DATA_TYPE:
             if (sqlType != null) {
                 return sqlType.getJDBCTypeId();
@@ -241,6 +250,7 @@ else if (type == Types.DATE || type == Types.TIME
                 // No corresponding SQL type
                 return 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-319
 		case 6: // LENGTH (in bytes):
                 if (sqlType != null)
                     return sqlType.getMaximumWidthInBytes();
@@ -265,6 +275,7 @@ public short getShort(int column) throws SQLException
         {
 		case 2: // COLUMN_TYPE:
 			return columnType;
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
 
 		case 7: // SCALE:
                 if (sqlType != null)
@@ -292,6 +303,7 @@ public short getShort(int column) throws SQLException
 		//FIXME
 		case 9: // NULLABLE:
 			return nullable;
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
 
 		case 11: // METHOD_ID: 
                 return method_count;
@@ -315,6 +327,7 @@ public void close()
 
 		EmbedResultSetMetaData.getResultColumnDescriptor("COLUMN_NAME",				 Types.VARCHAR, false, 128),
 		EmbedResultSetMetaData.getResultColumnDescriptor("COLUMN_TYPE",				 Types.SMALLINT, false),
+//IC see: https://issues.apache.org/jira/browse/DERBY-137
 		EmbedResultSetMetaData.getResultColumnDescriptor("DATA_TYPE",				 Types.INTEGER, false),
 		EmbedResultSetMetaData.getResultColumnDescriptor("TYPE_NAME",				 Types.VARCHAR, false, 22),
 		EmbedResultSetMetaData.getResultColumnDescriptor("PRECISION",				 Types.INTEGER, false),
@@ -329,5 +342,6 @@ public void close()
 	};
 
     private static final ResultSetMetaData metadata =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         new EmbedResultSetMetaData(columnInfo);
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/Java5SystemProcedures.java b/java/org.apache.derby.engine/org/apache/derby/catalog/Java5SystemProcedures.java
index 14310cec5f..e88b7658d3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/Java5SystemProcedures.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/Java5SystemProcedures.java
@@ -100,12 +100,14 @@ public  class   Java5SystemProcedures
         throws SQLException
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			ClassFactoryContext cfc = (ClassFactoryContext) getContext( ClassFactoryContext.CONTEXT_ID );
             ClassFactory    classFactory = cfc.getClassFactory();
 
             String              toolClassName = findToolClassName( toolName, optionalArgs );            
             OptionalTool    tool = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
             Class<?> toolClass;
             try {
                 toolClass = classFactory.loadApplicationClass( toolClassName );
@@ -117,6 +119,7 @@ public  class   Java5SystemProcedures
             }
 
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 tool = (OptionalTool) toolClass.getConstructor().newInstance();
             }
             catch (InstantiationException ie) { throw wrap( ie ); }
@@ -164,6 +167,7 @@ private static  StandardException   badTool( String toolName )
     }
 
     private static StandardException badCustomTool(String className) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
         return StandardException.newException(
                 SQLState.LANG_UNKNOWN_CUSTOM_TOOL_NAME, className);
     }
@@ -199,6 +203,7 @@ private static  String[]    stripCustomClassName( String... optionalArgs )
      */
     private  static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/Statistics.java b/java/org.apache.derby.engine/org/apache/derby/catalog/Statistics.java
index da8cb13230..cafe2586bd 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/Statistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/Statistics.java
@@ -23,9 +23,11 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
  <p>
  This interface is used in the column SYS.SYSSTATISTICS.STATISTICS. It
  encapsulates information collected by the UPDATE STATISTICS command
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
  and is used internally by the Derby optimizer to estimate cost 
  and selectivity of different query plans.
  </p>
@@ -39,6 +41,7 @@ public interface Statistics
      * @return Number of rows.
      */
     long getRowEstimate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4938
 
 	/**
      * @param predicates The predicates to evaluate
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/SystemProcedures.java b/java/org.apache.derby.engine/org/apache/derby/catalog/SystemProcedures.java
index 5b62b5548d..19e126bbe4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/SystemProcedures.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/SystemProcedures.java
@@ -87,6 +87,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	Currently information on those can be found at url: 
 	ftp://ftp.software.ibm.com/ps/products/db2/info/vr8/pdf/letter/db2l2e80.pdf
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-475
+//IC see: https://issues.apache.org/jira/browse/DERBY-592
 	<P>
 	Also used for builtin-routines, such as SYSFUN functions, when direct calls
 	into Java libraries cannot be made.
@@ -100,6 +102,7 @@ public class SystemProcedures  {
 	private final static String ODBC_DRIVER_OPTION = "'ODBC'";
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 	  Method used by Derby Network Server to get localized message (original call
 	  from jcc.
 
@@ -134,6 +137,8 @@ public static void SQLCAMESSAGE(int sqlcode, short errmcLen, String sqlerrmc,
 		// translated and append to make the final result.
 		for (int index=0; ; numMessages++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6802
+//IC see: https://issues.apache.org/jira/browse/DERBY-6823
 			if (sqlerrmc.indexOf(MessageUtils.SQLERRMC_MESSAGE_DELIMITER, index) == -1)
 				break;
 			index = sqlerrmc.indexOf(MessageUtils.SQLERRMC_MESSAGE_DELIMITER, index) + 
@@ -153,6 +158,8 @@ public static void SQLCAMESSAGE(int sqlcode, short errmcLen, String sqlerrmc,
 			String[] errMsg = new String[2];
 			for (int i=0; i<numMessages; i++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6802
+//IC see: https://issues.apache.org/jira/browse/DERBY-6823
 				endIdx = sqlerrmc.indexOf(MessageUtils.SQLERRMC_MESSAGE_DELIMITER, startIdx);
 				if (i == numMessages-1)				// last error message
 					sqlError = sqlerrmc.substring(startIdx);
@@ -166,6 +173,8 @@ public static void SQLCAMESSAGE(int sqlcode, short errmcLen, String sqlerrmc,
 					msg[0] += " SQLSTATE: " + sqlState + ": ";
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6802
+//IC see: https://issues.apache.org/jira/browse/DERBY-6823
 				MessageUtils.getLocalizedMessage(sqlcode, (short)sqlError.length(), sqlError,
 											sqlerrp, errd0, errd1, errd2, errd3, errd4, errd5,
 											warn, sqlState, file, localeStr, errMsg, rc);
@@ -176,6 +185,8 @@ public static void SQLCAMESSAGE(int sqlcode, short errmcLen, String sqlerrmc,
 						msg[0] = errMsg[0];
 					else msg[0] += errMsg[0];	// append the new message
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6802
+//IC see: https://issues.apache.org/jira/browse/DERBY-6823
 				startIdx = endIdx + MessageUtils.SQLERRMC_MESSAGE_DELIMITER.length();
 			}
 		}
@@ -194,6 +205,7 @@ private static Connection getDefaultConn()throws SQLException
 	{
 		InternalDriver id = InternalDriver.activeDriver();
 		if (id != null) { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
 			Connection conn = id.connect( "jdbc:default:connection", null, 0 );
 			if (conn != null)
 				return conn;
@@ -229,6 +241,7 @@ private static DatabaseMetaData getDMD() throws SQLException {
 	public static void SQLPROCEDURES (String catalogName, String schemaName, String procName,
 										String options, ResultSet[] rs) throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		rs[0] = isForODBC(options)
 			? ((EmbedDatabaseMetaData)getDMD()).getProceduresForODBC(
 				catalogName, schemaName, procName)
@@ -249,6 +262,7 @@ public static void SQLPROCEDURES (String catalogName, String schemaName, String
      * @throws SQLException on error
 	 */
 	public static void SQLFUNCTIONS(String catalogName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-924
 									String schemaName, 
 									String funcName,
 									String options, 
@@ -303,6 +317,7 @@ public static void SQLTABLES (String catalogName, String schemaName, String tabl
 			return;
 		}
 		optionValue = getOption("GETSCHEMAS", options);
+//IC see: https://issues.apache.org/jira/browse/DERBY-970
 		if (optionValue != null) {
 			optionValue = optionValue.trim();
 			if (optionValue.equals("1")) {
@@ -421,6 +436,7 @@ public static void SQLPROCEDURECOLS (String catalogName, String schemaName, Stri
 										String paramName, String options, ResultSet[] rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		rs[0] = isForODBC(options)
 			? ((EmbedDatabaseMetaData)getDMD()).getProcedureColumnsForODBC(
 				catalogName, schemaName, procName, paramName)
@@ -447,6 +463,7 @@ public static void SQLPROCEDURECOLS (String catalogName, String schemaName, Stri
      * @throws SQLException on error
 	 */
 	public static void SQLFUNCTIONPARAMS(String catalogName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
 										 String schemaName,
 										 String funcName,
 										 String paramName,
@@ -454,6 +471,7 @@ public static void SQLFUNCTIONPARAMS(String catalogName,
 										 ResultSet[] rs) throws SQLException
         {
 			rs[0] = ((EmbedDatabaseMetaData)getDMD()).
+//IC see: https://issues.apache.org/jira/browse/DERBY-1530
 				getFunctionColumns(catalogName, schemaName, funcName, 
 									  paramName);
         }
@@ -478,6 +496,7 @@ public static void SQLCOLUMNS (String catalogName, String schemaName, String tab
 										String columnName, String options, ResultSet[] rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		rs[0] = isForODBC(options)
 			? ((EmbedDatabaseMetaData)getDMD()).getColumnsForODBC(
 				catalogName, schemaName, tableName, columnName)
@@ -540,6 +559,7 @@ public static void SQLTABLEPRIVILEGES (String catalogName, String schemaName, St
 	public static void SQLPRIMARYKEYS (String catalogName, String schemaName, String tableName, String options, ResultSet[] rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-137
 		rs[0] = getDMD().getPrimaryKeys(catalogName, schemaName, tableName);
 	}
 
@@ -558,6 +578,7 @@ public static void SQLPRIMARYKEYS (String catalogName, String schemaName, String
 	public static void SQLGETTYPEINFO (short dataType, String options, ResultSet[] rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		rs[0] = isForODBC(options)
 			? ((EmbedDatabaseMetaData)getDMD()).getTypeInfoForODBC()
 			: getDMD().getTypeInfo();
@@ -586,6 +607,7 @@ public static void SQLSTATISTICS (String catalogName, String schemaName, String
 		boolean boolUnique = (unique == 0) ? true: false;
 		boolean boolApproximate = (approximate == 1) ? true: false;
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		rs[0] = isForODBC(options)
 			? ((EmbedDatabaseMetaData)getDMD()).getIndexInfoForODBC(
 				catalogName, schemaName, tableName, boolUnique, boolApproximate)
@@ -618,6 +640,7 @@ public static void SQLSPECIALCOLUMNS (short colType, String catalogName, String
 		boolean boolNullable = (nullable == 1) ? true: false;
 		if (colType == SQL_BEST_ROWID)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 			rs[0] = isForODBC(options)
 				? ((EmbedDatabaseMetaData)getDMD()).getBestRowIdentifierForODBC(
 					catalogName, schemaName, tableName, scope, boolNullable)
@@ -689,6 +712,7 @@ public static void SQLUDTS (String catalogName, String schemaPattern, String typ
 	public static void METADATA (ResultSet[] rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
 		rs[0] = ((EmbedDatabaseMetaData) getDMD()).getClientCachedMetaData();
 	}
 
@@ -699,6 +723,7 @@ public static void METADATA (ResultSet[] rs)
 	 */
 	private static boolean isForODBC(String options) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		String optionValue = getOption(DRIVER_TYPE_OPTION, options);
 		return ((optionValue != null) && optionValue.toUpperCase().equals(ODBC_DRIVER_OPTION));
 
@@ -719,6 +744,7 @@ public static void SYSCS_SET_DATABASE_PROPERTY(
     String  value)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         setDatabaseProperty( key, value, Securable.SET_DATABASE_PROPERTY );
     }
 
@@ -758,6 +784,7 @@ public static String SYSCS_GET_DATABASE_PROPERTY(
     String  key)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         return getProperty( key, Securable.GET_DATABASE_PROPERTY );
     }
 
@@ -775,6 +802,7 @@ private static  String  getProperty( String key, Securable authorizationCheck )
         throws SQLException
     {
         LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
 
         try {
             // make sure that application code doesn't bypass security checks
@@ -1037,6 +1065,7 @@ public static void SYSCS_CHECKPOINT_DATABASE()
     public static void SYSCS_BACKUP_DATABASE(String  backupDir)
 		throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         Factory.getDatabaseOfConnection().backup(backupDir, true);
     }
 
@@ -1090,6 +1119,7 @@ public static void SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
     short     deleteOnlineArchivedLogFiles)
 		throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         Factory.getDatabaseOfConnection().backupAndEnableLogArchiveMode(
                 backupDir, 
                 (deleteOnlineArchivedLogFiles != 0),
@@ -1125,6 +1155,7 @@ public static void SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT(
     short     deleteOnlineArchivedLogFiles)
 		throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         Factory.getDatabaseOfConnection().backupAndEnableLogArchiveMode(
                 backupDir,
                 (deleteOnlineArchivedLogFiles != 0),
@@ -1145,6 +1176,7 @@ public static void SYSCS_DISABLE_LOG_ARCHIVE_MODE(
     short     deleteOnlineArchivedLogFiles)
 		throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         Factory.getDatabaseOfConnection().disableLogArchiveMode(
                 (deleteOnlineArchivedLogFiles != 0));
     }
@@ -1310,6 +1342,8 @@ public static void SYSCS_INPLACE_COMPRESS_TABLE(
     	//is really a no-op. In order to avoid having to go throught
     	//the ALTER TABLE code just for a no-op, we simply do the check
     	//here and return if we are dealing with VTI.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3674
+//IC see: https://issues.apache.org/jira/browse/DERBY-1062
 		LanguageConnectionContext lcc       = ConnectionUtil.getCurrentLCC();
 		TransactionController     tc        = lcc.getTransactionExecute();
 
@@ -1469,6 +1503,9 @@ public static void REMOVE_JAR(String jar, int undeploy)
             LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
 
 			String[] st = IdUtil.parseMultiPartSQLIdentifier(jar.trim());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 
             String schemaName;
             String sqlName;
@@ -1568,6 +1605,7 @@ public static void SYSCS_EXPORT_TABLE(
      * @exception SQLException if a database error occurs
      **/
     public static void SYSCS_EXPORT_TABLE_LOBS_TO_EXTFILE(
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
     String  schemaName,
     String  tableName,
     String  fileName,
@@ -1645,6 +1683,7 @@ public static void SYSCS_EXPORT_QUERY(
      * @exception SQLException if a database error occurs
      **/
     public static void SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE(
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
     String  selectStatement,
     String  fileName,
     String  columnDelimiter,
@@ -1698,6 +1737,7 @@ public static void SYSCS_IMPORT_TABLE(
 		Connection conn = getDefaultConn();
 		try{
 			Import.importTable(conn, schemaName , tableName , fileName ,
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                                columnDelimiter , characterDelimiter, codeset, 
                                replace, false);
 		}catch(SQLException se)
@@ -1735,6 +1775,8 @@ public static void SYSCS_IMPORT_TABLE(
      * @throws SQLException on error
      **/
 	public static void SYSCS_IMPORT_TABLE_BULK(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6892
 	String  schemaName,
     	String  tableName,
 	String  fileName,
@@ -1796,6 +1838,7 @@ private static void rollBackAndThrowSQLException(Connection conn,
      * @exception SQLException if a database error occurs
      **/
     public static void SYSCS_IMPORT_TABLE_LOBS_FROM_EXTFILE(
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
     String  schemaName,
     String  tableName,
     String  fileName,
@@ -1863,6 +1906,7 @@ public static void SYSCS_IMPORT_DATA(
 			Import.importData(conn, schemaName , tableName ,
 								  insertColumnList, columnIndexes, fileName,
 								  columnDelimiter, characterDelimiter, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
 								  codeset, replace, false);
 		}catch(SQLException se)
 		{
@@ -1900,6 +1944,8 @@ public static void SYSCS_IMPORT_DATA(
      * @exception SQLException if a database error occurs
      **/
 	public static void SYSCS_IMPORT_DATA_BULK(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6893
     String  schemaName,
     String  tableName,
 	String  insertColumnList,
@@ -1956,6 +2002,7 @@ public static void SYSCS_IMPORT_DATA_BULK(
      * @exception SQLException if a database error occurs
      **/
     public static void SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE(
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
     String  schemaName,
     String  tableName,
     String  insertColumnList,
@@ -2005,6 +2052,7 @@ public static void SYSCS_BULK_INSERT(
 	)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         try {
             // make sure that application code doesn't bypass security checks
             // by calling this public entry point
@@ -2017,9 +2065,11 @@ public static void SYSCS_BULK_INSERT(
         // Use default schema if schemaName is null. This isn't consistent
         // with the other procedures, as they would fail if schema was null.
         String entityName = IdUtil.mkQualifiedName(schemaName, tableName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4866
 
 		String binsertSql = 
 			"insert into " + entityName +
+//IC see: https://issues.apache.org/jira/browse/DERBY-1660
 			" --DERBY-PROPERTIES insertMode=bulkInsert \n" +
 			"select * from new " + IdUtil.normalToDelimited(vtiName) +
 			"(" + 
@@ -2048,6 +2098,7 @@ public static void SYSCS_BULK_INSERT(
     public static void SYSCS_RELOAD_SECURITY_POLICY()
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         try {
             // make sure that application code doesn't bypass security checks
             // by calling this public entry point
@@ -2067,6 +2118,7 @@ public static void SYSCS_RELOAD_SECURITY_POLICY()
         
         try {
             AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     new PrivilegedAction<Object>() {
                         public Object run() {
                             Policy.getPolicy().refresh();
@@ -2129,9 +2181,12 @@ public static double RAND(int seed)
      * @throws SQLException Error setting the permission
      */
     public static void SYSCS_SET_USER_ACCESS(String userName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
             String connectionPermission)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3158
+//IC see: https://issues.apache.org/jira/browse/DERBY-3159
          try {
             
             if (userName == null)
@@ -2167,6 +2222,7 @@ else if (connectionPermission == null)
             
             
             if (addListProperty != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
                 String addList = getProperty( addListProperty, Securable.SET_USER_ACCESS );
                 setDatabaseProperty
                     (
@@ -2194,6 +2250,7 @@ private static void removeFromAccessList(
             String listProperty, String userName)
         throws SQLException, StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         String removeList = getProperty( listProperty, Securable.SET_USER_ACCESS );
         if (removeList != null)
         {
@@ -2216,6 +2273,7 @@ public static String SYSCS_GET_USER_ACCESS(String userName)
     {
         try {
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-3160
             if (userName == null)
             {
                 throw StandardException.newException(SQLState.AUTH_INVALID_USER_NAME,
@@ -2223,6 +2281,7 @@ public static String SYSCS_GET_USER_ACCESS(String userName)
             }
            
             String fullUserList =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
                 getProperty( Property.FULL_ACCESS_USERS_PROPERTY, Securable.GET_USER_ACCESS );
             if (IdUtil.idOnList(userName, fullUserList))
             {
@@ -2242,6 +2301,7 @@ public static String SYSCS_GET_USER_ACCESS(String userName)
             {
                 defaultAccess = StringUtil.SQLToUpperCase(defaultAccess);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
             else
             {
                 defaultAccess = Property.FULL_ACCESS; // is the default.
@@ -2261,6 +2321,7 @@ public static String SYSCS_GET_USER_ACCESS(String userName)
      * @throws SQLException on error
      */
     public static void SYSCS_INVALIDATE_STORED_STATEMENTS()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5578
        throws SQLException
     {
     	LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
@@ -2270,6 +2331,7 @@ public static void SYSCS_INVALIDATE_STORED_STATEMENTS()
             // make sure that application code doesn't bypass security checks
             // by calling this public entry point
             SecurityUtil.authorize( Securable.INVALIDATE_STORED_STATEMENTS );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
 
         	dd.invalidateAllSPSPlans(lcc);
         } catch (StandardException se) {
@@ -2286,8 +2348,10 @@ public static void SYSCS_INVALIDATE_STORED_STATEMENTS()
      * @throws SQLException on error
      */
     public static void SYSCS_EMPTY_STATEMENT_CACHE()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2772
        throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         try {
             // make sure that application code doesn't bypass security checks
             // by calling this public entry point
@@ -2313,6 +2377,7 @@ public static void SYSCS_EMPTY_STATEMENT_CACHE()
      * @throws StandardException on error
      */
     public static void SYSCS_SET_XPLAIN_MODE(int mode)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         throws SQLException, StandardException
     {
         try {
@@ -2336,6 +2401,7 @@ public static void SYSCS_SET_XPLAIN_MODE(int mode)
      * @throws StandardException on error
      */
     public static int SYSCS_GET_XPLAIN_MODE()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         throws SQLException, StandardException
     {
         try {
@@ -2360,6 +2426,7 @@ public static int SYSCS_GET_XPLAIN_MODE()
     public static void SYSCS_SET_XPLAIN_SCHEMA(String schemaName)
                 throws SQLException, StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         try {
             // make sure that application code doesn't bypass security checks
             // by calling this public entry point
@@ -2420,6 +2487,7 @@ private static void createXplainSchema(String schemaName)
         Connection conn = getDefaultConn();
         if (!hasSchema(conn, schemaName))
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5017
             String escapedSchema = IdUtil.normalToDelimited(schemaName);
             Statement s = conn.createStatement();
             s.executeUpdate("CREATE SCHEMA " + escapedSchema);
@@ -2462,6 +2530,7 @@ private static void createXplainTable(
     public static String SYSCS_GET_XPLAIN_SCHEMA()
                 throws SQLException, StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         try {
             // make sure that application code doesn't bypass security checks
             // by calling this public entry point
@@ -2489,6 +2558,7 @@ public static String SYSCS_GET_XPLAIN_SCHEMA()
          )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5762
         userName = normalizeUserName( userName );
             
         LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
@@ -2500,6 +2570,7 @@ public static String SYSCS_GET_XPLAIN_SCHEMA()
             // make sure that application code doesn't bypass security checks
             // by calling this public entry point
             SecurityUtil.authorize( Securable.CREATE_USER );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
 
             DataDictionary dd = lcc.getDataDictionary();
             String  dbo = dd.getAuthorizationDatabaseOwner();
@@ -2619,6 +2690,7 @@ public static String SYSCS_GET_XPLAIN_SCHEMA()
          )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         try {
             // make sure that application code doesn't bypass security checks
             // by calling this public entry point
@@ -2626,6 +2698,7 @@ public static String SYSCS_GET_XPLAIN_SCHEMA()
         }
         catch (StandardException se) { throw PublicAPI.wrapStandardException( se ); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5762
         resetAuthorizationIDPassword( normalizeUserName( userName ), password );
     }
 
@@ -2684,6 +2757,7 @@ public static String SYSCS_GET_XPLAIN_SCHEMA()
     {
         String currentUser = ConnectionUtil.getCurrentLCC().getStatementContext().getSQLSessionContext().getCurrentUser();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5762
         resetAuthorizationIDPassword( currentUser, password );
     }
   
@@ -2700,11 +2774,13 @@ public static String SYSCS_GET_XPLAIN_SCHEMA()
          )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5762
         userName = normalizeUserName( userName );
             
         try {
             // make sure that application code doesn't bypass security checks
             // by calling this public entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
             SecurityUtil.authorize( Securable.DROP_USER );
             
             LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
@@ -2760,6 +2836,7 @@ private static  void    checkLegalUser( DataDictionary dd, String userName )
      * @throws SQLException on error
      */
     private static  String  normalizeUserName( String userName )
+//IC see: https://issues.apache.org/jira/browse/DERBY-5762
         throws SQLException
     {
         try {
@@ -2773,6 +2850,7 @@ private static  String  normalizeUserName( String userName )
      * @throws SQLException on error
      */
     public static String SYSCS_GET_DATABASE_NAME()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6725
         throws SQLException
     {
         //DERBY-6725(Add a system function which returns the name of the database.)
@@ -2821,6 +2899,7 @@ public static Long SYSCS_PEEK_AT_IDENTITY( String schemaName, String tableName )
      */
     private static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6725
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/TriggerNewTransitionRows.java b/java/org.apache.derby.engine/org/apache/derby/catalog/TriggerNewTransitionRows.java
index 8b1f2d5d5f..7a60db8062 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/TriggerNewTransitionRows.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/TriggerNewTransitionRows.java
@@ -91,6 +91,7 @@ public ResultSet executeQuery() throws SQLException {
    }
     
    public int getResultSetConcurrency() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
         return ResultSet.CONCUR_READ_ONLY;
    }
    
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/TriggerOldTransitionRows.java b/java/org.apache.derby.engine/org/apache/derby/catalog/TriggerOldTransitionRows.java
index 1fc4529768..1faf1bbe7c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/TriggerOldTransitionRows.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/TriggerOldTransitionRows.java
@@ -91,6 +91,7 @@ public ResultSet executeQuery() throws SQLException {
        }
         
        public int getResultSetConcurrency() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
             return ResultSet.CONCUR_READ_ONLY;
        }
        public void close() throws SQLException {
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/TypeDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/catalog/TypeDescriptor.java
index 572becbaa9..5709fd797c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/TypeDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/TypeDescriptor.java
@@ -74,6 +74,7 @@ The return value from getMaximumWidth() for types where the maximum
      */
     TypeDescriptor DOUBLE = DataTypeDescriptor.DOUBLE.getCatalogType();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
 
 	///////////////////////////////////////////////////////////////////////
 	//
@@ -103,6 +104,7 @@ is the number of bytes (i.e. 4).
 
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-319
 	  Returns the maximum width of the type IN BYTES.  This is the
 	  maximum number of bytes that could be returned for this type
 	  if the corresponding getXXX() method is used.  For example,
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/UUID.java b/java/org.apache.derby.engine/org/apache/derby/catalog/UUID.java
index 884f191f5b..94773846ba 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/UUID.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/UUID.java
@@ -23,6 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
  An interface for accessing Derby UUIDs, unique identifiers.
 		
 	<p>The values in the
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java
index 4c768109f8..a32f48fa81 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java
@@ -248,6 +248,8 @@ public int getTypeFormatId()
             // will lose the format id. This can happen if you pass one of these
             // objects across the network. Here we recover the format id.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             if ( TypeId.BOOLEAN_NAME.equals( unqualifiedName ) ) {
                 return StoredFormatIds.BOOLEAN_TYPE_ID_IMPL; }
             else if ( TypeId.BIGINT_NAME.equals( unqualifiedName ) ) {
@@ -363,6 +365,7 @@ private void setTypeIdSpecificInstanceVariables()
           case StoredFormatIds.BOOLEAN_TYPE_ID_IMPL:
               schemaName = null;
               unqualifiedName = TypeId.BOOLEAN_NAME;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4868
               JDBCTypeId = Types.BOOLEAN;
               break;
 
@@ -384,6 +387,8 @@ private void setTypeIdSpecificInstanceVariables()
               JDBCTypeId = Types.TINYINT;
               break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
           case StoredFormatIds.BIGINT_TYPE_ID_IMPL:
               schemaName = null;
               unqualifiedName = TypeId.BIGINT_NAME;
@@ -435,6 +440,7 @@ private void setTypeIdSpecificInstanceVariables()
           case StoredFormatIds.CLOB_TYPE_ID_IMPL:
               schemaName = null;
               unqualifiedName = TypeId.CLOB_NAME;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
               JDBCTypeId = Types.CLOB;
               break;
 
@@ -459,6 +465,7 @@ private void setTypeIdSpecificInstanceVariables()
           case StoredFormatIds.BLOB_TYPE_ID_IMPL:
               schemaName = null;
               unqualifiedName = TypeId.BLOB_NAME;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
               JDBCTypeId = Types.BLOB;
               break;
 
@@ -483,6 +490,7 @@ private void setTypeIdSpecificInstanceVariables()
           case StoredFormatIds.XML_TYPE_ID_IMPL:
               schemaName = null;
               unqualifiedName = TypeId.XML_NAME;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
               JDBCTypeId = Types.SQLXML;
               break;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/DefaultInfoImpl.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
index 9352b9d330..d4a183e393 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
@@ -59,6 +59,7 @@ public class DefaultInfoImpl implements DefaultInfo, Formatable
     private String[]                   referencedColumnNames;
     private String                  originalCurrentSchema;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 	final private static int BITS_MASK_IS_DEFAULTVALUE_AUTOINC = 0x1 << 0;
 	final private static int BITS_MASK_IS_GENERATED_COLUMN = 0x2;
 
@@ -77,6 +78,7 @@ public DefaultInfoImpl(boolean isDefaultValueAutoinc,
 		String defaultText,
 		DataValueDescriptor defaultValue)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 		this.type = calcType(isDefaultValueAutoinc);
 		this.defaultText = defaultText;
 		this.defaultValue = defaultValue;
@@ -117,6 +119,7 @@ public String getDefaultText()
 	 */
 	public String[] getReferencedColumnNames()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
         return ArrayUtil.copy( referencedColumnNames );
 	}
 
@@ -156,6 +159,7 @@ public void readExternal( ObjectInput in )
 		defaultText = (String) in.readObject();
 		defaultValue = (DataValueDescriptor) in.readObject();
 		type = in.readInt();
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 
         if ( isGeneratedColumn() )
         {
@@ -178,6 +182,7 @@ public void writeExternal( ObjectOutput out )
 	{
 		out.writeObject( defaultText );
 		out.writeObject( defaultValue );
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 		out.writeInt(type);
         
         if ( isGeneratedColumn() )
@@ -222,6 +227,7 @@ public void setDefaultValue(DataValueDescriptor defaultValue)
 	 * @see DefaultInfo#isDefaultValueAutoinc
 	 */
 	public boolean isDefaultValueAutoinc(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 		return (type & BITS_MASK_IS_DEFAULTVALUE_AUTOINC ) != 0;
 	}
 	
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java
index 8c4c881df2..186a295bd5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java
@@ -127,6 +127,9 @@ public IndexDescriptorImpl(String indexType,
 		this.indexType = indexType;
 		this.isUnique = isUnique;
 		this.isUniqueWithDuplicateNulls = isUniqueWithDuplicateNulls;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         this.isUniqueDeferrable = isUniqueDeferrable;
         this.hasDeferrableChecking = hasDeferrableChecking;
 		this.baseColumnPositions = ArrayUtil.copy( baseColumnPositions );
@@ -146,6 +149,7 @@ public IndexDescriptorImpl()
      */
 	public boolean isUniqueWithDuplicateNulls()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 		return isUniqueWithDuplicateNulls;
 	}
 
@@ -155,6 +159,9 @@ public boolean isUniqueWithDuplicateNulls()
      */
     public boolean hasDeferrableChecking()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         return hasDeferrableChecking;
     }
 
@@ -181,6 +188,7 @@ public boolean isUnique()
 	/** @see IndexDescriptor#baseColumnPositions */
 	public int[] baseColumnPositions()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
         return ArrayUtil.copy( baseColumnPositions );
 	}
 
@@ -236,12 +244,14 @@ public boolean			isDescending(Integer keyColumnPosition)
 	/** @see IndexDescriptor#isAscending */
 	public boolean[]		isAscending()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
         return ArrayUtil.copy( isAscending );
 	}
 
 	/** @see IndexDescriptor#setBaseColumnPositions */
 	public void		setBaseColumnPositions(int[] baseColumnPositions)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
 		this.baseColumnPositions = ArrayUtil.copy( baseColumnPositions );
 	}
 
@@ -260,7 +270,11 @@ public void		setNumberOfOrderedColumns(int numberOfOrderedColumns)
 	public String toString()
 	{
         StringBuilder   sb = new StringBuilder(60);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         if (isUnique || isUniqueDeferrable)
 			sb.append("UNIQUE ");
 		else if (isUniqueWithDuplicateNulls)
@@ -312,6 +326,7 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept
 		indexType = (String)fh.get("indexType");
 		//isUniqueWithDuplicateNulls attribute won't be present if the index
 		//was created in older versions  
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 		if (fh.containsKey("isUniqueWithDuplicateNulls"))
 			isUniqueWithDuplicateNulls = fh.getBoolean(
                                     "isUniqueWithDuplicateNulls");
@@ -320,6 +335,9 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept
 
         // hasDeferrableChecking won't be present if the index
         // was created in old versions (< 10_11).
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         if (fh.containsKey("hasDeferrableChecking")) {
             hasDeferrableChecking = fh.getBoolean("hasDeferrableChecking");
         } else {
@@ -353,8 +371,12 @@ public void writeExternal(ObjectOutput out) throws IOException
 		fh.putInt("orderedColumns", numberOfOrderedColumns);
 		fh.put("indexType", indexType);
 		//write the new attribut older versions will simply ignore it
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 		fh.putBoolean("isUniqueWithDuplicateNulls", 
                                         isUniqueWithDuplicateNulls);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         fh.putBoolean("hasDeferrableChecking", hasDeferrableChecking);
         fh.putBoolean("isUniqueDeferrable", isUniqueDeferrable);
         out.writeObject(fh);
@@ -388,6 +410,7 @@ public boolean equals(Object other)
 			** Check all the fields for equality except for the array
 			** elements (this is hardest, so save for last)
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 			if ((id.isUnique == this.isUnique)       &&
                 (id.isUniqueWithDuplicateNulls == 
                     this.isUniqueWithDuplicateNulls) &&
@@ -407,6 +430,7 @@ public boolean equals(Object other)
 				{
 					/* If any array element is not equal, return false */
 					if ((id.baseColumnPositions[i] !=
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 						 this.baseColumnPositions[i]) || 
                         (id.isAscending[i] != this.isAscending[i]))
 					{
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java
index 04fb0478ab..e67278b9c8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java
@@ -95,6 +95,8 @@ public ReferencedColumnsDescriptorImpl(	int[] referencedColumns)
 	public ReferencedColumnsDescriptorImpl(	int[] referencedColumns,
 			int[] referencedColumnsInTriggerAction)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
 		this.referencedColumns = ArrayUtil.copy( referencedColumns );
 		this.referencedColumnsInTriggerAction = ArrayUtil.copy( referencedColumnsInTriggerAction );
 	}
@@ -108,6 +110,7 @@ public ReferencedColumnsDescriptorImpl()
 	*/
 	public int[] getReferencedColumnPositions()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
 		return ArrayUtil.copy( referencedColumns );
 	}
 	
@@ -116,6 +119,7 @@ public int[] getReferencedColumnPositions()
 	*/
 	public int[] getTriggerActionReferencedColumnPositions()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
 		return ArrayUtil.copy( referencedColumnsInTriggerAction );
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/RoutineAliasInfo.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
index c7f59decc8..7a7dd900db 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
@@ -99,6 +99,7 @@ public class RoutineAliasInfo extends MethodAliasInfo
         bits 0-3    sqlAllowed = MODIFIES_SQL_DATA, READS_SQL_DATA,CONTAINS_SQL, or NO_SQL
 
         bit 4         on if function is DETERMINISTIC, off otherwise
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         bit 5         on if running with definer's right, off otherwise
     */
 	private short	sqlOptions;
@@ -137,6 +138,7 @@ public RoutineAliasInfo() {
          boolean hasVarargs
          )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         this(methodName,
              parameterCount,
              parameterNames,
@@ -172,6 +174,7 @@ public RoutineAliasInfo(String methodName,
 
 		super(methodName);
 		this.parameterCount = parameterCount;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
 		this.parameterNames = ArrayUtil.copy( parameterNames );
 		setParameterTypes( parameterTypes );
 		this.parameterModes = ArrayUtil.copy( parameterModes );
@@ -181,6 +184,7 @@ public RoutineAliasInfo(String methodName,
         if ( isDeterministic ) { this.sqlOptions = (short) (sqlOptions | DETERMINISTIC_MASK); }
         if ( hasVarargs ) { this.sqlOptions = (short) (sqlOptions | VARARGS_MASK); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         if (definersRights) {
             this.sqlOptions = (short) (sqlOptions | SECURITY_DEFINER_MASK);
         }
@@ -234,6 +238,7 @@ public int getParameterCount() {
      */
 	public TypeDescriptor[] getParameterTypes()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
         return TypeDescriptorImpl.copyTypeDescriptors( parameterTypes );
 	}
 
@@ -276,6 +281,7 @@ public boolean hasVarargs()
 
     public boolean hasDefinersRights()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         return ( (sqlOptions & SECURITY_DEFINER_MASK) != 0 );
     }
 
@@ -403,14 +409,17 @@ public String toString() {
 			if (i != 0)
 				sb.append(',');
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-475
 			if (returnType == null) {
 			// This is a PROCEDURE.  We only want to print the
 			// parameter mode (ex. "IN", "OUT", "INOUT") for procedures--
 			// we don't do it for functions since use of the "IN" keyword
 			// is not part of the FUNCTION syntax.
+//IC see: https://issues.apache.org/jira/browse/DERBY-337
 				sb.append(RoutineAliasInfo.parameterMode(parameterModes[i]));
 				sb.append(' ');
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1963
 			sb.append(IdUtil.normalToDelimited(parameterNames[i]));
 			sb.append(' ');
 			sb.append(parameterTypes[i].getSQLstring());
@@ -418,6 +427,7 @@ public String toString() {
         if ( hasVarargs() ) { sb.append( " ... " ); }
 		sb.append(')');
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-475
 		if (returnType != null) {
 		// this a FUNCTION, so syntax requires us to append the return type.
 			sb.append(" RETURNS " + returnType.getSQLstring());
@@ -432,9 +442,11 @@ public String toString() {
 		    case PS_DERBY:    sb.append( "DERBY " ); break;
 		}
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3570
         if ( isDeterministic() )
         { sb.append( " DETERMINISTIC " ); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         if ( hasDefinersRights())
         { sb.append( " EXTERNAL SECURITY DEFINER " ); }
 
@@ -447,6 +459,7 @@ public String toString() {
 			sb.append(dynamicResultSets);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-475
 		if (returnType != null) {
 		// this a FUNCTION, so append the syntax telling what to
 		// do with a null parameter.
@@ -459,6 +472,7 @@ public String toString() {
 
 	public static String parameterMode(int parameterMode) {
 		switch (parameterMode) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
         case (ParameterMetaData.parameterModeIn):
 			return "IN";
         case (ParameterMetaData.parameterModeOut):
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/RowMultiSetImpl.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/RowMultiSetImpl.java
index 3a7732f54b..c3ff988474 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/RowMultiSetImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/RowMultiSetImpl.java
@@ -87,6 +87,7 @@ public RowMultiSetImpl()
      */
     public RowMultiSetImpl( String[] columnNames, TypeDescriptor[] types )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
         _columnNames = ArrayUtil.copy( columnNames );
         setTypes( types );
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/StatisticsImpl.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/StatisticsImpl.java
index e215b31241..d05aac9dda 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/StatisticsImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/StatisticsImpl.java
@@ -64,6 +64,7 @@ public StatisticsImpl()
 
     /** {@inheritDoc} */
     public long getRowEstimate() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4938
         return numRows;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
index ef63fa4d5f..b94740b7b2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
@@ -137,6 +137,7 @@ public TypeDescriptorImpl(
 		this.isNullable = isNullable;
 		this.maximumWidth = maximumWidth;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
         this.scale = JDBC40Translation.UNKNOWN_SCALE;
         this.precision = JDBC40Translation.UNKNOWN_PRECISION;
 	}
@@ -168,6 +169,7 @@ public TypeDescriptorImpl(
 	}
 
 	public TypeDescriptorImpl(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2334
 			TypeDescriptorImpl source, 
 			int precision,
 			int scale,
@@ -207,6 +209,7 @@ public TypeDescriptorImpl(
     /** copy an array of type descriptors */
     public  static TypeDescriptor[]    copyTypeDescriptors( TypeDescriptor[] original )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
         return (original == null) ? null : (TypeDescriptor[]) original.clone();
     }
     
@@ -238,6 +241,7 @@ public int	getMaximumWidth()
 	public int	getMaximumWidthInBytes()
 	{
 		switch (typeId.getJDBCTypeId()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-319
 
 			case Types.BIT:
 			case Types.TINYINT:
@@ -305,6 +309,7 @@ public int	getMaximumWidthInBytes()
 
 			// ODBC does not define a BOOLEAN data type.
             // However, 1 seems to me like a reasonable byte length for a BOOLEAN.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
             case Types.BOOLEAN: return 1;
                 
 			case Types.ARRAY:
@@ -479,6 +484,7 @@ public boolean equals(Object object)
 		   return false;
 	    else
 	    {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2524
 			switch (typeId.getJDBCTypeId()) {
 			case Types.CHAR:
 			case Types.VARCHAR:
@@ -567,6 +573,8 @@ public void writeExternal( ObjectOutput out )
 		//with. For character data types, it really represents the collation 
 		//type of the character data type. For all the other data types, it 
 		//represents the scale of that data type.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2524
+//IC see: https://issues.apache.org/jira/browse/DERBY-1478
 		switch (typeId.getJDBCTypeId()) {
 		case Types.CHAR:
 		case Types.VARCHAR:
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java
index 4e5af1dfcb..c21dd74715 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java
@@ -33,6 +33,8 @@ public Object getNewInstance() {
                   case StoredFormatIds.INT_TYPE_ID_IMPL:
                   case StoredFormatIds.SMALLINT_TYPE_ID_IMPL:
                   case StoredFormatIds.TINYINT_TYPE_ID_IMPL:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                   case StoredFormatIds.BIGINT_TYPE_ID_IMPL:
                   case StoredFormatIds.DOUBLE_TYPE_ID_IMPL:
                   case StoredFormatIds.REAL_TYPE_ID_IMPL:
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/UDTAliasInfo.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/UDTAliasInfo.java
index 61d1b06032..143eb11588 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/UDTAliasInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/UDTAliasInfo.java
@@ -115,6 +115,7 @@ public void writeExternal( ObjectOutput out )
      * needed to recreate this alias.
      */
 	public String toString() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4485
 		return "LANGUAGE JAVA";
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java b/java/org.apache.derby.engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
index 90af5d786d..9c43827d50 100644
--- a/java/org.apache.derby.engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
@@ -87,6 +87,8 @@ public UserDefinedTypeIdImpl(String className) throws StandardException
         // If the name begins with a quote, then it is the schema-qualified name
         // of a UDT. Parse the name.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         if ( className.charAt( 0 ) == '"' )
         {
             String[] nameParts = IdUtil.parseMultiPartSQLIdentifier( className );
diff --git a/java/org.apache.derby.engine/org/apache/derby/database/Database.java b/java/org.apache.derby.engine/org/apache/derby/database/Database.java
index f39ed0c2db..ffac67ca12 100644
--- a/java/org.apache.derby.engine/org/apache/derby/database/Database.java
+++ b/java/org.apache.derby.engine/org/apache/derby/database/Database.java
@@ -22,6 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.derby.database;
 
 /*
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
   The org.apache.derby.iapi.db.Database interface is all the externally 
   available methods on a database.  These are methods that might be called from 
   an SQL-J CALL statement. 
@@ -116,6 +117,8 @@ public void backupAndEnableLogArchiveMode(
 	 */
 	public void disableLogArchiveMode(boolean deleteOnlineArchivedLogFiles) 
 		throws SQLException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-523
 
 	/**
 	  * Freeze the database temporarily so a backup can be taken.
diff --git a/java/org.apache.derby.engine/org/apache/derby/diag/ContainedRoles.java b/java/org.apache.derby.engine/org/apache/derby/diag/ContainedRoles.java
index f0ba85d4a1..0e7ecd5d36 100644
--- a/java/org.apache.derby.engine/org/apache/derby/diag/ContainedRoles.java
+++ b/java/org.apache.derby.engine/org/apache/derby/diag/ContainedRoles.java
@@ -59,6 +59,7 @@ public class ContainedRoles extends VTITemplate {
     RoleClosureIterator rci;
     String nextRole;
     boolean initialized;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3930
     String role;
     boolean inverse;
 
@@ -108,6 +109,7 @@ public boolean next() throws SQLException {
             if (!initialized) {
                 initialized = true;
                 LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3930
                 DataDictionary dd = lcc.getDataDictionary();
                 RoleGrantDescriptor rdDef =
                     dd.getRoleDefinitionDescriptor(role);
@@ -120,6 +122,7 @@ public boolean next() throws SQLException {
                             rci = dd.createRoleClosureIterator
                                 (lcc.getLastActivation().
                                      getTransactionController(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3930
                                  role, !inverse);
                         } finally {
                             dd.doneReading(mode, lcc);
@@ -172,5 +175,7 @@ public String getString(int columnIndex) throws SQLException {
 
     private static final ResultSetMetaData metadata =
         new EmbedResultSetMetaData(columnInfo);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3930
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
 
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/diag/DiagUtil.java b/java/org.apache.derby.engine/org/apache/derby/diag/DiagUtil.java
index c2f842278d..60399ae9fc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/diag/DiagUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/diag/DiagUtil.java
@@ -45,6 +45,7 @@ abstract    class   DiagUtil
     static void    checkAccess()   throws StandardException
     {
         LanguageConnectionContext lcc = (LanguageConnectionContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             getContextOrNull(LanguageConnectionContext.CONTEXT_ID);
         DataDictionary  dd = lcc.getDataDictionary();
 
@@ -67,6 +68,7 @@ static void    checkAccess()   throws StandardException
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContextOrNull( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/diag/ErrorLogReader.java b/java/org.apache.derby.engine/org/apache/derby/diag/ErrorLogReader.java
index ca12f81db2..0cae844da3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/diag/ErrorLogReader.java
+++ b/java/org.apache.derby.engine/org/apache/derby/diag/ErrorLogReader.java
@@ -56,6 +56,7 @@ find the timestamp (timestampConstant) of interest in the error log.
 	<PRE>SELECT vti.ts, threadid, cast(xid as int) as xid_int, cast(lccid as int) as lccid_int, logtext 
 		 FROM new org.apache.derby.diag.ErrorLogReader() vti, 
 			(VALUES timestampConstant) t(ts)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		 WHERE vti.ts &lt;= t.ts AND 
 				vti.ts &gt;
 					(SELECT MAX(ts) IS NULL ? '2000-01-01 00:00:00.1' : MAX(ts)
@@ -122,6 +123,7 @@ public ErrorLogReader() throws StandardException
 	{
         DiagUtil.checkAccess();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         final String home = AccessController.doPrivileged
             (
              new PrivilegedAction<String>()
@@ -267,6 +269,7 @@ public String getString(int columnNumber)
 				/* Executing prepared statement is a special case as
 				 * it could span multiple lines
 				 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
 				StringBuffer output = new StringBuffer(64);
 				if (line.indexOf(BEGIN_EXECUTING_STRING) == -1)
 				{
@@ -279,6 +282,7 @@ public String getString(int columnNumber)
 				int endIndex = line.indexOf(END_EXECUTING_STRING, drdaidIndex);
 				if (endIndex == -1)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
 					output.append(line.substring(line.indexOf(END_DRDAID_STRING, drdaidIndex) + 3));
 				}
 				else
@@ -300,6 +304,7 @@ public String getString(int columnNumber)
 					endIndex = line.indexOf(END_EXECUTING_STRING);
 					if (endIndex == -1)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
 						output.append(line);
 					}
 					else
@@ -342,11 +347,13 @@ public boolean wasNull()
 		EmbedResultSetMetaData.getResultColumnDescriptor("LCCID", Types.VARCHAR, false, 15),
 		EmbedResultSetMetaData.getResultColumnDescriptor("DATABASE", Types.VARCHAR, false, 128),
 		EmbedResultSetMetaData.getResultColumnDescriptor("DRDAID", Types.VARCHAR, true, 50),
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		EmbedResultSetMetaData.getResultColumnDescriptor("LOGTEXT",Types.VARCHAR, false, Limits.DB2_VARCHAR_MAXWIDTH)
 	};
 
     private static final ResultSetMetaData metadata =
         new EmbedResultSetMetaData(columnInfo);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
 
 }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/diag/ErrorMessages.java b/java/org.apache.derby.engine/org/apache/derby/diag/ErrorMessages.java
index 9f46cf7e35..edc93afffb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/diag/ErrorMessages.java
+++ b/java/org.apache.derby.engine/org/apache/derby/diag/ErrorMessages.java
@@ -109,6 +109,7 @@ public boolean next() {
 		if (retCode) {
 		  SQLState =StandardException.getSQLStateFromIdentifier(k);
 		  message = MessageService.getTextMessage(k);
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		  message = StringUtil.truncate(message, Limits.DB2_VARCHAR_MAXWIDTH);
 		}
 		return retCode;
@@ -157,6 +158,7 @@ private void loadProperties() throws IOException
 		p = new Properties();
 		for (int i = 0; i < 50; i++) {
 			msgFile = i;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			InputStream is = java.security.AccessController.doPrivileged(this);
 			if (is == null)
 				continue;
@@ -224,11 +226,13 @@ public final InputStream run() {
 	private static final ResultColumnDescriptor[] columnInfo = {
 
 		EmbedResultSetMetaData.getResultColumnDescriptor("SQL_STATE",  Types.VARCHAR, true, 5),
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		EmbedResultSetMetaData.getResultColumnDescriptor("MESSAGE",    Types.VARCHAR, true, Limits.DB2_VARCHAR_MAXWIDTH),
 		EmbedResultSetMetaData.getResultColumnDescriptor("SEVERITY",   Types.INTEGER, true),
 	};
 
     private static final ResultSetMetaData metadata =
         new EmbedResultSetMetaData(columnInfo);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
 
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/diag/LockTable.java b/java/org.apache.derby.engine/org/apache/derby/diag/LockTable.java
index cf3619bb8f..907c98bcad 100644
--- a/java/org.apache.derby.engine/org/apache/derby/diag/LockTable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/diag/LockTable.java
@@ -53,6 +53,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	the database.
 	
 	This virtual table can be invoked by calling it directly
+//IC see: https://issues.apache.org/jira/browse/DERBY-714
+//IC see: https://issues.apache.org/jira/browse/DERBY-571
 	<PRE> select * from SYSCS_DIAG.LOCK_TABLE </PRE>
 	
 	<P>The LockTable virtual table takes a snap shot of the lock table while
@@ -78,6 +80,7 @@ <LI>STATE varchar(5) - nullable.  GRANT or WAIT </LI>
 	<LI>TABLETYPE varchar(9) - not nullable.  'T' for user table, 'S' for system table </LI>
 	<LI>LOCKCOUNT varchar(5) - not nullable.  Internal lock count.</LI>
 	<LI>INDEXNAME varchar(128) - normally null.  If non-null, a lock is held on 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2592
 	the index.</LI>
 	</UL>
 
@@ -106,8 +109,10 @@ public class LockTable extends VTITemplate implements VTICosting  {
 
 	/**
 		The normal way of instantiating a LockTable, equivalent to
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		LockTable(org.apache.derby.diag.LockTable-&gt;TABLE_AND_ROWLOCK).
 		Only shows row and table lock and not latches.  Latches are generally
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 		held for very short duration and are not of interest to Derby 
 		users.  Only under abnormal circumstances will one be interested in
 		looking at latches.
@@ -138,6 +143,7 @@ public ResultSetMetaData getMetaData()
 	/**
 		@see java.sql.ResultSet#next
 		@exception SQLException if no transaction context can be found, or other
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 		Derby internal errors are encountered.
 	 */
 	public boolean next() throws SQLException
@@ -149,6 +155,7 @@ public boolean next() throws SQLException
 				LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
 
 				tc = lcc.getTransactionExecute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2164
 				LockFactory lf = tc.getAccessManager().getLockFactory();
 				lockTable = lf.makeVirtualLockTable();
 				initialized = true;
@@ -236,6 +243,7 @@ private Hashtable<String,Object> dumpLock(
     Latch                   lock)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Hashtable<String,Object>	attributes = new Hashtable<String,Object>(17);
         Object      lock_type =  lock.getQualifier();
 
@@ -295,11 +303,13 @@ else if (!(lock instanceof org.apache.derby.impl.services.locks.ActiveLock))
 				return null; // can't deal with this for now
 
 			Long value = (Long)attributes.get(VirtualLockTable.CONTAINERID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			conglomId = tc.findConglomid(value.longValue());
 			attributes.put(VirtualLockTable.CONGLOMID, conglomId);
 		}
 
 		attributes.put(VirtualLockTable.LOCKOBJ, lock);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		Object owner = lock.getCompatabilitySpace().getOwner();
 		attributes.put(VirtualLockTable.XACTID,
 					   (owner == null) ? "<null>" : owner.toString());
@@ -341,6 +351,7 @@ else if (!(lock instanceof org.apache.derby.impl.services.locks.ActiveLock))
 	};
 	
     private static final ResultSetMetaData metadata =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         new EmbedResultSetMetaData(columnInfo);
 }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/diag/SpaceTable.java b/java/org.apache.derby.engine/org/apache/derby/diag/SpaceTable.java
index dfd654b917..7dd621f555 100644
--- a/java/org.apache.derby.engine/org/apache/derby/diag/SpaceTable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/diag/SpaceTable.java
@@ -51,6 +51,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	
 	This virtual table can be invoked by calling it
 	directly, and supplying the schema name and table name as arguments.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4051
     <PRE> SELECT * FROM TABLE(SYSCS_DIAG.SPACE_TABLE('MYSCHEMA', 'MYTABLE')) T;  </PRE>
     If the schema name is not supplied, the default schema is used.
     <PRE> SELECT * FROM TABLE(SYSCS_DIAG.SPACE_TABLE('MYTABLE')) T; </PRE>
@@ -99,6 +100,7 @@ <LI>TABLEID char(36) - not nullable.  The UUID of the table.</LI>
     select v.*
     from SYS.SYSSCHEMAS s,
          SYS.SYSTABLES t,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4051
          TABLE(SYSCS_DIAG.SPACE_TABLE(SCHEMANAME, TABLENAME)) v
     where s.SCHEMAID = t.SCHEMAID;
     </PRE>
@@ -140,6 +142,7 @@ private void getConglomInfo(LanguageConnectionContext lcc)
         if ( tableName != null )
         {
             // if schemaName is null, it gets the default schema
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
             SchemaDescriptor sd = dd.getSchemaDescriptor(schemaName, tc, true);
             TableDescriptor td = dd.getTableDescriptor(tableName,sd, tc);
             if (td == null)  // table does not exist
@@ -215,6 +218,7 @@ public boolean next() throws SQLException
     		{
 				LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
                 tc = lcc.getTransactionExecute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
                getConglomInfo(lcc);
                 
 			    initialized = true;
@@ -377,6 +381,7 @@ public boolean supportsMultipleInstantiations(VTIEnvironment vtiEnvironment)
 	
     private static final ResultSetMetaData metadata =
         new EmbedResultSetMetaData(columnInfo);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
 
 }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/diag/StatementCache.java b/java/org.apache.derby.engine/org/apache/derby/diag/StatementCache.java
index 88a8705944..f6e96e40ea 100644
--- a/java/org.apache.derby.engine/org/apache/derby/diag/StatementCache.java
+++ b/java/org.apache.derby.engine/org/apache/derby/diag/StatementCache.java
@@ -56,6 +56,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	<LI> ID CHAR(36) - not nullable.  Internal identifier of the compiled statement.
 	<LI> SCHEMANAME VARCHAR(128) - nullable.  Schema the statement was compiled in.
 	<LI> SQL_TEXT VARCHAR(32672) - not nullable.  Text of the statement
+//IC see: https://issues.apache.org/jira/browse/DERBY-6065
 	<LI> UNICODE BIT/BOOLEAN - not nullable.  Always true.
 	<LI> VALID BIT/BOOLEAN - not nullable.  True if the statement is currently valid, false otherwise
 	<LI> COMPILED_AT TIMESTAMP nullable - time statement was compiled, requires STATISTICS TIMING to be enabled.
@@ -64,6 +65,7 @@ <LI> SQL_TEXT VARCHAR(32672) - not nullable.  Text of the statement
 	</UL>
 	<P>
 	The internal identifier of a cached statement matches the toString() method of a PreparedStatement object for a Derby database.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 
 	<P>
 	This class also provides a static method to empty the statement cache, StatementCache.emptyCache()
@@ -82,17 +84,21 @@ public StatementCache() throws StandardException {
         
         LanguageConnectionContext lcc = (LanguageConnectionContext)
             getContextOrNull(LanguageConnectionContext.CONTEXT_ID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2772
         CacheManager statementCache =
             lcc.getLanguageConnectionFactory().getStatementCache();
 
 		if (statementCache != null) {
 			final Collection values = statementCache.values();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			data = new Vector<GenericPreparedStatement>(values.size());
 			for (Iterator i = values.iterator(); i.hasNext(); ) {
 				final CachedStatement cs = (CachedStatement) i.next();
 				final GenericPreparedStatement ps =
 					(GenericPreparedStatement) cs.getPreparedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				data.add(ps);
 			}
 		}
@@ -106,6 +112,7 @@ public boolean next() {
 		position++;
 
 		for (; position < data.size(); position++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 			currentPs = (GenericPreparedStatement) data.get(position);
 	
 			if (currentPs != null)
@@ -131,6 +138,7 @@ public String getString(int colId) {
 			return ((GenericStatement) currentPs.statement).getCompilationSchema();
 		case 3:
 			String sql = currentPs.getSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			sql = StringUtil.truncate(sql, Limits.DB2_VARCHAR_MAXWIDTH);
 			return sql;
 		default:
@@ -144,6 +152,7 @@ public boolean getBoolean(int colId) {
 		case 4:
 			// was/is UniCode column, but since Derby 10.0 all
 			// statements are compiled and submitted as UniCode.
+//IC see: https://issues.apache.org/jira/browse/DERBY-571
 			return true;
 		case 5:
 			return currentPs.isValid();
@@ -170,6 +179,7 @@ public boolean wasNull() {
 
 		EmbedResultSetMetaData.getResultColumnDescriptor("ID",		  Types.CHAR, false, 36),
 		EmbedResultSetMetaData.getResultColumnDescriptor("SCHEMANAME",    Types.VARCHAR, true, 128),
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		EmbedResultSetMetaData.getResultColumnDescriptor("SQL_TEXT",  Types.VARCHAR, false, Limits.DB2_VARCHAR_MAXWIDTH),
 		EmbedResultSetMetaData.getResultColumnDescriptor("UNICODE",   Types.BIT, false),
 		EmbedResultSetMetaData.getResultColumnDescriptor("VALID",  Types.BIT, false),
@@ -179,6 +189,7 @@ public boolean wasNull() {
 	
     private static final ResultSetMetaData metadata =
         new EmbedResultSetMetaData(columnInfo);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
 
 	public ResultSetMetaData getMetaData() {
 
@@ -191,6 +202,7 @@ public ResultSetMetaData getMetaData() {
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContextOrNull( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/diag/StatementDuration.java b/java/org.apache.derby.engine/org/apache/derby/diag/StatementDuration.java
index 355cd387d3..f14d1cb58b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/diag/StatementDuration.java
+++ b/java/org.apache.derby.engine/org/apache/derby/diag/StatementDuration.java
@@ -114,6 +114,7 @@ public StatementDuration()  throws StandardException
 	{
         DiagUtil.checkAccess();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         final String home = AccessController.doPrivileged
             (
              new PrivilegedAction<String>()
@@ -167,6 +168,7 @@ public boolean next() throws SQLException
 				throw new SQLException(ex.getMessage());
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			hashTable = new Hashtable<String,String[]>();
 		}
 
@@ -204,6 +206,7 @@ public boolean next() throws SQLException
 
 				/* NOTE: We need to use the LCCID as the key
 				 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				String[] previousRow = hashTable.put(newRow[3],
 												   newRow);
 				if (previousRow == null)
@@ -256,6 +259,7 @@ private Timestamp   stringToTimestamp( String raw ) throws SQLException
             // Date.toString(), which is always formatted using the pattern
             // specified below, and always in US locale.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-5414
             SimpleDateFormat sdf =
                 new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
 
@@ -325,6 +329,7 @@ private String setupColumn(int columnNumber)
 				/* Executing prepared statement is a special case as
 				 * it could span multiple lines
 				 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
 				StringBuffer output = new StringBuffer(64);
 				if (line.indexOf(BEGIN_EXECUTING_STRING) == -1)
 				{
@@ -337,6 +342,7 @@ private String setupColumn(int columnNumber)
 				int endIndex = line.indexOf(END_EXECUTING_STRING, lccidIndex);
 				if (endIndex == -1)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
 					output.append(line.substring(line.indexOf(END_XID_STRING, lccidIndex) + 3));
 				}
 				else
@@ -358,6 +364,7 @@ private String setupColumn(int columnNumber)
 					endIndex = line.indexOf(END_EXECUTING_STRING);
 					if (endIndex == -1)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
 						output.append(line);
 					}
 					else
@@ -392,11 +399,13 @@ public boolean wasNull()
 		EmbedResultSetMetaData.getResultColumnDescriptor("THREADID",  Types.VARCHAR, false, 80),
 		EmbedResultSetMetaData.getResultColumnDescriptor("XID",       Types.VARCHAR, false, 15),
 		EmbedResultSetMetaData.getResultColumnDescriptor("LCCID",     Types.VARCHAR, false, 10),
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		EmbedResultSetMetaData.getResultColumnDescriptor("LOGTEXT",   Types.VARCHAR, true, Limits.DB2_VARCHAR_MAXWIDTH),
 		EmbedResultSetMetaData.getResultColumnDescriptor("DURATION",  Types.VARCHAR, false, 10),
 	};
 	
     private static final ResultSetMetaData metadata =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         new EmbedResultSetMetaData(columnInfo);
 }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/diag/TransactionTable.java b/java/org.apache.derby.engine/org/apache/derby/diag/TransactionTable.java
index c4905fe86a..11eaadd395 100644
--- a/java/org.apache.derby.engine/org/apache/derby/diag/TransactionTable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/diag/TransactionTable.java
@@ -49,6 +49,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	This virtual table can be invoked by calling it
 	directly
 	<PRE> select * from SYSCS_DIAG.TRANSACTION_TABLE </PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-714
+//IC see: https://issues.apache.org/jira/browse/DERBY-571
 
 	<P>The TransactionTable virtual table takes a snap shot of the 
 	transaction table while the system is in flux, so it is possible that some
@@ -64,6 +66,7 @@ <LI>XID varchar(15) - not nullable.  The transaction id, this can be joined
 	<LI>GLOBAL_XID varchar(140) - nullable.  The global transaction id, only
 	set if this transaction is a participant in a distributed transaction.</LI>
 	<LI>USERNAME varchar(128) - nullable.  The user name, or APP by default.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 	May appear null if the transaction is started by Derby.</LI>
 	<LI>TYPE varchar(30) - not nullable. UserTransaction or an internal
 	transaction spawned by Derby.</LI>
@@ -110,6 +113,7 @@ public boolean next() throws SQLException
 		{
 			LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2164
 			transactionTable = lcc.getTransactionExecute().
 			   getAccessManager().getTransactionInfo();
 
@@ -176,6 +180,7 @@ public String getString(int columnNumber)
 		case 7:
 
 			str = info.getStatementTextString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			str = StringUtil.truncate(str, Limits.DB2_VARCHAR_MAXWIDTH);
 			break;
 
@@ -236,10 +241,12 @@ public boolean supportsMultipleInstantiations(VTIEnvironment vtiEnvironment)
 		EmbedResultSetMetaData.getResultColumnDescriptor("TYPE",          Types.VARCHAR, false, 30),
 		EmbedResultSetMetaData.getResultColumnDescriptor("STATUS",        Types.VARCHAR, false, 8),
 		EmbedResultSetMetaData.getResultColumnDescriptor("FIRST_INSTANT", Types.VARCHAR, true,  20),
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		EmbedResultSetMetaData.getResultColumnDescriptor("SQL_TEXT",      Types.VARCHAR, true,  Limits.DB2_VARCHAR_MAXWIDTH),
 	};
 	
     private static final ResultSetMetaData metadata =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         new EmbedResultSetMetaData(columnInfo);
 }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/db/ConsistencyChecker.java b/java/org.apache.derby.engine/org/apache/derby/iapi/db/ConsistencyChecker.java
index 66e0c0788f..1f65dfef6c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/db/ConsistencyChecker.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/db/ConsistencyChecker.java
@@ -141,15 +141,18 @@ public static boolean checkTable(String schemaName, String tableName)
             // make sure that application code doesn't bypass security checks
             // by calling this public entry point
             SecurityUtil.authorize( Securable.CHECK_TABLE );           
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
 
             dd = lcc.getDataDictionary();
 
             dvf = lcc.getDataValueFactory();
             
             ExecutionFactory ef = lcc.getLanguageConnectionFactory().getExecutionFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 
             sd = dd.getSchemaDescriptor(schemaName, tc, true);
             td = dd.getTableDescriptor(tableName, sd, tc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 
             if (td == null)
             {
@@ -177,6 +180,7 @@ public static boolean checkTable(String schemaName, String tableName)
 
 			/* Get a row template for the base table */
 			baseRow = ef.getValueRow(td.getNumberOfColumns());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 
 			/* Fill the row with nulls of the correct type */
 			ColumnDescriptorList cdl = td.getColumnDescriptorList();
@@ -269,6 +273,7 @@ public static boolean checkTable(String schemaName, String tableName)
 
 				/* Get one row template for the index scan, and one for the fetch */
 				indexRow = ef.getValueRow(baseColumns + 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 
 				/* Fill the row with nulls of the correct type */
 				for (int column = 0; column < baseColumns; column++)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/db/OptimizerTrace.java b/java/org.apache.derby.engine/org/apache/derby/iapi/db/OptimizerTrace.java
index 06570ba4ab..5734e1f216 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/db/OptimizerTrace.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/db/OptimizerTrace.java
@@ -34,6 +34,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
   <P>
   This  class provides static methods for controlling the
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
   optimizer tracing in a Derby database.
   
   */
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/db/PropertyInfo.java b/java/org.apache.derby.engine/org/apache/derby/iapi/db/PropertyInfo.java
index 9635191128..c00d6b3f3c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/db/PropertyInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/db/PropertyInfo.java
@@ -51,6 +51,7 @@ public final class PropertyInfo
 	/**
 		Set or delete the value of a property of the database on the current connection.
         For security reasons (see DERBY-6616), this code is duplicated in SystemProcedures.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
 
 		@param key the property key
 		@param value the new value, if null the property is deleted.
@@ -63,10 +64,12 @@ public static void setDatabaseProperty(String key, String value) throws SQLExcep
 		LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
             SecurityUtil.authorize( Securable.SET_DATABASE_PROPERTY );
             
 		Authorizer a = lcc.getAuthorizer();
 		a.authorize((Activation) null, Authorizer.PROPERTY_WRITE_OP);
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 
         // Get the current transaction controller
         TransactionController tc = lcc.getTransactionExecute();
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/AutoloadedDriver.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/AutoloadedDriver.java
index f0f18d80c0..cd21bf5872 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/AutoloadedDriver.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/AutoloadedDriver.java
@@ -111,6 +111,7 @@ public boolean acceptsURL(String url) throws SQLException {
 		// the application is looking for a connection from some other
 		// driver.
 		//
+//IC see: https://issues.apache.org/jira/browse/DERBY-2788
 		return !_engineForcedDown && InternalDriver.embeddedDriverAcceptsURL(url);
 	}
 
@@ -193,6 +194,7 @@ public boolean jdbcCompliant() {
 
     public  Logger getParentLogger() throws SQLFeatureNotSupportedException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         throw (SQLFeatureNotSupportedException) Util.notImplemented( "getParentLogger()" );
     }
     
@@ -215,6 +217,7 @@ public static	Driver getDriverModule() throws SQLException {
 		}
 
 		if ( !isBooted() ) { JDBCBoot.boot(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 		return _driverModule;
 	}
@@ -231,6 +234,8 @@ public static	void	registerDriverModule( Driver driver )
         try {
             if (_autoloadedDriver == null) {
                 //Support JDBC 4 or higher (DERBY-2905)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5029
+//IC see: https://issues.apache.org/jira/browse/DERBY-2095
                 _autoloadedDriver = makeAutoloadedDriver();
                 DriverManager.registerDriver(_autoloadedDriver);
             }
@@ -250,6 +255,7 @@ public static	void	unregisterDriverModule()
 		_engineForcedDown = true;
         try {
             // deregister is false if user set deregister=false attribute (DERBY-2905)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
             if (InternalDriver.getDeregister() && _autoloadedDriver != null) {
                 deregisterDriver(_autoloadedDriver);
                 _autoloadedDriver = null;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
index f6ad989cd2..94840d639a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
@@ -646,6 +646,7 @@ final PreparedStatement getPreparedStatement() throws SQLException {
 	*/
 	public CallableStatement createDuplicateStatement(Connection conn, CallableStatement oldStatement) throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5877
         CallableStatement newStatement = conn.prepareCall(
             sql, resultSetType, resultSetConcurrency, resultSetHoldability);
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement42.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement42.java
index 435a53bb31..49d48f6090 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement42.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement42.java
@@ -69,6 +69,7 @@ public  void registerOutParameter( String parameterName,  SQLType sqlType, Strin
     }
     
     public  void setObject
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         ( int parameterIndex, java.lang.Object x, SQLType sqlType )
         throws SQLException
     {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
index adf062e175..924fe45a37 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
@@ -374,6 +374,7 @@ public final void setTypeMap(java.util.Map<String, Class<?>> map) throws SQLExce
     public final Statement createStatement(int resultSetType,
             int resultSetConcurrency,
             int resultSetHoldability)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5877
             throws SQLException {
         try {
             resultSetHoldability =
@@ -509,7 +510,9 @@ public final PreparedStatement prepareStatement(
      * Generate an exception reporting that there is no current connection.
      * @return a no-current-connection exception
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
     final SQLException noCurrentConnection() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6253
         return ExceptionFactory.getInstance().getSQLException(
                 SQLState.NO_CURRENT_CONNECTION, null, null, null);
     }
@@ -522,11 +525,13 @@ final SQLException noCurrentConnection() {
 	final EngineConnection getRealConnection() throws SQLException {
 		if (isClosed)
 			throw noCurrentConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 
 		return control.getRealConnection();
 	}
 
 	final void notifyException(SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-24
 		if (!isClosed)
 			control.notifyException(sqle);
 	}
@@ -573,6 +578,7 @@ Connection, otherwise set only the Connection related state (ie.
 	public void setState(boolean complete) throws SQLException {
 
 		if (complete) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5017
 		    Connection conn = getRealConnection();
 			conn.setTransactionIsolation(stateIsolationLevel);
 			conn.setReadOnly(stateReadOnly);
@@ -580,13 +586,16 @@ public void setState(boolean complete) throws SQLException {
 			// make the underlying connection pick my holdability state
 			// since holdability is a state of the connection handle
 			// not the underlying transaction.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5050
             conn.setHoldability(stateHoldability);
 		}
 	}
 
     public final BrokeredStatement newBrokeredStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             BrokeredStatementControl statementControl) throws SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3525
             return new BrokeredStatement(statementControl);
         } catch (SQLException sqle) {
             notifyException(sqle);
@@ -681,6 +690,7 @@ public final void addWarning(SQLWarning w) throws SQLException
      */
     public String toString() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-412
         if ( connString == null )
         {
             String wrappedString;
@@ -742,6 +752,7 @@ public final int getHoldability() throws SQLException {
     // JDBC 4.0 methods
 
     public final Array createArrayOf(String typeName, Object[] elements)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             throws SQLException {
         try {
             return getRealConnection().createArrayOf(typeName, elements);
@@ -1004,6 +1015,7 @@ final int statementHoldabilityCheck(int resultSetHoldability)
         int holdability = control.checkHoldCursors(resultSetHoldability, true);
         if (holdability != resultSetHoldability) {
             SQLWarning w =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3461
                  SQLWarningFactory.newSQLWarning(SQLState.HOLDABLE_RESULT_SET_NOT_AVAILABLE);
             
             addWarning(w);
@@ -1033,6 +1045,7 @@ public Object getLOBMapping(int key) throws SQLException {
      * @throws java.sql.SQLException on error
      */
     public String getCurrentSchemaName() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
         try {
             return getRealConnection().getCurrentSchemaName();
         }
@@ -1046,6 +1059,7 @@ public String getCurrentSchemaName() throws SQLException {
      * @see org.apache.derby.iapi.jdbc.EngineConnection
      */
     public void resetFromPool()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3596
             throws SQLException {
         getRealConnection().resetFromPool();
     }
@@ -1061,6 +1075,7 @@ public void resetFromPool()
      */
     public String   getSchema() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
     	try {
             return getRealConnection().getSchema();
     	}
@@ -1087,6 +1102,7 @@ public void   setSchema(  String schemaName ) throws SQLException
     }
 
     public void abort(Executor executor) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         if (!isClosed) {
             ((EngineConnection) getRealConnection()).abort(executor);
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredConnection42.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredConnection42.java
index 24f6a1426b..a3819bf24a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredConnection42.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredConnection42.java
@@ -50,6 +50,7 @@ public BrokeredConnection42(BrokeredConnectionControl control)
     }
     
     public BrokeredCallableStatement newBrokeredStatement(BrokeredStatementControl statementControl, String sql) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         try {
             return new BrokeredCallableStatement42(statementControl, sql);
         } catch (SQLException sqle) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
index 7040e825c9..3c36631bb7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
@@ -717,6 +717,7 @@ public final Statement getStatement() throws SQLException {
 	public PreparedStatement createDuplicateStatement(Connection conn, PreparedStatement oldStatement) throws SQLException {
 
         PreparedStatement newStatement;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5877
 
         if (generatedKeys == null) {
             newStatement = conn.prepareStatement(
@@ -742,6 +743,8 @@ public PreparedStatement createDuplicateStatement(Connection conn, PreparedState
 	}
 
     public final long getVersionCounter() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5459
+//IC see: https://issues.apache.org/jira/browse/DERBY-2402
         return ((EnginePreparedStatement)getPreparedStatement()).
                 getVersionCounter();
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
index 5c2b43dbca..f64692a606 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
 	A Statement implementation that forwards all of its requests to an underlying Statement.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
     This class implements the JDBC 4.1 interface.
  */
 public class BrokeredStatement implements EngineStatement
@@ -54,6 +55,7 @@ My control. Use the controlCheck() method to obtain the control
 	private String cursorName;
 	private Boolean escapeProcessing;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3525
     BrokeredStatement(BrokeredStatementControl control) throws SQLException
     {
 		this.control = control;
@@ -120,6 +122,8 @@ public final int executeUpdate(String sql) throws SQLException
      */
 	public void close() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
 		control.closeRealStatement();
     }
 
@@ -434,6 +438,7 @@ public final int executeUpdate(String sql,
      */
 	public final boolean getMoreResults(int current) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         return getStatement().getMoreResults(current);
 	}
 
@@ -477,6 +482,7 @@ public final int getResultSetHoldability()
 	public Statement createDuplicateStatement(Connection conn, Statement oldStatement) throws SQLException {
 
 		Statement newStatement;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3525
 		newStatement = conn.createStatement(resultSetType, resultSetConcurrency,
                     resultSetHoldability);
 
@@ -571,6 +577,7 @@ public <T> T unwrap(Class<T> iface) throws SQLException {
      * @exception SQLException if an error occurs
      */
     public final boolean isClosed() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         return getStatement().isClosed();
     }
 
@@ -584,7 +591,9 @@ protected final void checkIfClosed()
         throws SQLException
     {
         if (isClosed()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6253
             throw ExceptionFactory.getInstance().getSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
                     SQLState.ALREADY_CLOSED, null, null,
                     new Object[]{ "Statement" });
         }
@@ -598,6 +607,7 @@ protected final void checkIfClosed()
      * @return an exception indicating that unwrap failed
      */
     final SQLException unableToUnwrap(Class iface) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6253
         return ExceptionFactory.getInstance().getSQLException(
                 SQLState.UNABLE_TO_UNWRAP, null, null,
                 new Object[]{ iface });
@@ -610,6 +620,7 @@ final SQLException unableToUnwrap(Class iface) {
      * @throws SQLException if the forwarding call fails.
      */
     public final boolean isPoolable() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         return getStatement().isPoolable();
     }
 
@@ -631,6 +642,7 @@ public final void setPoolable(boolean poolable) throws SQLException {
 
     public  void    closeOnCompletion() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         ((EngineStatement) getStatement()).closeOnCompletion();
     }
 
@@ -647,10 +659,12 @@ public  boolean isCloseOnCompletion() throws SQLException
 
     public  long[] executeLargeBatch() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         return ((EngineStatement) getStatement()).executeLargeBatch();
     }
     public  long executeLargeUpdate( String sql ) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         return ((EngineStatement) getStatement()).executeLargeUpdate( sql );
     }
     public  long executeLargeUpdate( String sql, int autoGeneratedKeys) throws SQLException
@@ -667,10 +681,12 @@ public  long executeLargeUpdate( String sql, String[] columnNames ) throws SQLEx
     }
     public  long getLargeMaxRows() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         return ((EngineStatement) getStatement()).getLargeMaxRows();
     }
     public  long getLargeUpdateCount() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         return ((EngineStatement) getStatement()).getLargeUpdateCount();
     }
     public  void setLargeMaxRows( long max ) throws SQLException
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/CharacterStreamDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/CharacterStreamDescriptor.java
index f2ffeb1b33..76bb918cef 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/CharacterStreamDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/CharacterStreamDescriptor.java
@@ -85,6 +85,7 @@ private CharacterStreamDescriptor(Builder b) {
         byteLength = b.byteLength;
         charLength = b.charLength;
         maxCharLength = b.maxCharLength;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
         stream = b.stream;
     }
 
@@ -166,6 +167,7 @@ public long getMaxCharLength() {
      * @return An {@code InputStream} reference.
      */
     public InputStream getStream() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
         return stream;
     }
 
@@ -193,6 +195,7 @@ public String toString() {
                 bufferable + ":positionAware=" +
                 positionAware + ":byteLength=" + byteLength + ":charLength=" +
                 charLength + ":curBytePos=" + curBytePos + ":curCharPos=" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
                 curCharPos + ":dataOffset=" + dataOffset + ":stream=" +
                 stream.getClass());
     }
@@ -296,6 +299,7 @@ public Builder byteLength(long length) {
          * @return The builder.
          */
         public Builder copyState(CharacterStreamDescriptor csd) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
             this.bufferable = csd.bufferable;
             this.byteLength = csd.byteLength;
             this.charLength = csd.charLength;
@@ -354,6 +358,7 @@ public Builder maxCharLength(long length) {
          * @return The builder.
          */
         public Builder stream(InputStream stream) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
             if (SanityManager.DEBUG) {
                 SanityManager.ASSERT(stream != null);
             }
@@ -375,6 +380,7 @@ public Builder stream(InputStream stream) {
         public CharacterStreamDescriptor build() {
             // Do validation only in sane builds.
             if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 SanityManager.ASSERT(curBytePos >= 0, "Negative curBytePos");
                 SanityManager.ASSERT(curCharPos >= 1 ||
                         curCharPos == BEFORE_FIRST, "Invalid curCharPos " +
@@ -396,11 +402,13 @@ public CharacterStreamDescriptor build() {
                 // If we're in the header section, the character position must
                 // be before the first character.
                 if (curBytePos < dataOffset) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                     SanityManager.ASSERT(curCharPos == BEFORE_FIRST,
                             "curCharPos in header, " + toString());
                 }
                 // Byte length minus data offset must be equal to or greater
                 // then the character length.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
                 if (byteLength > 0 && charLength > 0) {
                     SanityManager.ASSERT(byteLength - dataOffset >= charLength,
                             "Less than one byte per char, " + toString());
@@ -423,6 +431,7 @@ public CharacterStreamDescriptor build() {
          * @return The textual representation of the builder.
          */
         public String toString() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             String str = "CharacterStreamBuiler@"  + hashCode() +
                     ":bufferable=" + bufferable + ", isPositionAware=" +
                     positionAware + ", curBytePos=" + curBytePos +
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
index 7eb114f3b6..a5bead4203 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
@@ -138,6 +138,7 @@ public void setStartInfo(InetAddress listenAddress, int portNumber, PrintWriter
      * @throws SecurityException 
      */
     private void findStartStopMethods(final Class<?> serverClass)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1966
         throws SecurityException, NoSuchMethodException
     {
         // Methods are public so no need for privilege blocks.
@@ -179,6 +180,7 @@ public void boot(boolean create,
             Constructor  serverConstructor;
             try
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 serverConstructor = AccessController.doPrivileged(
 			      new PrivilegedExceptionAction<Constructor>() {
 						  public Constructor run() throws NoSuchMethodException, SecurityException
@@ -207,6 +209,7 @@ public Constructor run() throws NoSuchMethodException, SecurityException
 
             }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-1966
             findStartStopMethods(serverClass);
             
 			if (listenAddress == null) {
@@ -214,10 +217,12 @@ public Constructor run() throws NoSuchMethodException, SecurityException
                     new Object[]{userArg, passwordArg});
             } else {
 				server = serverConstructor.newInstance(new Object[]
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 					{listenAddress, portNumber,
                      userArg, passwordArg});
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             serverThread = getMonitor().getDaemonThread( this, "NetworkServerStarter", false);
             serverThread.start();
         }
@@ -233,6 +238,7 @@ public void run()
     {
         try
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1966
             runServerMethod.invoke( server,
                                       new Object[] {consoleWriter });
         }
@@ -259,7 +265,9 @@ public void stop()
 			{
 				serverShutdownMethod.invoke( server,
 											 null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2564
 				AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 							      new PrivilegedAction<Object>() {
 								  public Object run() {
 								      serverThread.interrupt();
@@ -298,6 +306,7 @@ public Object run() {
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/Driver42.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/Driver42.java
index 4f69ed62fc..09b1d03ce8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/Driver42.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/Driver42.java
@@ -74,6 +74,7 @@ public BrokeredConnection newBrokeredConnection(
     
     public EmbedResultSet newEmbedResultSet
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
          EmbedConnection conn, ResultSet results, boolean forMetaData,
          org.apache.derby.impl.jdbc.EmbedStatement statement,
          boolean isAtomic
@@ -83,6 +84,7 @@ public BrokeredConnection newBrokeredConnection(
     }
 
     public CallableStatement newEmbedCallableStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         EmbedConnection conn,
         String stmt,
         int resultSetType,
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EmbeddedDataSourceInterface.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EmbeddedDataSourceInterface.java
index a197a81360..4ec6530455 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EmbeddedDataSourceInterface.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EmbeddedDataSourceInterface.java
@@ -67,6 +67,7 @@ public interface EmbeddedDataSourceInterface extends javax.sql.DataSource {
      * @throws SQLException on error
      */
     public Connection getConnection(String username,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                                    String password,
                                    boolean requestPassword)
       throws SQLException;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EmbeddedXADataSourceInterface.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EmbeddedXADataSourceInterface.java
index f4cdf8ada8..c629c7b9ac 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EmbeddedXADataSourceInterface.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EmbeddedXADataSourceInterface.java
@@ -37,6 +37,9 @@ public interface EmbeddedXADataSourceInterface extends EmbeddedDataSourceInterfa
 
     /** Added by Java 9 */
     public default ShardingKeyBuilder createShardingKeyBuilder()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
         throws SQLException
     {
         throw new java.sql.SQLFeatureNotSupportedException();
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EngineConnection.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EngineConnection.java
index ba5acba106..2257ac199c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EngineConnection.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/EngineConnection.java
@@ -134,6 +134,7 @@ public void addWarning(SQLWarning newWarning)
     public void   setSchema(  String schemaName ) throws SQLException;
 
     void abort(Executor executor) throws SQLException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
 
     void setNetworkTimeout(Executor executor, int millis) throws SQLException;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/FailedProperties40.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/FailedProperties40.java
index e5b13fbf61..195413a200 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/FailedProperties40.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/FailedProperties40.java
@@ -38,6 +38,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
      */
 public class FailedProperties40 {
     private final HashMap<String,ClientInfoStatus> failedProps_ = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1380
 	new HashMap<String,ClientInfoStatus>();
     private final String firstKey_;
     private final String firstValue_;
@@ -73,6 +74,7 @@ public FailedProperties40(Properties props) {
         Enumeration e = props.keys();
         firstKey_ = (String)e.nextElement();
         firstValue_ = props.getProperty(firstKey_);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1380
         failedProps_.put(firstKey_, ClientInfoStatus.REASON_UNKNOWN_PROPERTY);
         while (e.hasMoreElements()) {
             failedProps_.put((String)e.nextElement(), 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/InternalDriver.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/InternalDriver.java
index 4e3d74e96c..fe4e1b42b2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/InternalDriver.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/InternalDriver.java
@@ -121,6 +121,7 @@ public static final InternalDriver activeDriver()
 	}
 
 	public InternalDriver() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		contextServiceFactory = getContextService();
 	}
 
@@ -138,12 +139,14 @@ public void boot(boolean create, Properties properties) throws StandardException
 		active = true;
         
         mbean = ((ManagementService)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
            getSystemModule(Module.JMX)).registerMBean(
                    new JDBC(this),
                    JDBCMBean.class,
                    "type=JDBC");
 
         // Register with the driver manager
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         AutoloadedDriver.registerDriverModule(this);
 	}
 
@@ -155,6 +158,7 @@ public void stop() {
 		}
         
         ((ManagementService)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 getSystemModule(Module.JMX)).unregisterMBean(
                         mbean);
 
@@ -162,6 +166,7 @@ public void stop() {
 
 		contextServiceFactory = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         AutoloadedDriver.unregisterDriverModule();
 	}
 
@@ -170,6 +175,7 @@ public void stop() {
 	*/
 	public boolean acceptsURL(String url) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1459
 		return active && embeddedDriverAcceptsURL( url );
 	}
 
@@ -180,6 +186,7 @@ public boolean acceptsURL(String url) throws SQLException
 	*/
 	public static	boolean embeddedDriverAcceptsURL(String url) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         if ( url == null )
         {
             throw Util.generateCsSQLException( SQLState.MALFORMED_URL, "null" );
@@ -187,6 +194,7 @@ public static	boolean embeddedDriverAcceptsURL(String url) throws SQLException
         
 		return
 		//	need to reject network driver's URL's
+//IC see: https://issues.apache.org/jira/browse/DERBY-535
 		!url.startsWith(Attribute.JCC_PROTOCOL) && !url.startsWith(Attribute.DNC_PROTOCOL) &&
 		(url.startsWith(Attribute.PROTOCOL) || url.equals(Attribute.SQLJ_NESTED));
 				
@@ -201,6 +209,7 @@ public Connection connect( String url, Properties info, int loginTimeoutSeconds
          * If we are below the low memory watermark for obtaining
          * a connection, then don't even try. Just throw an exception.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-444
 		if (EmbedConnection.memoryState.isLowMemory())
 		{
 			throw EmbedConnection.NO_MEM;
@@ -233,6 +242,7 @@ public Connection connect( String url, Properties info, int loginTimeoutSeconds
 
 		// convert the ;name=value attributes in the URL into
 		// properties.
+//IC see: https://issues.apache.org/jira/browse/DERBY-444
 		FormatableProperties finfo = null;
         
 		try {
@@ -280,6 +290,7 @@ public Connection connect( String url, Properties info, int loginTimeoutSeconds
                         boolean deregister = Boolean.valueOf(
                                 finfo.getProperty(Attribute.DEREGISTER_ATTR))
                                 .booleanValue();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
                         InternalDriver.setDeregister(deregister);
                     }
 
@@ -289,12 +300,14 @@ public Connection connect( String url, Properties info, int loginTimeoutSeconds
 					//checkShutdownPrivileges(user);
 
 					getMonitor().shutdown();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 					throw Util.generateCsSQLException(
                                          SQLState.CLOUDSCAPE_SYSTEM_SHUTDOWN);
 				}
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
             EmbedConnection conn;
 			
             if ( loginTimeoutSeconds <= 0 ) { conn = getNewEmbedConnection( url, finfo ); }
@@ -308,6 +321,7 @@ public Connection connect( String url, Properties info, int loginTimeoutSeconds
 
 			return conn;
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-444
 		catch (OutOfMemoryError noMemory)
 		{
 			EmbedConnection.memoryState.setLowMemory();
@@ -324,12 +338,14 @@ public Connection connect( String url, Properties info, int loginTimeoutSeconds
      * Enforce the login timeout.
      */
     private EmbedConnection timeLogin(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             String url, Properties info, int loginTimeoutSeconds)
         throws SQLException
     {
         try {
             LoginCallable callable = new LoginCallable(this, url, info);
             Future<EmbedConnection> task = _executorPool.submit(callable);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6167
             long now = System.currentTimeMillis();
             long giveUp = now + loginTimeoutSeconds * 1000L;
 
@@ -447,6 +463,7 @@ private void checkShutdownPrivileges(String user) throws SQLException {
 
         // the check
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3491
             final Permission sp = new SystemPermission(
                 SystemPermission.ENGINE, SystemPermission.SHUTDOWN);
             checkSystemPrivileges(user, sp);
@@ -462,6 +479,7 @@ private void checkShutdownPrivileges(String user) throws SQLException {
     }
 
 	public int getMajorVersion() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		return getMonitor().getEngineVersion().getMajorVersion();
 	}
 	
@@ -470,6 +488,8 @@ public int getMinorVersion() {
 	}
 
 	public boolean jdbcCompliant() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-561
+//IC see: https://issues.apache.org/jira/browse/DERBY-530
 		return true;
 	}
 
@@ -632,6 +652,7 @@ public AuthenticationService getAuthenticationService() {
 		//
 		if (this.authenticationService == null) {
 			this.authenticationService = (AuthenticationService)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				findService(AuthenticationService.MODULE,
 									"authentication"
 								   );
@@ -644,6 +665,7 @@ public AuthenticationService getAuthenticationService() {
 		Methods to be overloaded in sub-implementations such as
 		a tracing driver.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
     EmbedConnection getNewEmbedConnection( final String url, final Properties info)
         throws SQLException
     {
@@ -720,6 +742,7 @@ public boolean isActive() {
 	 *
 	 */
     public Connection getNewNestedConnection(EmbedConnection conn) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         return new EmbedConnection(conn);
     }
 
@@ -762,6 +785,7 @@ public PreparedStatement newEmbedPreparedStatement(
 				int autoGeneratedKeys,
 				int[] columnIndexes,
 				String[] columnNames)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         throws SQLException
     {
         return new EmbedPreparedStatement(conn,
@@ -815,6 +839,7 @@ public DatabaseMetaData newEmbedDatabaseMetaData(
 	 * @throws SQLException on error
 	 */
     public EmbedResultSet newEmbedResultSet(EmbedConnection conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             ResultSet results, boolean forMetaData, EmbedStatement statement,
             boolean isAtomic) throws SQLException {
         return new EmbedResultSet(conn, results, forMetaData, statement,
@@ -830,6 +855,7 @@ public EmbedResultSet newEmbedResultSet(EmbedConnection conn,
      */
     public EmbedResultSetMetaData newEmbedResultSetMetaData(
             ResultColumnDescriptor[] columnInfo) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-940
         return new EmbedResultSetMetaData(columnInfo);
     }
 
@@ -937,6 +963,7 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info)
                 optionsNoDB[attrIndex].description = MessageService.getTextMessage(connStringAttributes[i][1]);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             optionsNoDB[0].choices = getMonitor().getServiceList(Property.DATABASE_MODULE);
             // since database name is not stored in FormatableProperties, we
             // assign here explicitly
@@ -987,6 +1014,7 @@ public Logger getParentLogger()
      * deregister itself
      */
     public static void setDeregister(boolean deregister) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         InternalDriver.deregister = deregister;
     }
 
@@ -1007,12 +1035,14 @@ public static boolean getDeregister() {
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/JDBC.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/JDBC.java
index 82b5eea5d4..56bfb5dc76 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/JDBC.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/JDBC.java
@@ -58,6 +58,7 @@ public boolean isCompliantDriver()
     }
     
     public boolean acceptsURL(String url)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         throws SQLException
     {
         return driver.acceptsURL(url);
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/JDBCBoot.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
index 45c17e1049..337717f588 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
@@ -59,6 +59,7 @@ void addProperty(String name, String value) {
 	*/
 	public static void boot() {
         PrintWriter pw = DriverManager.getLogWriter();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         if (pw == null) {
             pw = new PrintWriter(System.err, true);
@@ -88,6 +89,7 @@ public void boot(String protocol, final PrintWriter logging) {
         // on DERBY-4480. Moving the boot method out of EmbeddedDriver
         // somehow created a race condition during simultaneous getConnection() calls.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         synchronized(NETWORK_SERVER_AUTOSTART_CLASS_NAME)
         {
             if (InternalDriver.activeDriver() == null)
@@ -99,6 +101,7 @@ public void boot(String protocol, final PrintWriter logging) {
                 addProperty("derby.service.jdbc", InternalDriver.class.getName());
                 addProperty("derby.service.authentication", AuthenticationService.MODULE);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 boot( bootProperties, logging);
             }
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
index 488716eb30..a0fa23c62f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
@@ -38,6 +38,7 @@ <P> There is one instance of ResourceAdapter per Resource Manager (database).
 	global transactions, i.e., it does not know of in-doubt global transactions
 	re-created by recovery.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 	<P>	The following is an overall design of the JTA implementation in Derby,
 	most of it has little to do with the ResourceAdapter interface itself.
 	<P><B>Design Overview </B>
@@ -164,6 +165,7 @@ transactions, store must deal with (throw exception) when someone wants to
 	<BR> First some ugly pictures.  Some links are not shown to reduce
 	clutter.  Externally visible object is in <B>bold</B>.
   
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	<PRE>
 * 
 * When user ask for an XAConnection via a XADataSource, the following objects
@@ -426,5 +428,6 @@ public interface ResourceAdapter {
      * @throws XAException on error
 	 */
 	public void cancelXATransaction(XAXactId xid, String messageId) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
 		throws XAException;
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/security/SecurityUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/security/SecurityUtil.java
index 94ea60f689..6a4770344d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/security/SecurityUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/security/SecurityUtil.java
@@ -59,6 +59,7 @@ public class SecurityUtil {
      */
     private final static SystemPermission USE_DERBY_INTERNALS = new SystemPermission
         ( SystemPermission.ENGINE, SystemPermission.USE_DERBY_INTERNALS );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
     /**
      * Creates a (read-only) Subject representing a given user
@@ -70,6 +71,7 @@ public class SecurityUtil {
      * @see <a href="http://wiki.apache.org/db-derby/UserIdentifiers">User Names & Authorization Identifiers in Derby</a>
      */
     static public Subject createSystemPrincipalSubject(String user) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         final Set<SystemPrincipal> principals = new HashSet<SystemPrincipal>();
         // add the authenticated user
         if (user != null) {
@@ -133,6 +135,7 @@ static private String getAuthorizationId(String name) {
     static public void checkSubjectHasPermission(final Subject subject,
                                                  final Permission perm) {
         // the checks
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         final PrivilegedAction<Void> runCheck
             = new PrivilegedAction<Void>() {
                     public Void run() {
@@ -186,10 +189,12 @@ static public void checkUserHasPermission(String user,
      * to perform the indicated operation.
      */
     public  static  void    authorize( Securable operation )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         throws StandardException
     {
         LanguageConnectionContext lcc = (LanguageConnectionContext)
 				getContextOrNull( LanguageConnectionContext.CONTEXT_ID );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         if ( lcc.usesSqlAuthorization() )
         {
@@ -216,6 +221,7 @@ public  static  void    authorize( Securable operation )
      */
     public  static  void    checkDerbyInternalsPrivilege()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() != null )
         {
             AccessController.checkPermission( USE_DERBY_INTERNALS );
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/CacheManager.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/CacheManager.java
index deb461f59c..10354fcc53 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/CacheManager.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/CacheManager.java
@@ -296,10 +296,12 @@ Discard all objects that match the partialKey (or exact key).
      * @throws StandardException if an error occurs when registering the MBean
      */
     void registerMBean(String dbName) throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
 
     /**
      * Deregister the MBean that monitors this cache. If there is no MBean
      * for this instance, this is a no-op.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
     void deregisterMBean();
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/Cacheable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/Cacheable.java
index b8f5b18c99..7f26081a57 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/Cacheable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/Cacheable.java
@@ -32,6 +32,7 @@ class must be public and it must have a public no-arg constructor. This is becau
 	<P>
 	A Cacheable object has five states:
 	<OL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	<LI> No identity - The object is only accessable by the cache manager</LI>
 	<LI> Identity, clean, unkept - The object has an identity, is clean but is only accessable by the cache manager</LI>
 	<LI> Identity, clean, kept - The object has an identity, is clean, and is in use by one or more threads</LI> 
@@ -142,6 +143,7 @@ then the object should create a new object, call its initParameter() with the pa
 
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		Returns true if the object is dirty. 
 		May be called when the object is kept or unkept.
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/CacheableFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/CacheableFactory.java
index 3fd044e83b..d243a8ff71 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/CacheableFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/CacheableFactory.java
@@ -22,6 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.derby.iapi.services.cache;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	<P>
 	Any object that implements this interface can be cached using the services of
 	the CacheManager/CacheFactory. In addition to implementing this interface the
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/ClassSize.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/ClassSize.java
index 5f79d8a3f3..38643ebddb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/ClassSize.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/ClassSize.java
@@ -61,8 +61,10 @@ public class ClassSize
         int tmpRefSize = fetchRefSizeFromSystemProperties();
         // If we didn't understand the properties, or were not allowed to read
         // them, use a heuristic.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3731
         if (tmpRefSize < 4) {
             Runtime runtime = Runtime.getRuntime();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3731
             runtime.gc();
             runtime.runFinalization();
             long memBase = runtime.totalMemory() - runtime.freeMemory();
@@ -204,6 +206,7 @@ private static int estimateBaseFromCatalog( Class<?> cls, boolean addToCatalog)
             return 0;
 
         ClassSizeCatalog catalog = ClassSizeCatalog.getInstance();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         if( SanityManager.DEBUG)
 			SanityManager.ASSERT( catalog != null, "The class size catalog could not be initialized.");
@@ -309,8 +312,10 @@ public static int estimateMemoryUsage( String str)
      */
     private static final int fetchRefSizeFromSystemProperties() {
         // Try the direct way first, by looking for 'sun.arch.data.model'
+//IC see: https://issues.apache.org/jira/browse/DERBY-3731
         String dataModel = getSystemProperty("sun.arch.data.model");
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             return Integer.parseInt(dataModel) / 8;
         } catch (NumberFormatException ignoreNFE) {}
 
@@ -344,6 +349,7 @@ private static final int fetchRefSizeFromSystemProperties() {
      */
     private static final String getSystemProperty(final String propName) {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             return AccessController.doPrivileged(
                     new PrivilegedAction<String>() {
                         public String run() {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/ClassSizeCatalog.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/ClassSizeCatalog.java
index 5709533290..e93e4fe1d6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/ClassSizeCatalog.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/cache/ClassSizeCatalog.java
@@ -36,6 +36,7 @@ abstract class ClassSizeCatalog extends Hashtable<String, int[]> {
         // try to compile it. This may fail because ClassSizeCatalogImpl.java
         // is not created until everything else has been compiled. Bury
         // ClassSizeCatalogImpl in a string.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         String className = ClassSizeCatalog.class.getName() + "Impl";
         try {
             Class<?> clazz = Class.forName(className);
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/Attributes.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/Attributes.java
index b2a3a60f4b..97f24ffbd1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/Attributes.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/Attributes.java
@@ -25,6 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 import java.io.IOException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 class Attributes extends Vector<AttributeEntry> {
 	private int classFileSize;
 
@@ -35,6 +36,7 @@ class Attributes extends Vector<AttributeEntry> {
 	void put(ClassFormatOutput out) throws IOException {
 		int size = size();
 		for (int i = 0; i < size; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			elementAt(i).put(out);
 		}
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
index 94a1370058..c140bd5a64 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
@@ -39,6 +39,7 @@ class ClassEnumeration implements Enumeration {
 	ClassHolder	cpt;
 	Enumeration			inner;
 	CONSTANT_Index_info	position;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	HashSet<String>           foundClasses;
     Enumeration         classList;
 
@@ -49,6 +50,7 @@ class ClassEnumeration implements Enumeration {
     {
 		this.cpt = cpt;
 		inner = e;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		foundClasses = new HashSet<String>(30, 0.8f);
 		findMethodReferences(methods, foundClasses);
 		findFieldReferences(fields, foundClasses);
@@ -108,6 +110,7 @@ private void findClassReferences(HashSet<String> foundClasses)
 	}
 
 	private void findMethodReferences(  Enumeration methods,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	                                    HashSet<String> foundClasses)
 	{
 	    while (methods.hasMoreElements())
@@ -119,6 +122,7 @@ private void findMethodReferences(  Enumeration methods,
 	}
 
 	private void findFieldReferences(   Enumeration fields,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	                                    HashSet<String> foundClasses)
 	{
 	    while (fields.hasMoreElements())
@@ -129,6 +133,7 @@ private void findFieldReferences(   Enumeration fields,
 	    }
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	void distillClasses(String fieldOrMethodSig, HashSet<String> foundClasses)
 	{
 	    if (fieldOrMethodSig == null || fieldOrMethodSig.length() < 1)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java
index 22e787f1a8..122457de4d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java
@@ -55,6 +55,7 @@ public ClassFormatOutput(java.io.OutputStream stream) {
 	public void putU1(int i) throws IOException {
 		// ensure the format of the class file is not
 		// corrupted by writing an incorrect, truncated value.
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		if (i > 255)
 			ClassFormatOutput.limit("U1", 255, i);
 		write(i);
@@ -96,6 +97,7 @@ public byte[] getData() {
 	 * @throws IOException Thrown when limit is exceeded.
 	 */
 	static void limit(String name, int limit, int value)
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		throws IOException
 	{
 		throw new IOException(name + "(" + value + " > " + limit + ")");
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassHolder.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
index 0623ce9e3c..f8ba3441fe 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
@@ -108,6 +108,7 @@ public class ClassHolder {
 	protected ClassHolder(int estimatedConstantPoolCount) {
 		// Constant Pool Information
 		// 100 is the estimate of the number of entries that will be generated
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		cptEntries = new Vector<ConstantPoolEntry>(estimatedConstantPoolCount);
 		cptHashTable = new Hashtable<Object,ConstantPoolEntry>(estimatedConstantPoolCount, (float)0.75);
 
@@ -145,6 +146,7 @@ private void put(ClassFormatOutput out) throws IOException {
 		// (as it is stored as a U2).
 		// Special case to allow somewhat easier debugging
 		// of the resulting failure.
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		out.putU2("constant_pool", cptEntries.size());
 		cptPut(out);
 
@@ -214,6 +216,7 @@ public ByteArray getFileFormat() throws IOException {
 
 	
 		ClassFormatOutput cfo = new ClassFormatOutput(classFileSize + 200);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 		put(cfo);
 
@@ -422,6 +425,7 @@ protected int addEntry(Object key, ConstantPoolEntry item) {
 		if (key != null)
 			cptHashTable.put(key, item);
 		cptEntries.add(item);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 
 		cptEstimatedSize += item.classFileSize();
 
@@ -536,6 +540,7 @@ private int addString(String value) {
 
  	protected void cptPut(ClassFormatOutput out) throws IOException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		for (Enumeration<ConstantPoolEntry> e = cptEntries.elements(); e.hasMoreElements(); ) {
 			ConstantPoolEntry item = e.nextElement();
 			if (item == null) {
@@ -551,6 +556,7 @@ protected void cptPut(ClassFormatOutput out) throws IOException {
 	*/
 
 	public ConstantPoolEntry getEntry(int index) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		return cptEntries.get(index);
 	}
 
@@ -657,6 +663,7 @@ protected int findIndexIndex(int tag, int i1, int i2) {
 	}
 
 	protected ConstantPoolEntry findMatchingEntry(Object key) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		return cptHashTable.get(key);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassInput.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassInput.java
index 2720720207..06d81cb4c0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassInput.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassInput.java
@@ -37,6 +37,7 @@ class ClassInput extends DataInputStream {
 	}
 
     int getU1() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6857
         return readUnsignedByte();
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
index 204e1704e2..ae8978c9da 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
@@ -140,9 +140,11 @@ public Enumeration implementedInterfaces()
 	{
 		int interfaceCount = interfaces == null ? 0 : interfaces.length;
 		Vector<String> implemented = new Vector<String>(interfaceCount);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         for (int i = 0; i < interfaceCount; i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
             implemented.add(className(interfaces[i]));
         }
         return implemented.elements();
@@ -150,6 +152,7 @@ public Enumeration implementedInterfaces()
     public Enumeration<ClassMember> getFields() {
 		if (field_info == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			return Collections.enumeration( new Vector<ClassMember>() );
         }
 
@@ -178,6 +181,7 @@ private Enumeration getClasses(Enumeration<ClassMember> methods, Enumeration<Cla
 	}
 
 	public Enumeration getStrings() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		HashSet<String> strings = new HashSet<String>(30, 0.8f);
 		
 		int size = cptEntries.size();
@@ -244,6 +248,7 @@ else if (name.equals("InnerClasses"))
 		attribute_info = null;
 
 		// fields
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		for (Enumeration<ClassMember> e = getFields(); e.hasMoreElements(); ) {
 			ClassMember member = e.nextElement();
 
@@ -270,6 +275,7 @@ else if (name.equals("Synthetic"))
 		}
 
 		// methods
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		for (Enumeration<ClassMember> e = getMethods(); e.hasMoreElements(); ) {
 			ClassMember member = e.nextElement();
 
@@ -304,6 +310,7 @@ private void processCodeAttribute(ClassMember member, AttributeEntry ae) throws
 
 		ClassInput ci = new ClassInput(new java.io.ByteArrayInputStream(ae.infoIn));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3941
 		DataInputUtil.skipFully(ci, 4);// puts us at code_length
 		int len = ci.getU4();
 		DataInputUtil.skipFully(ci, len);// puts us at exception_table_length
@@ -330,6 +337,7 @@ private void processCodeAttribute(ClassMember member, AttributeEntry ae) throws
 				System.err.println("ERROR - Unknown code attribute " + name);
 
 			len = ci.getU4();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3941
 			DataInputUtil.skipFully(ci, len);
 		}
 
@@ -400,6 +408,7 @@ private void renameMembers(Enumeration<ClassMember> e, Hashtable classNameMap, H
 
 		for (; e.hasMoreElements(); ) {
 			ClassMember member = e.nextElement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 			String oldMemberName = nameIndexToString(member.name_index);
 			String newMemberName = (String) memberNameMap.get(oldMemberName);
@@ -462,6 +471,7 @@ private void doRenameString(int index, String newName) {
 
 		newCpe.index = index;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 		cptEntries.set(index, newCpe);
 	}
 
@@ -470,6 +480,7 @@ private static ConstantPoolEntry getConstant(ClassInput in)
 
 		ConstantPoolEntry item;
         final int tag = in.getU1();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6857
 
 		switch (tag) {
 		case VMDescriptor.CONSTANT_Class:
@@ -482,6 +493,7 @@ private static ConstantPoolEntry getConstant(ClassInput in)
 		case VMDescriptor.CONSTANT_Fieldref:
 		case VMDescriptor.CONSTANT_Methodref:
 		case VMDescriptor.CONSTANT_InterfaceMethodref:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6857
         case VMDescriptor.CONSTANT_InvokeDynamic:
 			item = new CONSTANT_Index_info(tag, in.getU2(), in.getU2());
 			break;
@@ -506,6 +518,7 @@ private static ConstantPoolEntry getConstant(ClassInput in)
 			item = new CONSTANT_Utf8_info(in.readUTF());
 			break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6857
         case VMDescriptor.CONSTANT_MethodHandle:
             item = new CONSTANT_Index_info(tag, in.getU1(), in.getU2());
             break;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/MemberTable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/MemberTable.java
index e4c950ad1e..beb27686f1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/MemberTable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile/MemberTable.java
@@ -34,6 +34,7 @@ class MemberTable {
 	private MemberTableHash	mutableMTH = null;
 
 	public MemberTable(int count) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		entries = new Vector<ClassMember>(count);
 		hashtable = new Hashtable<MemberTableHash,MemberTableHash>((count > 50) ? count : 50);
 		mutableMTH = new MemberTableHash(null, null);
@@ -46,6 +47,7 @@ void addEntry(ClassMember item) {
 									entries.size());
 		/* Add to the Vector */
 		entries.add(item);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 
 		/* Add to the Hashtable */
 		hashtable.put(mth, mth);
@@ -59,6 +61,7 @@ ClassMember find(String name, String descriptor) {
 		mutableMTH.setHashCode();
 
 		/* search the hash table */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		MemberTableHash mth = hashtable.get(mutableMTH);
 		if (mth == null)
 		{
@@ -84,6 +87,7 @@ int size() {
 	int classFileSize() {
 		int size = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Vector<ClassMember> lentries = entries;
 		int count = lentries.size();
 		for (int i = 0; i < count; i++) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
index 07dcdc3626..7acb679686 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
@@ -85,6 +85,7 @@ class using the ClassBuilder's ClassFactory.
 	 * the default no-arg constructor will be defined.
 	 */
 	ByteArray getClassBytecode() throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 	/**
 	 * the class's unqualified name
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
index 69d1b16358..17326c3ca2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
@@ -62,6 +62,7 @@ public interface MethodBuilder {
 	/**
 		Push a parameter value.
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,param_value
 		</PRE>
@@ -72,6 +73,7 @@ public interface MethodBuilder {
 	/**
 		Push a byte constant onto the stack
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,byte_value
 		</PRE>
@@ -90,6 +92,7 @@ public interface MethodBuilder {
 	/**
 		Push a short constant onto the stack
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,short_value
 		</PRE>
@@ -99,6 +102,7 @@ public interface MethodBuilder {
 	/**
 		Push a int constant onto the stack
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,int_value
 		</PRE>
@@ -108,6 +112,7 @@ public interface MethodBuilder {
 	/**
 		Push a long constant onto the stack
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,long_value
 		</PRE>
@@ -117,6 +122,7 @@ public interface MethodBuilder {
 	/**
 		Push a float constant onto the stack
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,float_value
 		</PRE>
@@ -126,6 +132,7 @@ public interface MethodBuilder {
 	/**
 		Push a double constant onto the stack
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,double_value
 		</PRE>
@@ -135,6 +142,7 @@ public interface MethodBuilder {
 	/**
 		Push a String constant onto the stack
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,String_value
 		</PRE>
@@ -144,6 +152,7 @@ public interface MethodBuilder {
 	/**
 		Push a typed null onto the stack
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,null
 		</PRE>
@@ -166,6 +175,7 @@ public interface MethodBuilder {
 		This call requires the instance (reference) to be pushed by the caller.
 
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,field_ref  =&gt;
 		      ...,field_value
 		</PRE>
@@ -176,6 +186,8 @@ This call requires the instance (reference) to be pushed by the caller.
 	/**
 		Push the contents of the described static field onto the stack.
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,field_value
 		</PRE>
@@ -183,6 +195,7 @@ This call requires the instance (reference) to be pushed by the caller.
 	public void getStaticField(String declaringClass, String fieldName, String fieldType);
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 	Pop the top stack value and store it in the local field. 
 	This call pushes the this instance required to access the field itself.
 	This call does not leave any value on the stack.
@@ -212,6 +225,9 @@ This call requires the instance (reference) to be pushed by the caller.
 		Like the Java language 'field = value', this leaves the value on the stack.
 
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,value  =&gt;
 		      ...,value
 		</PRE>
@@ -224,6 +240,7 @@ This call requires the instance (reference) to be pushed by the caller.
 		Like the Java language 'field = value', this leaves the value on the stack.
 
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,field_ref,value  =&gt;
 		      ...,value
 		</PRE>
@@ -238,6 +255,7 @@ can be pushed onto the stack between the pushNewStart() and pushNewComplete() me
 		calls.
 
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ... =&gt; [unchanged]
 		      ...
 		</PRE>
@@ -253,6 +271,7 @@ Complete the sequence that was started with pushNewStart().
 		to the newly created object.
 
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,value* =&gt; [numArgs number of values will be popped]
 		      ...,new_ref
 		</PRE>
@@ -265,6 +284,7 @@ Complete the sequence that was started with pushNewStart().
 		Create an instance of an array and push it onto the stack. 
 
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,array_ref
 		</PRE>
@@ -278,6 +298,8 @@ Complete the sequence that was started with pushNewStart().
 	/**
 		Push this onto the stack.
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...  =&gt;
 		      ...,this_ref
 		</PRE>
@@ -289,6 +311,7 @@ Complete the sequence that was started with pushNewStart().
 		by upcasting method parameters. It does not put any casting code into the
 		byte code stream. Can only be used for refrences.
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,ref =&gt;
 		      ...,ref
 		</PRE>
@@ -299,6 +322,7 @@ Complete the sequence that was started with pushNewStart().
 		Cast the top stack value. Correctly down-casts a reference or casts
 		a primitive type (e.g. int to short).
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,value =&gt;
 		      ...,cast_value
 		</PRE>
@@ -311,6 +335,7 @@ a primitive type (e.g. int to short).
 		Pop the top stack value and push a boolean that is the result of
 		an instanceof check on the popped reference.
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,ref =&gt;
 		      ...,boolean_value
 		</PRE>.
@@ -319,7 +344,9 @@ a primitive type (e.g. int to short).
 	
 	/**
 	 * Pop the top value off the stack
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ..., value =&gt;
 		      ...
 		</PRE>.
@@ -349,6 +376,8 @@ a primitive type (e.g. int to short).
 		on the stack. If the stack contains a single
 		value then that is popped and used as the returned value.
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack value =&gt;
 		      :empty:
 		or
@@ -361,6 +390,7 @@ a primitive type (e.g. int to short).
 	public void methodReturn();
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 		Initiate a conditional sequence.
 		The top value on the stack (a reference) is popped and compared to 'null'.
 		If the value is null then the code following this call until the startElseCode()
@@ -381,11 +411,13 @@ the completeConditional() is called.
 
 		Each path through the ?: statement must leave the stack at the same depth
 		as the other.
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 		<BR>
 		If the if or else code pops values from the stack that were before the conditional
 		value, then they must use the same number of values from the stack.
 
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,ref =&gt;
 		      ...
 		</PRE>.
@@ -395,6 +427,7 @@ the completeConditional() is called.
 	public void conditionalIfNull();
 	
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 		Initiate a conditional sequence.
 		The top value on the stack must be a boolean and will be popped. If it
 		is true then the code following this call until the startElseCode()
@@ -403,6 +436,7 @@ the completeConditional() is called. See conditionalIfNull() for example
 		and restrictions.
 
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,boolean_value =&gt;
 		      ...
 		</PRE>.
@@ -410,6 +444,7 @@ the completeConditional() is called. See conditionalIfNull() for example
 	public void conditionalIf();
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 		Complete the true code path of a conditional.
 	*/
 	public void startElseCode();
@@ -477,6 +512,8 @@ Call a method previously described by describeMethod().
 		<PRE>
 		static methods
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,value* =&gt; [numArgs number of values will be popped]
 		      ...,return_value [void methods will not push a value]
 
@@ -493,6 +530,7 @@ Call a method previously described by describeMethod().
 		Call super(). Caller must only add this to a constructor.
 		<PRE>
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ... =&gt;
 		      ... 
 		</PRE>
@@ -503,6 +541,7 @@ Call super(). Caller must only add this to a constructor.
 	/**
 		Pop an array refrence off the stack and push an element from that array.
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,array_ref =&gt;
 		      ...,value
 		</PRE>
@@ -514,6 +553,7 @@ Call super(). Caller must only add this to a constructor.
 	/**
 		Pop an array reference off the stack, store a value in the array at the passed in offset.
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,array_ref, value =&gt;
 		      ...
 		</PRE>
@@ -526,6 +566,7 @@ Call super(). Caller must only add this to a constructor.
 	/**
 		Swap the top two values on the stack.
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,valueA,valueB =&gt;
 		      ...,valueB,valueA
 		</PRE>
@@ -535,6 +576,7 @@ Call super(). Caller must only add this to a constructor.
 	/**
 		Duplicate the top value on the stack.
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ...,value =&gt;
 		      ...,value,value
 		</PRE>
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/ContextManager.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/ContextManager.java
index 33f44c485e..a532463e89 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/ContextManager.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/ContextManager.java
@@ -82,6 +82,7 @@ private static final class CtxStack {
 		// expensive, but those operations are infrequent.
 		private Context top_ = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-938
 		void push(Context context) { 
 			stack_.add(context); 
 			top_ = context; 
@@ -89,6 +90,7 @@ void push(Context context) {
 		void pop() {
 			stack_.remove(stack_.size()-1);
 			top_ = stack_.isEmpty() ? 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 null : stack_.get(stack_.size()-1);
 		}
 		void remove(Context context) {
@@ -103,7 +105,9 @@ Context top() {
 		}
 		boolean isEmpty() { return stack_.isEmpty(); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         List<Context> getUnmodifiableList() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2884
 			return view_;
 		}
 	}
@@ -136,6 +140,7 @@ public void pushContext(Context newContext)
 		checkInterrupt();
 		final String contextId = newContext.getIdName();
 		CtxStack idStack = ctxTable.get(contextId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		// if the stack is null, create a new one.
 		if (idStack == null) {
@@ -159,6 +164,7 @@ public void pushContext(Context newContext)
 	public Context getContext(String contextId) {
 		checkInterrupt();
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		final CtxStack idStack = ctxTable.get(contextId);
 		if (SanityManager.DEBUG)
 			SanityManager.ASSERT( idStack == null ||
@@ -181,6 +187,7 @@ public void popContext()
 
 		// remove the top context from the global stack
 		Context theContext = holder.remove(holder.size()-1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		// now find its id and remove it from there, too
 		final String contextId = theContext.getIdName();
@@ -210,6 +217,7 @@ void popContext(Context theContext)
 
 		final String contextId = theContext.getIdName();
 		final CtxStack idStack = ctxTable.get(contextId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		// now remove it from its id's stack.
 		idStack.remove(theContext);
@@ -218,6 +226,7 @@ void popContext(Context theContext)
     /**
      * Is the ContextManager empty containing no Contexts.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
     final boolean isEmpty()
     {
         return holder.isEmpty();
@@ -236,7 +245,9 @@ final boolean isEmpty()
 	 * @see org.apache.derby.iapi.sql.conn.StatementContext#resetSavePoint()
 	 */
     public final List<Context> getContextStack(String contextId) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		final CtxStack cs = ctxTable.get(contextId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return cs == null ?
                Collections.<Context>emptyList() :
                cs.getUnmodifiableList();
@@ -267,6 +278,7 @@ public boolean cleanupOnError(Throwable error, boolean diagActive)
 		if (error instanceof ThreadDeath)
 			seenThreadDeath = (ThreadDeath) error;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4010
         if (error instanceof PassThroughException) {
             error = error.getCause();
         }
@@ -279,6 +291,7 @@ public boolean cleanupOnError(Throwable error, boolean diagActive)
 			if (! shutdown)
 			{
 				// report an id for the message if possible
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 ContextImpl lcc =
                         (ContextImpl)getContext(ContextId.LANG_CONNECTION);
 				if (lcc != null) {
@@ -297,6 +310,7 @@ public boolean cleanupOnError(Throwable error, boolean diagActive)
 			
 			if (!shutdown)		// Do this only during normal processing.
 			{	
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 				ContextImpl sc = (ContextImpl) getContext(org.apache.derby.shared.common.reference.ContextId.LANG_STATEMENT);
 				// Output the SQL statement that failed in the log file.
 				if (sc != null)
@@ -341,6 +355,7 @@ the vector interface to do this.
 						break;
 					}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					Context ctx = (holder.get(index));
 					lastHandler = ctx.isLastHandler(errorSeverity);
 
@@ -551,6 +566,9 @@ private boolean reportError(Throwable t) {
      */
     public int getErrorSeverity(Throwable error) {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4856
+//IC see: https://issues.apache.org/jira/browse/DERBY-4929
+//IC see: https://issues.apache.org/jira/browse/DERBY-289
         if (error instanceof StandardException) {
             return ((StandardException) error).getErrorCode();
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/ContextService.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/ContextService.java
index e47be138de..c0a8682aba 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/ContextService.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/ContextService.java
@@ -63,6 +63,7 @@ public final class ContextService //OLD extends Hashtable
             and this is enforced by synchronization outside the ContextManager.
             E.g for JDBC connections, synchronization at the JDBC level.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         <LI> ContextManagerStack containing ContextManagers - the current
         thread is actively using multiple different ContextManagers,
         with nesting. All ContextManagers in the stack will have
@@ -70,6 +71,7 @@ public final class ContextService //OLD extends Hashtable
         set to -1. This is because nesting is solely represented by
         the stack, with the current context manager on top of the stack.
         This supports multiple levels of nesting across two stacks, e.g.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         C1-&gt;C2-&gt;C2-&gt;C1-&gt;C2.
 		</UL>
 
@@ -77,6 +79,7 @@ public final class ContextService //OLD extends Hashtable
 		fast access to a list of candidate contexts. If one of the contexts has its activeThread
 		equal to the current thread then it is the current context manager.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 		If the thread has pushed multiple contexts (e.g. open a new non-nested Derby connection
 		from a server side method) then threadContextList will contain a Stack. The value for each cm
 		will be a push order, with higher numbers being more recently pushed.
@@ -95,6 +98,7 @@ the context manager keeps track of the number of times it has been pushed (set).
 		for the lifetime of the request. In this case this variable will contain a  WeakReference.
 		</UL>
         <BR>
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Single thread for Connection execution.
         <pre>
         threadContextList.get() == cm
@@ -184,6 +188,7 @@ public ContextService() {
 		ContextService.factory = this;
 
 		allContexts = new HashSet<ContextManager>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	}
 
@@ -193,11 +198,13 @@ public ContextService() {
 	public static void stop()
     {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		// For some unknown reason, the ContextManager and
 		// ContextService objects will not be garbage collected
 		// without the next two lines.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
         ContextService fact = ContextService.factory;
         if (fact != null) {
             synchronized (fact) {
@@ -229,6 +236,7 @@ public static ContextService getFactory()
 	public static Context getContext(String contextId)
     {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		ContextManager cm = getFactory().getCurrentContextManager();
@@ -252,6 +260,8 @@ public static Context getContext(String contextId)
 	public static Context getContextOrNull(String contextId)
     {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		ContextService csf = factory;
@@ -301,6 +311,7 @@ public ContextManager getCurrentContextManager() {
 		if (list == null)
 			return null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return ((ContextManagerStack) list).peek();
 	}
 
@@ -345,6 +356,7 @@ public void resetCurrentContextManager(ContextManager cm) {
 		}
 
 		if (cm.activeCount != -1) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
 			if (--cm.activeCount == 0) {
 				cm.activeThread = null;
                 
@@ -364,6 +376,7 @@ public void resetCurrentContextManager(ContextManager cm) {
 		}
 
         ContextManagerStack stack = (ContextManagerStack) tcl.get();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // Remove the context manager at the top of the stack.
         stack.pop();
@@ -410,6 +423,8 @@ public void resetCurrentContextManager(ContextManager cm) {
 	private boolean addToThreadList(Thread me, ContextManager associateCM) {
 
 		ThreadLocal<Object> tcl = threadContextList;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		if (tcl == null) {
 			// The context service is already stopped.
@@ -429,6 +444,7 @@ private boolean addToThreadList(Thread me, ContextManager associateCM) {
 			return true;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ContextManagerStack stack;
 		if (list instanceof ContextManager) {
             
@@ -449,6 +465,7 @@ private boolean addToThreadList(Thread me, ContextManager associateCM) {
             
             // Nested, need to create a Stack of ContextManagers,
             // the top of the stack will be the active one.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             stack = new ContextManagerStack();
 			tcl.set(stack);
             
@@ -466,6 +483,7 @@ private boolean addToThreadList(Thread me, ContextManager associateCM) {
 		{
             // existing stack, nesting represented
             // by stack entries, not activeCount.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             stack = (ContextManagerStack) list;
 		}
 
@@ -567,6 +585,7 @@ public void notifyAllActiveThreads(Context c) {
 
 		synchronized (this) {
             for (ContextManager cm : allContexts) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 				Thread active = cm.activeThread;
 
@@ -576,11 +595,13 @@ public void notifyAllActiveThreads(Context c) {
 				if (active == null)
 					continue;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2564
                 final Thread fActive = active;
 				if (cm.setInterrupted(c))
                 {
                     try {
                         AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                                 new PrivilegedAction<Void>() {
                                     public Void run()  {
                                         fActive.interrupt();
@@ -600,6 +621,7 @@ public Void run()  {
      * Remove a ContextManager from the list of all active
      * contexts managers.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
     synchronized void removeContext(ContextManager cm)
     {
         if (allContexts != null)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/SystemContext.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/SystemContext.java
index 29fc8149b1..0e98fd5f88 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/SystemContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/context/SystemContext.java
@@ -50,6 +50,7 @@ public void cleanupOnError(Throwable t) {
 				return;
             
             popMe();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
 
 			if (severity >= ExceptionSeverity.SYSTEM_SEVERITY)
 				doShutdown = true;
@@ -77,6 +78,7 @@ public void cleanupOnError(Throwable t) {
 
 		} finally {
 			// we need this to happen even if we fail to print out a notice
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			getMonitor().shutdown();
 		}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/crypto/CipherFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
index 7a9e5d9337..71fae9ab47 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
@@ -77,6 +77,7 @@ public String changeBootPassword(String changeString, Properties properties, Cip
 		throws StandardException;
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-862
 		Verify the external encryption key. Throws exception if unable to verify
 		that the encryption key is the same as that
 		used during database creation or if there are any problems when trying to do the
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/daemon/Serviceable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/daemon/Serviceable.java
index f96b2f4e54..29d2d13f75 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/daemon/Serviceable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/daemon/Serviceable.java
@@ -110,6 +110,7 @@ public interface Serviceable {
 		If it doesn't make any difference if this work is done on a the user thread
 		immediately or if it is performed by another thread asynchronously
 		later, then return false.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         @return true if this work shold happen immediately on the user thread
 	*/
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
index c809ce37db..7d17006dc9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
@@ -24,6 +24,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
 
 The Diagnostic framework is meant to provide a way to include as much
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 diagnostic capability within the distributed release of the Derby
 product without adversely affecting the runtime speed or foot print of
 a running configuration that needs not use this information.
@@ -82,6 +83,7 @@ public static Diagnosticable findDiagnostic(Object ref)
 					className.substring(0, lastDot) + 
 					"D_" + className.substring(lastDot);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				Class<?> diagClass;
 				
 				try {
@@ -97,6 +99,7 @@ public static Diagnosticable findDiagnostic(Object ref)
 				}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Constructor<?> constructor = diagClass.getConstructor();
 				Diagnosticable diag_obj = (Diagnosticable) diagClass.getConstructor().newInstance();
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
index cd532ab6bd..87cd73a68b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
@@ -69,6 +69,7 @@ public byte[] getInternalByteArray() {
      */
     public void readFrom(InputStream in) throws IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-552
        byte[] buffer = new byte[8192];
         
         for(;;)
@@ -90,6 +91,7 @@ public void readFrom(InputStream in) throws IOException
      */
     public InputStream getInputStream()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
         return new ByteArrayInputStream(buf, 0, count);
     }
     
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/ArrayInputStream.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
index f9b5631cf1..e3c9254799 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
@@ -49,6 +49,7 @@ public final class ArrayInputStream extends InputStream implements LimitObjectIn
 	 *
 	 */
 	public ArrayInputStream() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 		this(ArrayUtil.EMPTY_BYTE_ARRAY);
 	}
 
@@ -72,6 +73,7 @@ public ArrayInputStream(byte[] data) {
 	/**
 		Set the array of bytes to be read.
 		Position is set to zero.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2118
 
         @param data The data in the stream
 	*/
@@ -84,6 +86,7 @@ public void setData(byte[] data) {
 	/**
 		Return a reference to the array of bytes this stream is going to read
 		from so that caller may load it with stuff
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         @return the data in the stream
 	*/
@@ -176,6 +179,7 @@ public void setLimit(int offset, int length) throws IOException {
 		start = offset;
 		end = offset + length;
 		position = start;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2118
 
 		if ((offset < 0) || (length < 0) || (end > pageData.length)) {
 			start = end = position = 0;
@@ -192,6 +196,7 @@ public final void setLimit(int length) throws IOException {
         start = position;
         end   = position + length;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2118
         if (end > pageData.length) {
 			start = end = position = 0;
 			throw new EOFException();
@@ -204,6 +209,7 @@ public final void setLimit(int length) throws IOException {
 		@see Limit#clearLimit
 	*/
 	public final int clearLimit() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2118
         start = 0;
         int remainingBytes = end - position;
         end = pageData.length;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java
index b22920be39..836a687390 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/CloseFilterInputStream.java
@@ -36,6 +36,7 @@ public class CloseFilterInputStream
 
     /** Message, modeled after CloseFilterInputStream in the client. */
     private static final String MESSAGE =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
             MessageService.getTextMessage(MessageId.OBJECT_CLOSED); 
     
     /** Tells if this stream has been closed. */
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/CompressedNumber.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/CompressedNumber.java
index 151e970852..d3bb50b5dc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/CompressedNumber.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/CompressedNumber.java
@@ -54,6 +54,7 @@ public abstract class CompressedNumber {
 		Write a compressed integer only supporting signed values.
 		Formats are (with x representing value bits):
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		1 Byte - 00xxxxxx                              Represents the value &lt;= 63 (0x3f)
 		2 Byte - 01xxxxxx xxxxxxxx                     Represents the value &gt; 63 &amp;&amp; &lt;= 16383 (0x3fff)
 		4 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx   Represents the value &gt; 16383 &amp;&amp; &lt;= MAX_INT
@@ -291,6 +292,7 @@ public static final int sizeInt(int value) {
 
 		Formats are (with x representing value bits):
 		<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		2 byte - 00xxxxxx xxxxxxxx                     Represents the value &lt;= 16383 (0x3fff)
 		4 byte - 01xxxxxx xxxxxxxx xxxxxxxx xxxxxxxx   Represents the value &gt; 16383  &amp;&amp; &lt;= 0x3fffffff
 		8 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx   Represents the value &gt; 0x3fffffff &amp;&amp; &lt;= MAX_LONG
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java
index 8f0faa4d49..d22db9e5ab 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java
@@ -46,6 +46,7 @@ public void write(byte[] b, int off, int len) throws IOException {
 
 	void checkObject(Formatable f) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2598
 		ByteArrayInputStream in = 
             new ByteArrayInputStream(tee.getInternalByteArray(), 0, tee.size());
 
@@ -77,6 +78,7 @@ void checkObject(Formatable f) {
 
             // for debugging purposes print this both to derby.log and to
             // System.out.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2598
             String err_msg = 
                 "FormatableError:read error    : " + t.toString() + 
                 "\nFormatableError:class written : " + f.getClass();
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
index b79bdeda12..8449ee1c8b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
@@ -231,6 +231,7 @@ public void discardLeft(int amountToShrinkBy) {
 		expansion.
 
 		<UL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		<LI> buf.length &lt; 128k - increase by 4k
 		<LI> buf.length &lt; 1Mb - increase by 128k
 		<LI> otherwise increase by 1Mb.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FileUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FileUtil.java
index 53d1865aed..4f867ba2a7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FileUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FileUtil.java
@@ -206,6 +206,8 @@ public static boolean copyDirectory( StorageFactory storageFactory,
 
 				if (entry.isDirectory())
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-304
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
                     if(copySubDirs) {
                         if (!copyDirectory( storageFactory, entry, 
                                             new File(to,fileName), buffer, 
@@ -239,10 +241,15 @@ public static boolean copyFile( StorageFactory storageFactory, StorageFile from,
 		InputStream from_s = null;
 		FileOutputStream to_s = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
 		try {
 			from_s = from.getInputStream();
 			to_s = new FileOutputStream( to);
             limitAccessToOwner(to);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
 			if (buf == null)
 				buf = new byte[BUFFER_SIZE]; // reuse this buffer to copy files
@@ -311,7 +318,9 @@ public static boolean copyDirectory( WritableStorageFactory storageFactory,
 			return false;
 		}			
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             to.limitAccessToOwner();
         } catch (IOException ioe) {
             return false;
@@ -519,6 +528,7 @@ public static void limitAccessToOwner(File file) throws IOException {
             Property.STORAGE_USE_DEFAULT_FILE_PERMISSIONS);
 
         if (value != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6865
             if (Boolean.parseBoolean(value.trim())) {
                 return;
             }
@@ -535,6 +545,7 @@ public static void limitAccessToOwner(File file) throws IOException {
 
         // First attempt to limit access using the java.io.File class.
         // If it is successful, that's it and we're done.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6521
         if (limitAccessToOwnerViaFile(file)) {
             return;
         }
@@ -597,6 +608,7 @@ private static boolean limitAccessToOwnerViaFileAttributeView(File file)
             throws IOException {
 
         Path fileP = file.toPath();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6865
 
         PosixFileAttributeView posixView = Files.getFileAttributeView(
                 fileP, PosixFileAttributeView.class);
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
index dceb62b6c3..823f369ba3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
@@ -44,6 +44,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   information about the streams format and capabilites.
   */
 public final class FormatIdInputStream extends DataInputStream
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
     implements ErrorObjectInput, Resetable, CloneableStream
 {
 	protected ClassFactory cf;
@@ -204,6 +206,7 @@ ClassFactory getClassFactory() {
 		if (cf == null) {
 
 			ClassFactoryContext cfc =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				(ClassFactoryContext) getContextOrNull
 				                                  (ClassFactoryContext.CONTEXT_ID);
 
@@ -265,6 +268,7 @@ public InputStream cloneStream() {
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContextOrNull( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/Formatable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/Formatable.java
index d88f8a30cf..8f4c5f85f4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/Formatable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/Formatable.java
@@ -24,6 +24,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.io.Externalizable;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
   Derby interface for creating a stored form for
   an object and re-constructing an equivalent object
   from this stored form. The object which creates the
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java
index 0ce8298d58..2c68b60901 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java
@@ -75,6 +75,7 @@ public FormatableArrayHolder(Object[] array)
 					"array input to constructor is null, code can't handle this.");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
 		setArray( array );
 	}
 
@@ -91,6 +92,7 @@ public void setArray(Object[] array)
 					"array input to setArray() is null, code can't handle this.");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
 		this.array = ArrayUtil.copy( array );
 	}
 
@@ -105,6 +107,7 @@ public void setArray(Object[] array)
 	 */
     public <E> E[] getArray(Class<E[]> arrayClass)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6292
         return Arrays.copyOf(array, array.length, arrayClass);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatableBitSet.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
index 7bf016def8..49daf0d23b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
@@ -74,6 +74,7 @@ public final class FormatableBitSet implements Formatable, Cloneable
 	private transient int	lengthAsBits;
 
 	private final void checkPosition(int p) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if (p < 0 || lengthAsBits <= p) {
 			throw new
 				IllegalArgumentException("Bit position "+p+
@@ -99,6 +100,7 @@ private final void checkPosition(int p) {
 	 */
 	public FormatableBitSet()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 		value = ArrayUtil.EMPTY_BYTE_ARRAY;
 	}
 
@@ -109,6 +111,7 @@ public FormatableBitSet()
 	 */
 	public FormatableBitSet(int numBits)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if (numBits < 0) {
 			throw new
 			IllegalArgumentException("Bit set size "+ numBits +
@@ -135,6 +138,7 @@ private void initializeBits(int numBits)
 	 */
 	public FormatableBitSet(byte[] newValue)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
 		value = ArrayUtil.copy( newValue );
 		bitsInLastByte = 8;
 		lengthAsBits = calculateLength(newValue.length);
@@ -182,6 +186,7 @@ public Object clone()
 	 */
 	public boolean invariantHolds() {
 		// Check that all bits will fit in byte array
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		final int arrayLengthAsBits = value.length*8;
 		if (lengthAsBits > arrayLengthAsBits) { return false; }
 
@@ -275,6 +280,7 @@ public byte[] getByteArray()
 			value = data;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
 		return ArrayUtil.copy( value );
 	}
 
@@ -292,10 +298,12 @@ public byte[] getByteArray()
 	 */
 	public void grow(int n)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if (SanityManager.DEBUG) {
 			SanityManager.ASSERT(invariantHolds(), "broken invariant");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
  		if (n < 0) {
  			throw new IllegalArgumentException("Bit set cannot grow from "+
  											   lengthAsBits+" to "+n+" bits");
@@ -307,6 +315,7 @@ public void grow(int n)
 		int newNumBytes = FormatableBitSet.numBytesFromBits(n);
 
 		// is there enough room in the existing array
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if (newNumBytes > value.length) {
 			/*
 			** We didn't have enough bytes in value, so we need
@@ -333,10 +342,12 @@ public void grow(int n)
 	 */
 	public void shrink(int n)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if (SanityManager.DEBUG) {
 			SanityManager.ASSERT(invariantHolds(), "broken invariant");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if (n < 0 || n > lengthAsBits) {
 			throw new
 				IllegalArgumentException("Bit set cannot shrink from "+
@@ -377,6 +388,7 @@ public void shrink(int n)
 	 */
 	public boolean equals(Object other)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5022
         if (other instanceof FormatableBitSet) 
         {
             FormatableBitSet that = (FormatableBitSet) other;
@@ -508,6 +520,7 @@ public int hashCode()
 	public final boolean isSet(int position)
 	{
 		checkPosition(position);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		final int byteIndex = udiv8(position);
 		final byte bitIndex = umod8(position);
 		return ((value[byteIndex] & (0x80>>bitIndex)) != 0);
@@ -535,6 +548,7 @@ public final boolean get(int position)
 	public void set(int position)
 	{
 		checkPosition(position);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		final int byteIndex = udiv8(position);
 		final byte bitIndex = umod8(position);
 		value[byteIndex] |= (0x80>>bitIndex);
@@ -548,7 +562,9 @@ public void set(int position)
 	 */
 	public void clear(int position)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		checkPosition(position);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		final int byteIndex = udiv8(position);
 		final byte bitIndex = umod8(position);
 		value[byteIndex] &= ~(0x80>>bitIndex);
@@ -574,6 +590,7 @@ public void clear()
 	* @return	the number of bytes
 	*/
 	private static int numBytesFromBits(int bits) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		return (bits + 7) >> 3;
 	}
 
@@ -588,6 +605,7 @@ private static int numBytesFromBits(int bits) {
 	private static byte
 	numBitsInLastByte(int bits)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if (bits == 0) return 0;
 		byte lastbits = umod8(bits);
 		return (lastbits != 0 ? lastbits : 8);
@@ -606,6 +624,7 @@ public String toString()
 			StringBuffer str = new StringBuffer(getLength()*8*3);
 			str.append("{");
 			boolean first = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 			for (int inPosition = 0; inPosition < getLength(); inPosition++)
 			{
 				if (isSet(inPosition))
@@ -645,6 +664,7 @@ public static int maxBitsForSpace(int numBytes)
 	 * @return the zero-based index of the first set bit in the argument byte
 	 */
 	private static byte firstSet(byte v) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if ((v & 0x80) != 0) {
 			return 0;
 		}
@@ -704,6 +724,7 @@ public int anySetBit() {
 	 * beyondBit is set
 	 */
 	public int anySetBit(int beyondBit) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if (SanityManager.DEBUG) {
 			SanityManager.ASSERT(invariantHolds(), "broken invariant");
 		}
@@ -735,6 +756,7 @@ public int anySetBit(int beyondBit) {
 	 */
 	public void or(FormatableBitSet otherBit)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if (otherBit == null) {
 			return;
 		}
@@ -761,6 +783,7 @@ public void or(FormatableBitSet otherBit)
      */
     public  void    copyFrom( FormatableBitSet that )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
         System.arraycopy( that.getByteArray(), 0, value, 0, that.getLengthInBytes());
     }
 
@@ -837,6 +860,7 @@ public void xor(FormatableBitSet otherBit)
 	 */
 	public int getNumBitsSet()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 		if (SanityManager.DEBUG) {
 			SanityManager.ASSERT(invariantHolds(),"broken invariant");
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/InputStreamUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
index 01382af6b4..ee3e06b4f3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
@@ -121,6 +121,7 @@ public static int readLoop(InputStream in,
      *      if the param 'is' equals null.
      */
     public static long skipUntilEOF(InputStream is) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
         if(is == null)
             throw new NullPointerException();
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/LimitInputStream.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/LimitInputStream.java
index 0c8061e18a..7ed8d7a0c9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/LimitInputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/LimitInputStream.java
@@ -153,6 +153,7 @@ public void setInput(InputStream in) {
      * @return {@code false}
      */
     public boolean markSupported() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4245
         return false;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/StoredFormatIds.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
index acf5f2c184..ce59a5d3cc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
@@ -37,6 +37,7 @@ and another may restore (read) the object. The implication of this
   <UL>
   <LI>The interface(s) the stored object must support. Any implementation
   which reads the object must support these interfaces.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6168
   <LI>The format of the stored object. All implementations which support
   the format must be able to read and write it.
   </UL>
@@ -48,6 +49,7 @@ <LI>The interface(s) the stored object must support. Any implementation
 
   <P>When you add a format id to this file, please include the list
   of interfaces an implementation must support when it supports
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
   the format id. When Derby code reads a stored form it returns an 
   object of a Class which supports the stored form. A reader may
   cast this object to any interface listed in this file. It is an error for
@@ -58,6 +60,7 @@ the reader to cast the object to a class or interface not listed in this
   states the name of the class. The first implementation of a format defines
   the stored form.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
   <P>This interface defines all the format ids for Derby.
   If you define a format id please be sure to declare it in this
   file. If you remove support for a one please document that the
@@ -320,6 +323,7 @@ class org.apache.derby.impl.sql.catalog.TableDescriptorFinder
             (MIN_ID_2 + 137);
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
     class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
      */
     static public final int ROUTINE_PERMISSION_FINDER_V01_ID =
@@ -338,6 +342,7 @@ class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
             (MIN_ID_2 + 463);
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-3666
     class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
      */
     static public final int ROLE_GRANT_FINDER_V01_ID =
@@ -1456,6 +1461,7 @@ class org.apache.derby.impl.sql.GenericColumnDescriptor
 
     public static final int ACCESS_T_INTCOL_V1_ID =      
             (MIN_ID_4 + 4);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
     public static final int ACCESS_B2I_V4_ID =
             (MIN_ID_2 + 466);
@@ -1464,6 +1470,7 @@ class org.apache.derby.impl.sql.GenericColumnDescriptor
             (MIN_ID_2 + 467);
 
     public static final int ACCESS_B2I_V5_ID = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
             (MIN_ID_2 + 470);
     /******************************************************************
     **
@@ -1566,6 +1573,7 @@ class org.apache.derby.impl.sql.GenericColumnDescriptor
     /* org.apache.derby.impl.store.raw.log.ChecksumOperation */
     public static final int LOGOP_CHECKSUM =
             (MIN_ID_2 + 453);
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 
     /* org.apache.derby.impl.store.raw.data.CompressSpacePageOperation10_2 */
     public static final int LOGOP_COMPRESS10_2_SPACE =
@@ -1578,6 +1586,7 @@ class org.apache.derby.impl.sql.GenericColumnDescriptor
     /* org.apache.derby.impl.store.raw.data.EncryptContainerOperation */
     public static final int LOGOP_ENCRYPT_CONTAINER =
             (MIN_ID_2 + 459);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 
     /* org.apache.derby.impl.store.raw.data.EncryptContainerUndoOperation */
     public static final int LOGOP_ENCRYPT_CONTAINER_UNDO =
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/TypedFormat.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/TypedFormat.java
index afd2bac034..7ed900c406 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/TypedFormat.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/io/TypedFormat.java
@@ -21,6 +21,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 package org.apache.derby.iapi.services.io;
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
   Derby interface for identifying the format id for the
   stored form of an object. Objects of different classes may
   have the same format id if:
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/jmx/ManagementService.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/jmx/ManagementService.java
index 765533a18c..497b768dbf 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/jmx/ManagementService.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/jmx/ManagementService.java
@@ -72,6 +72,7 @@ public interface ManagementService extends ManagementMBean {
      * @throws StandardException on error
      */
     public <T> Object registerMBean(T bean,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Class<T> beanInterface,
             String keyProperties)
             throws StandardException;
@@ -92,5 +93,6 @@ public <T> Object registerMBean(T bean,
      * @return the quoted value
      * @see javax.management.ObjectName#quote(String)
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
     String quotePropertyValue(String value);
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassFactory.java
index bb10f2957e..5db3c843bb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassFactory.java
@@ -60,6 +60,7 @@ public GeneratedClass loadGeneratedClass(String fullyQualifiedName, ByteArray cl
         @param className The name of the class to load
         @return the corresponding class object
 		@exception ClassNotFoundException Class cannot be found, or
+//IC see: https://issues.apache.org/jira/browse/DERBY-485
 		a SecurityException or LinkageException was thrown loading the class.
 	*/
 	public Class loadApplicationClass(String className)
@@ -71,6 +72,7 @@ public Class loadApplicationClass(String className)
         @param classDescriptor Descriptor for class
         @return the corresponding class
 		@exception ClassNotFoundException Class cannot be found, or
+//IC see: https://issues.apache.org/jira/browse/DERBY-485
 		a SecurityException or LinkageException was thrown loading the class.
 	*/
 	public Class loadApplicationClass(ObjectStreamClass classDescriptor)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java
index 438ee719e8..aca71316b5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java
@@ -83,6 +83,7 @@ public final ClassFactory getClassFactory() {
      */
 	public final void cleanupOnError(Throwable error) {
         if (error instanceof StandardException) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
 
             StandardException se = (StandardException) error;
             
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassInfo.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassInfo.java
index 79832ea9ac..5223c1aa56 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassInfo.java
@@ -70,6 +70,7 @@ public final Class getClassObject() {
 
 	*/
 	public Object getNewInstance()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		throws InstantiationException,
                IllegalAccessException,
                InvocationTargetException,
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassInspector.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassInspector.java
index 5b65c0b120..bc53610bb2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassInspector.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/ClassInspector.java
@@ -78,6 +78,7 @@ public ClassInspector(ClassFactory cf) {
 	public boolean instanceOf(String className, Object obj)
 		throws ClassNotFoundException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Class<?> clazz = getClass(className);
 		// is className an untyped null
 		if (clazz == null)
@@ -99,6 +100,7 @@ public boolean assignableTo(String fromClassName, String toClassName)
 	{
 		try
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			Class<?> toClass = getClass(toClassName);
 			// is toClass an untyped null
 			if (toClass == null) {
@@ -132,6 +134,7 @@ public boolean assignableTo(String fromClassName, String toClassName)
 	public boolean accessible(String className)
 		throws ClassNotFoundException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Class<?> theClass = getClass(className);
 		if (theClass == null)
 			return false;
@@ -362,6 +365,7 @@ public Member findPublicField(String receiverType,
 		Exception e = null;
 		try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			Class<?> receiverClass = getClass(receiverType);
 			if (receiverClass == null)
 				return null;
@@ -451,6 +455,8 @@ public Member findPublicConstructor(String receiverType,
 									boolean[] isParam)
 						throws ClassNotFoundException, StandardException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Class<?> receiverClass = getClass(receiverType);
 		if (receiverClass == null)
 			return null;
@@ -520,6 +526,7 @@ public Class[][] getTypeBounds( Class parameterizedInterface, Class implementati
         throws StandardException
 	{
         if ( implementation == null ) { return null; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6243
 
         Type[]  genericInterfaces = implementation.getGenericInterfaces();
         for ( Type genericInterface : genericInterfaces )
@@ -573,6 +580,7 @@ public boolean  isVarArgsMethod( Member member )
      * @throws StandardException on error
 	 */
     public Class<?>[] getGenericParameterTypes(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             Class parameterizedType, Class implementation )
         throws StandardException
 	{
@@ -596,6 +604,7 @@ public Class<?>[] getGenericParameterTypes(
             return null;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return parameterTypes.toArray(new Class<?>[parameterTypes.size()]);
     }
 
@@ -863,6 +872,7 @@ public static boolean primitiveType(String typeName)
 		if (ambiguous)
 		{
 			/* Put the parameter type names into a single string */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
 			StringBuffer parmTypesString = new StringBuffer();
 			for (int i = 0; i < paramClasses.length; i++)
 			{
@@ -899,6 +909,7 @@ public static boolean primitiveType(String typeName)
         @param className Name of class
         @return the class
 		@exception ClassNotFoundException Class cannot be found, or
+//IC see: https://issues.apache.org/jira/browse/DERBY-485
 		a SecurityException or LinkageException was thrown loading the class.
 	*/
 	public Class<?> getClass(String className) throws ClassNotFoundException {
@@ -1055,6 +1066,7 @@ protected boolean classConvertableFromTo(Class fromClass, Class toClass, boolean
         //
         // OUT and INOUT args are arrays. Compare the cell types rather than the array types.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4958
         if ( fromClass.isArray() && toClass.isArray() )
         {
             return classConvertableFromTo( fromClass.getComponentType(), toClass.getComponentType(), mixTypes );
@@ -1185,6 +1197,7 @@ public String getDeclaringClass(Member method)
      * parameterized type.
      */
     private Class[][] findTypeBounds(ParameterizedType pt) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6243
         Type[] actualTypeArguments = pt.getActualTypeArguments();
         int argCount = actualTypeArguments.length;
         Class[][] retval = new Class[argCount][];
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java
index 7acdf54c9e..d845715b71 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java
@@ -40,6 +40,8 @@ public interface GeneratedByteCode {
 	*/
 	public void initFromContext(Context context)
 		throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-418
+//IC see: https://issues.apache.org/jira/browse/DERBY-1142
 
 	/**
 		Set the Generated Class. Call by the class manager just after
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/InstanceGetter.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/InstanceGetter.java
index 9e2f3531a6..522cad2c76 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/InstanceGetter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/loader/InstanceGetter.java
@@ -37,6 +37,7 @@ public interface InstanceGetter {
 
 	*/
 	public Object getNewInstance()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		throws InstantiationException,
                IllegalAccessException,
                InvocationTargetException,
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/Latch.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/Latch.java
index 21119321fb..064cec61be 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/Latch.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/Latch.java
@@ -28,6 +28,7 @@ public interface Latch {
 
 	/**	
 		Get the compatibility space the latch is held in.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 
         @return the latch's compatibility space
 	*/
@@ -35,6 +36,7 @@ public interface Latch {
 
 	/**
 		Get the object the latch is held on.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         @return the object the latch is held on
 	*/
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/LockFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/LockFactory.java
index 64adc94084..e144b02dd1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/LockFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/LockFactory.java
@@ -49,6 +49,7 @@ public interface LockFactory extends PropertySetCallback {
 	public CompatibilitySpace createCompatibilitySpace(LockOwner owner);
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		Lock an object within a compatibility space
 		and associate the lock with a group object,
 		waits up to timeout milli-seconds for the object to become unlocked. A 
@@ -76,6 +77,7 @@ public interface LockFactory extends PropertySetCallback {
 		could not be granted.
 
         @exception StandardException if a deadlock has occurred (message id
+//IC see: https://issues.apache.org/jira/browse/DERBY-6323
             will be LockFactory.Deadlock), or if the wait for the lock timed
             out (message id will be LockFactory.TimeOut), or if another thread
             interrupted this thread while it was waiting for the lock (this will
@@ -84,6 +86,7 @@ interrupted this thread while it was waiting for the lock (this will
             any other error occurs when locking the object
 	*/
 	public boolean lockObject(CompatibilitySpace compatibilitySpace,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 							  Object group, Lockable ref, Object qualifier,
 							  int timeout)
 		throws StandardException;
@@ -139,6 +142,7 @@ public void transfer(CompatibilitySpace compatibilitySpace,
 	public boolean anyoneBlocked();
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		Return true if locks are held in this compatibility space and
 		 this group.
 
@@ -168,6 +172,7 @@ public boolean areLocksHeld(CompatibilitySpace compatibilitySpace,
 		Zero duration means the lock is released as soon as it is obtained.
 		<P>
 		A compatibility space in an space where lock requests are assumed to be
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
         compatible and granted by the lock manager if the trio
         {compatibilitySpace, ref, qualifier} are equal (i.e. reference equality
         for qualifier and compatibilitySpace, equals() method for ref).
@@ -187,6 +192,7 @@ public boolean areLocksHeld(CompatibilitySpace compatibilitySpace,
 		could not be granted.
 
         @exception StandardException if a deadlock has occurred (message id
+//IC see: https://issues.apache.org/jira/browse/DERBY-6323
             will be LockFactory.Deadlock), or if the wait for the lock timed
             out (message id will be LockFactory.TimeOut), or if another thread
             interrupted this thread while it was waiting for the lock (this will
@@ -196,6 +202,7 @@ interrupted this thread while it was waiting for the lock (this will
 
 	*/
 	public boolean zeroDurationlockObject(CompatibilitySpace compatibilitySpace,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 										  Lockable ref, Object qualifier,
 										  int timeout)
 		throws StandardException;
@@ -214,6 +221,7 @@ public boolean isLockHeld(CompatibilitySpace compatibilitySpace,
 							  Object group, Lockable ref, Object qualifier);
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
 		Get the lock timeout in milliseconds. A negative number means that
         there is no timeout.
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/Lockable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/Lockable.java
index da8ca67665..3a329843d7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/Lockable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/Lockable.java
@@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	<LI>Otherwise the request is granted if the following expression evaluates
 	to true for every other lock <TT>{ CSn, Qn}</TT> held on <TT> L </TT>
 	<UL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	<LI> <PRE>    ( ( CSn == CS1 ) &amp;&amp; L.lockerAlwaysCompatible() ) </PRE>
 	<LI> <PRE> || (L.reqestCompatible(Q1, Qn)) </PRE>
 	</UL>
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/ShExLockable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/ShExLockable.java
index ddc764d889..632a77962d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/ShExLockable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/locks/ShExLockable.java
@@ -102,6 +102,7 @@ public boolean lockAttributes(int flag, Hashtable<String,Object> attributes)
             return false;
         // No containerId, but need something in there so it can print
 		attributes.put(VirtualLockTable.CONTAINERID, -1); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		attributes.put(VirtualLockTable.LOCKNAME, this.toString() );
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/memory/LowMemory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/memory/LowMemory.java
index 290d3dc607..0b05fec93d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/memory/LowMemory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/memory/LowMemory.java
@@ -101,6 +101,7 @@ public void setLowMemory() {
                     interrupted = true;
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             if (interrupted) {
                 // reinstate flag
                 Thread.currentThread().interrupt();
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/DerbyObservable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/DerbyObservable.java
index 67698a0a38..cf6dcfc64f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/DerbyObservable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/DerbyObservable.java
@@ -67,6 +67,7 @@ public synchronized void addObserver(DerbyObserver observer)
     {
       if (observer == null) { throw new IllegalArgumentException("Null arguments not allowed."); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6891
       if (!_observers.contains(observer)) { _observers.add(observer); }
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/ModuleControl.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/ModuleControl.java
index a31010cb3d..c3df2fca5e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/ModuleControl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/ModuleControl.java
@@ -56,6 +56,7 @@ be found through a findModule(). In this case the module's stop() method
 		This attributes properties set has the second default properties set as
 		its default. This set (which could be null) contains the properties
 		that the user set on their DriverManager.getConnection() call, and are thus
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 		not owned by Derby code, and thus must not be modified by Derby 
 		code.
 		<P>
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java
index 016d9603f0..b15f41904b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java
@@ -181,6 +181,7 @@ implement the passed in protocol (java interface class name).
 		<BR>
 		<B>Do not call directly - use Monitor.startPersistentService()</B>
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 		<P> The poperty set passed in is for boot options for the modules
 		required to start the service. It does not support defining different
 		or new modules implementations.
@@ -277,6 +278,7 @@ public Object startModule(boolean create, Object service, String protocol,
 
 	/**
 		Return a property from the JVM's system set.
+//IC see: https://issues.apache.org/jira/browse/DERBY-623
 		In a Java2 environment this will be executed as a privileged block
 		if and only if the property starts with 'derby.'.
 		If a SecurityException occurs, null is returned.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/Monitor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/Monitor.java
index dd0c7b839d..5402d5b2d1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/Monitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/Monitor.java
@@ -169,6 +169,7 @@ by another service (or the monitor itself) but are not fundamentally part of the
 	<LI>The properties set of the service (i.e. that passed into Monitor.createPersistentService()
 	or Monitor.startService()).
 	<LI>The System (JVM) properties set (i.e. java.lang.System.getProperties()).
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 	<LI>The application properties set (i.e. obtained from the derby.properties file).
 	<LI>The default implementation properties set (i.e. obtained from the
 	/org/apache/derby/modules.properties resource).
@@ -285,8 +286,11 @@ <LI> Execute the run() method of startCode (if startCode was not null).
     @SuppressWarnings("ResultOfObjectAllocationIgnored")
 	public static void startMonitor(Properties bootProperties, PrintWriter logging) {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
         try {
             new org.apache.derby.impl.services.monitor.FileMonitor(bootProperties, logging);
         } catch (AccessControlException e) {
@@ -301,6 +305,7 @@ of the monitor (ModuleFactory).
 	public static boolean setMonitor(ModuleFactory theMonitor) {
 
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		synchronized (syncMe) {
@@ -315,6 +320,7 @@ public static boolean setMonitor(ModuleFactory theMonitor) {
 
 	public static void clearMonitor() {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		// the monitor reference needs to remain valid
@@ -330,6 +336,7 @@ public static void clearMonitor() {
 	*/
 	public static ModuleFactory getMonitor() {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		return monitor;
@@ -360,6 +367,7 @@ public static HeaderPrintWriter getStream() {
 	*/
 	public static String getServiceName(Object serviceModule) {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		return monitor.getServiceName(serviceModule);
@@ -383,6 +391,7 @@ then an instance will be created (see prologue) and booted as follows.
 	*/
 	public static Object startSystemModule(String factoryInterface)
         throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         // Verify that we have permission to execute this method.
         SecurityUtil.checkDerbyInternalsPrivilege();
@@ -404,6 +413,7 @@ public static Object startSystemModule(String factoryInterface)
 	public static Object findSystemModule(String factoryInterface) throws StandardException
 	{
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		Object module = getMonitor().findModule((Object) null,
@@ -421,8 +431,10 @@ public static Object findSystemModule(String factoryInterface) throws StandardEx
     public static Object getSystemModule(String factoryInterface)
     {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
         ModuleFactory monitor = getMonitor();
         if (monitor == null)
             return null;
@@ -455,6 +467,7 @@ public static Object bootServiceModule(boolean create, Object serviceModule,
 		throws StandardException {
 
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		Object module = monitor.startModule(create, serviceModule, factoryInterface,
@@ -490,6 +503,7 @@ public static Object bootServiceModule(boolean create, Object serviceModule,
 		throws StandardException {
 
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		Object module = monitor.startModule(create, serviceModule, factoryInterface, identifier, properties);
@@ -512,6 +526,7 @@ public static Object bootServiceModule(boolean create, Object serviceModule,
 	public static Object findServiceModule(Object serviceModule, String factoryInterface)
 		throws StandardException {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		Object module = getMonitor().findModule(serviceModule, factoryInterface, (String) null);
@@ -522,6 +537,7 @@ public static Object findServiceModule(Object serviceModule, String factoryInter
 	public static Object getServiceModule(Object serviceModule, String factoryInterface)
 	{
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		Object module = getMonitor().findModule(serviceModule, factoryInterface, (String) null);
@@ -549,6 +565,7 @@ public static Object getServiceModule(Object serviceModule, String factoryInterf
 	*/
 	public static Object findService(String factoryInterface, String serviceName) {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		return monitor.findService(factoryInterface, serviceName);
@@ -571,6 +588,7 @@ public static Object findService(String factoryInterface, String serviceName) {
 		If true is returned then findService should be used to see if the service
 		exists or not.
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 		<P> The poperty set passed in is for boot options for the modules
 		required to start the service. It does not support defining different
 		or new modules implementations.
@@ -640,6 +658,9 @@ public static Object createPersistentService(String factoryInterface, String ser
 		throws StandardException {
 
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		if (SanityManager.DEBUG) {
@@ -653,13 +674,16 @@ public static void removePersistentService(String name)
         throws StandardException
     {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
         // For now we only allow dropping in-memory databases.
         // This is mostly due to the fact that the current implementation for
         // the on-disk back end doesn't handle logDevice when dropping.
         // Security is another concern.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4590
         if (!name.startsWith(PersistentService.INMEMORY + ":")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
             throw StandardException.newException(
                     SQLState.SERVICE_DIRECTORY_REMOVE_ERROR, name);
         }
@@ -748,6 +772,7 @@ public static void logMessage(String messageText) {
 	}
 
     public static void logTextMessage(String messageID, Object... args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
         getStream().println(MessageService.getTextMessage(messageID, args));
 	}
 
@@ -768,6 +793,7 @@ public static Locale getLocaleFromString(String localeDescription)
 	public static boolean isFullUpgrade(Properties startParams, String oldVersionInfo) throws StandardException {
 
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         SecurityUtil.checkDerbyInternalsPrivilege();
         
 		boolean fullUpgrade = Boolean.valueOf(startParams.getProperty(Attribute.UPGRADE_ATTR)).booleanValue();
@@ -813,6 +839,7 @@ public static boolean isDesiredType(Properties startParams, int desiredProperty
      * if the bit intersect of the two values is no zero.
      */
 	public static boolean isDesiredType(int engineType, int desiredType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2164
 		return (engineType & desiredType) != 0;
 	}
 	
@@ -847,6 +874,7 @@ public static boolean isDesiredCreateType(Properties p, int type)
 		boolean plainCreate = Boolean.valueOf(p.getProperty(Attribute.CREATE_ATTR)).booleanValue();
 
 		if (plainCreate) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2164
 			return (type & EngineType.STANDALONE_DB) != 0;
 		}
 
@@ -858,6 +886,7 @@ public static boolean isDesiredCreateType(Properties p, int type)
      * Logs the stack trace of the specified throwable object.
      */
     public static void logThrowable(Throwable t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
         t.printStackTrace(getStream().getPrintWriter());
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/PersistentService.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/PersistentService.java
index 41c558c2b2..7769dc0d99 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/PersistentService.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/monitor/PersistentService.java
@@ -158,6 +158,7 @@ public void saveServiceProperties(String serviceName,
 		@exception StandardException Properties cannot be saved.
 	*/
 	public void saveServiceProperties(String serviceName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5260
                                       Properties properties)
 		throws StandardException;
 
@@ -179,6 +180,7 @@ public String createServiceRoot(String name, boolean deleteExisting)
 		cannot be converted into a canonical form.
 		
         @exception StandardException if an error happens when converting the
+//IC see: https://issues.apache.org/jira/browse/DERBY-6323
         name (name probably invalid)
 	*/
 	public String getCanonicalServiceName(String name)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyFactory.java
index 3d9ada546f..32142d3343 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyFactory.java
@@ -42,10 +42,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
   <p>
   An PropertyFactory is typically obtained from the Monitor:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   </p>
   <blockquote><pre>
 	// Get the current validation factory.
 	PropertyFactory af;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	af = (PropertyFactory) Monitor.findServiceModule(this, org.apache.derby.shared.common.reference.Module.PropertyFactory);
   </pre></blockquote>
 **/
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyUtil.java
index f58bce3778..92dace5df4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyUtil.java
@@ -104,6 +104,7 @@ static int whereSet(String key, Dictionary set) {
 		boolean dbOnly = isDBOnly(set);
 
 		if (!dbOnly) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			if (getMonitor().getJVMProperty(key) != null) {
 				return SET_IN_JVM;
 			}
@@ -129,6 +130,7 @@ public static boolean isDBOnly(Dictionary set) {
 
 		boolean dbOnly = Boolean.valueOf(
                     (value != null ? value.trim() : null)).booleanValue();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		return dbOnly;
 	}
@@ -153,11 +155,13 @@ public static boolean isDBOnly(Properties set) {
      */
     public  static  String[]    getServicePropertyList()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6166
         return ArrayUtil.copy( servicePropertyList );
     }
 	
 	/**
 		Find a system wide property.
+//IC see: https://issues.apache.org/jira/browse/DERBY-623
 
         @param key The key to lookup
 		@return the value of the property or null if it does not exist.
@@ -176,6 +180,7 @@ public static String getSystemProperty(String key) {
 		</OL>
 
 		<P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 		This method can be used by a system that is not running Derby,
 		just to maintain the same lookup logic and security manager concerns
 		for finding derby.properties and reading system properties.
@@ -187,6 +192,7 @@ public static String getSystemProperty(String key) {
 	public static String getSystemProperty(String key, String defaultValue) {
 
 		ModuleFactory monitor = getMonitorLite();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		String value = monitor.getJVMProperty(key);
 
@@ -337,6 +343,9 @@ public static String getServiceProperty(PersistentSet set, String key, String de
                 (value != null ? value.trim() : value)).booleanValue();
 
 		if (!dbOnly) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			value = getMonitor().getJVMProperty(key);
 			if (value != null)
 				return value;
@@ -378,6 +387,7 @@ public static String getServiceProperty(PersistentSet set, String key)
 		@return true of the property is set to 'true, TRUE', false otherwise
 	*/
 	public static boolean getSystemBoolean(String key) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
 		return getSystemBoolean(key, false);
 	}
 
@@ -545,6 +555,7 @@ public static boolean booleanProperty(String p, Serializable v, boolean defaultV
 
 		String vS = ((String) v).trim();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 		if ("TRUE".equals(StringUtil.SQLToUpperCase(vS)))
 			return true;
         if ("FALSE".equals(StringUtil.SQLToUpperCase(vS)))
@@ -616,6 +627,7 @@ public static boolean isServiceProperty(String key)
 	 * @exception StandardException on error
 	 */
 	public static boolean existsBuiltinUser (
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
 		PersistentSet set,
 		String username)
 			throws StandardException
@@ -704,6 +716,7 @@ public static boolean localNativeAuthenticationEnabled( Properties properties )
 	private static boolean systemPropertiesExistsBuiltinUser(String username)
 	{
 		ModuleFactory monitor = getMonitorLite();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		try {
 			Properties JVMProperties = System.getProperties();
@@ -758,6 +771,7 @@ private static boolean propertiesContainsBuiltinUser(Properties props,
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyValidation.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyValidation.java
index 7d01a029df..50829584ba 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyValidation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/property/PropertyValidation.java
@@ -57,6 +57,7 @@ public Serializable doValidateApplyAndMap(TransactionController tc,
 			synchronized (this) {
 
 				for (int i = 0; i < notifyOnSet.size() ; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					PropertySetCallback psc = notifyOnSet.get(i);
 					if (!psc.validate(key, value, d))
 						continue;
@@ -101,6 +102,7 @@ public Serializable doMap(String key,
 		Serializable mappedValue = null;
  		if (notifyOnSet != null) {
 			for (int i = 0; i < notifyOnSet.size() && mappedValue == null; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				PropertySetCallback psc = notifyOnSet.get(i);
 				mappedValue = psc.map(key, value, set);
 			}
@@ -126,6 +128,7 @@ public void validateSingleProperty(String key,
 
  		if (notifyOnSet != null) {
 			for (int i = 0; i < notifyOnSet.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				PropertySetCallback psc = notifyOnSet.get(i);
 				psc.validate(key, value, set);
 			}
@@ -135,8 +138,10 @@ public void validateSingleProperty(String key,
 	public synchronized void addPropertySetNotification(PropertySetCallback who){
 
 		if (notifyOnSet == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			notifyOnSet = new Vector<PropertySetCallback>(1,1);
 		notifyOnSet.add(who);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java
index 7d439c3a6e..6f4c856f24 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java
@@ -38,6 +38,7 @@ Internal comment (not for user documentation):
  */
 /**
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   <p>
   Generates and recreates unique identifiers.
   </p>
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/LanguageFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/LanguageFactory.java
index 1a61cc2901..2607c53e97 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/LanguageFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/LanguageFactory.java
@@ -67,6 +67,8 @@ public interface LanguageFactory
 	 */
 	public ResultDescription getResultDescription
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		ResultDescription	inputResultDescription,
 		int[]				theCols
 	);
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ParameterValueSet.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ParameterValueSet.java
index 558c762532..0de5d47524 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ParameterValueSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ParameterValueSet.java
@@ -43,6 +43,7 @@ public interface ParameterValueSet
 	 */
 	void initialize(DataTypeDescriptor[] types) throws StandardException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
 
 	/**
 		Set the mode of the parameter, called when setting up static method calls and stored procedures.
@@ -116,6 +117,7 @@ void registerOutParameter(int parameterIndex, int sqlType, int scale)
 
 	/**
 		Set the value of this user defined parameter to the passed in Object.
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 
         @param parameterIndex The position of the parameter
         @param value It's value
@@ -133,6 +135,7 @@ void registerOutParameter(int parameterIndex, int sqlType, int scale)
 
 	/**
 	 * Tells whether all the parameters are set and ready for execution.
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	   OUT are not required to be set.
 	 *
 	 * @return	true if all parameters are set, false if at least one
@@ -176,6 +179,7 @@ void registerOutParameter(int parameterIndex, int sqlType, int scale)
 	/**
 		Check that there are not output parameters defined
 		by the parameter set. If there are unknown parameter
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 		types they are forced to input types. i.e. Derby static method
 		calls with parameters that are array.
 
@@ -216,6 +220,7 @@ void registerOutParameter(int parameterIndex, int sqlType, int scale)
      * @exception StandardException if a database-access error occurs.
      */
 	DataValueDescriptor getReturnValueForSet() throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 
 	/**
 	 * Return the scale of the given parameter index in this pvs.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/PreparedStatement.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/PreparedStatement.java
index 2d7c19fe14..d0fffebe69 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/PreparedStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/PreparedStatement.java
@@ -38,6 +38,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 public interface PreparedStatement
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
 	extends Dependent
 {
 
@@ -74,6 +75,7 @@ public interface PreparedStatement
 	 *
 	 * @exception StandardException thrown if unable to perform
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4279
 	void rePrepare(LanguageConnectionContext lcc) 
 		throws StandardException;
 
@@ -206,6 +208,7 @@ ResultSet executeSubStatement(LanguageConnectionContext lcc,
      * @throws StandardException if the index is out of range
      */
     DataTypeDescriptor  getParameterType( int idx ) throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 
 	/**
 	 *	Return the SQL string that this statement is for.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java
index 2fd10c85b6..4e45e05c31 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java
@@ -57,6 +57,7 @@ public interface ResultColumnDescriptor
 	 *		is not in a schema (i.e. is a derived column), it returns NULL.
 	 */
 	String	getSourceSchemaName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 
 	/**
 	 * Get the name of the underlying(base) table this column comes from, if any.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ResultSet.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ResultSet.java
index 72b645561d..0281829f36 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/ResultSet.java
@@ -85,6 +85,7 @@ Only valid of returnsRows() returns false.
 	 * @return	The number of rows affect by the statement, so far.
 	 */
 	long	modifiedRowCount();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
 	/**
 	 * Returns a ResultDescription object, which describes the results
@@ -95,6 +96,8 @@ Only valid of returnsRows() returns false.
 	 * @return	A ResultDescription describing the results of the
 	 *		statement.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 	ResultDescription	getResultDescription();
 	
 	Activation getActivation();
@@ -221,6 +224,7 @@ Only valid of returnsRows() returns false.
 	 * methods: getLastRow(), getNextRow(), getPreviousRow(), 
 	 * getFirstRow(), getRelativeRow(..) or getAbsoluteRow(..).
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1361
 	void clearCurrentRow();
 	 
     /**
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/Statement.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/Statement.java
index 2653f30875..a2d7efec1a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/Statement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/Statement.java
@@ -70,6 +70,7 @@ public interface Statement
 	 *	   execution-only version of the module (the prepare() method
 	 *	   relies on compilation).
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 	PreparedStatement	prepare(LanguageConnectionContext lcc, boolean allowInternalSyntax) throws StandardException;
 	
 	/**
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/StatementUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/StatementUtil.java
index c1bc26d193..fc854e92f6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/StatementUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/StatementUtil.java
@@ -53,6 +53,7 @@ public static String typeName(int typeNumber)
 			break;
 
 		  default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
 			retval = "UNKNOWN";
 			break;
 		}
@@ -86,6 +87,7 @@ public static String typeName(int typeNumber)
      */
 	public static SchemaDescriptor	getSchemaDescriptor
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
          String schemaName,
          boolean raiseError,
          DataDictionary dataDictionary,
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/ASTVisitor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/ASTVisitor.java
index c5b7d51085..4db5f9f6fc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/ASTVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/ASTVisitor.java
@@ -1,6 +1,7 @@
 /*
 
    Derby - Class org.apache.derby.iapi.sql.compile.ASTVisitor
+//IC see: https://issues.apache.org/jira/browse/DERBY-4415
 
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/CompilerContext.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
index 266a257194..c0a030212a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
@@ -161,6 +161,8 @@ public interface CompilerContext extends Context
 	 */
 
     OptimizerFactory getOptimizerFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 	/**
 	 * Get the TypeCompilerFactory from this CompilerContext.
@@ -317,6 +319,7 @@ public interface CompilerContext extends Context
 	 *
 	 */
     void createDependency(Dependent d, Provider p) throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 	/**
 	 * Add an object to the pool that is created at compile time
@@ -346,6 +349,7 @@ public interface CompilerContext extends Context
      * @throws NullPointerException if {@code objs} is null
 	 */
     void setSavedObjects(List<Object> objs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	/**
 	 * Set the in use state for the compiler context.
@@ -353,6 +357,7 @@ public interface CompilerContext extends Context
 	 * @param inUse	 The new inUse state for the compiler context.
 	 */
     void setInUse(boolean inUse);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 	/**
 	 * Return the in use state for the compiler context.
@@ -382,6 +387,7 @@ public interface CompilerContext extends Context
 	 *
 	 */
     void    setReliability(int reliability);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 	/**
 	 * Return the reliability requirements of this clause. See setReliability()
@@ -399,6 +405,7 @@ public interface CompilerContext extends Context
 	 * @return the compilation schema descirptor
 	 */
     SchemaDescriptor getCompilationSchema();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 	/**
 	 * Set the compilation schema descriptor for this compilation context.
@@ -408,6 +415,7 @@ public interface CompilerContext extends Context
 	 * @return the previous compilation schema descirptor
 	 */
     SchemaDescriptor setCompilationSchema(SchemaDescriptor newDefault);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 	/**
 	 * Push a default schema to use when compiling.
@@ -422,6 +430,7 @@ public interface CompilerContext extends Context
 	 */
     void pushCompilationSchema(SchemaDescriptor sd);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 	/**
 	 * Pop the default schema to use when compiling.
@@ -438,6 +447,7 @@ public interface CompilerContext extends Context
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     StoreCostController getStoreCostController(long conglomerateNumber)
 			throws StandardException;
 
@@ -447,6 +457,7 @@ StoreCostController getStoreCostController(long conglomerateNumber)
 	 * @exception StandardException		Thrown on error
 	 */
     SortCostController getSortCostController() throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 	/**
 	 * Set the parameter list.
@@ -528,6 +539,7 @@ StoreCostController getStoreCostController(long conglomerateNumber)
 	 * @param privType One of the privilege types in 
 	 *						org.apache.derby.iapi.sql.conn.Authorizer.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     void pushCurrentPrivType( int privType);
 	
     void popCurrentPrivType();
@@ -554,6 +566,7 @@ StoreCostController getStoreCostController(long conglomerateNumber)
 	 * @param privType	CREATE_SCHEMA_PRIV, MODIFY_SCHEMA_PRIV or DROP_SCHEMA_PRIV
 	 */
     void addRequiredSchemaPriv(String schema, String aid, int privType);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 	/**
 	 * Add a routine execute privilege to the list of used routine privileges.
@@ -579,6 +592,7 @@ StoreCostController getStoreCostController(long conglomerateNumber)
 	/**
 	 * @return The list of required privileges.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     List<StatementPermission> getRequiredPermissionsList();
     
 	/**
@@ -610,6 +624,7 @@ StoreCostController getStoreCostController(long conglomerateNumber)
      */
     public  boolean passesPrivilegeFilters( Visitable visitable )
         throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
 
     /**
      * Record that the compiler is entering a named scope. Increment the
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java
index 3247ebd747..14f8fa7b26 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java
@@ -116,6 +116,7 @@ OptimizablePredicateList getBasePredicates(
 	 * @return	The extra selectivity due to non-base predicates
 	 */
 	double nonBasePredicateSelectivity(Optimizable innerTable,
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 										OptimizablePredicateList predList)
 	throws StandardException;
 
@@ -178,6 +179,7 @@ public int maxCapacity( int userSpecifiedCapacity,
 
     /** Get the operator symbol used to represent this join strategy in optimizer traces */
     String  getOperatorSymbol();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
 	/**
 	 * Get the name of the result set method for base table scans
@@ -188,6 +190,7 @@ public int maxCapacity( int userSpecifiedCapacity,
      * @param validatingCheckConstraint True of this is a special scan to
      *        validate a check constraint.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     String resultSetMethodName(
         boolean bulkFetch,
         boolean multiprobe,
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptTrace.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptTrace.java
index de2398a6f4..5c1fe7a805 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptTrace.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptTrace.java
@@ -103,6 +103,7 @@ public  interface   OptTrace
     /** Say that we are remembering the current plan as the best join order so far. */
     public  void    traceRememberingBestJoinOrder
         ( int joinPosition, int[] bestJoinOrder, int planType, CostEstimate planCost, JBitSet assignedTableMap );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
     /** Say that we are skipping a plan because it consumes too much memory. */
     public  void    traceSkippingBecauseTooMuchMemory( int maxMemoryPerTable );
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/Optimizable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/Optimizable.java
index 4a2055ab56..1554039f3b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/Optimizable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/Optimizable.java
@@ -376,6 +376,7 @@ public boolean feasibleJoinStrategy(OptimizablePredicateList predList,
      */
     public boolean memoryUsageOK( double rowCount, int maxMemoryPerTable)
 			throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
 
 	/**
      * Return the maximum capacity of the hash table, for hash join strategy
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java
index a667a854cc..b3a021c332 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java
@@ -134,6 +134,7 @@ int hasEqualOnColumnList(int[] baseColumnPositions,
 	 */
 	double selectivity(Optimizable optTable)
 	throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 
 	/**
 	 * Get the position of the index column that this predicate restricts.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java
index f727150eaf..dcb7df4978 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java
@@ -62,6 +62,7 @@ public Optimizer getOptimizer( OptimizableList optimizableList,
 								  DataDictionary dDictionary,
 								  RequiredRowOrdering requiredRowOrdering,
 								  int numTablesInQuery,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
 								  OptimizerPlan overridingPlan,
 								  LanguageConnectionContext lcc)
 			throws StandardException;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizerPlan.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizerPlan.java
index 480fccb0d6..5db6b2ebdd 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizerPlan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/OptimizerPlan.java
@@ -93,6 +93,7 @@ else if ( utd instanceof AliasDescriptor )
         (
          DataDictionary dataDictionary,
          LanguageConnectionContext lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
          CompilerContext cc
          )
         throws StandardException;
@@ -155,6 +156,7 @@ public static  final   class Join extends OptimizerPlan
             (
              DataDictionary dataDictionary,
              LanguageConnectionContext lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
              CompilerContext cc
              )
             throws StandardException
@@ -225,6 +227,7 @@ public static  class    DeadEnd extends OptimizerPlan
 
         public DeadEnd( String name )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
             _name = name;
         }
 
@@ -272,6 +275,7 @@ protected   RowSource() {}
             (
              DataDictionary dataDictionary,
              LanguageConnectionContext lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
              CompilerContext cc
              )
             throws StandardException
@@ -363,6 +367,8 @@ public TableFunctionRS( AliasDescriptor ad )
             (
              DataDictionary dataDictionary,
              LanguageConnectionContext lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
              CompilerContext cc
              )
             throws StandardException
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/Visitor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/Visitor.java
index 9c7e91f9d1..aecd59a1a9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/Visitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/compile/Visitor.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.iapi.sql.compile.Visitor
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/Authorizer.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/Authorizer.java
index e639556c09..faad1de73b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/Authorizer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/Authorizer.java
@@ -128,6 +128,7 @@ public void authorize(Activation activation, int operation)
 
 	/**
 	  Verify the connected user possesses the indicated permissions
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
 
 	  @param requiredPermissionsList    the required permissions
 	  @param activation holds the execution logic
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java
index ba73fc4231..e71cc8ae89 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java
@@ -46,6 +46,7 @@ public static LanguageConnectionContext getCurrentLCC()
 
 			LanguageConnectionContext lcc = (LanguageConnectionContext)
 				getContextOrNull(LanguageConnectionContext.CONTEXT_ID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			if (lcc == null)
 				throw new SQLException(
@@ -64,6 +65,7 @@ public static LanguageConnectionContext getCurrentLCC()
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContextOrNull( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
index 3d9eb636c0..96c8232749 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
@@ -100,6 +100,7 @@ public interface LanguageConnectionContext extends Context {
 	 * @exception StandardException thrown if something goes wrong
 	 */
 	void initialize() throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 
 	/**
 	 * Get value of logStatementText.
@@ -137,6 +138,8 @@ public interface LanguageConnectionContext extends Context {
 	 * Add the activation to those known about by this connection.
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-418
+//IC see: https://issues.apache.org/jira/browse/DERBY-1142
 	void addActivation(Activation a)
 		throws StandardException;
 
@@ -230,6 +233,7 @@ void removeActivation(Activation a)
 	public TableDescriptor getTableDescriptorForDeclaredGlobalTempTable(String tableName);
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-130
 		Reset the connection before it is returned (indirectly) by
 		a PooledConnection object. See EmbeddedConnection.
 	 */
@@ -237,6 +241,7 @@ public void resetFromPool()
 		 throws StandardException;
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 		Do a commit, as internally needed by Derby.  E.g.
 	 	a commit for sync, or a commit for autocommit.  Skips
 		checks that a user isn't doing something bad like issuing
@@ -279,6 +284,7 @@ Do a commit, as issued directly by a user (e.g. via Connection.commit()
 
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 		Do a rollback, as internally needed by Derby.  E.g.
 	 	a rollback for sync, or a rollback for an internal error.  Skips
 		checks that a user isn't doing something bad like issuing
@@ -477,6 +483,8 @@ public void setDefaultSchema(SchemaDescriptor sd)
 	 */
 	public void setDefaultSchema(Activation a, SchemaDescriptor sd)
 		throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
 
 	/**
 	 * Reset any occurence of schemaName as current default schema in
@@ -606,8 +614,10 @@ public boolean verifyAllHeldResultSetsAreClosed()
 	 * @return StatementContext The statement context.
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 	StatementContext pushStatementContext(boolean isAtomic, boolean isForReadOnly, String stmtText,
 		ParameterValueSet pvs, boolean rollbackParentContext, long timeoutMillis);
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
 
 	/**
 	 * Pop a StatementContext of the context stack.
@@ -882,8 +892,10 @@ public void popTriggerExecutionContext(TriggerExecutionContext tec)
 	 *                      metadata query is getting executed.
 	 */
          public PreparedStatement prepareInternalStatement(SchemaDescriptor compilationSchema, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
          		String sqlText, boolean isForReadOnly, boolean allowInternalSyntax) 
 	    throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 
         /**
 	 * Return a PreparedStatement object for the query.
@@ -1088,6 +1100,7 @@ public void autoincrementCreateCounter(String s, String t, String c,
 	 */
 	public String getCurrentRoleIdDelimited(Activation a)
 			throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3667
 
 	/**
 	 * Checks whether the given role can be legally set for the current user.
@@ -1103,6 +1116,7 @@ public String getCurrentRoleIdDelimited(Activation a)
 	 */
     public boolean roleIsSettable(Activation a, String role)
             throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
 	/**
 	 * Create a new SQL session context for the current activation on the basis
@@ -1126,6 +1140,9 @@ public boolean roleIsSettable(Activation a, String role)
 	 */
     public void pushNestedSessionContext(Activation a,
                                         boolean definersRights,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                                         String definer)
             throws StandardException;
 
@@ -1167,6 +1184,7 @@ public void pushNestedSessionContext(Activation a,
 	 */
     public void setupSubStatementSessionContext(Activation a)
             throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
 	/**
 	 * Create a fresh SQLSessionContext for this connection.
@@ -1271,6 +1289,7 @@ public void setupSubStatementSessionContext(Activation a)
      */
     public void setReferencedColumnMap(TableDescriptor td,
                                        FormatableBitSet map);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4895
 
     /**
      * Set the constraint mode for this constraint to {@code deferred}.
@@ -1283,6 +1302,8 @@ public void setReferencedColumnMap(TableDescriptor td,
      * @throws StandardException
      */
     public void setConstraintDeferred(Activation a,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                                     ConstraintDescriptor cd,
                                     boolean deferred) throws StandardException;
 
@@ -1320,8 +1341,11 @@ public void setDeferredAll(Activation a, boolean deferred)
      * constraints.
      * @return the set
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
     HashMap<UUID, DeferredConstraintsMemory.ValidationInfo>
         getDeferredHashTables();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
     /**
      * Check that deferred constraints are valid, if not roll back the
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java
index e13573035d..0c2311ddda 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java
@@ -70,6 +70,7 @@ public interface LanguageConnectionFactory {
 
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 		Get a Statement
 		@param compilationSchema schema
 		@param statementText the text for the statement
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/StatementContext.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/StatementContext.java
index 0293bc64e1..dbacc61025 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/StatementContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/conn/StatementContext.java
@@ -56,6 +56,7 @@ public interface StatementContext extends Context {
 	 */
     public void setInUse(boolean inTrigger, boolean isAtomic, boolean isForReadOnly,
 			 String stmtText, ParameterValueSet pvs, long timeoutMillis);
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 
 	/**
 	 * Mark this context as not in use.  This is important because we
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/depend/DependencyManager.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
index 3a1e98a971..2ca5344656 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
@@ -33,6 +33,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	Dependency Manager Interface
 	<p>
 	The dependency manager tracks needs that dependents have of providers. This
+//IC see: https://issues.apache.org/jira/browse/DERBY-1539
 	is a general purpose interface which is associated with a
 	DataDictinary object; infact the dependencymanager is really the
 	datadictionary keeping track of dependencies between objects that it handles
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
index a5c67ea2c5..f37b12b68f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
@@ -60,6 +60,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 
 public final class AliasDescriptor 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	extends PrivilegedSQLObject
 	implements Provider, Dependent
 {
@@ -194,6 +195,7 @@ public String getSchemaName()
 	 */
 	public String getQualifiedName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4476
         return IdUtil.mkQualifiedName(getSchemaName(), aliasName);
 	}
 
@@ -364,6 +366,7 @@ public String getClassType()
 	/** @see TupleDescriptor#getDescriptorType */
 	public String getDescriptorType()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 		return getAliasType(aliasType);
 	}
 	
@@ -406,6 +409,7 @@ public String getSpecificName()
      */
     public boolean isPersistent()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1809
         return !getSchemaUUID().toString().equals(SchemaDescriptor.SYSFUN_SCHEMA_UUID);
     }
    
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
index 24c6212695..c1389b48b8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
@@ -74,6 +74,7 @@ public abstract	class CatalogRowFactory
 
     public CatalogRowFactory(UUIDFactory uuidf,
 							 ExecutionFactory ef,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 							 DataValueFactory dvf)
 								 
 	{
@@ -192,6 +193,7 @@ public boolean isIndexUnique(int indexNumber)
 	public	String	generateIndexName( int indexNumber )
 	{
 		indexNumber++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 		return	catalogName + "_INDEX" + indexNumber;
 	}
 
@@ -223,6 +225,7 @@ public	void	initInfo(int        columnCount,
 		indexCount = (indexColumnPositions != null) ? 
 			                 indexColumnPositions.length : 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 		this.catalogName = catalogName;
 		this.columnCount = columnCount;
 
@@ -239,6 +242,7 @@ public	void	initInfo(int        columnCount,
 				indexNames[ictr] = generateIndexName(ictr);
 				indexUUID[ictr] = uf.recreateUUID(uuidStrings[ictr + 2 ]);
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 			this.indexColumnPositions = ArrayUtil.copy2( indexColumnPositions );
 			this.indexUniqueness = ArrayUtil.copy( indexUniqueness );
  
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java
index 07e9744a94..2088d056da 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java
@@ -145,6 +145,7 @@ public boolean needsToFire(int stmtType, int[] modifiedCols)
 		/*
 		** If we are disabled, we never fire
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (!enforced())
 		{
 			return false;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColPermsDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColPermsDescriptor.java
index 375b903c3e..c4a5516b2f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColPermsDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColPermsDescriptor.java
@@ -53,6 +53,7 @@ public ColPermsDescriptor( DataDictionary dd,
         this.columns = columns;
         //tableUUID can be null only if the constructor with colPermsUUID
         //has been invoked.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         if (tableUUID != null)
         	tableName = dd.getTableDescriptor(tableUUID).getName();
 	}
@@ -64,12 +65,14 @@ public ColPermsDescriptor( DataDictionary dd,
                                String grantee,
                                String grantor,
                                UUID tableUUID,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
                                String type) throws StandardException
     {
         this( dd, grantee, grantor, tableUUID, type, (FormatableBitSet) null);
     }           
     
     public ColPermsDescriptor( DataDictionary dd,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
             UUID colPermsUUID) throws StandardException
     {
         super(dd,null,null);
@@ -88,6 +91,7 @@ public int getCatalogNumber()
 
 	public String toString()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		return "colPerms: grantee=" + getGrantee() + 
         ",colPermsUUID=" + getUUID() +
 			",grantor=" + getGrantor() +
@@ -115,6 +119,7 @@ public boolean equals( Object other)
      */
     public int hashCode()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
     	return super.keyHashCode() + tableUUID.hashCode() +
 		((type == null) ? 0 : type.hashCode());
     }
@@ -124,6 +129,7 @@ public int hashCode()
 	 */
 	public boolean checkOwner(String authorizationId) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		TableDescriptor td = getDataDictionary().getTableDescriptor(tableUUID);
 		if (td.getSchemaDescriptor().getAuthorizationId().equals(authorizationId))
 			return true;
@@ -164,6 +170,7 @@ public String getClassType()
 	 */
 	public DependableFinder getDependableFinder() 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         return getDependableFinder(
                 StoredFormatIds.COLUMNS_PERMISSION_FINDER_V01_ID);
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
index 4f7d2ea768..ec8f413d5f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
@@ -72,6 +72,7 @@ public final class ColumnDescriptor extends TupleDescriptor
 	//the increment value or to change the start value. If none of the above,
 	//then it will be set to -1
 	long				autoinc_create_or_modify_Start_Increment = -1; 
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 
 	/**
 	 * Constructor for a ColumnDescriptor when the column involved
@@ -103,8 +104,14 @@ public ColumnDescriptor(String columnName, int columnPosition,
 					 DefaultInfo columnDefaultInfo,
 					 TableDescriptor table,
 					 UUID defaultUUID, long autoincStart, long autoincInc, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 					 long userChangedWhat, boolean autoincCycle)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 		this(columnName, columnPosition, columnType, columnDefault,
 				columnDefaultInfo, table, defaultUUID, autoincStart,
 				autoincInc,autoincCycle);				
@@ -133,6 +140,11 @@ public ColumnDescriptor(String columnName, int columnPosition,
 						 DataTypeDescriptor columnType, DataValueDescriptor columnDefault,
 						 DefaultInfo columnDefaultInfo,
 						 TableDescriptor table,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 						 UUID defaultUUID, long autoincStart, long autoincInc, boolean autoincCycle)
 		{
 		this.columnName = columnName;
@@ -152,6 +164,7 @@ public ColumnDescriptor(String columnName, int columnPosition,
 			      columnDefaultInfo);
 
 		this.autoincStart = autoincStart;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3175
 		this.autoincValue = autoincStart;
 		this.autoincInc = autoincInc;
 		this.autoincCycle = autoincCycle;
@@ -181,9 +194,15 @@ public ColumnDescriptor(String columnName, int columnPosition,
 	public ColumnDescriptor(String columnName, int columnPosition,
 		DataTypeDescriptor columnType, DataValueDescriptor columnDefault,
 		DefaultInfo columnDefaultInfo,
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		UUID uuid,
 		UUID defaultUUID,
         long autoincStart, long autoincInc, long autoincValue, boolean autoincCycle)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 
 	{
 		this.columnName = columnName;
@@ -199,8 +218,19 @@ public ColumnDescriptor(String columnName, int columnPosition,
 			      columnDefaultInfo);
 		
 		this.autoincStart = autoincStart;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3175
 		this.autoincValue = autoincValue;
 		this.autoincInc = autoincInc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 		this.autoincCycle = autoincCycle;
 	}
 
@@ -251,6 +281,7 @@ public void	setColumnName(String newColumnName)
 	 */
 	public void	setTableDescriptor(TableDescriptor tableDescriptor)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		this.table = tableDescriptor;
 	}
 
@@ -353,6 +384,7 @@ public boolean isAutoincrement()
 	}
 	public boolean updatableByCursor()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		return false;
 	}
 
@@ -369,6 +401,7 @@ public boolean hasGenerationClause()
 	 * Is this column to have autoincremented value always ?
 	 */
 	public boolean isAutoincAlways(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 		return (columnDefaultInfo == null) && isAutoincrement();
 	}
 
@@ -384,6 +417,11 @@ public long getAutoincStart()
 
 	public boolean getAutoincCycle()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 		return autoincCycle;
 	}
 	
@@ -413,11 +451,13 @@ public long getAutoincInc()
 	 */
 	public long getAutoincValue()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3175
 		return autoincValue;
 	}
 
 	public long getAutoinc_create_or_modify_Start_Increment()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 		return autoinc_create_or_modify_Start_Increment;
 	}
 	public void setAutoinc_create_or_modify_Start_Increment(int c_or_m)
@@ -452,6 +492,7 @@ public String	toString()
 				"columnType: " + columnType + "\n" +
 				"columnDefault: " + columnDefault + "\n" +
 				"uuid: " + uuid + "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				"defaultUUID: " + defaultUUID ;
 		}
 		else
@@ -475,6 +516,7 @@ public String getDescriptorType()
 
 	
 	private static void assertAutoinc(boolean autoinc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 					  long autoincInc,
 					  DefaultInfo defaultInfo){
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java
index cf0eade141..bfd1cfda35 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java
@@ -64,6 +64,7 @@ public ColumnDescriptor getColumnDescriptor(UUID tableID,
 	{
 		ColumnDescriptor	returnValue = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         for (ColumnDescriptor columnDescriptor : this)
 		{
 			if ( columnName.equals( columnDescriptor.getColumnName() ) &&
@@ -89,6 +90,7 @@ public ColumnDescriptor getColumnDescriptor(UUID tableID, int columnID)
 	{
 		ColumnDescriptor	returnValue = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         for (ColumnDescriptor columnDescriptor : this)
 		{
 			if ( ( columnID == columnDescriptor.getPosition() ) &&
@@ -111,6 +113,7 @@ public ColumnDescriptor getColumnDescriptor(UUID tableID, int columnID)
 	 */
 	public ColumnDescriptor elementAt(int n)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return get(n);
 	}
 
@@ -128,6 +131,7 @@ public String[] getColumnNames()
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             ColumnDescriptor columnDescriptor = elementAt(index);
 			strings[index] = columnDescriptor.getColumnName();
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
index abfd96de32..e11b840b23 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
@@ -60,6 +60,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 
 public final class ConglomerateDescriptor extends UniqueTupleDescriptor
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	implements Provider
 {
 	// Implementation
@@ -109,6 +110,7 @@ public final class ConglomerateDescriptor extends UniqueTupleDescriptor
 		this.forConstraint = forConstraint;
 		if (uuid == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			UUIDFactory uuidFactory = DataDescriptorGenerator.getMonitor().getUUIDFactory();
 			uuid = uuidFactory.createUUID();
 		}
@@ -230,6 +232,7 @@ public IndexRowGenerator getIndexDescriptor()
 	 */
 	public void setColumnNames(String[] columnNames)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		this.columnNames = ArrayUtil.copy( columnNames );
 	}
 
@@ -241,6 +244,7 @@ public void setColumnNames(String[] columnNames)
 	 */
 	public String[] getColumnNames()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return ArrayUtil.copy( columnNames );
 	}
 
@@ -309,6 +313,7 @@ public String toString()
 		if (SanityManager.DEBUG)
 		{
 			StringBuffer keyString = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
 
 			if (indexable && columnNames != null )
 			{
@@ -457,6 +462,7 @@ public ConglomerateDescriptor drop(LanguageConnectionContext lcc,
 			 * has a uniqueness requirement.
 			 */
 			needNewConglomerate =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3502
 				(indexRowGenerator.isUnique() && !othersIRG.isUnique()) ||
 					(indexRowGenerator.isUniqueWithDuplicateNulls() && 
 						!othersIRG.isUniqueWithDuplicateNulls());
@@ -612,6 +618,7 @@ public ConglomerateDescriptor describeSharedConglomerate(
 				continue;
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3502
 			if (descriptors[i].getIndexDescriptor().isUnique())
 			{
 				/* Given criteria #1 and #4 described above, if we
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java
index 3973e1a167..0040d48e37 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.Arrays;
 
 public class ConglomerateDescriptorList extends
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<ConglomerateDescriptor>
 {
 
@@ -72,6 +73,8 @@ public ConglomerateDescriptor[] getConglomerateDescriptors(long conglomerateNumb
 		int size = size(), j = 0;
 		ConglomerateDescriptor[] draft = new ConglomerateDescriptor[size];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         for (ConglomerateDescriptor conglomerateDescriptor : this)
 		{
 			if (conglomerateNumber == conglomerateDescriptor.getConglomerateNumber())
@@ -98,6 +101,7 @@ public ConglomerateDescriptor getConglomerateDescriptor(String conglomerateName)
 	{
 		ConglomerateDescriptor	returnValue = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         for (ConglomerateDescriptor conglomerateDescriptor : this)
 		{
 			if (conglomerateName.equals(conglomerateDescriptor.getConglomerateName()))
@@ -125,6 +129,7 @@ public ConglomerateDescriptor getConglomerateDescriptor(UUID uuid)
 	{
 		ConglomerateDescriptor	returnValue = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         for (ConglomerateDescriptor conglomerateDescriptor : this)
 		{
 			if (uuid.equals(conglomerateDescriptor.getUUID()))
@@ -151,6 +156,7 @@ public ConglomerateDescriptor[] getConglomerateDescriptors(UUID uuid)
 		int size = size(), j = 0;
 		ConglomerateDescriptor[] draft = new ConglomerateDescriptor[size];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         for (ConglomerateDescriptor conglomerateDescriptor : this)
 		{
 			if (uuid.equals(conglomerateDescriptor.getUUID()))
@@ -176,6 +182,7 @@ public ConglomerateDescriptor[] getConglomerateDescriptors(UUID uuid)
 	public void dropConglomerateDescriptor(UUID tableID, ConglomerateDescriptor cgDesc) 
 						throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Iterator<ConglomerateDescriptor> iterator = iterator();
         while (iterator.hasNext())
 		{
@@ -202,6 +209,7 @@ public void dropConglomerateDescriptor(UUID tableID, ConglomerateDescriptor cgDe
 	public void dropConglomerateDescriptorByUUID(UUID conglomerateID) 
 						throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Iterator<ConglomerateDescriptor> iterator = iterator();
         while (iterator.hasNext())
 		{
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
index 3e1ec4834a..ab1690500e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
@@ -48,6 +48,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 
 public abstract class ConstraintDescriptor 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	extends UniqueTupleDescriptor
 	implements Provider, Dependent
 {
@@ -60,6 +61,7 @@ public abstract class ConstraintDescriptor
 	// field that we want users to be able to know about
 	public static final int SYSCONSTRAINTS_STATE_FIELD = 6;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     TableDescriptor       table;
     final String          constraintName;
     private boolean deferrable;
@@ -101,6 +103,7 @@ public abstract class ConstraintDescriptor
 		this.table = table;
 		this.constraintName = constraintName;
 		this.deferrable = deferrable;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         this.initiallyDeferred = initiallyDeferred;
 		this.referencedColumns = referencedColumns;
 		this.constraintId = constraintId;
@@ -172,6 +175,7 @@ public boolean deferrable()
 	}
 
     public void setDeferrable(boolean b) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         deferrable = b;
     }
 
@@ -208,6 +212,7 @@ public void setInitiallyDeferred(boolean b) {
 	 */
 	public int[]	getReferencedColumns()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return ArrayUtil.copy( referencedColumns );
 	}
 
@@ -250,6 +255,7 @@ public int[]	getKeyColumns()
 	 */
     public boolean enforced()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         return enforced;
 	}
 
@@ -360,6 +366,7 @@ public boolean areColumnsComparable(ColumnDescriptorList otherColumns)
 		int index;
 		for (index = 0; index < mySize && index < otherSize; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             myColumn = myColDl.elementAt(index);
             otherColumn = otherColumns.elementAt(index);
 
@@ -448,7 +455,9 @@ public String toString()
 				"constraintName: " + constraintName + "\n" +
 				"constraintId: " + constraintId + "\n" +
 				"deferrable: " + deferrable + "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 "initiallyDeferred: " + initiallyDeferred + "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6148
                "referencedColumns: " +
                     Arrays.toString(referencedColumns) + "\n" +
 				"schemaDesc: " + schemaDesc + "\n"
@@ -547,6 +556,7 @@ public void prepareToInvalidate(Provider p, int action,
 		    case DependencyManager.SET_CONSTRAINTS_DISABLE:
 		    case DependencyManager.SET_TRIGGERS_ENABLE:
 		    case DependencyManager.SET_TRIGGERS_DISABLE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6672
 		    case DependencyManager.RENAME:
 			//When REVOKE_PRIVILEGE gets sent (this happens for privilege 
 			//types SELECT, UPDATE, DELETE, INSERT, REFERENCES, TRIGGER), we  
@@ -554,9 +564,12 @@ public void prepareToInvalidate(Provider p, int action,
 			//the ConstraintDescriptor drop itself. 
 			//Ditto for role grant conferring a privilege.
 		    case DependencyManager.REVOKE_PRIVILEGE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		    case DependencyManager.REVOKE_ROLE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3743
 		    case DependencyManager.INTERNAL_RECOMPILE_REQUEST:
 				// Only used by Activations
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		    case DependencyManager.RECHECK_PRIVILEGES:
 				break;
 
@@ -601,6 +614,7 @@ public void makeInvalid(int action, LanguageConnectionContext lcc)
 		*/
 
 		//Let's handle REVOKE_PRIVILEGE and REVOKE_ROLE first
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		if (action == DependencyManager.REVOKE_PRIVILEGE ||
 			action == DependencyManager.REVOKE_ROLE)
 		{
@@ -616,6 +630,7 @@ public void makeInvalid(int action, LanguageConnectionContext lcc)
             // when the CHECK constraint is dropped explicitly.
             //
             getDataDictionary().getDependencyManager().invalidateFor( table, DependencyManager.ALTER_TABLE, lcc );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
 
 			lcc.getLastActivation().addWarning(
 				StandardException.newWarning(
@@ -652,6 +667,7 @@ public void makeInvalid(int action, LanguageConnectionContext lcc)
 			(action != DependencyManager.SET_TRIGGERS_ENABLE) &&
 			(action != DependencyManager.SET_TRIGGERS_DISABLE) &&
 			(action != DependencyManager.INTERNAL_RECOMPILE_REQUEST) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6672
 			(action != DependencyManager.RECHECK_PRIVILEGES) &&
 			(action != DependencyManager.RENAME)
 		   )
@@ -700,6 +716,7 @@ public ConglomerateDescriptor drop(LanguageConnectionContext lcc,
 
         if (clearDependencies)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5017
             DependencyManager dm = dd.getDependencyManager();
             dm.clearDependencies(lcc, this);
         }
@@ -724,6 +741,9 @@ public ConglomerateDescriptor drop(LanguageConnectionContext lcc,
             // Bug 4307
             // We need to get the conglomerate descriptors from the 
             // dd in case we dropped other constraints in a cascade operation. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             ConglomerateDescriptor[]conglomDescs =
                     dd.getConglomerateDescriptors(getConglomerateId());
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java
index 205284e6e6..9497911880 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java
@@ -212,6 +212,7 @@ public ConstraintDescriptorList getConstraintDescriptorList(boolean enforced)
 		{
 			ConstraintDescriptor cd = elementAt(index);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             if (cd.enforced() == enforced)
 			{
 				cdl.add(cd);
@@ -229,6 +230,7 @@ public ConstraintDescriptorList getConstraintDescriptorList(boolean enforced)
 	 */
 	public ConstraintDescriptor elementAt(int n)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		return get(n);
 	}
 
@@ -249,6 +251,7 @@ public ConstraintDescriptorList getSubList(int type)
 		for (int index = 0; index < size; index++)
 		{
             ConstraintDescriptor cd = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			if (cd.getConstraintType() == type)
 			{
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
index d75a0db66b..e2e2df8002 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
@@ -62,6 +62,7 @@ public	class	DDUtils
 
 
         ReferencedKeyConstraintDescriptor refCd;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		String[]	refColumnNames = otherConstraintInfo.getReferencedColumnNames();
 
@@ -129,6 +130,7 @@ public	class	DDUtils
 					 columnNamesMatch(refColumnNames, 
 										cd.getColumnDescriptors()))
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                     if (cd.deferrable()) {
                         final int onDelete = otherConstraintInfo.
                                 getReferentialActionDeleteRule();
@@ -181,6 +183,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 		
 		for (int index = 0; index < columnNames.length; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             String name = cdl.elementAt(index).getColumnName();
 			if (!name.equals(columnNames[index]))
 			{
@@ -237,6 +240,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 		//check whether the foreign key relation ships referential action
 		//is not violating the restrictions we have in the current system.
 		TableDescriptor refTd = otherConstraintInfo.getReferencedTableDescriptor(dd);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Hashtable<String,Integer> deleteConnHashtable = new Hashtable<String,Integer>();
 		//find whether the foreign key is self referencing.
 		boolean isSelfReferencingFk = (refTd.getUUID().equals(td.getUUID()));
@@ -245,6 +249,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 		int currentSelfRefValue = getCurrentDeleteConnections(dd, td, -1, deleteConnHashtable, false, true);
 		validateDeleteConnection(dd, td, refTd, 
 								 refAction, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                                  deleteConnHashtable,
                                  new Hashtable<String, Integer>(deleteConnHashtable),
 								 true, myConstraintName, false , 
@@ -276,6 +281,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 	 DataDictionary	dd,
 	 TableDescriptor	td,
 	 int refActionType,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	 Hashtable<String,Integer> dch,
 	 boolean prevNotCascade,
 	 boolean findSelfRef
@@ -318,6 +324,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 					String refTableName = refTd.getSchemaName() + "." + refTd.getName();
 					//check with  the existing references.
                     Integer rAction = dch.get(refTableName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 					if(rAction != null) // we already looked at this table
 					{
@@ -345,6 +352,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 					//not specified on the current link. It is actually the 
 					//value of what happens to the table whose delete
 					// connections we are finding.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     dch.put(refTableName, Integer.valueOf(childRefAction));
 					
 					//find the next delete conectiions on this path for non
@@ -380,6 +388,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 		TableDescriptor actualTd,  // the table we are adding the foriegn key.
 		TableDescriptor	refTd,
 		int refActionType,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Hashtable<String,Integer> dch,
 		Hashtable<String,Integer> ech,  //existing delete connections
 		boolean checkImmediateRefTable,
@@ -403,7 +412,9 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 
 		if(checkImmediateRefTable)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5017
 		    String refTableName = refTd.getSchemaName() + "." + refTd.getName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             rAction = dch.get(refTableName);
 			
 			// check possible invalide cases incase of self referencing foreign key
@@ -455,6 +466,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 				** CASCADE, otherwise we should throw error.
 				*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 if( isSelfReferencingFk &&
                     dch.contains(Integer.valueOf(StatementType.RA_CASCADE)) &&
                     refActionType !=  StatementType.RA_CASCADE)
@@ -509,6 +521,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 			** of cycles , all the nodes in the cycle have same type of
 			** referential action.
 			**/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6330
 			cycleString.append(refActionType);
 		}
 
@@ -567,6 +580,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 				//check for this is non self referencing cycles case
 				//In cases of cycle, whole cycle should have the same refAction
 				// value. Other wise we should throw an exception
+//IC see: https://issues.apache.org/jira/browse/DERBY-6330
 				cycleString.append(raDeleteRule);
 				boolean isFormingCycle = (nextRefTd.getUUID().equals(actualTd.getUUID()));
 				if(isFormingCycle)
@@ -602,6 +616,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 				
 
 				String nextRefTableName =  nextRefTd.getSchemaName() + "." + nextRefTd.getName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 rAction = ech.get(nextRefTableName);
 				if(rAction != null)
 				{
@@ -620,6 +635,7 @@ public	static boolean columnNamesMatch(String []columnNames, ColumnDescriptorLis
 
 				}else
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     rAction = dch.get(nextRefTableName);
 					if(rAction == null)
 					{
@@ -774,6 +790,7 @@ private static void checkForMultiplePathInvalidCases(int currentRefAction,
 	 DataDictionary	dd,
 	 TableDescriptor td,
 	 int refActionType,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	 Hashtable<String,Integer> newDconnHashTable,
 	 String myConstraintName
 	 )
@@ -789,6 +806,7 @@ private static void checkForMultiplePathInvalidCases(int currentRefAction,
 		//are adding the foreign key and check whether we violate their existing rules.
 		String addTableName = td.getSchemaName() + "." + td.getName();;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ConstraintDescriptor cd : dd.getConstraintDescriptors(td))
         {
 			if ((cd instanceof ReferencedKeyConstraintDescriptor))
@@ -804,6 +822,7 @@ private static void checkForMultiplePathInvalidCases(int currentRefAction,
 				
 				//Note: More than one table can refer to the same
 				//ReferencedKeyConstraintDescriptor, so we need to find all the tables.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				Hashtable<String,Integer> dConnHashtable = new Hashtable<String,Integer>();
 				for (int inner = 0; inner < size; inner++)
 				{
@@ -830,6 +849,7 @@ private static void checkForMultiplePathInvalidCases(int currentRefAction,
 						**referential action and only one SET NULL path.
 						**/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 						for (Enumeration<String> e = dConnHashtable.keys() ; e.hasMoreElements() ;) 
 						{
 							String tName = e.nextElement();
@@ -877,6 +897,7 @@ private static StandardException generateError(String messageId,
 		String raRuleStringId;
 		switch (raRule){
 		case StatementType.RA_CASCADE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
 			raRuleStringId = "CASCADE";
 			break;
 		case StatementType.RA_RESTRICT:
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java
index 466fe11a56..b4b26d0b1b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java
@@ -608,6 +608,7 @@ public PermDescriptor newPermDescriptor(
      */
     static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
index cc0bc096c5..ee9fe61bd7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
@@ -412,6 +412,7 @@ public SchemaDescriptor	getSchemaDescriptor(UUID schemaId, TransactionController
 	 */
 	public SchemaDescriptor	getSchemaDescriptor(UUID schemaId,
 												int isolationLevel,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3678
 												TransactionController tc)
 						throws StandardException;
 
@@ -426,6 +427,7 @@ public SchemaDescriptor	getSchemaDescriptor(UUID schemaId,
 	 * @exception StandardException
 	 */
 	public boolean existsSchemaOwnedBy(String authid,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
 									   TransactionController tc)
 			throws StandardException;
 
@@ -502,6 +504,8 @@ public boolean isSystemSchemaName( String name)
 	 * @exception StandardException		Thrown on failure
 	 */
 	public void	dropRoleGrant(String roleName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 							  String grantee,
 							  String grantor,
 							  TransactionController tc)
@@ -554,6 +558,7 @@ public void	dropRoleGrantsByName(String roleName,
 	 * @throws StandardException
 	 */
 	public RoleClosureIterator createRoleClosureIterator
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
 		(TransactionController tc,
 		 String role,
 		 boolean inverse
@@ -617,6 +622,7 @@ public boolean isSchemaEmpty(SchemaDescriptor sd)
 	 * @exception StandardException		Thrown on failure
 	 */
 	public TableDescriptor		getTableDescriptor(String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 					SchemaDescriptor schema, TransactionController tc)
 						throws StandardException;
 
@@ -768,6 +774,7 @@ public void	updateSYSCOLPERMSforAddColumnToUserTable(UUID tableID, TransactionCo
 	 */
 	public void	updateSYSCOLPERMSforDropColumn(UUID tableID,
 			TransactionController tc, ColumnDescriptor columnDescriptor)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
 	throws StandardException;
 	
 	
@@ -1216,6 +1223,7 @@ public TriggerDescriptor getTriggerDescriptor(String name, SchemaDescriptor sd)
 				throws StandardException;
 
 	public int[] examineTriggerNodeAndCols(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
 			Visitable actionStmt,
 			String oldReferencingName,
 			String newReferencingName,
@@ -1354,6 +1362,7 @@ public int[] examineTriggerNodeAndCols(
 	 * @throws StandardException
 	 */
 	public String getTriggerActionString(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 			Visitable actionStmt,
 			String oldReferencingName,
 			String newReferencingName,
@@ -1364,6 +1373,7 @@ public String getTriggerActionString(
 			TableDescriptor triggerTableDescriptor,
 			int triggerEventMask,
             boolean createTriggerTime,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
             List<int[]> replacements,
            	int[] cols)
 	throws StandardException;
@@ -1404,6 +1414,9 @@ public TriggerDescriptorList getTriggerDescriptors(TableDescriptor td)
 		TriggerDescriptor 	triggerd,
 		UUID					formerUUID,
 		int[]					colsToSet,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
 		TransactionController	tc
 	) throws StandardException;
 
@@ -1439,6 +1452,7 @@ public TriggerDescriptorList getTriggerDescriptors(TableDescriptor td)
 	 */
     @SuppressWarnings("UseOfObsoleteCollectionType")
     public Hashtable<Long, ConglomerateDescriptor>
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         hashAllConglomerateDescriptorsByNumber(TransactionController tc)
             throws StandardException;
 
@@ -1622,6 +1636,7 @@ public void updateConglomerateDescriptor(ConglomerateDescriptor cd,
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     List<DependencyDescriptor> getDependentsDescriptorList(String dependentID)
 		throws StandardException;
 
@@ -1636,6 +1651,7 @@ List<DependencyDescriptor> getDependentsDescriptorList(String dependentID)
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     List<DependencyDescriptor> getProvidersDescriptorList(String providerID)
 		throws StandardException;
 
@@ -1725,6 +1741,8 @@ public AliasDescriptor getAliasDescriptor(String schemaID, String aliasName, cha
 		Get the list of routines matching the schema and routine name.
 	 */
     public List<AliasDescriptor> getRoutineList(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         String schemaID,
         String routineName,
         char nameSpace) throws StandardException;
@@ -1847,6 +1865,8 @@ public RowLocation getRowLocationTemplate( LanguageConnectionContext lcc, TableD
 	 * holds the lock.
 	 */
 	public NumberDataValue 	getSetAutoincrementValue(RowLocation rl,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5687
+//IC see: https://issues.apache.org/jira/browse/DERBY-4437
 											 TransactionController tc,
 											 boolean doUpdate,
 											 NumberDataValue newValue,
@@ -1922,6 +1942,8 @@ public void setAutoincrementValue(TransactionController tc,
      * @throws StandardException if the sequence does not cycle and its range is exhausted
 	 */
     public void getCurrentValueAndAdvance
+//IC see: https://issues.apache.org/jira/browse/DERBY-5687
+//IC see: https://issues.apache.org/jira/browse/DERBY-4437
         ( String sequenceUUIDstring, NumberDataValue returnValue )
         throws StandardException;
 
@@ -2072,6 +2094,7 @@ To use this method, a feature implemented in a certain release (DataDictionary v
      * actions to PermssionDescriptor's dependents.
      */
     public boolean addRemovePermissionsDescriptor( boolean add,
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
                                                  PermissionsDescriptor perm,
                                                  String grantee,
                                                  TransactionController tc)
@@ -2101,6 +2124,7 @@ public TablePermsDescriptor getTablePermissions( UUID tableUUID, String authoriz
      */
     public TablePermsDescriptor getTablePermissions( UUID tablePermsUUID)
     throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 
     /**
      * Get one user's column privileges for a table.
@@ -2143,6 +2167,7 @@ public ColPermsDescriptor getColumnPermissions( UUID tableUUID,
      * @exception StandardException
      */
     public ColPermsDescriptor getColumnPermissions( UUID tableUUID,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
             String privTypeStr,
             boolean forGrant,
             String authorizationId)
@@ -2158,6 +2183,7 @@ public ColPermsDescriptor getColumnPermissions( UUID tableUUID,
      */
     public ColPermsDescriptor getColumnPermissions( UUID colPermsUUID)
     throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 
     /**
      * Get one user's permissions for a routine (function or procedure).
@@ -2260,6 +2286,7 @@ public RoleGrantDescriptor getRoleDefinitionDescriptor(String roleName)
 	 */
 	public RoleGrantDescriptor getRoleGrantDescriptor(UUID uuid)
 			throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
 	/**
 	 * Get a descriptor for a role grant
@@ -2271,6 +2298,7 @@ public RoleGrantDescriptor getRoleGrantDescriptor(UUID uuid)
 	 * @throws StandardException error
 	 */
 	public RoleGrantDescriptor getRoleGrantDescriptor(String roleName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 													  String grantee,
 													  String grantor)
 		throws StandardException;
@@ -2302,6 +2330,7 @@ public void dropDependentsStoredDependencies(UUID dependentsUUID,
 	 * @return boolean true if such a grant exists
 	 */
 	public boolean existsGrantToAuthid(String authId,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
 									   TransactionController tc)
 				throws StandardException;
 
@@ -2461,6 +2490,7 @@ public DependableFinder getColumnDependableFinder(
     public  BulkInsertCounter   getBulkInsertCounter
         ( String sequenceUUIDString, boolean restart )
         throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 
     /**
      * Flush the updated values of the BulkInsertCounter to disk and to the original, cached
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
index 87b870f3b9..c9754da386 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
@@ -40,6 +40,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 
 public final class DefaultDescriptor 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	extends UniqueTupleDescriptor
 	implements Provider, Dependent
 {
@@ -208,6 +209,7 @@ public void prepareToInvalidate(Provider p, int action,
 
 				throw StandardException.newException(SQLState.LANG_PROVIDER_HAS_DEPENDENT_OBJECT, 
 									dm.getActionString(action), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
 									p.getObjectName(), "DEFAULT",
 									td.getQualifiedName() + "." +
 									cd.getColumnName());
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
index 2615f43287..a7eb513eb4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
@@ -36,6 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * A Descriptor for a file that has been stored in the database.
  */
 public final class  FileInfoDescriptor extends UniqueSQLObjectDescriptor 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	implements Provider
 {
 	/** A type tho indicate the file is a jar file **/
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java
index ee569e0a87..24ab7d8baa 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java
@@ -85,6 +85,7 @@ protected ForeignKeyConstraintDescriptor(
 		super(dataDictionary, table, constraintName, deferrable,
 			  initiallyDeferred, fkColumns,
               constraintId, indexId, schemaDesc, enforced);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
 		this.referencedConstraintDescriptor = referencedConstraintDescriptor;
 		this.raDeleteRule = raDeleteRule;
@@ -126,6 +127,7 @@ protected ForeignKeyConstraintDescriptor(
 	{
 		super(dataDictionary, table, constraintName, deferrable,
 			  initiallyDeferred, fkColumns,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
               constraintId, indexId, schemaDesc, enforced);
 		this.referencedConstraintId = referencedConstraintId;
 		this.raDeleteRule = raDeleteRule;
@@ -242,6 +244,7 @@ public boolean needsToFire(int stmtType, int[] modifiedCols)
 		/*
 		** If we are disabled, we never fire
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (!enforced())
 		{
 			return false;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java
index cbbffa912f..fa0e8216f2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java
@@ -26,6 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.ArrayList;
 
 public class GenericDescriptorList<E extends UniqueTupleDescriptor>
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
        extends ArrayList<E>
 {
 	private boolean scanned;
@@ -64,6 +65,7 @@ public boolean getScanned()
 	 */
     public E getUniqueTupleDescriptor(UUID uuid)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (E ud : this)
 		{
 			if (ud.getUUID().equals(uuid))
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
index 987496c2f7..a24077a6c7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
@@ -83,6 +83,7 @@ public	IndexRowGenerator[]		getIndexRowGenerators()
 					throws StandardException
 	{
 		if ( indexRowGenerators == null ) { getAllIndexes(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return ArrayUtil.copy(indexRowGenerators);
 	}
 
@@ -97,6 +98,7 @@ public	long[]		getIndexConglomerateNumbers()
 					throws StandardException
 	{
 		if ( indexConglomerateNumbers == null ) { getAllIndexes(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return	ArrayUtil.copy( indexConglomerateNumbers );
 	}
 
@@ -112,6 +114,7 @@ public	IndexRowGenerator[]		getDistinctIndexRowGenerators()
 					throws StandardException
 	{
 		if ( distinctIndexRowGenerators == null ) { getAllIndexes(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return ArrayUtil.copy(distinctIndexRowGenerators);
 	}
 
@@ -127,6 +130,7 @@ public	long[]		getDistinctIndexConglomerateNumbers()
 					throws StandardException
 	{
 		if ( distinctIndexConglomerateNumbers == null ) { getAllIndexes(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return	ArrayUtil.copy( distinctIndexConglomerateNumbers );
 	}
 
@@ -140,6 +144,7 @@ public	long[]		getDistinctIndexConglomerateNumbers()
 	  */
     public	String[]		getDistinctIndexNames()	throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5111
 		if ( distinctIndexNames == null ) { getAllIndexes(); }
 		return	ArrayUtil.copy( distinctIndexNames );
 	}
@@ -213,6 +218,7 @@ private void getAllIndexes()
 			if ( ! cd.isIndex())
 				continue;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             indexRowGenerators[++j] = cd.getIndexDescriptor();
 			indexConglomerateNumbers[j] = cd.getConglomerateNumber();
 			if (!(cd.isConstraint()))
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
index 62444637fb..d98f5ccd48 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
@@ -92,6 +92,9 @@ public IndexRowGenerator(String indexType,
 		id = new IndexDescriptorImpl(indexType,
 									isUnique,
 									isUniqueWithDuplicateNulls,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                                     isUniqueDeferrable,
                                     hasDeferrableChecking,
 									baseColumnPositions,
@@ -245,6 +248,7 @@ public void getIndexRow(ExecRow baseRow,
 	 * @exception  StandardException  Standard exception policy.
      **/
     public int[] getColumnCollationIds(ColumnDescriptorList columnList)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		throws StandardException
     {
         int[] base_cols     = id.baseColumnPositions();
@@ -283,11 +287,15 @@ public IndexRowGenerator()
      */
 	public boolean isUniqueWithDuplicateNulls()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 		return id.isUniqueWithDuplicateNulls();
 	}
 
     public boolean hasDeferrableChecking()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         return id.hasDeferrableChecking();
     }
 
@@ -397,6 +405,7 @@ private ExecutionFactory getExecutionFactory()
 			ExecutionContext	ec;
 
 			ec = (ExecutionContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 					getContext(ExecutionContext.CONTEXT_ID);
 			ef = ec.getExecutionFactory();
 		}
@@ -442,6 +451,7 @@ public int getTypeFormatId()
      */
     private  static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java
index 1e2323863b..9dda0a7207 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java
@@ -79,6 +79,7 @@ <li>public ConglomerateDescriptor getIndexConglomerateDescriptor(DataDictionary
 	{
 		super(dataDictionary, table, constraintName, deferrable,
 			  initiallyDeferred, referencedColumns,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
               constraintId, schemaDesc, enforced);
 		this.indexId = indexId;
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PasswordHasher.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PasswordHasher.java
index 1f6ee64089..d912e2eb06 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PasswordHasher.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PasswordHasher.java
@@ -108,6 +108,7 @@ public  class   PasswordHasher
          )
     {
         _messageDigestAlgorithm = messageDigestAlgorithm;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
         _salt = ArrayUtil.copy( salt );
         _iterations = iterations;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PermDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PermDescriptor.java
index 05344a8c8e..f3acbe23a3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PermDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PermDescriptor.java
@@ -212,6 +212,7 @@ public String getClassType() {
      * @see Dependable#getDependableFinder
      */
     public DependableFinder getDependableFinder() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         return getDependableFinder(
                 StoredFormatIds.PERM_DESCRIPTOR_FINDER_V01_ID);
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java
index 31badd7f49..86777233a7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * system tables.
  */
 public abstract class PermissionsDescriptor extends TupleDescriptor 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 	implements Cloneable, Provider
 {
 	protected UUID oid;
@@ -56,6 +57,7 @@ public Object clone()
 		catch( java.lang.CloneNotSupportedException cnse)
 		{
 			if( SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Could not clone a " +
 										  getClass().getName(), cnse);
 			return null;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PrivilegedSQLObject.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PrivilegedSQLObject.java
index 616bfc32bf..b78222fbf6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PrivilegedSQLObject.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/PrivilegedSQLObject.java
@@ -27,6 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * This is a descriptor for schema object which can have privileges granted on it.
  */
 public abstract class PrivilegedSQLObject
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     extends UniqueSQLObjectDescriptor
     implements Provider
 {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java
index f8c21bbf81..925b3b552e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java
@@ -90,6 +90,7 @@ protected ReferencedKeyConstraintDescriptor(int constraintType,
 	{
 		super(dataDictionary, table, constraintName, deferrable,
 			  initiallyDeferred, columns, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
               constraintId, indexId, schemaDesc, enforced);
 		this.referenceCount = referenceCount;
 		this.constraintType = constraintType;
@@ -131,6 +132,8 @@ public boolean hasSelfReferencingFK(ConstraintDescriptorList cdl, int type)
 			cdl = getForeignKeyConstraints(type);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ConstraintDescriptor cd : cdl)
 		{
 			if (! (cd instanceof ForeignKeyConstraintDescriptor))
@@ -160,6 +163,7 @@ public ConstraintDescriptorList getNonSelfReferencingFK(int type)
 		throws StandardException
 	{
         ConstraintDescriptorList result = new ConstraintDescriptorList();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
 		if (SanityManager.DEBUG)
 		{
@@ -168,6 +172,7 @@ public ConstraintDescriptorList getNonSelfReferencingFK(int type)
 	
 		ForeignKeyConstraintDescriptor fkcd;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         for (ConstraintDescriptor cd : getForeignKeyConstraints(type))
 		{
 			if (! (cd instanceof ForeignKeyConstraintDescriptor))
@@ -178,6 +183,7 @@ public ConstraintDescriptorList getNonSelfReferencingFK(int type)
 			fkcd = (ForeignKeyConstraintDescriptor) cd;
 			if(!(fkcd.getTableId().equals(getTableId())))
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 result.add(fkcd);
 			}
 		}
@@ -305,6 +311,7 @@ public boolean needsToFire(int stmtType, int[] modifiedCols)
 		/*
 		** If we are disabled, we never fire
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (!enforced())
 		{
 			return false;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/RoleGrantDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/RoleGrantDescriptor.java
index bba404255d..062983cdb6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/RoleGrantDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/RoleGrantDescriptor.java
@@ -47,6 +47,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * upgrading an older database that did not forbid this.
  */
 public class RoleGrantDescriptor extends TupleDescriptor
+//IC see: https://issues.apache.org/jira/browse/DERBY-3666
     implements Provider
 {
     private final UUID uuid;
@@ -71,6 +72,9 @@ public class RoleGrantDescriptor extends TupleDescriptor
      *
      */
     public RoleGrantDescriptor(DataDictionary dd,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                                UUID uuid,
                                String roleName,
                                String grantee,
@@ -87,6 +91,7 @@ public RoleGrantDescriptor(DataDictionary dd,
     }
 
     public UUID getUUID() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         return uuid;
     }
 
@@ -116,6 +121,7 @@ public void setWithAdminOption(boolean b) {
 
     public String toString() {
         if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
             return "uuid: " + uuid + "\n" +
                 "roleName: " + roleName + "\n" +
                 "grantor: " + grantor + "\n" +
@@ -148,6 +154,7 @@ public void drop(LanguageConnectionContext lcc) throws StandardException
         DataDictionary dd = getDataDictionary();
         TransactionController tc = lcc.getTransactionExecute();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         dd.dropRoleGrant(roleName, grantee, grantor, tc);
     }
 
@@ -164,6 +171,7 @@ public void drop(LanguageConnectionContext lcc) throws StandardException
      */
     public UUID getObjectID()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3666
         return uuid;
     }
 
@@ -208,6 +216,7 @@ public String getClassType()
      */
     public DependableFinder getDependableFinder()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         return getDependableFinder(StoredFormatIds.ROLE_GRANT_FINDER_V01_ID);
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/RoutinePermsDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/RoutinePermsDescriptor.java
index 76aa5020a4..604fec6ef6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/RoutinePermsDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/RoutinePermsDescriptor.java
@@ -44,11 +44,13 @@ public RoutinePermsDescriptor( DataDictionary dd,
                                    UUID routineUUID,
                                    boolean hasExecutePermission) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
         super (dd, grantee, grantor);
         this.routineUUID = routineUUID;
         this.hasExecutePermission = hasExecutePermission;
         //routineUUID can be null only if the constructor with routineePermsUUID
         //has been invoked.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         if (routineUUID != null)
         	routineName = dd.getAliasDescriptor(routineUUID).getObjectName();
 	}
@@ -58,6 +60,7 @@ public RoutinePermsDescriptor( DataDictionary dd,
                                    String grantor,
                                    UUID routineUUID) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
         this( dd, grantee, grantor, routineUUID, true);
 	}
 
@@ -66,12 +69,14 @@ public RoutinePermsDescriptor( DataDictionary dd,
      */
 	public RoutinePermsDescriptor( DataDictionary dd,
                                    String grantee,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
                                    String grantor) throws StandardException
     {
         this( dd, grantee, grantor, (UUID) null);
     }
 	   
     public RoutinePermsDescriptor( DataDictionary dd, UUID routineePermsUUID) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
     throws StandardException
 	{
         this( dd, null, null, null, true);
@@ -89,6 +94,7 @@ public int getCatalogNumber()
 
 	public String toString()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		return "routinePerms: grantee=" + getGrantee() + 
         ",routinePermsUUID=" + getUUID() +
           ",grantor=" + getGrantor() +
@@ -121,6 +127,7 @@ public int hashCode()
 	 */
 	public boolean checkOwner(String authorizationId) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		UUID sd = getDataDictionary().getAliasDescriptor(routineUUID).getSchemaUUID();
 		if (getDataDictionary().getSchemaDescriptor(sd, null).getAuthorizationId().equals(authorizationId))
 			return true;
@@ -161,6 +168,7 @@ public String getClassType()
 	 */
 	public DependableFinder getDependableFinder() 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         return getDependableFinder(
                 StoredFormatIds.ROUTINE_PERMISSION_FINDER_V01_ID);
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
index 902eb17e0d..d5fa6822ca 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
@@ -74,6 +74,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 public class SPSDescriptor extends UniqueSQLObjectDescriptor
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	implements Dependent, Provider
 {
 	/**
@@ -216,6 +217,7 @@ <li>public void revalidate(LanguageConnectionContext lcc)
 		super( dataDictionary );
 
         // Added this check when setUUID was removed, see DERBY-4918.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4918
         if (uuid == null) {
             throw new IllegalArgumentException("UUID is null");
         }
@@ -225,6 +227,7 @@ <li>public void revalidate(LanguageConnectionContext lcc)
 		this.text = text;
 		this.usingText = usingText;
 		this.valid = valid;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		this.compileTime = DataTypeUtilities.clone( compileTime );
 		this.sd = dataDictionary.getSchemaDescriptor(suuid, null);
 		this.preparedStatement = preparedStatement;
@@ -371,6 +374,7 @@ public final synchronized void prepareAndRelease(LanguageConnectionContext lcc)
 
 		// stored statements always stored as unicode.
 		Statement 			stmt = lcf.getStatement(dd.getSchemaDescriptor(compSchemaId, null), text, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 
 		try
 		{
@@ -401,6 +405,7 @@ public final synchronized void prepareAndRelease(LanguageConnectionContext lcc)
 		setParams(preparedStatement.getParameterTypes());
 
 		if (!dd.isReadOnlyUpgrade()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 
 			/*
 			** Indicate that we are going to write the data
@@ -409,6 +414,7 @@ public final synchronized void prepareAndRelease(LanguageConnectionContext lcc)
 			*/
 			dd.startWriting(lcc);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4918
             DependencyManager dm = dd.getDependencyManager();
 			/*
 			** Clear out all the dependencies that exist
@@ -485,6 +491,7 @@ public final char getType()
 	 * @return type as a string
 	 */	
     public final String getTypeAsString() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4918
         return String.valueOf(type);
     }
 
@@ -517,6 +524,7 @@ public static boolean validType(char type)
 	 */
 	public final synchronized Timestamp getCompileTime()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return DataTypeUtilities.clone( compileTime );
 	}
 
@@ -593,13 +601,16 @@ public final UUID getUUID() {
 	public final synchronized DataTypeDescriptor[] getParams()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4918
         if (params == null && !lookedUpParams) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             List<DataValueDescriptor> tmpDefaults = new ArrayList<DataValueDescriptor>();
             params = getDataDictionary().getSPSParams(this, tmpDefaults);
             paramDefaults = tmpDefaults.toArray();
             lookedUpParams = true;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return ArrayUtil.copy(params);
 	}
 
@@ -610,6 +621,7 @@ public final synchronized DataTypeDescriptor[] getParams()
 	 */
 	public final synchronized void setParams(DataTypeDescriptor params[])
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.params = ArrayUtil.copy(params);
 	}
 
@@ -631,6 +643,7 @@ public final synchronized Object[] getParameterDefaults()
 			getParams();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return ArrayUtil.copy( paramDefaults );
 	}
 
@@ -641,6 +654,7 @@ public final synchronized Object[] getParameterDefaults()
 	 */
 	public final synchronized void setParameterDefaults(Object[] values)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		this.paramDefaults = ArrayUtil.copy( values );
 	}
 	
@@ -688,6 +702,7 @@ public final synchronized ExecPreparedStatement getPreparedStatement(boolean rec
 			 (preparedStatement == null)))
 		{
 			ContextManager cm = getContextService().getCurrentContextManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			/*
 			** Find the language connection context.  Get
@@ -699,6 +714,7 @@ public final synchronized ExecPreparedStatement getPreparedStatement(boolean rec
 
 
 			if (!lcc.getDataDictionary().isReadOnlyUpgrade()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 
                 final String savepoint = lcc.getUniqueSavepointName();
 
@@ -754,6 +770,7 @@ public final synchronized ExecPreparedStatement getPreparedStatement(boolean rec
                         nestedTC.rollbackToSavePoint(savepoint, false, null);
                     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                     if (
                         (nestedTC != null) &&
                         ( se.isLockTimeout() || se.isSelfDeadlock() )
@@ -1018,6 +1035,12 @@ public final synchronized void makeInvalid(int action,
 			case DependencyManager.CREATE_TRIGGER:
 			case DependencyManager.DROP_TRIGGER:
 			case DependencyManager.DROP_COLUMN:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1489
+//IC see: https://issues.apache.org/jira/browse/DERBY-1909
+//IC see: https://issues.apache.org/jira/browse/DERBY-1926
+//IC see: https://issues.apache.org/jira/browse/DERBY-1489
+//IC see: https://issues.apache.org/jira/browse/DERBY-1909
+//IC see: https://issues.apache.org/jira/browse/DERBY-1926
 			case DependencyManager.DROP_COLUMN_RESTRICT:
 		    case DependencyManager.UPDATE_STATISTICS:
 		    case DependencyManager.DROP_STATISTICS:
@@ -1030,9 +1053,15 @@ public final synchronized void makeInvalid(int action,
 				if (valid == true)
 				{
 					valid = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
+//IC see: https://issues.apache.org/jira/browse/DERBY-4835
+//IC see: https://issues.apache.org/jira/browse/DERBY-5289
+//IC see: https://issues.apache.org/jira/browse/DERBY-5105
+//IC see: https://issues.apache.org/jira/browse/DERBY-5263
                     preparedStatement = null;
 					updateSYSSTATEMENTS(lcc, INVALIDATE, null);
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 dm.invalidateFor(
                         this, DependencyManager.USER_RECOMPILE_REQUEST, lcc);
 				break;
@@ -1121,6 +1150,7 @@ private void updateSYSSTATEMENTS(LanguageConnectionContext lcc, int mode, Transa
 	{
 		DataDictionary dd = getDataDictionary();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 		if (dd.isReadOnlyUpgrade())
 			return;
 
@@ -1148,6 +1178,7 @@ private UUID recreateUUID(String idString)
 	{
 		if (uuidFactory == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			uuidFactory = DataDescriptorGenerator.getMonitor().getUUIDFactory();
 		}
 		return uuidFactory.recreateUUID(idString);
@@ -1170,6 +1201,7 @@ private UUID recreateUUID(String idString)
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getFactory();
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
index 65e5e8ed5a..25014984a4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
@@ -41,6 +41,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 
 public final class SchemaDescriptor extends UniqueTupleDescriptor 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	implements Provider
 {
 	
@@ -258,6 +259,7 @@ public void	setUUID(UUID oid)
 	 */
 	public int	getCollationType()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2530
 		return collationType;
 	}
 
@@ -363,6 +365,7 @@ public boolean isSystemSchema()
 	 */
 	public boolean isSchemaWithGrantableRoutines()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		if (!isSystem)
 			return true;
 
@@ -407,6 +410,8 @@ public String getDescriptorType()
      * @throws StandardException Schema could not be dropped.
      */
 	public void drop(LanguageConnectionContext lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
 					 Activation activation) throws StandardException
 	{
         DataDictionary dd = getDataDictionary();
@@ -447,6 +452,8 @@ public void drop(LanguageConnectionContext lcc,
 	     ** LCC is free to set the new default schema to 
 	     ** some system defined default.
 	     */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
 		lcc.resetSchemaUsages(activation, getSchemaName());
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SequenceDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SequenceDescriptor.java
index 4f43f907ce..9a48c0ba3d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SequenceDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/SequenceDescriptor.java
@@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * can be generated from it.
  */
 public class SequenceDescriptor
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     extends PrivilegedSQLObject
     implements Provider, Dependent
 {
@@ -272,6 +273,7 @@ public String getClassType() {
      * @see Dependable#getDependableFinder
      */
     public DependableFinder getDependableFinder() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         return getDependableFinder(
                 StoredFormatIds.SEQUENCE_DESCRIPTOR_FINDER_V01_ID);
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementColumnPermission.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementColumnPermission.java
index e465dd7f48..3cd6dc6dfd 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementColumnPermission.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementColumnPermission.java
@@ -93,9 +93,11 @@ public void check( LanguageConnectionContext lcc,
 					   Activation activation)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		DataDictionary dd = lcc.getDataDictionary();
 		ExecPreparedStatement ps = activation.getPreparedStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         if (hasPermissionOnTable(lcc, activation, forGrant, ps)) {
 			return;
 		}
@@ -111,6 +113,7 @@ public void check( LanguageConnectionContext lcc,
 													permittedColumns);
 			permittedColumns = addPermittedColumns( dd,
 													false /* non-grantable permissions */,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                                                     currentUserId,
 													permittedColumns);
 		}
@@ -120,6 +123,7 @@ public void check( LanguageConnectionContext lcc,
 												permittedColumns);
 		permittedColumns = addPermittedColumns( dd,
 												true /* grantable permissions */,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                                                 currentUserId,
 												permittedColumns);
 		
@@ -135,7 +139,9 @@ public void check( LanguageConnectionContext lcc,
 			return;
 
 		FormatableBitSet unresolvedColumns = (FormatableBitSet)columns.clone();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		for (int i = unresolvedColumns.anySetBit();
 			 i >= 0;
 			 i = unresolvedColumns.anySetBit(i)) {
@@ -163,6 +169,7 @@ public void check( LanguageConnectionContext lcc,
 			// used.
 			String dbo = dd.getAuthorizationDatabaseOwner();
             rd = dd.getRoleGrantDescriptor(role, currentUserId, dbo);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
 			if (rd == null) {
 				rd = dd.getRoleGrantDescriptor
@@ -255,6 +262,8 @@ public void check( LanguageConnectionContext lcc,
 					(forGrant
 					 ? SQLState.AUTH_NO_COLUMN_PERMISSION_FOR_GRANT
 					 : SQLState.AUTH_NO_COLUMN_PERMISSION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                     currentUserId,
 					getPrivName(),
 					cd.getColumnName(),
@@ -271,6 +280,7 @@ public void check( LanguageConnectionContext lcc,
 			// another role has been set), we are able to
 			// invalidate the ps or activation (the latter is used
 			// if the current role changes).
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 			DependencyManager dm = dd.getDependencyManager();
 			RoleGrantDescriptor rgd =
 				dd.getRoleDefinitionDescriptor(role);
@@ -307,6 +317,7 @@ private FormatableBitSet addPermittedColumns( DataDictionary dd,
 	 * @see StatementPermission#getPermissionDescriptor
 	 */
 	public PermissionsDescriptor getPermissionDescriptor(String authid, DataDictionary dd)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 	throws StandardException
 	{
 		//If table permission found for authorizationid, then simply return that
@@ -379,6 +390,7 @@ public PermissionsDescriptor getPUBLIClevelColPermsDescriptor(String authid, Dat
 	 * @return false if the current role is required
 	 */
 	public boolean allColumnsCoveredByUserOrPUBLIC(String authid,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 												   DataDictionary dd)
 			throws StandardException {
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementGenericPermission.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementGenericPermission.java
index d4cad0d8b1..c993374c3e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementGenericPermission.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementGenericPermission.java
@@ -67,6 +67,7 @@ public void check( LanguageConnectionContext lcc,
 					   boolean forGrant,
 					   Activation activation) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         genericCheck( lcc, forGrant, activation, _privilege );
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementPermission.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementPermission.java
index bb72c148e5..0494442f48 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementPermission.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementPermission.java
@@ -56,6 +56,7 @@ public abstract class StatementPermission
 	public abstract void check( LanguageConnectionContext lcc,
 								boolean forGrant,
 								Activation activation) throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 
 	/**
 	 * 
@@ -79,6 +80,7 @@ public abstract void check( LanguageConnectionContext lcc,
 	 */
 	public abstract PermissionsDescriptor getPermissionDescriptor(String authid, DataDictionary dd)
 	throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 
     /**
      * Return true if the passed in permission matches the one required by this
@@ -115,6 +117,7 @@ public String getObjectType()
 		TransactionController tc = lcc.getTransactionExecute();
 		ExecPreparedStatement ps = activation.getPreparedStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         PermissionsDescriptor perm =
             getPermissionDescriptor( lcc.getCurrentUserId(activation), dd );
 		if( !isCorrectPermission( perm ) ) { perm = getPermissionDescriptor(Authorizer.PUBLIC_AUTHORIZATION_ID, dd ); }
@@ -137,6 +140,7 @@ public String getObjectType()
 			String dbo = dd.getAuthorizationDatabaseOwner();
 			RoleGrantDescriptor rd = dd.getRoleGrantDescriptor
                 (role, lcc.getCurrentUserId(activation), dbo);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
 			if (rd == null) {
 				rd = dd.getRoleGrantDescriptor(
@@ -209,6 +213,7 @@ public String getObjectType()
 				(forGrant
 				 ? SQLState.AUTH_NO_GENERIC_PERMISSION_FOR_GRANT
 				 : SQLState.AUTH_NO_GENERIC_PERMISSION),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 lcc.getCurrentUserId(activation),
                 privilegeType,
 				getObjectType(),
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementRolePermission.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementRolePermission.java
index 8c48622d13..1b2023726a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementRolePermission.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementRolePermission.java
@@ -55,6 +55,7 @@ public StatementRolePermission(String roleName, int privType)
      */
     public void check(LanguageConnectionContext lcc,
                       boolean forGrant,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                       Activation activation
                       ) throws StandardException
     {
@@ -98,6 +99,7 @@ public PermissionsDescriptor getPermissionDescriptor(String authid,
 
     private String getPrivName( )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         switch(privType) {
         case Authorizer.CREATE_ROLE_PRIV:
             return "CREATE_ROLE";
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementRoutinePermission.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementRoutinePermission.java
index 97b842b07b..d4436c7d60 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementRoutinePermission.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementRoutinePermission.java
@@ -54,6 +54,7 @@ public StatementRoutinePermission( UUID routineUUID)
 	 */
 	public UUID getRoutineUUID()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3743
 		return routineUUID;
 	}
 
@@ -62,8 +63,10 @@ public UUID getRoutineUUID()
 	 */
 	public void check( LanguageConnectionContext lcc,
 					   boolean forGrant,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 					   Activation activation) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         genericCheck( lcc, forGrant, activation, "EXECUTE" );
 	}
 
@@ -89,6 +92,7 @@ public PrivilegedSQLObject getPrivilegedObject( DataDictionary dd ) throws Stand
 	 * @see StatementPermission#getPermissionDescriptor
 	 */
 	public PermissionsDescriptor getPermissionDescriptor(String authid, DataDictionary dd)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 	throws StandardException
 	{
 		return dd.getRoutinePermissions(routineUUID,authid);
@@ -101,6 +105,7 @@ public PermissionsDescriptor getPermissionDescriptor(String authid, DataDictiona
 
 	public String toString()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		return "StatementRoutinePermission: " + routineUUID;
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementSchemaPermission.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementSchemaPermission.java
index 05e5b9963e..1a37e38a76 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementSchemaPermission.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementSchemaPermission.java
@@ -62,15 +62,19 @@ public StatementSchemaPermission(String schemaName, String aid, int privType)
 	 */
 	public void check( LanguageConnectionContext lcc,
 					   boolean forGrant,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 					   Activation activation) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		DataDictionary dd =	lcc.getDataDictionary();
 		TransactionController tc = lcc.getTransactionExecute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         String currentUserId = lcc.getCurrentUserId(activation);
 		switch ( privType )
 		{
 			case Authorizer.MODIFY_SCHEMA_PRIV:
 			case Authorizer.DROP_SCHEMA_PRIV:
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 				SchemaDescriptor sd = dd.getSchemaDescriptor(schemaName, tc, false);
 				// If schema hasn't been created already, no need to check
 				// for drop schema, an exception will be thrown if the schema 
@@ -78,6 +82,7 @@ public void check( LanguageConnectionContext lcc,
 				if (sd == null)
 					return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 if (!currentUserId.equals(sd.getAuthorizationId()))
 					throw StandardException.newException(
                         SQLState.AUTH_NO_ACCESS_NOT_OWNER,
@@ -117,6 +122,7 @@ public void check( LanguageConnectionContext lcc,
 	 * @see StatementPermission#check
 	 */
 	public PermissionsDescriptor getPermissionDescriptor(String authid, DataDictionary dd)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 	throws StandardException
 	{
 		return null;
@@ -124,6 +130,7 @@ public PermissionsDescriptor getPermissionDescriptor(String authid, DataDictiona
 
     private String getPrivName( )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		switch(privType) {
 		case Authorizer.CREATE_SCHEMA_PRIV:
 			return "CREATE_SCHEMA";
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementTablePermission.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementTablePermission.java
index 5ce4485ae2..5006792941 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementTablePermission.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/StatementTablePermission.java
@@ -116,7 +116,9 @@ public void check( LanguageConnectionContext lcc,
 	{
 		ExecPreparedStatement ps = activation.getPreparedStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         if (!hasPermissionOnTable(lcc, activation, forGrant, ps)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5017
 		    DataDictionary dd = lcc.getDataDictionary();
 			TableDescriptor td = getTableDescriptor( dd);
             throw StandardException.newException(
@@ -149,13 +151,17 @@ protected TableDescriptor getTableDescriptor(DataDictionary dd)  throws Standard
 	 *        privileges
 	 */
 	protected boolean hasPermissionOnTable(LanguageConnectionContext lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 										   Activation activation,
 										   boolean forGrant,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 										   ExecPreparedStatement ps)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		DataDictionary dd = lcc.getDataDictionary();
         String currentUserId = lcc.getCurrentUserId(activation);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
 		boolean result =
 			oneAuthHasPermissionOnTable(dd,
@@ -178,6 +184,7 @@ protected boolean hasPermissionOnTable(LanguageConnectionContext lcc,
 				String dbo = dd.getAuthorizationDatabaseOwner();
 				RoleGrantDescriptor rd = dd.getRoleGrantDescriptor
                     (role, currentUserId, dbo);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
 				if (rd == null) {
 					rd = dd.getRoleGrantDescriptor(
@@ -219,6 +226,7 @@ protected boolean hasPermissionOnTable(LanguageConnectionContext lcc,
 						// another role has been set), we are able to
 						// invalidate the ps or activation (the latter is used
 						// if the current role changes).
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 						DependencyManager dm = dd.getDependencyManager();
 						RoleGrantDescriptor rgd =
 							dd.getRoleDefinitionDescriptor(role);
@@ -272,6 +280,7 @@ protected boolean oneAuthHasPermissionOnTable(DataDictionary dd, String authoriz
 	 * @see StatementPermission#getPermissionDescriptor
 	 */
 	public PermissionsDescriptor getPermissionDescriptor(String authid, DataDictionary dd)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 	throws StandardException
 	{
 		//if the required type of privilege exists for the given authorizer,
@@ -292,6 +301,7 @@ public String getPrivName( )
 		{
 		case Authorizer.SELECT_PRIV:
 		case Authorizer.MIN_SELECT_PRIV:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1824
 			return "SELECT";
 		case Authorizer.UPDATE_PRIV:
 			return "UPDATE";
@@ -309,6 +319,7 @@ public String getPrivName( )
 
 	public String toString()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		return "StatementTablePermission: " + getPrivName() + " " + tableUUID;
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java
index 78d584bffa..efaa46957d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java
@@ -48,6 +48,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
  <p>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   This class represents a table descriptor. The external interface to this
   class is:
  </p>
@@ -90,6 +91,7 @@ <li>public void getAllRelevantConstraints(...) throws StandardException</li>
 	*/
 
 public class TableDescriptor extends UniqueSQLObjectDescriptor
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	implements Provider, Dependent
 {
 	public static final int BASE_TABLE_TYPE = 0;
@@ -108,6 +110,7 @@ public class TableDescriptor extends UniqueSQLObjectDescriptor
     public static final int ISTATS_ABSDIFF_THRESHOLD;
     public static final double ISTATS_LNDIFF_THRESHOLD;
     static {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4938
         ISTATS_CREATE_THRESHOLD = PropertyUtil.getSystemInt(
                 Property.STORAGE_AUTO_INDEX_STATS_DEBUG_CREATE_THRESHOLD,
                 Property.STORAGE_AUTO_INDEX_STATS_DEBUG_CREATE_THRESHOLD_DEFAULT
@@ -162,6 +165,7 @@ public class TableDescriptor extends UniqueSQLObjectDescriptor
      */
     private volatile long           heapConglomNumber = -1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4895
     ColumnDescriptorList            columnDescriptorList;
 	ConglomerateDescriptorList		conglomerateDescriptorList;
 	ConstraintDescriptorList		constraintDescriptorList;
@@ -186,6 +190,8 @@ private FormatableBitSet referencedColumnMapGet() {
 		(FormatableBitSet newReferencedColumnMap) {
 
         LanguageConnectionContext lcc =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             (LanguageConnectionContext)getContextOrNull(
                 LanguageConnectionContext.CONTEXT_ID);
 
@@ -319,6 +325,7 @@ public void	setTableName(String newTableName)
 	 */
 	public String	getQualifiedName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4476
         return IdUtil.mkQualifiedName(getSchemaName(), getName());
 	}
 
@@ -413,6 +420,7 @@ public int getNumberOfColumns()
 	 */
 	public FormatableBitSet getReferencedColumnMap()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2861
 		return referencedColumnMapGet();
 	}
 
@@ -424,6 +432,7 @@ public FormatableBitSet getReferencedColumnMap()
 	 */
 	public void setReferencedColumnMap(FormatableBitSet referencedColumnMap)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2861
 		referencedColumnMapPut(referencedColumnMap);
 	}
 
@@ -462,6 +471,7 @@ public int getMaxColumnID()
 	{
 		int					maxColumnID = 1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ColumnDescriptor cd : columnDescriptorList)
 		{
 			maxColumnID = Math.max( maxColumnID, cd.getPosition() );
@@ -548,11 +558,13 @@ public ExecRow getEmptyExecRow()
 		 throws StandardException
 	{
 		int							columnCount = getNumberOfColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 		ExecRow result =
             getDataDictionary().getExecutionFactory().getValueRow(columnCount);
 
 		for (int index = 0; index < columnCount; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ColumnDescriptor cd = columnDescriptorList.elementAt(index);
 			//String name = column.getColumnName();
 			DataValueDescriptor dataValue = cd.getType().getNull();
@@ -574,6 +586,7 @@ public ExecRow getEmptyExecRow()
 	 * @exception  StandardException  Standard exception policy.
      **/
     public int[] getColumnCollationIds()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		throws StandardException
     {
         int[] collation_ids = new int[getNumberOfColumns()]; 
@@ -581,6 +594,7 @@ public int[] getColumnCollationIds()
 		for (int index = 0; index < collation_ids.length; index++)
 		{
             ColumnDescriptor cd = columnDescriptorList.elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             collation_ids[index] = cd.getType().getCollationType();
 
@@ -649,6 +663,7 @@ public boolean isPersistent()
 	 */
 	public boolean isSynonymDescriptor()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 		if (tableType == TableDescriptor.SYNONYM_TYPE)
 			return true;
 		return false;
@@ -663,6 +678,7 @@ public boolean isSynonymDescriptor()
 	public int getTotalNumberOfIndexes()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
 		return getQualifiedNumberOfIndexes(0, false);
 	}
 
@@ -680,6 +696,7 @@ public int getTotalNumberOfIndexes()
     public int getQualifiedNumberOfIndexes(int minColCount,
                                            boolean nonUniqeTrumpsColCount) {
         int matches = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ConglomerateDescriptor cd : conglomerateDescriptorList) {
             if (cd.isIndex()) {
                 IndexRowGenerator irg = cd.getIndexDescriptor();
@@ -706,6 +723,7 @@ public int getQualifiedNumberOfIndexes(int minColCount,
 	(
 		int						statementType,
 		int[]					changedColumnIds,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         TriggerDescriptorList   relevantTriggers
     )
 		throws StandardException
@@ -721,6 +739,7 @@ public int getQualifiedNumberOfIndexes(int minColCount,
 
 		DataDictionary				dd = getDataDictionary();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TriggerDescriptor tgr : dd.getTriggerDescriptors(this)) {
             if (tgr.needsToFire(statementType, changedColumnIds)) {
                 relevantTriggers.add(tgr);
@@ -823,6 +842,7 @@ public int getQualifiedNumberOfIndexes(int minColCount,
 	 */
 	public DependableFinder getDependableFinder()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2861
 		if (referencedColumnMapGet() == null)
 			return	getDependableFinder(StoredFormatIds.TABLE_DESCRIPTOR_FINDER_V01_ID);
 		else
@@ -838,10 +858,12 @@ public DependableFinder getDependableFinder()
 	 */
 	public String getObjectName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2861
 		if (referencedColumnMapGet() == null)
 			return tableName;
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             StringBuilder name = new StringBuilder();
             name.append(tableName);
 			boolean first = true;
@@ -852,6 +874,7 @@ public String getObjectName()
 				{
 					if (first)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5071
 						name.append("(").append(cd.getColumnName());
 						first = false;
 					}
@@ -899,6 +922,7 @@ public String toString()
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 			String tempString =
 				"\n" + "schema: " + schema + "\n" +
 				"tableName: " + tableName + "\n" +
@@ -909,6 +933,7 @@ public String toString()
 				"heapConglomNumber: " + heapConglomNumber + "\n";
 			if (tableType == TableDescriptor.GLOBAL_TEMPORARY_TABLE_TYPE)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				tempString = tempString + "onCommitDeleteRows: " + "\n" +
 					onCommitDeleteRows + "\n";
 				tempString = tempString + "onRollbackDeleteRows: " + "\n" +
@@ -1050,6 +1075,8 @@ public void emptyTriggerDescriptorList()
 		throws StandardException
 	{
 		// Easier just to get a new CDL then to clean out the current one
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         this.triggerDescriptorList = new TriggerDescriptorList();
 	}
 
@@ -1244,6 +1271,7 @@ public	IndexLister	getIndexLister()
 	 */
 	public boolean tableHasAutoincrement()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ColumnDescriptor cd : columnDescriptorList)
 		{
 			if (cd.isAutoincrement())
@@ -1319,7 +1347,9 @@ public synchronized List<StatisticsDescriptor> getStatistics() throws StandardEx
      * @throws StandardException if obtaining index statistics fails
      */
     public void markForIndexStatsUpdate(long tableRowCountEstimate)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4938
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         List<StatisticsDescriptor> sdl = getStatistics();
         if (sdl.isEmpty() && tableRowCountEstimate >= ISTATS_CREATE_THRESHOLD) {
             // No statistics exists, create them.
@@ -1330,6 +1360,7 @@ public void markForIndexStatsUpdate(long tableRowCountEstimate)
         }
 
         // Check the state of the existing indexes (if any).
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (StatisticsDescriptor sd : sdl) {
             long indexRowCountEstimate = sd.getStatistic().getRowEstimate();
             long diff = Math.abs(tableRowCountEstimate - indexRowCountEstimate);
@@ -1387,6 +1418,7 @@ public boolean statisticsExist(ConglomerateDescriptor cd)
 		throws StandardException
 	{
         List<StatisticsDescriptor> sdl = getStatistics();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		if (cd == null)
 			return (sdl.size() > 0);
@@ -1423,6 +1455,7 @@ public double selectivityForConglomerate(ConglomerateDescriptor cd,
 	{
 		UUID referenceUUID = cd.getUUID();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (StatisticsDescriptor statDesc : getStatistics())
 		{
 			if (!referenceUUID.equals(statDesc.getReferenceID()))
@@ -1447,6 +1480,7 @@ public double selectivityForConglomerate(ConglomerateDescriptor cd,
     @Override
 	public String getDescriptorType() 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 		return (tableType == TableDescriptor.SYNONYM_TYPE) ? "Synonym" : "Table/View";
 	}
 
@@ -1536,6 +1570,7 @@ public  static  String  makeSequenceName( UUID tableID )
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContextOrNull( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TablePermsDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TablePermsDescriptor.java
index 07b83cb30f..e7931dc2e5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TablePermsDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TablePermsDescriptor.java
@@ -52,6 +52,7 @@ public TablePermsDescriptor( DataDictionary dd,
                                  String insertPriv,
                                  String updatePriv,
                                  String referencesPriv,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
                                  String triggerPriv) throws StandardException
 	{
 		super (dd, grantee, grantor);
@@ -64,7 +65,9 @@ public TablePermsDescriptor( DataDictionary dd,
         this.triggerPriv = triggerPriv;
         //tableUUID can be null only if the constructor with tablePermsUUID
         //has been invoked.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         if (tableUUID != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         	tableName = dd.getTableDescriptor(tableUUID).getName();
 	}
 
@@ -74,6 +77,7 @@ public TablePermsDescriptor( DataDictionary dd,
     public TablePermsDescriptor( DataDictionary dd,
                                  String grantee,
                                  String grantor,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
                                  UUID tableUUID) throws StandardException
     {
         this( dd, grantee, grantor, tableUUID,
@@ -81,6 +85,7 @@ public TablePermsDescriptor( DataDictionary dd,
     }
     
     public TablePermsDescriptor( DataDictionary dd,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
             UUID tablePermsUUID) throws StandardException
             {
         this( dd, null, null, null,
@@ -104,6 +109,7 @@ public int getCatalogNumber()
 
 	public String toString()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		return "tablePerms: grantee=" + getGrantee() +
 		",tablePermsUUID=" + getUUID() +
 			",grantor=" + getGrantor() +
@@ -133,6 +139,7 @@ public boolean equals( Object other)
      */
     public int hashCode()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
     	return super.keyHashCode() + tableUUID.hashCode();
     }
 	
@@ -141,6 +148,7 @@ public int hashCode()
 	 */
 	public boolean checkOwner(String authorizationId) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		TableDescriptor td = getDataDictionary().getTableDescriptor(tableUUID);
 		if (td.getSchemaDescriptor().getAuthorizationId().equals(authorizationId))
 			return true;
@@ -181,6 +189,7 @@ public String getClassType()
 	 */
 	public DependableFinder getDependableFinder() 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         return getDependableFinder(
                 StoredFormatIds.TABLE_PERMISSION_FINDER_V01_ID);
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
index 304ce8768d..6c633ceed4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
@@ -95,6 +95,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * </ol>
  */
 public class TriggerDescriptor extends UniqueSQLObjectDescriptor
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	implements Provider, Dependent, Formatable 
 {
 	// field that we want users to be able to know about
@@ -162,6 +163,7 @@ public TriggerDescriptor() {}
      * @param whenClauseText the SQL text of the WHEN clause, or {@code null}
      *                       if there is no WHEN clause
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6186
     TriggerDescriptor
 	(
 		DataDictionary		dataDictionary,
@@ -198,6 +200,7 @@ public TriggerDescriptor() {}
 		this.whenSPSId = whenSPSId;
 		this.isEnabled = isEnabled;
 		this.referencedCols = referencedCols;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		setReferencedColsInTriggerAction( referencedColsInTriggerAction );
 		this.creationTimestamp = DataTypeUtilities.clone( creationTimestamp );
 		this.triggerDefinition = triggerDefinition;
@@ -285,6 +288,7 @@ public int getTriggerEventMask()
 	 */
 	public Timestamp getCreationTimestamp()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return DataTypeUtilities.clone( creationTimestamp );
 	}
 
@@ -404,6 +408,7 @@ private SPSDescriptor getSPS(LanguageConnectionContext lcc,
                                  : pa.parseStatement(originalSQL);
 			lcc.popCompilerContext(newCC);
             int[] cols;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
             cols = dd.examineTriggerNodeAndCols(stmtnode,
 					oldReferencingName,
 					newReferencingName,
@@ -411,6 +416,7 @@ private SPSDescriptor getSPS(LanguageConnectionContext lcc,
 					referencedCols,
 					referencedColsInTriggerAction,
                     0,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6726
 					getTableDescriptor(),
 					-1,
                     false,
@@ -423,9 +429,11 @@ private SPSDescriptor getSPS(LanguageConnectionContext lcc,
 					referencedCols,
 					referencedColsInTriggerAction,
 					0,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6726
 					getTableDescriptor(),
 					-1,
                     false,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
                     null,
                     cols);
 
@@ -525,12 +533,14 @@ public TableDescriptor getTableDescriptor()
 	 */
 	public int[] getReferencedCols()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return ArrayUtil.copy( referencedCols );
 	}
 
     /** Update the array of referenced columns */
     public  void    setReferencedCols( int[] newCols )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
         referencedCols = ArrayUtil.copy( newCols );
     }
 
@@ -541,6 +551,7 @@ public  void    setReferencedCols( int[] newCols )
 	 */
 	public int[] getReferencedColsInTriggerAction()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
         return ArrayUtil.copy( referencedColsInTriggerAction );
 	}
 
@@ -811,6 +822,7 @@ public synchronized boolean isValid()
 		    case DependencyManager.DROP_SPS:
             case DependencyManager.DROP_VIEW:
 		    case DependencyManager.RENAME:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1643
 		    case DependencyManager.REVOKE_PRIVILEGE_RESTRICT:
             case DependencyManager.DROP_METHOD_ALIAS:
 				DependencyManager dm = getDataDictionary().getDependencyManager();
@@ -861,6 +873,7 @@ public void makeInvalid(int action, LanguageConnectionContext lcc) throws Standa
 			// make the TriggerDescriptor drop itself. 
 			// Ditto for revoking a role conferring a privilege.
 			case DependencyManager.REVOKE_PRIVILEGE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 			case DependencyManager.REVOKE_ROLE:
                 drop(lcc);
 
@@ -972,6 +985,7 @@ protected DataDictionary getDataDictionary()
  		if (dd == null)
  		{
   			LanguageConnectionContext lcc = (LanguageConnectionContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				getContext(LanguageConnectionContext.CONTEXT_ID);
   			dd = lcc.getDataDictionary();
 			setDataDictionary(dd);
@@ -1063,6 +1077,7 @@ public String getDescriptorType()
      */
     private  static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java
index e623bf83b2..c1110b605f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java
@@ -89,6 +89,7 @@ public boolean isPersistent()
 	//////////////////////////////////////////////////////////////////
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 	DependableFinder getDependableFinder(int formatId)
 	{
 		return dataDictionary.getDependableFinder(formatId);
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/UserDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/UserDescriptor.java
index 068b136f8e..c0ff1eb56e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/UserDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/UserDescriptor.java
@@ -45,6 +45,7 @@ public final class  UserDescriptor extends TupleDescriptor
 	 * @param password  The user's password.
 	 * @param lastModified  Time that the password was last modified.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6186
     UserDescriptor
         (
          DataDictionary dataDictionary,
@@ -67,6 +68,7 @@ public final class  UserDescriptor extends TupleDescriptor
             System.arraycopy( password, 0, _password, 0, password.length );
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
         _lastModified = DataTypeUtilities.clone( lastModified );
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
index 30916d8bb7..a5fe3fcbe6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
@@ -52,6 +52,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 
 public final class ViewDescriptor extends UniqueTupleDescriptor
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	implements Dependent, Provider
 {
 	private final int			checkOption;
@@ -242,6 +243,9 @@ public void prepareToInvalidate(Provider p, int action,
 			 */
 		    case DependencyManager.CREATE_INDEX:
 		    case DependencyManager.DROP_INDEX:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1489
+//IC see: https://issues.apache.org/jira/browse/DERBY-1909
+//IC see: https://issues.apache.org/jira/browse/DERBY-1926
 		    case DependencyManager.DROP_COLUMN:
 		    case DependencyManager.CREATE_CONSTRAINT:
 		    case DependencyManager.ALTER_TABLE:
@@ -274,9 +278,11 @@ public void prepareToInvalidate(Provider p, int action,
 			// anything here. Later in makeInvalid method, we make the
 			// ViewDescriptor drop itself.
 			case DependencyManager.REVOKE_ROLE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 
 			// Only used by Activations
 		    case DependencyManager.RECHECK_PRIVILEGES:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 
 				break;
 				// When REVOKE_PRIVILEGE gets sent to a
@@ -285,6 +291,7 @@ public void prepareToInvalidate(Provider p, int action,
 				// may be GPSs needing re-compilation. But Dependents
 				// could also be ViewDescriptors, which then also need
 				// to handle this event.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2594
 			case DependencyManager.INTERNAL_RECOMPILE_REQUEST:
 		    	break;
 
@@ -345,6 +352,7 @@ public void makeInvalid(int action, LanguageConnectionContext lcc)
 
 				// Only used by Activations
 			case DependencyManager.RECHECK_PRIVILEGES:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 
 				// When REVOKE_PRIVILEGE gets sent to a
 				// TablePermsDescriptor we must also send
@@ -352,6 +360,7 @@ public void makeInvalid(int action, LanguageConnectionContext lcc)
 				// may be GPSs needing re-compilation. But Dependents
 				// could also be ViewDescriptors, which then also need
 				// to handle this event.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2594
 		    case DependencyManager.INTERNAL_RECOMPILE_REQUEST:
 				break;
 
@@ -359,8 +368,13 @@ public void makeInvalid(int action, LanguageConnectionContext lcc)
 				// types SELECT, UPDATE, DELETE, INSERT, REFERENCES, TRIGGER),
 				// we make the ViewDescriptor drop itself. REVOKE_ROLE also
 				// drops the dependent view.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1489
+//IC see: https://issues.apache.org/jira/browse/DERBY-1909
+//IC see: https://issues.apache.org/jira/browse/DERBY-1926
             case DependencyManager.DROP_COLUMN:
 		    case DependencyManager.REVOKE_PRIVILEGE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 			case DependencyManager.REVOKE_ROLE:
                 
                 TableDescriptor td = 
@@ -472,6 +486,7 @@ private void drop(
 
 		/* Drop all table and column permission descriptors */
 		dd.dropAllTableAndColPermDescriptors(td.getUUID(), tc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
 
 		/* Drop the table */
 		dd.dropTableDescriptor(td, sd, tc);
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java
index f0f48cdd4b..bd7d0ee05a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java
@@ -28,6 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.iapi.services.loader.ClassFactory;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
    <P>
    An ExecAggregator is the interface that execution uses
    to an aggregate.  System defined aggregates will implement
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
index 4c55888d15..4c04466a07 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
@@ -71,6 +71,7 @@ public interface ExecPreparedStatement
      *  @return a list with all the saved objects
 	 */
     List<Object> getSavedObjects();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	/**
 	 *	Get the saved cursor info.  Used for stored prepared
@@ -175,6 +176,7 @@ public interface ExecPreparedStatement
 	 *         the database does not use SQL standard authorization
 	 */
     List<StatementPermission> getRequiredPermissionsList();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
     // Methods for stale plan checking.
 
@@ -193,6 +195,7 @@ public interface ExecPreparedStatement
      * @return the row count from the first execution of the result set
      */
     long getInitialRowCount(int rsNum, long currentRowCount);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
 
     /**
      * Set the stale plan check interval.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
index 7c45560db8..22be468363 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
@@ -99,6 +99,7 @@ public ResultSetStatisticsFactory getResultSetStatisticsFactory()
 	 * @exception StandardException     Thrown on error
 	 */
 	XPLAINFactoryIF getXPLAINFactory()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
                                 throws StandardException;
 	
 	
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java
index 169d9e221d..ee216598a8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java
@@ -198,6 +198,7 @@ public interface NoPutResultSet extends ResultSet, RowLocationRetRowSource
 	 * @exception StandardException thrown on failure.
 	 */
 	public void updateRow(ExecRow row, RowChanger rowChanger)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
 			throws StandardException;
 	
 	/**
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
index bfde9ef2c4..65642ce182 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
@@ -121,6 +121,7 @@ ResultSet getSetTransactionResultSet(Activation activation)
 		@exception StandardException thrown when unable to perform the insert
 	 */
 	ResultSet getInsertResultSet(NoPutResultSet source, GeneratedMethod generationClauses,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                  GeneratedMethod checkGM, int fullTemplate,
                                  String schemaNameName,
                                  String tableName)
@@ -296,6 +297,7 @@ ResultSet getCallStatementResultSet(GeneratedMethod methodCall,
 			that is applied to the activation's "current row" field
 			to determine whether the restriction is satisfied or not.
 			The signature of this method is
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 				"Boolean restriction() throws StandardException;"
 		@param projection a reference to a method in the activation
 			that is applied to the activation's "current row" field
@@ -331,6 +333,8 @@ NoPutResultSet getProjectRestrictResultSet(NoPutResultSet source,
 		boolean reuseResult,
 		boolean doesProjection,
         boolean validatingCheckConstraint,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         String validatingBaseTableUUIDString,
 		double optimizerEstimatedRowCount,
 		double optimizerEstimatedCost) throws StandardException;
@@ -352,6 +356,7 @@ NoPutResultSet getProjectRestrictResultSet(NoPutResultSet source,
 			that is applied to the activation's "current row" field
 			to project out the expected result row.
 			The signature of this method is
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 				"ExecRow projection() throws StandardException;"
 		@param resultSetNumber	The resultSetNumber for the ResultSet
 		@param mapRefItem	Item # for mapping of source to target columns
@@ -588,6 +593,7 @@ NoPutResultSet getAnyResultSet(NoPutResultSet source,
 
 	/**
 		A once result set iterates over its source,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		raising an error if the source returns &gt; 1 row and
 		returning a row with all columns set to nulls
 		if the source returns no rows.
@@ -628,6 +634,7 @@ NoPutResultSet getOnceResultSet(NoPutResultSet source,
 			create the result set.
 		@param row a reference to a method in the activation
 			that creates the expected row.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 				"ExecRow row() throws StandardException;"
 		@param canCacheRow	True if execution can cache the input row
 			after it has gotten it.  If the input row is constructed soley
@@ -690,6 +697,7 @@ public NoPutResultSet getVTIResultSet(Activation activation, int row,
                                      int returnTypeNumber,
                                      int vtiProjectionNumber,
                                      int vtiRestrictionNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
                                      String vtiSchema,
                                      String vtiName
                                           )
@@ -883,6 +891,7 @@ NoPutResultSet getDistinctScanResultSet(
 		@exception StandardException thrown when unable to create the
 			result set
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     NoPutResultSet getValidateCheckConstraintResultSet(
                                 Activation activation,
                                 long conglomId,
@@ -1072,6 +1081,7 @@ NoPutResultSet getMultiProbeTableScanResultSet(
 		and uses the RowLocation in its last column to get the row from the
 		base conglomerate.
 		<p>
+//IC see: https://issues.apache.org/jira/browse/DERBY-2998
 
 	    @param conglomId	Conglomerate # for the heap.
 		@param scoci The saved item for the static conglomerate info.
@@ -1079,6 +1089,7 @@ NoPutResultSet getMultiProbeTableScanResultSet(
 						rows from an index conglomerate
 		@param resultRowAllocator a reference to a method in the activation
 			that creates a holder for the rows from the scan.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 				"ExecRow rowAllocator() throws StandardException;"
 		@param resultSetNumber	The resultSetNumber for the ResultSet
 		@param indexName		The name of the index.
@@ -1086,6 +1097,7 @@ NoPutResultSet getMultiProbeTableScanResultSet(
 								are referenced in the underlying heap.  -1 if
 								no item.
 		@param allColRefItem A saved item for a bitImpl of columns
+//IC see: https://issues.apache.org/jira/browse/DERBY-2226
 								that are referenced in the underlying
 								index and heap.  -1 if no item.
 		@param heapOnlyColRefItem A saved item for a bitImpl of
@@ -1126,6 +1138,8 @@ public NoPutResultSet getIndexRowToBaseRowResultSet(
 
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 	   A OLAP window on top of a regular result set. It is used to realize
 	   window functions.
 	   <p>
@@ -1303,6 +1317,10 @@ public NoPutResultSet getNestedLoopLeftOuterJoinResultSet(NoPutResultSet leftRes
 			that is applied to the activation's "current row" field
 			to determine whether the joinClause is satisfied or not.
 			The signature of this method is
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 				"Boolean joinClause() throws StandardException;"
 		@param resultSetNumber	The resultSetNumber for the ResultSet
 		@param emptyRowFun a reference to a method in the activation
@@ -1332,6 +1350,10 @@ public NoPutResultSet getHashLeftOuterJoinResultSet(NoPutResultSet leftResultSet
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 								   String userSuppliedOptimizerOverrides)
 			throws StandardException;
 
@@ -1522,6 +1544,7 @@ NoPutResultSet getSetOpResultSet( NoPutResultSet leftSource,
         int                 resultRowTemplate,
 		long 				conglomId,
 		String 				tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		String 				userSuppliedOptimizerOverrides,
 		String 				indexName,
 		int 				colRefItem,
@@ -1535,6 +1558,7 @@ NoPutResultSet getSetOpResultSet( NoPutResultSet leftSource,
 
 	/**
 		A Dependent table scan result set forms a result set on a scan
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 		of a dependent table for the rows that got materialized
 		on the scan of its parent table and if the row being deleted
 		on parent table has a reference in the dependent table.
@@ -1548,6 +1572,10 @@ NoPutResultSet getSetOpResultSet( NoPutResultSet leftSource,
 		@param startKeyGetter a reference to a method in the activation
 			that gets the start key indexable row for the scan.  Null
 			means there is no start key.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 				"ExecIndexRow startKeyGetter() throws StandardException;"
 		@param startSearchOperator The start search operator for opening
 			the scan
@@ -1579,6 +1607,7 @@ NoPutResultSet getSetOpResultSet( NoPutResultSet leftSource,
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
 		@param parentResultSetId  Id to access the materialized temporary result
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
                             	  set from the reference stored in the activation.
 		@param fkIndexConglomId foreign key index conglomerate id.
 		@param fkColArrayItem  saved column array object  that matches the foreign key index
@@ -1602,6 +1631,15 @@ public NoPutResultSet getRaDependentTableScanResultSet(
 									boolean sameStartStopPosition,
 									Qualifier[][] qualifiers,
 									String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 									String userSuppliedOptimizerOverrides,
 									String indexName,
 									boolean isConstraint,
@@ -1642,9 +1680,11 @@ public NoPutResultSet getRaDependentTableScanResultSet(
 	 */
 
 	public NoPutResultSet getRowCountResultSet(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4079
 		NoPutResultSet source,
 		Activation activation,
 		int resultSetNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4208
 		GeneratedMethod offsetMethod,
 		GeneratedMethod fetchFirstMethod,
         boolean hasJDBClimitClause,
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java
index 5ac16cbcf6..28369bf6ae 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java
@@ -50,6 +50,7 @@ public interface TargetResultSet extends ResultSet
 	public void changedRow(ExecRow execRow, RowLocation rowLocation) throws StandardException;
 
     public void offendingRowLocation(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             RowLocation rl, long constainerId) throws StandardException;
 	/**
 	 * Preprocess the source row prior to getting it back from the source.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/AccessFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/AccessFactory.java
index dd7602b961..f946db39f7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/AccessFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/AccessFactory.java
@@ -36,6 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   <p>
   Module interface for an access manager.  An access manager provides
   transactional access via access methods to data in a single storage
@@ -238,6 +239,7 @@ TransactionController getAndNameTransaction(
      * thrown on error.
      */
     public void startReplicationMaster(String dbmaster, String host, int port,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
                                        String replicationMode)
         throws StandardException;
 
@@ -337,6 +339,8 @@ public void backupAndEnableLogArchiveMode(
 	public void disableLogArchiveMode(boolean deleteOnlineArchivedLogFiles)
 		throws StandardException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-523
 
 	/**
 	 * Checkpoints the database, that is, flushes all dirty data to disk.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java
index b612ea713d..4ff7186c7f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java
@@ -73,6 +73,7 @@ public interface AccessFactoryGlobals
 	public static final String SORT_INTERNAL = "sort internal";
     public static final String SORT_UNIQUEWITHDUPLICATENULLS_EXTERNAL 
                                     = "sort almost unique external";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 
 	public static final String NESTED_READONLY_USER_TRANS = "nestedReadOnlyUserTransaction";
 	public static final String NESTED_UPDATE_USER_TRANS = "nestedUpdateUserTransaction";
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
index 3d86c4b3e2..b4c2c33d3e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
@@ -58,6 +58,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 The hash table will be built logically as follows (actual implementation
 may differ).  The important points are that the hash value is the standard
 java hash value on the row[key_column_numbers[0], if key_column_numbers.length is 1,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 or row[key_column_numbers[0, 1, ...]] if key_column_numbers.length &gt; 1, 
 and that duplicate detection is done by the standard java duplicate detection provided by 
 java.util.Hashtable.
@@ -118,6 +119,7 @@ or a LocatedRow (i.e., a structure holding the columns plus a RowLocation).
 </p>
 
 <ul>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 <li>DataValueDescriptor[] and ArrayList&lt;DataValueDescriptor&gt;</li>
 <li>or LocatedRow and ArrayList&lt;LocatedRow&gt;</li>
 </ul>
@@ -157,6 +159,7 @@ public class BackingStoreHashtable
      * The estimated number of bytes used by ArrayList(0)
      */  
     private final static int ARRAY_LIST_SIZE =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
         ClassSize.estimateBaseFromCatalog(ArrayList.class);
     
     private DiskHashtable diskHashtable;
@@ -236,6 +239,7 @@ public BackingStoreHashtable(
         this.remove_duplicates    = remove_duplicates;
 		this.row_source			   = row_source;
 		this.skipNullKeyColumns	   = skipNullKeyColumns;
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
         this.max_inmemory_rowcnt = max_inmemory_rowcnt;
         if ( max_inmemory_rowcnt > 0)
         {
@@ -265,6 +269,7 @@ public BackingStoreHashtable(
         {
             hash_table = 
                 ((loadFactor == -1) ? 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                      new HashMap<Object,Object>(initialCapacity) :
                      new HashMap<Object,Object>(initialCapacity, loadFactor));
         }
@@ -297,6 +302,7 @@ public BackingStoreHashtable(
              */
             hash_table = 
                 (((estimated_rowcnt <= 0) || (row_source == null)) ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                      new HashMap<Object,Object>() :
                      (estimated_rowcnt < max_inmemory_size) ?
                          new HashMap<Object,Object>((int) estimated_rowcnt) :
@@ -318,6 +324,10 @@ public BackingStoreHashtable(
                 // it would still satisfy the max_inmemory condition.  Note
                 // that this isn't a hard limit--the hash table can grow if
                 // needed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1007
+//IC see: https://issues.apache.org/jira/browse/DERBY-1259
+//IC see: https://issues.apache.org/jira/browse/DERBY-1260
+//IC see: https://issues.apache.org/jira/browse/DERBY-1205
                 if (hash_table == null)
                 {
                     // Check to see how much memory we think the first row
@@ -325,6 +335,7 @@ public BackingStoreHashtable(
                     // capacity of the hash table.
                     double rowUsage = getEstimatedMemUsage(row);
                     hash_table =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                         new HashMap<Object,Object>((int)(max_inmemory_size / rowUsage));
                 }
                
@@ -339,8 +350,10 @@ public BackingStoreHashtable(
         // an empty result set) so that calls to other methods on this
         // BackingStoreHashtable (ex. "size()") will have a working hash_table
         // on which to operate.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1365
         if (hash_table == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             hash_table = new HashMap<Object,Object>();
         }
     }
@@ -417,6 +430,7 @@ private static DataValueDescriptor[] cloneRow(DataValueDescriptor[] old_row)
         {
             if ( old_row[i] != null)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
                 new_row[i] = old_row[i].cloneValue(false);
             }
         }
@@ -443,6 +457,7 @@ static DataValueDescriptor[] shallowCloneRow(DataValueDescriptor[] old_row)
         {
             if ( old_row[i] != null)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
                 new_row[i] = old_row[i].cloneHolder();
             }
         }
@@ -529,6 +544,7 @@ private void doSpaceAccounting(Object hashValue,
             max_inmemory_size -= getEstimatedMemUsage( hashValue );
             if ( firstDuplicate)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
                 max_inmemory_size -= ARRAY_LIST_SIZE;
             }
         }
@@ -581,6 +597,7 @@ private void doSpaceAccounting(Object hashValue,
             // Want to start spilling
             diskRow = makeDiskRow( columnValues, rowLocation );
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             diskHashtable = 
                 new DiskHashtable(
                        tc,
@@ -775,6 +792,7 @@ public void close()
         hash_table = null;
         if ( diskHashtable != null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
             diskHashtable.close();
             diskHashtable = null;
         }
@@ -830,6 +848,7 @@ public Enumeration<Object> elements()
     {
         if ( diskHashtable == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
             return Collections.enumeration(hash_table.values());
         }
         return new BackingStoreHashtableEnumeration();
@@ -1091,6 +1110,7 @@ private class BackingStoreHashtableEnumeration implements Enumeration<Object>
         
         public boolean hasMoreElements()
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
             if (memoryIterator != null) {
                 if (memoryIterator.hasNext()) {
                     return true;
@@ -1106,6 +1126,7 @@ public boolean hasMoreElements()
 
         public Object nextElement() throws NoSuchElementException
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
             if (memoryIterator != null) {
                 if (memoryIterator.hasNext()) {
                     return memoryIterator.next();
@@ -1125,6 +1146,7 @@ public Object nextElement() throws NoSuchElementException
     private static class RowList extends ArrayList<Object> {
 
         private RowList(int initialCapacity) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             super(initialCapacity);
         }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/BinaryOrderable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/BinaryOrderable.java
index a7ae77350a..1e32a78f1c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/BinaryOrderable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/BinaryOrderable.java
@@ -33,6 +33,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   The Orderable interface represents a value that can
   be linearly ordered.
   <P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
   Currently only supports linear (&lt;, =, &lt;=) operations.
   Eventually we may want to do other types of orderings,
   in which case there would probably be a number of interfaces
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/DiskHashtable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/DiskHashtable.java
index 458b4d3841..4dfd6a026d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/DiskHashtable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/DiskHashtable.java
@@ -94,8 +94,10 @@ public DiskHashtable(
         this.tc                         = tc;
         this.key_column_numbers         = key_column_numbers;
         this.remove_duplicates          = remove_duplicates;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2462
         this.keepAfterCommit            = keepAfterCommit;
         LanguageConnectionContext lcc   = (LanguageConnectionContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             getContextOrNull(
                 LanguageConnectionContext.CONTEXT_ID);
 
@@ -129,6 +131,7 @@ public DiskHashtable(
                 "heap",
                 template,
                 (ColumnOrdering[]) null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 collation_ids,
                 (Properties) null,
                 tempFlags);
@@ -166,6 +169,7 @@ public DiskHashtable(
 
         // default collation is used for hash code and row location
         int[] index_collation_ids = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             {StringDataValue.COLLATION_TYPE_UCS_BASIC,
              StringDataValue.COLLATION_TYPE_UCS_BASIC};
 
@@ -260,6 +264,7 @@ private Object getRemove(Object key, boolean remove, boolean existenceOnly)
     {
         int hashCode = key.hashCode();
         int rowCount = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         DataValueDescriptor[] firstRow = null;
         List<DataValueDescriptor[]> allRows = null;
 
@@ -290,6 +295,7 @@ && rowMatches( row, key))
                     if( existenceOnly)
                         return this;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                     DataValueDescriptor[] clonedRow =
                             BackingStoreHashtable.shallowCloneRow(row);
 
@@ -322,6 +328,7 @@ && rowMatches( row, key))
                     }
                     if( remove_duplicates)
                         // This must be the only row with the key
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                         return clonedRow;
                 }
             }
@@ -331,6 +338,7 @@ && rowMatches( row, key))
             scan.close();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         if (allRows == null) {
             // No duplicates. Return the single row, or null if no row was
             // found for the given key.
@@ -403,6 +411,7 @@ public Enumeration<Object> elements()
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContextOrNull( contextID );
@@ -433,6 +442,7 @@ private class ElementEnum implements Enumeration<Object>
             try
             {
                 scan = tc.openScan( rowConglomerateId,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2462
                                     keepAfterCommit,
                                     0, // read only
                                     TransactionController.MODE_TABLE,
@@ -448,6 +458,7 @@ private class ElementEnum implements Enumeration<Object>
                 {
                     scan.close();
                     scan = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2462
                 } else if (keepAfterCommit) {
                     rowloc = rowConglomerate.newRowLocationTemplate();
                     scan.fetchLocation(rowloc);
@@ -479,6 +490,7 @@ public Object nextElement()
                 throw new NoSuchElementException();
             try
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2462
                 if (scan.isHeldAfterCommit()) {
                     // automatically reopens scan:
                     if (!scan.positionAtRowLocation(rowloc)) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/FileResource.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/FileResource.java
index 5634449c0e..37806d3702 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/FileResource.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/FileResource.java
@@ -57,6 +57,8 @@ Within a database a	(name,generationId) pair uniquely identifies
 public interface FileResource {
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-304
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
        The name of the jar directory
     */
     public static final String JAR_DIRECTORY_NAME = "jar";
@@ -111,6 +113,8 @@ public long replace(String name, long currentGenerationId, InputStream source)
 		throws StandardException;
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
+//IC see: https://issues.apache.org/jira/browse/DERBY-2040
 	  Get the StorageFile for a file resource.
 	  
 	  @param name The name of the fileResource
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/GlobalXact.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/GlobalXact.java
index 39977c1252..b1cf08ae6a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/GlobalXact.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/GlobalXact.java
@@ -33,6 +33,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 <LI> org.apache.derby.iapi.store.access.xa.XAXactId : 
 this class is a specific implementation of the JTA Xid interface
 <LI> org.apache.derby.impl.store.access.GlobalXactId : 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 this class represents internal Derby transaction ids
 </UL>
 <P>
@@ -83,6 +84,7 @@ public String toString()
 			for (int i = 0; i < global_id.length; i++)
 		    {
 				mask = (global_id[i] & 0xFF);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2551
                 if (mask < 16) {
                     globalhex += "0" + Integer.toHexString(mask);
                 } else {
@@ -97,6 +99,7 @@ public String toString()
 			for (int i = 0; i < branch_id.length; i++)
 		    {
 				mask = (branch_id[i] & 0xFF);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2551
                 if (mask < 16) {
                     branchhex += "0" + Integer.toHexString(mask);
                 } else {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
index d22677c017..57264b67ab 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
@@ -139,6 +139,7 @@ public int fetchNextGroup(
         throws StandardException;
 
     public int fetchNextGroup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     DataValueDescriptor[][] row_array,
     RowLocation[]           oldrowloc_array,
     RowLocation[]           newrowloc_array)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/Qualifier.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/Qualifier.java
index 2f839e7666..15d4680a42 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/Qualifier.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/Qualifier.java
@@ -26,11 +26,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.error.StandardException;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-1665
   <p>
   A structure which is used to "qualify" a column.  Specifies
   that the column value in a given column identified by column
   id is to be compared via a specific operator to a particular
   DataValueDescriptor value.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   </p>
   <p>
   The implementation of this interface is provided by the client; 
@@ -59,7 +61,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
           compare_result = !(compare_result);
       }
   }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   </pre></blockquote>
+//IC see: https://issues.apache.org/jira/browse/DERBY-1665
   <p>
   Qualifiers are often passed through interfaces as a set of Qualifiers,
   rather than one at a time, for example see the qualifier argument in 
@@ -85,7 +89,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   of OR's.  Thus the 2 dimensional array qual[][] argument is to be treated as 
   the following, note if qual.length = 1 then only the first array is valid and
   it is and an array of AND clauses:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   </p>
+//IC see: https://issues.apache.org/jira/browse/DERBY-1665
   <blockquote><pre>
   (qual[0][0] AND qual[0][0] ... AND qual[0][qual[0].length - 1])
   AND
@@ -94,6 +100,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   (qual[2][0] OR  qual[2][1] ... OR  qual[2][qual[2].length - 1])
   ...
   AND (qual[qual.length - 1][0] OR  qual[1][1] ... OR  qual[1][2])
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   </pre></blockquote>
   <p>
   If any of the array's qual[0].length ... qual[qual.length -1] are 0 length
@@ -103,6 +110,7 @@ encoding of (a or b) that takes advantage of this.
   <p>
   Note that any of the arrays qual[0].length ... qual[qual.length -1] may also
   be of length 1, thus no guarantee is made the presence of OR
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
   predicates if qual.length &lt; 1. See example 1a.
   </p>
   <p>
@@ -130,6 +138,7 @@ encoding of (a or b) that takes advantage of this.
     qualifier[0][0] = a
     qualifier[1][0] = b
     qualifier[2][0] = c
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   </pre></blockquote>
   <p>
   Example 2: "(f) AND (a OR b) AND (c OR d OR e)"
@@ -147,6 +156,7 @@ encoding of (a or b) that takes advantage of this.
     qualifier[2][0] = c
     qualifier[2][1] = d
     qualifier[2][2] = e
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   </pre></blockquote>
   <p>
   Example 3: "(a OR b) AND (c OR d) AND (e OR f)" 
@@ -166,6 +176,7 @@ encoding of (a or b) that takes advantage of this.
     qualifier[2][1] = d
     qualifier[3][0] = e
     qualifier[3][1] = f
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   </pre></blockquote>
   <p>
   Example 4: "(a OR b)" 
@@ -178,6 +189,7 @@ encoding of (a or b) that takes advantage of this.
     qualifier[1][0] = a
     qualifier[1][1] = b
   </pre></blockquote>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
   @see ScanController
   @see TransactionController#openScan 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowCountable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowCountable.java
index eb9d7dff2d..a8224e8fc7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowCountable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowCountable.java
@@ -54,6 +54,7 @@ public interface RowCountable
      */
     public long getEstimatedRowCount()
         throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4938
 
     /**
      * Set the total estimated number of rows in the container.
@@ -81,5 +82,6 @@ public long getEstimatedRowCount()
      */
     public void setEstimatedRowCount(long count)
         throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4938
 
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java
index fb52987468..b8d575efad 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java
@@ -74,6 +74,7 @@ public interface RowLocationRetRowSource extends RowSource
 
 		NeedsRowLocation and rowLocation will ONLY be called by a drainer of
 		the row source which CAN return a row location.  Drainer of row source
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         which cannot return rowLocation will guarantee to not call either
 		callbacks. Conversely, if NeedsRowLocation is called and it returns
 		true, then for every row return by getNextRowFromRowSource, a
@@ -90,6 +91,7 @@ row location, it needs to clone it (RowLocation is a ClonableObject).
 	 */
 	void rowLocation(RowLocation rl) throws StandardException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     void offendingRowLocation(
             RowLocation rl, long containdId) throws StandardException;
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowSource.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowSource.java
index 10ef323aca..fadbe4df1d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowSource.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowSource.java
@@ -98,6 +98,7 @@ preceeding getNextRowFromRowSource() call.  Column N maps to
 	  not in the partial row if validColumns.get(N) returns false.  Column N is
 	  in the partial row if validColumns.get(N) returns true.  If column N is
 	  in the partial row then it maps to DataValueDescriptor[M] where M is the 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
       count of calls to validColumns.get(i) that return true where i &lt; N.  If
 	  DataValueDescriptor.length is greater than the number of columns 
       indicated by validColumns the extra entries are ignored.  
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowUtil.java
index 956d88b81d..0c1664b7fb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/RowUtil.java
@@ -36,6 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.Vector;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   <P>
   A set of static utility methods to work with rows.
   </P>
@@ -56,6 +57,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   that the format for a partial row changed from a "packed" representation
   in the 3.0 release to a "sparse" representation in later releases:
   </P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
   <blockquote><pre>
 
@@ -73,6 +75,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   FormatableBitSet.set(7);
   </pre></blockquote>
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
   <BR>
   <P>
@@ -97,6 +100,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
        returns false.</LI>
   <LI> Column N is in the partial row if validColumns.isSet(N) returns true.</LI>
   <LI> If column N is in the partial row then it maps to row[N].
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	   If N &gt;= row.length then the column is taken as non existent for an
 	   insert or update, and not fetched on a fetch.</LI>
   </UL>
@@ -256,6 +260,7 @@ public static int getNumberOfColumns(
 	/**
 		See if a row actually contains no columns.
 		Returns true if row is null or row.length is zero.
+//IC see: https://issues.apache.org/jira/browse/DERBY-404
 
 		@return true if row is empty.
 	*/
@@ -371,6 +376,7 @@ public static final FetchDescriptor getFetchDescriptorConstant(
 	 * @exception  StandardException  Standard exception policy.
      **/
     public static DataValueDescriptor[] newTemplate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     DataValueFactory    dvf,
     FormatableBitSet    column_list,
     int[]               format_ids,
@@ -379,6 +385,7 @@ public static DataValueDescriptor[] newTemplate(
     {
         int                   num_cols = format_ids.length;
         DataValueDescriptor[] ret_row  = new DataValueDescriptor[num_cols];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
 		int column_listSize = 
             (column_list == null) ? 0 : column_list.getLength();
@@ -398,6 +405,7 @@ public static DataValueDescriptor[] newTemplate(
 
                 // get empty instance of object identified by the format id.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 ret_row[i] = dvf.getNull(format_ids[i], collation_ids[i]);
             }
         }
@@ -422,6 +430,7 @@ public static DataValueDescriptor[] newTemplate(
 	 * @exception  StandardException  Standard exception policy.
      **/
     public static DataValueDescriptor[] newRowFromTemplate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     DataValueDescriptor[]    template) 
         throws StandardException
     {
@@ -460,6 +469,7 @@ public static String toString(Object[] row)
         {
 
             String str = "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
 
             if (row != null)
             {
@@ -501,6 +511,7 @@ public static String toString(Hashtable hash_table)
         if (SanityManager.DEBUG)
         {
             String str = "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
 
             Object  row_or_vector;
 
@@ -524,6 +535,7 @@ else if (row_or_vector instanceof Vector)
                         str += 
                             "vec[" + i + "]:" + 
                             RowUtil.toString((Object[]) vec.get(i));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 
                         str += "\n";
                     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/ScanController.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/ScanController.java
index 28dd64f11b..ed219be6a9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/ScanController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/ScanController.java
@@ -189,6 +189,7 @@ Fetch the (partial) row at the current position of the Scan.
 	fetch must be compatible with the number of scan columns
 	requested at the openScan call time.
 	<BR>
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     A fetch can return a sub-set of the scan columns requested
 	at scan open time by supplying a destRow will less elements
 	than the number of requested columns. In this case the N leftmost
@@ -218,6 +219,7 @@ void fetch(DataValueDescriptor[] destRow)
 		throws StandardException;
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
      The same as fetch, except that the qualifiers passed to the openScan()
      will not be applied. destRow will contain the current row even if it
      has been changed and no longer qualifies.
@@ -331,6 +333,7 @@ boolean next()
     boolean positionAtRowLocation(RowLocation rl) 
         throws StandardException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
 
     /**
     Replace the (partial) row at the current position of the scan.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/SortController.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/SortController.java
index 18fbeaab40..c075b6ca64 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/SortController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/SortController.java
@@ -44,6 +44,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public interface SortController
 {
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 	Inform SortController that all the rows have
     been inserted into it. 
 	**/
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/SpaceInfo.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/SpaceInfo.java
index 4d0aee451c..d5998728c9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/SpaceInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/SpaceInfo.java
@@ -23,6 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 <p>
 Manage the result information from a single call to
 ConglomerateController.getSpaceInfo().
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/StoreCostController.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/StoreCostController.java
index b9d40e87db..317ddb7292 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/StoreCostController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/StoreCostController.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 <p>
 The StoreCostController interface provides methods that an access client
 (most likely the system optimizer) can use to get store's estimated cost of
@@ -44,6 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 once per unit of work and rather than close and reopen the controller.  For
 instance if the optimizer needs to cost 2 different scans against a single
 conglomerate, it should use one instance of the StoreCostController.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 </p>
 <p>
 The locking behavior of the implementation of a StoreCostController is
@@ -53,6 +55,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 conglomerate, thus allowing concurrent access to the table by a executing
 query while another query is optimizing.
 </p>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 @see TransactionController#openStoreCost
 @see RowCountable
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/StoreCostResult.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/StoreCostResult.java
index c6eed17a9d..69f2a598dd 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/StoreCostResult.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/StoreCostResult.java
@@ -23,6 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 <p>
 Manage the result information from a single call to 
 StoreCostController.getScanCost().
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/TransactionController.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/TransactionController.java
index 9d892f44c9..9aea902dfa 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/TransactionController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/TransactionController.java
@@ -305,11 +305,13 @@ boolean conglomerateExists(long conglomId)
 		long conglomId = tc.createConglomerate(
 			"heap", // we're requesting a heap conglomerate
 			template, // a populated template is required for heap and btree.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             null, // no column order
             null, // default collation order for all columns
 			null, // default properties
 			0); // not temporary
 	</pre></blockquote>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
     Each implementation of a conglomerate takes a possibly different set
     of properties.  The "heap" implementation currently takes no properties.
@@ -386,6 +388,7 @@ template is kept (and thus this template can be re-used in subsequent
 	Ascending order.
 
     @param collationIds Specifies the collation id of each of the columns
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     in the new conglomerate.  Collation id along with format id may be used
     to create DataValueDescriptor's which may subsequently be used for
     comparisons.  For instance the correct collation specific order and
@@ -420,6 +423,7 @@ temporary conglomerates are truncated on abort (or rollback
 
 	All temporary conglomerate is removed by store when the
 	conglomerate controller is destroyed, or if it is dropped by an explicit
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 	dropConglomerate.  If Derby reboots, all temporary
 	conglomerates are removed.
 
@@ -454,6 +458,7 @@ with a database backup rather than an transaction log backup (when we have
     For now, use "BTREE" or "heap" for a local access manager.
 
     @param template A row which describes the prototypical
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 	row that the conglomerate will be holding.
 	Typically this row gives the conglomerate
 	information about the number and type of
@@ -501,6 +506,7 @@ long createAndLoadConglomerate(
     Properties              properties,
     int                     temporaryFlag,
     RowLocationRetRowSource rowSource,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 	long[]                  rowCount)
     throws StandardException;
 
@@ -549,6 +555,7 @@ template is kept (and thus this template can be re-used in subsequent
 	Ascending order.
 
     @param collationIds Specifies the collation id of each of the columns
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     in the new conglomerate.  Collation id along with format id may be used
     to create DataValueDescriptor's which may subsequently be used for
     comparisons.  For instance the correct collation specific order and
@@ -626,6 +633,7 @@ long recreateAndLoadConglomerate(
     public void addColumnToConglomerate(
     long        conglomId, 
     int         column_id, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     Storable    template_column,
     int         collation_id)
 		throws StandardException;
@@ -990,6 +998,7 @@ BackingStoreHashtable createBackingStoreHashtableFromScan(
 	<blockquote><pre>
 	  x: 1 3 4 4 4 5 5 5 6 7 9
 	  y: 1 1 2 4 6 2 4 6 1 1 1
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	</pre></blockquote>
 	<P>
 	A {start key, search op} pair of {{5.2}, GE} would position on
@@ -1009,6 +1018,7 @@ open a scan on the conglomerate (or a useful index) of t
 	|                   | value | op | value |op | returned     |serialization |
 	+-------------------+-------+----+-------+---+--------------+--------------+
 	| x = 5             | {5}   | GE | {5}   |GT |{5,2} .. {5,6}|{4,6} .. {5,6}|
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	| x &gt; 5             | {5}   | GT | null  |   |{6,1} .. {9,1}|{5,6} .. {9,1}|
 	| x &gt;= 5            | {5}   | GE | null  |   |{5,2} .. {9,1}|{4,6} .. {9,1}|
 	| x &lt;= 5            | null  |    | {5}   |GT |{1,1} .. {5,6}|first .. {5,6}|
@@ -1019,6 +1029,7 @@ open a scan on the conglomerate (or a useful index) of t
 	| x = 5  and y &lt; 5  | {5}   | GE | {5,5} |GE |{5,2} .. {5,4}|{4,6} .. {5,4}|
 	| x = 2             | {2}   | GE | {2}   |GT | none         |{1,1} .. {1,1}|
 	+-------------------+-------+----+-------+---+--------------+--------------+
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	</pre></blockquote>
 	<P>
 	As the above table implies, the underlying scan may lock
@@ -1068,6 +1079,7 @@ For example ((x = 5) or (x = 6)) and ((y = 1) or (y = 2)) would be
     <blockquote><pre>
     if (qualifier != null)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		for (int and_clause; and_clause &lt; qualifier.length; and_clause++)
 		{
             boolean or_qualifies = false;
@@ -1101,6 +1113,7 @@ For example ((x = 5) or (x = 6)) and ((y = 1) or (y = 2)) would be
     }
     </pre></blockquote>
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 	@param conglomId The identifier of the conglomerate
 	to open the scan for.
@@ -1623,6 +1636,7 @@ Sorts also do aggregation. The input (unaggregated) rows
 	row.
 	<p>
 	So, for the query:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	<blockquote><pre>
 		select a, sum(b)
 		from t
@@ -1748,6 +1762,7 @@ SortController openSort(long id)
      *
      * @see StoreCostController
      **/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
     SortCostController openSortCostController()
 		throws StandardException;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java
index 6c7dadf8b5..a8217f8018 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java
@@ -84,6 +84,7 @@ public interface Conglomerate extends Storable, DataValueDescriptor
 	public void addColumn(
     TransactionManager  xact_manager,
     int                 column_id,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     Storable            template_column,
     int                 collation_id)
         throws StandardException;
@@ -308,6 +309,7 @@ ScanManager openScan(
     int                             lock_level,
     LockingPolicy                   locking_policy,
     int                             isolation_level,
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 	FormatableBitSet				scanColumnList,
     DataValueDescriptor[]	        startKeyValue,
     int                             startSearchOperator,
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java
index 27cfa70c55..af4e0398c9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java
@@ -29,6 +29,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.iapi.store.access.BackingStoreHashtable;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 <p>
 The ScanManager interface contains those methods private to access method
 implementors necessary to implement Scans on Conglomerates.  Client of scans
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java
index bfab0a2070..99eb9a6b83 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java
@@ -59,6 +59,7 @@ SortController open(TransactionManager tran)
     @exception StandardException Standard exception policy.
 	**/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	ScanManager openSortScan(
     TransactionManager  tran,
     boolean             hold)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java
index 8e3664f889..6d09302a9b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 <p>
 The TransactionManager interface provides methods on the transaction needed
 by an access method implementer, but should not be visible to clients of a
@@ -99,6 +100,7 @@ public interface TransactionManager extends TransactionController
 	public boolean checkVersion(
     int     requiredMajorVersion, 
     int     requiredMinorVersion, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     String  feature) 
         throws StandardException;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/xa/XAXactId.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/xa/XAXactId.java
index f4f2ff8116..df4f87e06a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/xa/XAXactId.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/xa/XAXactId.java
@@ -64,6 +64,7 @@ private void copy_init_xid(
 							   byte[]  branch_id)
     {
 		this.format_id = format_id;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6184
         this.global_id = (byte[]) global_id.clone();
         this.branch_id = (byte[]) branch_id.clone();
     }
@@ -227,6 +228,7 @@ public int getFormatId()
      **/
     public byte[] getGlobalTransactionId()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6184
         return (byte[]) global_id.clone();
     }
 
@@ -238,6 +240,7 @@ public byte[] getGlobalTransactionId()
      **/
     public byte[] getBranchQualifier()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6184
         return (byte[]) branch_id.clone();
     }
 
@@ -274,6 +277,7 @@ public boolean equals(Object other)
 			// this class only knows how to compare with other Xids
 			if (SanityManager.DEBUG)
 				SanityManager.THROWASSERT("comparing XAXactId with " + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 										  other.getClass().getName(), cce); 
 		
 			return false;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerHandle.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
index b31bf5992f..565dcd4642 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
@@ -27,6 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.Properties;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	<p>
 	A Container contains a contigious address space of pages, the pages
 	start at page number Container.FIRST_PAGE_NUMBER and are numbered sequentially.
@@ -56,6 +57,7 @@ If the caller calls getPage (or one of its variants) more than once on the
     done.  In the example, p1 could have been unlatched after p2 with no ill 	
     effects.
 	</p>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 	<p>	<B>Open container modes</B>
 	ContainerHandle.MODE are used to open or create the container.
@@ -88,6 +90,7 @@ the container (other than the create) is ever logged.  The difference
 	does not force the cache.  It is up to the client of raw store to force the
 	cache at the appropriate time - this allows a statement to create and open
 	the container serveral times for bulk loading without logging or doing any
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	synchronous I/O.</LI>
 	<LI>MODE_LOCK_NOWAIT - if set, then don't wait for the container lock, else
 	wait for the container lock.  This flag only dictates whether the lock
@@ -114,6 +117,7 @@ the container (other than the create) is ever logged.  The difference
     update since the last commit or abort.  Temporary containers are private 
     to a transaction and must only be used a single thread within the 
     transaction at any time, these restrictions are not currently enforced.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
     </P>
 	<P>
 	When opening a temporary container for update access these additional mode
@@ -216,6 +220,7 @@ public interface ContainerHandle
 
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 		Release free space to the OS.
 		<P>
         As is possible release any free space to the operating system.  This
@@ -414,6 +419,7 @@ caller until its unlatch() method is called.
 		for (Page p = containerHandle.getFirstPage();
 			 p != null;
 			 p = containerHandle.getNextPage(p.getPageNumber()))
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		</PRE>
 		will guarentee to iterate thru and latched all the valid pages 
 		in the container
@@ -457,6 +463,7 @@ public Page getPageForInsert(int flag)
 
 	public Page getPageForCompress(
     int     flag,
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     long    pageno) 
 		 throws StandardException;
 
@@ -618,6 +625,7 @@ public RecordHandle makeRecordHandle(long pageNumber, int recordId)
     public SpaceInfo getSpaceInfo() throws StandardException;
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 	   Backup the container to the specified path.
 	   @exception StandardException	Standard Derby error policy
 	*/
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerKey.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerKey.java
index e7b745ae02..9697b41763 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerKey.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerKey.java
@@ -176,6 +176,7 @@ public boolean lockAttributes(int flag, Hashtable<String,Object> attributes)
 		if ((flag & VirtualLockTable.TABLE_AND_ROWLOCK) == 0)
 			return false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		attributes.put(VirtualLockTable.CONTAINERID,getContainerId());
 		attributes.put(VirtualLockTable.LOCKNAME, "Tablelock");
 		attributes.put(VirtualLockTable.LOCKTYPE, "TABLE");
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerLock.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerLock.java
index f5785e1883..2882490da3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerLock.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/ContainerLock.java
@@ -89,6 +89,7 @@ private ContainerLock(int type) {
 
 	/**
 		Get an integer representation of the type of the lock. This method is guaranteed
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		to return an integer &gt;= 0 and &lt; C_NUMBER. No correlation between the value
 		and one of the static variables (CIS etc.) is guaranteed, except that
 		the values returned do not change.
@@ -98,6 +99,7 @@ public int getType() {
 	}
 
 	public boolean isCompatible(ContainerLock granted) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2122
 		return (granted.typeBit & compat) != 0;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Loggable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Loggable.java
index 3b91b8e302..7e790839a7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Loggable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Loggable.java
@@ -93,6 +93,7 @@ which contains optional data that will be available in to doMe()
 		releaseResource method.
 
 		<P> The sequence of events in recovery redo of a Loggable operation is:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		<UL>
 		<LI> Get the loggable operation.  If loggable.needsRedo is false, then
 		no need to redo this operation.</LI>
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Page.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Page.java
index 727b18861f..a0f89684d8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Page.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Page.java
@@ -283,6 +283,8 @@ boolean spaceForInsert(
      * mode, or if the row cannot fit on the page, or if the row is null
      **/
 	RecordHandle insert(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     Object[]            row, 
     FormatableBitSet    validColumns,
     byte                insertFlag, 
@@ -648,6 +650,7 @@ public RecordHandle fetchFromSlot(
 		is locked but not fetched.
 		<BR>
 		The fieldId of the first field is 0.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		If the fieldId is &gt;= the number of fields on the record, 
 		column is restored to null
 		<P>
@@ -732,6 +735,7 @@ passed to the openContainer() call before the record is updated.
 		                                the slot is not on the page, or if the 
                                         record is deleted, or if the fieldId 
                                         is not on the record and (fieldId - 1)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6323
                                         does not exist, or if the container was
                                         not opened in update mode.
 
@@ -951,6 +955,7 @@ passed to the openContainer() call before the record is undeleted.
 
         @exception StandardException the container was not opened in update
                                      mode, or the slot is not on the page
+//IC see: https://issues.apache.org/jira/browse/DERBY-6323
 
 	*/
 	RecordHandle updateAtSlot(
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/PageKey.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/PageKey.java
index 8b0df52c01..05353db9d4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/PageKey.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/PageKey.java
@@ -93,6 +93,7 @@ public boolean equals(Object other) {
 
 	public int hashCode() {
         int hash = 7;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3280
         hash = 79 * hash + container.hashCode();
         hash = 79 * hash + (int) (pageNumber ^ (pageNumber >>> 32));
         return hash;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
index c549815ba5..6651467044 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
@@ -152,6 +152,7 @@ Maximum page cache size we will accept (MAXINT).
 
     /** Property name for the number of open files to maintain associated with
         the page cache.  Internally this is referred to as the "ContainerCache".
+//IC see: https://issues.apache.org/jira/browse/DERBY-3734
 
         Each object in this cache maps to a java level "open" file on a file
         in the database directory.  Although actual implementation depends on
@@ -289,6 +290,7 @@ Maximum stream file buffer size we will accept (MAXINT).
         if this property is set, it will attempt to allocate
         CONTAINER_INITIAL_PAGES, but with no guarentee.
         CONTAIENR_INITIAL_PAGES legally ranges from 1 to
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         MAX_CONTAINER_INITIAL_PAGES.  Values &lt; 1 will
         be set to 1 and values &gt; MAX_CONTAINER_INITIAL_PAGES will be set to
         MAX_CONTAINER_INITIAL_PAGES
@@ -469,6 +471,7 @@ The cleanupOnError() method of this context behaves as follows:
         <LI>
         If error is an instance of StandardException that
         has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         no action is taken.</li>
         <LI>
         If error is an instance of StandardException that
@@ -514,6 +517,7 @@ public Transaction startTransaction(
         <P>
         Starting a transaction always performs the following steps.
         <OL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         <LI>Create an raw store transaction context</LI>
         <LI>Create a new idle transaction and then link it to the context.</LI>
         </OL>
@@ -527,6 +531,7 @@ The cleanupOnError() method of this context behaves as follows:
         <LI>
         If error is an instance of StandardException that
         has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         no action is taken.</LI>
         <LI>
         If error is an instance of StandardException that
@@ -591,6 +596,7 @@ public Transaction findUserTransaction(
         <P>
         Starting an internal transaction always performs the following steps.
         <OL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         <LI>Create an raw store internal transaction context</LI>
         <LI>Create a new idle internal transaction and then link it to the 
             context.</LI>
@@ -618,6 +624,7 @@ The cleanupOnError() method of this context behaves as follows:
         If error is an instance of StandardException that
         has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
         the internal transaction is aborted, the internal transaction is closed,        the context is popped off the stack, and an exception of severity 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         Transaction exception is re-thrown.</LI>
         <LI>
         If error is an instance of StandardException that has a severity 
@@ -647,6 +654,7 @@ The cleanupOnError() method of this context behaves as follows:
         the transaction.
         Starting a transaction always performs the following steps.
         <OL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         <LI>Create an raw store transaction context</LI>
         <LI>Create a new idle transaction and then link it to the context.</LI>
         </OL>
@@ -694,7 +702,9 @@ The cleanupOnError() method of this context behaves as follows:
     */
 
     public Transaction startNestedReadOnlyUserTransaction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
     Transaction parentTransaction,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
     CompatibilitySpace compatibilitySpace,
     ContextManager contextMgr,
     String         transName)
@@ -709,8 +719,10 @@ public Transaction startNestedReadOnlyUserTransaction(
         the transaction.
         Starting a transaction always performs the following steps.
         <OL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         <LI>Create an raw store transaction context.</LI>
         <LI>Create a new idle transaction and then link it to the context.</LI>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         </OL>
         Only one user transaction and one nested user transaction can be active
         in a context at any one time.
@@ -723,6 +735,8 @@ The cleanupOnError() method of this context behaves as follows:
         <LI>
         If error is an instance of StandardException that
         has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         no action is taken.</LI>
         <LI>
         If error is an instance of StandardException that
@@ -759,6 +773,7 @@ The cleanupOnError() method of this context behaves as follows:
     */
 
     public Transaction startNestedUpdateUserTransaction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
     Transaction parentTransaction,
     ContextManager contextMgr,
     String         transName,
@@ -783,6 +798,7 @@ public Transaction startNestedUpdateUserTransaction(
      * thrown on error.
      */
     public void startReplicationMaster(String dbmaster, String host, int port,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
                                        String replicationMode)
         throws StandardException;
     
@@ -836,6 +852,8 @@ public void startReplicationMaster(String dbmaster, String host, int port,
       * @exception StandardException Thrown on error
       */
     public void backup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-523
     String backupDir, 
     boolean wait) throws StandardException;
 
@@ -885,6 +903,7 @@ public void disableLogArchiveMode(boolean deleteOnlineArchivedLogFiles)
 
     /**
         Checkpoint the database.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4239
 
         The raw store will wait for any current checkpoints to complete.  It
         will start a new checkpoint and not return until that checkpoint 
@@ -982,6 +1001,7 @@ public void getRawStoreProperties(PersistentSet tc)
         @exception StandardException Standard Derby Error Policy
      */
     public int encrypt(byte[] cleartext, int offset, int length, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
                        byte[] ciphertext, int outputOffset,
                        boolean newEngine) 
          throws StandardException ;
@@ -1034,6 +1054,7 @@ long getMaxContainerId()
 
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         Get the Transaction Factory to use with this store.
     */
     public TransactionFactory getXactFactory();
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/RowLock.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/RowLock.java
index f8f33f230a..288c04125b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/RowLock.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/RowLock.java
@@ -97,6 +97,7 @@ public final class RowLock {
 
 	private RowLock(int type) {
 		this.type = type;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2122
 		typeBit = (1 << type);
 		int bitmask = 0;
 		for (int i = 0; i < R_NUMBER; i++) {
@@ -110,6 +111,7 @@ private RowLock(int type) {
 
 	/**
 		Get an integer representation of the type of the lock. This method is 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         guaranteed to return an integer &gt;= 0 and &lt; R_NUMBER. No correlation 
         between the value and one of the static variables (CIS etc.) is 
         guaranteed, except that the values returned do not change.
@@ -119,6 +121,7 @@ public int getType() {
 	}
 
 	public boolean isCompatible(RowLock granted) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2122
 		return (granted.typeBit & compat) != 0;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Transaction.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Transaction.java
index a4fe8fa9e6..0c2b0fa1bc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Transaction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Transaction.java
@@ -58,6 +58,7 @@ public interface Transaction {
 	 * @return The compatibility space of the transaction.
      **/
     CompatibilitySpace getCompatibilitySpace();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 
     /**
      * Tell this transaction whether it should time out immediately if a lock
@@ -185,6 +186,8 @@ Everything else is identical to commit(), use this at your own risk.
         occur of lower severity than Transaction severity are caught, the 
         transaction is then aborted and then an exception of Transaction
 		severity is thrown nesting the original exception.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6323
+//IC see: https://issues.apache.org/jira/browse/DERBY-6323
         Any exception more severe than a
         Transaction exception is not caught and the transaction is not aborted.
         The transaction will be aborted by the standard context mechanism.
@@ -629,5 +632,6 @@ public void xa_rollback()
 	 * @exception  StandardException  Standard exception policy.
      **/
     public DataValueFactory getDataValueFactory()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		throws StandardException;
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Undoable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Undoable.java
index 056f4b4181..c266c752b8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Undoable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/Undoable.java
@@ -46,6 +46,7 @@ public interface Undoable extends Loggable {
 
 		<P>
 		There are 3 ways to implement a redo-only log record:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		<UL>
 		<LI>Make the log record a Loggable instead of an Undoable, this is the
 		cleanest method.</LI>
@@ -74,6 +75,7 @@ <P>Any resource (e.g., latched page) that is needed for the
 
 		<P>
 		The sequence of events in a rollback of a undoable operation is
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		<UL>
 		<LI> The logging system calls undoable.generateUndo.  If this returns
 		null, then there is nothing to undo.</LI>
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/data/DataFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/data/DataFactory.java
index fd75787e7f..428c455cdc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/data/DataFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/data/DataFactory.java
@@ -269,6 +269,7 @@ public int reclaimSpace(Serviceable work, ContextManager contextMgr)
 		@exception StandardException Standard Derby Error Policy
 	 */
 	public int encrypt(byte[] cleartext, int offset, int length,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 					   byte[] ciphertext, int outputOffset, 
                        boolean newEngine)
 		 throws StandardException ;
@@ -289,6 +290,7 @@ public int decrypt(byte[] ciphertext, int offset, int length,
      * @param t the transaction that is decrypting the container
      * @exception StandardException Standard Derby Error Policy
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
     void decryptAllContainers(RawTransaction t)
             throws StandardException;
 
@@ -397,6 +399,7 @@ long getMaxContainerId()
      * @return the root directory of the data storage area
      */
     String getRootDirectory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
 
 	public void	stop();
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java
index 32ceed32ba..e794cba693 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java
@@ -131,5 +131,6 @@ checkpoint is taken after any log record is sent to the log stream but
      */
     public void encryptOrDecryptContainer(String newFilePath, boolean doEncrypt)
             throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
 
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/log/LogFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
index ce4a841033..5bb3b11069 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
@@ -94,6 +94,7 @@ public void recover(DataFactory dataFactory,
 		properties,
 		RawStore.LOG_SWITCH_INTERVAL and RawStore.CHECKPOINT_INTERVAL.  
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4239
 		By default, LOG_SWITCH_INTERVAL is every 1M bytes of log record
 		written.  User can change this value by setting the property to some
 		other values during boot time.   The legal range of LOG_SWITCH_INTERVAL
@@ -162,6 +163,7 @@ LogScan openForwardsFlushedScan(LogInstant startAt)
 		@return the LogScan.
 		@exception StandardException Standard Derby error policy
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-862
 	ScanHandle openFlushedScan(DatabaseInstant startAt, int groupsIWant)
 		 throws StandardException;
 
@@ -404,6 +406,7 @@ public boolean checkVersion(int requiredMajorVersion,
      */
     public void startReplicationMasterRole(MasterFactory masterFactory)
         throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3051
 
     /**
      * Stop this LogFactory from passing log records to the
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java
index 2d393063d0..4ca03c30c1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java
@@ -322,6 +322,7 @@ public void notifyObservers(Object arg) {
      * @exception StandardException Exception encountered during checkpoint
 	 */
 	public abstract void checkpointInRollForwardRecovery(LogInstant cinstant,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3562
 														 long redoLWM,
 														 long undoLWM)
 		throws StandardException;
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java
index 1958a60630..ecfdb9cea2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java
@@ -109,7 +109,9 @@ public RawTransaction startTransaction(
 	*/
 	public RawTransaction startNestedReadOnlyUserTransaction(
     RawStoreFactory rsf,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
     RawTransaction parentTransaction,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
     CompatibilitySpace compatibilitySpace,
     ContextManager  contextMgr,
     String          transName)
@@ -139,6 +141,7 @@ public RawTransaction startNestedReadOnlyUserTransaction(
 	*/
 	public RawTransaction startNestedUpdateUserTransaction(
     RawStoreFactory rsf,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
     RawTransaction parentTransaction,
     ContextManager  contextMgr,
     String          transName,
@@ -335,6 +338,7 @@ public void useTransactionTable(Formatable transactionTable)
 	 */
 	public boolean blockBackupBlockingOperations(boolean wait) 
 		throws StandardException ;
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 
 	/**
 	 * Backup completed. Allow backup blocking operations. 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/replication/master/MasterFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/replication/master/MasterFactory.java
index 1a2664305c..ea5acbc0df 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/replication/master/MasterFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/replication/master/MasterFactory.java
@@ -71,6 +71,7 @@ public interface MasterFactory {
     /** The name of the Master Factory, used to boot the service.  */
     public static final String MODULE =
         "org.apache.derby.iapi.store.replication.master.MasterFactory";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3432
 
     /* Property names that are used as key values in the Properties objects*/
     
@@ -141,6 +142,7 @@ public void startMaster(RawStoreFactory rawStore,
      **/
     public void appendLog(long greatestInstant,
                           byte[] log, int logOffset, int logLength);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
 
     /**
      * Used by the LogFactory to notify the replication master
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/replication/slave/SlaveFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/replication/slave/SlaveFactory.java
index f0ff9b7f21..9cdb77d676 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/replication/slave/SlaveFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/replication/slave/SlaveFactory.java
@@ -45,12 +45,14 @@ public interface SlaveFactory {
     /** The name of the Slave Factory, used to boot the service.  */
     public static final String MODULE =
         "org.apache.derby.iapi.store.replication.slave.SlaveFactory";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3432
 
     /* Strings used as keys in the Properties objects*/
 
     /** Property key to specify the name of the database */
     public static final String SLAVE_DB =
         "replication.slave.dbname";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
 
     /** Property key to specify replication mode */
     public static final String REPLICATION_MODE =
@@ -64,6 +66,7 @@ public interface SlaveFactory {
      */
     public static final String SLAVE_MODE =
         "slavemode";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
 
     /**
      * Property value used to indicate that the service should be
@@ -112,6 +115,8 @@ public void startSlave(RawStoreFactory rawStore, LogFactory logFac)
      */
     public void stopSlave(boolean forcedStop) 
             throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
 
     /**
      * <p>
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/transaction/TransactionControl.java b/java/org.apache.derby.engine/org/apache/derby/iapi/transaction/TransactionControl.java
index 8046aa8eed..614bdb9510 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/transaction/TransactionControl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/transaction/TransactionControl.java
@@ -49,6 +49,7 @@ public final class TransactionControl {
      * JDBC constants.
      */
 	private static final int[] CS_TO_JDBC_ISOLATION_LEVEL_MAP = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 		java.sql.Connection.TRANSACTION_NONE,				// UNSPECIFIED_ISOLATION_LEVEL
 		java.sql.Connection.TRANSACTION_READ_UNCOMMITTED,	// READ_UNCOMMITTED_ISOLATION_LEVEL
 		java.sql.Connection.TRANSACTION_READ_COMMITTED,		// READ_COMMITTED_ISOLATION_LEVEL
@@ -90,6 +91,7 @@ public  static  String[]    isolationTextNames( int derbyIsolationLevel )
     
     public TransactionControl()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         listeners = new ArrayList<TransactionListener>();
     }
     
@@ -126,6 +128,7 @@ public void preCommitNotify() throws StandardException
         if (listeners.isEmpty())
             return;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         for (Iterator<TransactionListener> i = listeners.iterator(); i.hasNext(); )
         {
             TransactionListener listener =
@@ -167,6 +170,7 @@ public void preRollbackNotify() throws StandardException
         if (listeners.isEmpty())
             return;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         for (Iterator<TransactionListener> i = listeners.iterator(); i.hasNext(); )
         {
             TransactionListener listener =
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/BooleanDataValue.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/BooleanDataValue.java
index 7335e173e8..42bf0081b7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/BooleanDataValue.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/BooleanDataValue.java
@@ -124,6 +124,7 @@ public BooleanDataValue throwExceptionIfFalse(
      *                                  is false.
      */
     public BooleanDataValue throwExceptionIfImmediateAndFalse(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                     String SQLState,
                                     String tableName,
                                     String constraintName,
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/CharStreamHeaderGenerator.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/CharStreamHeaderGenerator.java
index 75fe71a2f7..27f8e0e3c6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/CharStreamHeaderGenerator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/CharStreamHeaderGenerator.java
@@ -36,6 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * </ul>
  * The length is encoded like this:
  * <pre>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             out.writeByte((byte)(byteLength &gt;&gt;&gt; 8));
             out.writeByte((byte)(byteLength &gt;&gt;&gt; 0));
  * </pre>
@@ -62,6 +63,7 @@ public boolean expectsCharCount() {
     /** Write the EOF marker to a byte array and return the EOF marker's length */
     public  static  int  writeEOFMarker( byte[] buffer, int offset )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6200
         System.arraycopy( DERBY_EOF_MARKER, 0, buffer, offset, DERBY_EOF_MARKER.length );
         return DERBY_EOF_MARKER.length;
     }
@@ -158,6 +160,7 @@ public int writeEOF(ObjectOutput out, long byteLength)
      * @return Maximum header length in bytes.
      */
     public int getMaxHeaderLength() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4661
         return 2;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/ClobStreamHeaderGenerator.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/ClobStreamHeaderGenerator.java
index f27c6615e7..c6bac5fb05 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/ClobStreamHeaderGenerator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/ClobStreamHeaderGenerator.java
@@ -98,6 +98,7 @@ public ClobStreamHeaderGenerator(boolean isPreDerbyTenFive) {
         // Do not try to determine the version through the cottext service, use
         // the specified value instead.
         this.callbackDVD = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4543
         this.isPreDerbyTenFive = Boolean.valueOf(isPreDerbyTenFive);
     }
 
@@ -129,6 +130,7 @@ public boolean expectsCharCount() {
      * @return The number of bytes written into the buffer.
      */
     public int generateInto(byte[] buf, int offset, long valueLength) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4543
         if (callbackDVD != null && isPreDerbyTenFive == null) {
             determineHeaderFormat();
         }
@@ -165,6 +167,7 @@ public int generateInto(byte[] buf, int offset, long valueLength) {
      */
     public int generateInto(ObjectOutput out, long valueLength)
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4543
         if (callbackDVD != null && isPreDerbyTenFive == null) {
             determineHeaderFormat();
         }
@@ -206,6 +209,7 @@ public int writeEOF(byte[] buffer, int offset, long valueLength) {
         }
         if (!isPreDerbyTenFive.booleanValue()) {
             if (valueLength < 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6200
                 return CharStreamHeaderGenerator.writeEOFMarker( buffer, offset );
             } else {
                 return 0;
@@ -225,11 +229,14 @@ public int writeEOF(byte[] buffer, int offset, long valueLength) {
      */
     public int writeEOF(ObjectOutput out, long valueLength)
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4543
+//IC see: https://issues.apache.org/jira/browse/DERBY-4543
         if (callbackDVD != null && isPreDerbyTenFive == null) {
             determineHeaderFormat();
         }
         if (!isPreDerbyTenFive.booleanValue()) {
             if (valueLength < 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6200
                 return CharStreamHeaderGenerator.writeEOFMarker( out );
             } else {
                 return 0;
@@ -245,6 +252,7 @@ public int writeEOF(ObjectOutput out, long valueLength)
      * @return Maximum header length in bytes.
      */
     public int getMaxHeaderLength() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4661
         return 5;
     }
 
@@ -259,6 +267,7 @@ public int getMaxHeaderLength() {
      */
     private void determineHeaderFormat() {
         DatabaseContext dbCtx = (DatabaseContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 getContext(DatabaseContext.CONTEXT_ID);
         if (dbCtx == null) {
             throw new IllegalStateException("No context, unable to determine " +
@@ -266,6 +275,7 @@ private void determineHeaderFormat() {
         } else {
             DataDictionary dd = dbCtx.getDatabase().getDataDictionary();
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4543
                 isPreDerbyTenFive = Boolean.valueOf(!dd.checkVersion(
                         DataDictionary.DD_VERSION_DERBY_10_5, null));
             } catch (StandardException se) {
@@ -280,6 +290,7 @@ private void determineHeaderFormat() {
             // being accessed in. It is assumed that a DVD is only shared
             // within a single database, i.e. the mode doesn't change during
             // the lifetime of the DVD.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4543
             callbackDVD.setStreamHeaderFormat(isPreDerbyTenFive);
         }
     }
@@ -290,6 +301,7 @@ private void determineHeaderFormat() {
      */
     private  static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLChar.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLChar.java
index 0346a1bb14..7fbe33680d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLChar.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLChar.java
@@ -90,6 +90,7 @@ protected RuleBasedCollator getCollatorForCollation() throws StandardException
     // Implementation of CollationElementsInterface interface
 
     public boolean hasSingleCollationElement() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2699
         return holderForCollationSensitiveInfo.hasSingleCollationElement();
     }
 
@@ -110,6 +111,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization)
 		catch (StandardException se)
 		{
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unexpected exception", se);
 			return null;
 		}
@@ -135,6 +137,7 @@ public DataValueDescriptor getNewNull()
 	 */
 	public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2534
 		if (collatorForComparison != null)
 		{
 			//non-null collatorForComparison means use this collator sensitive
@@ -154,6 +157,7 @@ public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	 protected int stringCompare(SQLChar char1, SQLChar char2)
 	 throws StandardException
 	 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
 		 return holderForCollationSensitiveInfo.stringCompare(char1, char2);
 	 }
 
@@ -197,6 +201,7 @@ public BooleanDataValue like(DataValueDescriptor pattern)
 	 * @exception StandardException		Thrown on error
 	 */
 	public BooleanDataValue like(DataValueDescriptor pattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2334
 			DataValueDescriptor escape) throws StandardException
 	{
 		return(holderForCollationSensitiveInfo.like(pattern, escape));
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLClob.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLClob.java
index f4fe3fb7ca..86da938f42 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLClob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLClob.java
@@ -72,6 +72,7 @@ class CollatorSQLClob extends SQLClob implements CollationElementsInterface
      * Create SQL CLOB value initially set to value that
      * performs collation according to collatorForCharacterDatatypes 
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
 	CollatorSQLClob(Clob val, RuleBasedCollator collatorForCharacterDatatypes)
 	{
 		super(val);
@@ -103,6 +104,7 @@ protected RuleBasedCollator getCollatorForCollation() throws StandardException
     // Implementation of CollationElementsInterface interface
 
     public boolean hasSingleCollationElement() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2699
         return holderForCollationSensitiveInfo.hasSingleCollationElement();
     }
 
@@ -115,6 +117,7 @@ public boolean hasSingleCollationElement() throws StandardException {
      */
     public DataValueDescriptor cloneValue(boolean forceMaterialization)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4542
         if (forceMaterialization) {
             try {
                 return new CollatorSQLClob(getString(),
@@ -123,6 +126,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization)
             catch (StandardException se)
             {
                 if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
                     SanityManager.THROWASSERT("Unexpected exception", se);
                 return null;
             }
@@ -142,6 +146,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization)
 	 */
 	public DataValueDescriptor getNewNull()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
 		CollatorSQLClob result = new CollatorSQLClob((String) null,
 				holderForCollationSensitiveInfo.getCollatorForCollation());
 		return result;
@@ -157,6 +162,7 @@ public DataValueDescriptor getNewNull()
 	 */
 	public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2534
 		if (collatorForComparison != null)
 		{
 			//non-null collatorForComparison means use this collator sensitive
@@ -176,6 +182,7 @@ public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	 protected int stringCompare(SQLChar char1, SQLChar char2)
 	 throws StandardException
 	 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
 		 return holderForCollationSensitiveInfo.stringCompare(char1, char2);
 	 }
 
@@ -219,6 +226,7 @@ public BooleanDataValue like(DataValueDescriptor pattern)
 	 * @exception StandardException		Thrown on error
 	 */
 	public BooleanDataValue like(DataValueDescriptor pattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2334
 			DataValueDescriptor escape) throws StandardException
 	{
 		return(holderForCollationSensitiveInfo.like(pattern, escape));
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLLongvarchar.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLLongvarchar.java
index f330375bcb..70adaf6b29 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLLongvarchar.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLLongvarchar.java
@@ -92,6 +92,7 @@ protected RuleBasedCollator getCollatorForCollation() throws StandardException
     // Implementation of CollationElementsInterface interface
 
     public boolean hasSingleCollationElement() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2699
         return holderForCollationSensitiveInfo.hasSingleCollationElement();
     }
 
@@ -112,6 +113,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization)
 		catch (StandardException se)
 		{
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unexpected exception", se);
 			return null;
 		}
@@ -137,6 +139,7 @@ public DataValueDescriptor getNewNull()
 	 */
 	public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2534
 		if (collatorForComparison != null)
 		{
 			//non-null collatorForComparison means use this collator sensitive
@@ -156,6 +159,7 @@ public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	 protected int stringCompare(SQLChar char1, SQLChar char2)
 	 throws StandardException
 	 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
 		 return holderForCollationSensitiveInfo.stringCompare(char1, char2);
 	 }
 
@@ -199,6 +203,7 @@ public BooleanDataValue like(DataValueDescriptor pattern)
 	 * @exception StandardException		Thrown on error
 	 */
 	public BooleanDataValue like(DataValueDescriptor pattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2334
 			DataValueDescriptor escape) throws StandardException
 	{
 		return(holderForCollationSensitiveInfo.like(pattern, escape));
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLVarchar.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLVarchar.java
index 0ad7b391f4..19aeb164d7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLVarchar.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/CollatorSQLVarchar.java
@@ -91,6 +91,7 @@ protected RuleBasedCollator getCollatorForCollation() throws StandardException
     // Implementation of CollationElementsInterface interface
 
     public boolean hasSingleCollationElement() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2699
         return holderForCollationSensitiveInfo.hasSingleCollationElement();
     }
 
@@ -111,6 +112,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization)
 		catch (StandardException se)
 		{
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unexpected exception", se);
 			return null;
 		}
@@ -143,6 +145,7 @@ protected StringDataValue getNewVarchar() throws StandardException
 	 */
 	public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2534
 		if (collatorForComparison != null)
 		{
 			//non-null collatorForComparison means use this collator sensitive
@@ -162,6 +165,7 @@ public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	 protected int stringCompare(SQLChar char1, SQLChar char2)
 	 throws StandardException
 	 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
 		 return holderForCollationSensitiveInfo.stringCompare(char1, char2);
 	 }
 
@@ -205,6 +209,7 @@ public BooleanDataValue like(DataValueDescriptor pattern)
 	 * @exception StandardException		Thrown on error
 	 */
 	public BooleanDataValue like(DataValueDescriptor pattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2334
 			DataValueDescriptor escape) throws StandardException
 	{
 		return(holderForCollationSensitiveInfo.like(pattern, escape));
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataType.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataType.java
index 9ff05479b1..b151c48009 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataType.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataType.java
@@ -60,6 +60,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 public abstract class DataType
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
     implements DataValueDescriptor, Comparable
 {
 	/*
@@ -223,6 +224,7 @@ public Timestamp	getTimestamp( Calendar cal) throws StandardException
 	 */
 	public InputStream	getStream() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
 		throw dataTypeConversion( "InputStream" );
 	}
 
@@ -236,6 +238,7 @@ public InputStream	getStream() throws StandardException
      * @return {@code false}
      */
     public boolean hasStream() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         return false;
     }
 
@@ -249,6 +252,7 @@ public boolean hasStream() {
      * @see DataValueDescriptor#getString
      */
     public String getTraceString() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1693
         return getString();  
     }
 
@@ -272,6 +276,7 @@ public DataValueDescriptor recycle() {
      * @see java.io.Externalizable#readExternal
      */
     public void readExternalFromArray(ArrayInputStream in)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2920
             throws IOException, ClassNotFoundException {
         readExternal(in);
     }
@@ -385,6 +390,7 @@ public void setValue(Date theValue, Calendar cal) throws StandardException
 	 */
 	public void setValue(Object theValue) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4499
 		throwLangSetMismatch("java.lang.Object");
 	}
 
@@ -407,6 +413,7 @@ public void setValue(String theValue) throws StandardException
 	 */
 	public void setValue(Blob theValue) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
 		throwLangSetMismatch("java.sql.Blob");
 	}
  
@@ -585,6 +592,7 @@ public void setToNull()
 	 * 
 	 */
 	public void setObjectForCast(Object theValue, boolean instanceOfResultType,
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			String resultTypeClassName) throws StandardException {
 		
 		if (theValue == null)
@@ -643,6 +651,7 @@ public Object	getObject() throws StandardException
 
 
 	void genericSetObject(Object theValue) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 
 		throwLangSetMismatch(theValue);
 	}
@@ -659,6 +668,7 @@ void genericSetObject(Object theValue) throws StandardException {
      * @return A shallow clone.
      */
     public DataValueDescriptor cloneHolder() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 		return cloneValue(false);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataTypeDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
index c264ed6e33..aa059941a1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
@@ -96,6 +96,7 @@ public final class DataTypeDescriptor implements Formatable
      * Runtime INTEGER type that is nullable.
      */
     public static final DataTypeDescriptor DOUBLE =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
         new DataTypeDescriptor(TypeId.DOUBLE_ID, true);
     
     public  static  final   int MIN_VALUE_IDX = 0;
@@ -328,6 +329,7 @@ public static TypeDescriptor getCatalogType(TypeDescriptor catalogType,
 	(
 		String	javaTypeName
 	)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
 			return DataTypeDescriptor.getSQLDataTypeDescriptor(javaTypeName, true);
@@ -383,6 +385,8 @@ public static TypeDescriptor getCatalogType(TypeDescriptor catalogType,
 		boolean	isNullable, 
 		int 	maximumWidth
 	)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
 		TypeId typeId = TypeId.getSQLTypeForJavaType(javaTypeName);
@@ -507,6 +511,7 @@ public DataTypeDescriptor(TypeId typeId, boolean isNullable,
 
 	public DataTypeDescriptor(TypeId typeId, boolean isNullable) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
 		this.typeId = typeId;
 		typeDescriptor = new TypeDescriptorImpl(typeId.getBaseTypeId(),
 												typeId.getMaximumPrecision(),
@@ -736,6 +741,7 @@ public DataTypeDescriptor getDominantType(DataTypeDescriptor otherDTS, ClassFact
 		 * types are system built-in types and the other if at least 1 is
 		 * a user type. (typePrecedence is meaningless for user types.)
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (!thisType.userType() && !otherType.userType())
 		{
 			TypeId  higherTypeId;
@@ -908,6 +914,7 @@ else if (thisType.typePrecedence() != otherType.typePrecedence())
 
 		higherType = new DataTypeDescriptor(higherType, 
 				precision, scale, nullable, maximumWidth);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
 
 		//Set collation info on the DTD for dominant type if it is string type
 		//The algorithm used is explained in this method's javadoc
@@ -1009,6 +1016,7 @@ public TypeId getTypeId()
 		Get a Null for this type.
 	*/
 	public DataValueDescriptor getNull() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
 		DataValueDescriptor returnDVD = typeId.getNull();
 		//If we are dealing with default collation, then we have got the
 		//right DVD already. Just return it.
@@ -1100,6 +1108,7 @@ public int	getCollationType()
      */
 	public static int getCollationType(String collationName)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
 		if (collationName.equalsIgnoreCase(Property.UCS_BASIC_COLLATION))
 			return StringDataValue.COLLATION_TYPE_UCS_BASIC;
 		else if (collationName.equalsIgnoreCase(Property.TERRITORY_BASED_COLLATION))
@@ -1129,6 +1138,7 @@ else if (collationName.equalsIgnoreCase(Property.TERRITORY_BASED_IDENTICAL_COLLA
      */
     public String getCollationName()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
 		if (getCollationDerivation() == StringDataValue.COLLATION_DERIVATION_NONE)
 			return Property.COLLATION_NONE;
 		else
@@ -1367,6 +1377,7 @@ public boolean	comparable(DataTypeDescriptor compareWithDTD,
     		//If both the types are string types, then we need to make sure
     		//they have the same collation set on them
     		if (compareWithTypeID.isStringTypeId() && typeId.isStringTypeId()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2793
     			return compareCollationInfo(compareWithDTD);    			
     		} else
     			return false;//can't be compared			
@@ -1455,6 +1466,7 @@ public boolean compareCollationInfo(DataTypeDescriptor compareWithDTD){
 		//both the operands can not have the collation derivation of
 		//NONE. This is because in that case, we do not know what kind
 		//of collation to use for comparison.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2793
 		if (getCollationDerivation() == compareWithDTD.getCollationDerivation() &&
 				getCollationDerivation() == StringDataValue.COLLATION_DERIVATION_NONE)
 			return false;
@@ -1533,6 +1545,8 @@ public double estimatedMemoryUsage() {
 			case StoredFormatIds.INT_TYPE_ID:
 				return 4.0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             case StoredFormatIds.BIGINT_TYPE_ID:
 				return 8.0;
 
@@ -1648,6 +1662,7 @@ public static boolean isJDBCTypeEquivalent(int existingType, int jdbcTypeId)
 		}
 		
 		// To CLOB
+//IC see: https://issues.apache.org/jira/browse/DERBY-628
 		if (existingType == Types.CLOB && DataTypeDescriptor.isCharacterType(jdbcTypeId))
 			return true;
 
@@ -1658,6 +1673,7 @@ public static boolean isNumericType(int jdbcType) {
 
 		switch (jdbcType) {
 		case Types.BIT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		case Types.BOOLEAN:
 		case Types.TINYINT:
 		case Types.SMALLINT:
@@ -1723,6 +1739,7 @@ private static boolean isBinaryType(int jdbcType) {
 		case Types.LONGVARBINARY:
 			return true;
 		default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
 			return false;
 		}
 	}
@@ -1736,6 +1753,7 @@ private static boolean isBinaryType(int jdbcType) {
 	 *         <code>false</code> otherwise
 	 */
 	public static boolean isAsciiStreamAssignable(int jdbcType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
 		return jdbcType == Types.CLOB || isCharacterType(jdbcType);
 	}
 
@@ -1787,6 +1805,7 @@ public void readExternal( ObjectInput in )
 
         // Restore typeId from the type descriptor. User-defined types and
         // built-in types have different methods for getting the type id.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         if (typeDescriptor.isUserDefinedType()) {
             try {
                 typeId = TypeId.getUserDefinedTypeId(
@@ -1855,6 +1874,7 @@ public boolean isUserCreatableType() throws StandardException
             case Types.DECIMAL:
                 return
                 (getPrecision() <= typeId.getMaximumPrecision()) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6956
                 (getScale() <= typeId.getMaximumScale());
             default: break;
         }
@@ -1891,6 +1911,7 @@ else if (typeId.variableLength())
      * String types.
      */
     public String getSQLTypeNameWithCollation() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2668
         String name = typeId.getSQLTypeName();
         if (typeId.isStringTypeId()) {
             name = name + " (" + getCollationName() + ")";
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataTypeUtilities.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataTypeUtilities.java
index e2f4ae97c7..f616e88cc8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataTypeUtilities.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataTypeUtilities.java
@@ -35,6 +35,7 @@ public abstract class DataTypeUtilities  {
     /** Clone a Timestamp because they are mutable */
     public  static  Timestamp   clone( Timestamp original )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
         return original == null ? null : (Timestamp) original.clone();
     }
     
@@ -55,10 +56,12 @@ public static int getPrecision(DataTypeDescriptor dtd) {
 		case Types.VARBINARY:
 		case Types.LONGVARBINARY:
 		case Types.BLOB:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
         case Types.SQLXML:
 				return dtd.getMaximumWidth();
 			case Types.SMALLINT:
 				return 5;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.BOOLEAN:
 				return 1;
 		}
@@ -98,6 +101,7 @@ public static boolean isCaseSensitive(DataTypeDescriptor dtd) {
 		          typeId == Types.VARCHAR ||
 		          typeId == Types.CLOB ||
 		          typeId == Types.LONGVARCHAR ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                   typeId == Types.SQLXML);
 	}
 	/**
@@ -148,6 +152,7 @@ public	static	int getColumnDisplaySize(int typeId, int storageLength)
 		switch (typeId)
 		{
 			case Types.TIMESTAMP:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
 				size = 29;
 				break;
 			case Types.DATE:
@@ -164,6 +169,7 @@ public	static	int getColumnDisplaySize(int typeId, int storageLength)
 				break;
 			case Types.REAL :
 			case Types.FLOAT :
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
 				size = 15;
 				break;
 			case Types.DOUBLE:
@@ -186,6 +192,7 @@ public	static	int getColumnDisplaySize(int typeId, int storageLength)
 				size = 20;
 				break;
 			case Types.BIT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.BOOLEAN:
 				// Types.BIT == SQL BOOLEAN, so 5 chars for 'false'
 				// In JDBC 3.0, Types.BIT or Types.BOOLEAN = SQL BOOLEAN
@@ -194,6 +201,7 @@ public	static	int getColumnDisplaySize(int typeId, int storageLength)
 			default: 
 				// MaximumWidth is -1 when it is unknown.
 				int w = storageLength;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                 size = (w > 0 ? w : JDBC40Translation.DEFAULT_COLUMN_DISPLAY_SIZE);
 				break;
 		}
@@ -216,6 +224,7 @@ public static int computeMaxWidth( int precision, int scale)
 	// 1. If scale = 0, only sign should be added to precision.
 	// 2. scale=precision, 3 should be added to precision for sign, decimal and an additional char '0'.
 	// 3. precision > scale > 0, 2 should be added to precision for sign and decimal.
+//IC see: https://issues.apache.org/jira/browse/DERBY-836
 	return (scale ==0) ? (precision +1) : ((scale == precision) ? (precision + 3) : (precision + 2));
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueDescriptor.java
index 53dd1e743d..d2ec36f6e6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueDescriptor.java
@@ -136,6 +136,7 @@ public interface DataValueDescriptor extends Storable, Orderable
      * the associated stream is given.
      */
     String getTraceString() throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1693
 
 	/**
 	 * Gets the value in the data value descriptor as a boolean.
@@ -290,6 +291,7 @@ public interface DataValueDescriptor extends Storable, Orderable
      * @see StringDataValue#getStreamWithDescriptor()
      */
     InputStream getStream() throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
 
     /**
      * Tells if this data value is, or will be, represented by a stream.
@@ -827,6 +829,7 @@ public BooleanDataValue in(DataValueDescriptor left,
          * or higher than all non-NULL values.
 	 *
 	 * @param other		The Orderable to compare this one to.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
          % @param nullsOrderedLow True if null should be lower than non-NULL
 	 *
 	 * @return  &lt;0 - this Orderable is less than other.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueFactory.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueFactory.java
index c368a0c523..764be7b3ac 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueFactory.java
@@ -251,6 +251,7 @@ StringDataValue getClobDataValue(String value, StringDataValue previous,
          * If collationType is equal to StringDataValue.COLLATION_TYPE_UCS_BASIC
          * then the call is the equivalent of the overload without collationType.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
         StringDataValue getClobDataValue(Clob value, StringDataValue previous,
                 int collationType) throws StandardException;
 
@@ -595,6 +596,7 @@ BitDataValue            getNullBlob(BitDataValue dataValue)
         StringDataValue         getNullChar(StringDataValue dataValue,
                 int collationType)
         throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
 
         /**
          * Get a SQL VARCHAR (UCS_BASIC) with a SQL null value. If the supplied value
@@ -612,6 +614,7 @@ StringDataValue         getNullChar(StringDataValue dataValue,
         StringDataValue         getNullVarchar(StringDataValue dataValue,
                 int collationType)
         throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
 
         /**
          * Get a SQL LONG VARCHAR (UCS_BASIC) with a SQL null value. If the supplied value
@@ -629,6 +632,7 @@ StringDataValue         getNullVarchar(StringDataValue dataValue,
         StringDataValue         getNullLongvarchar(StringDataValue dataValue,
                 int collationType)
         throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
 
         /**
          * Get a SQL CLOB (UCS_BASIC) with a SQL null value. If the supplied value
@@ -646,6 +650,7 @@ StringDataValue         getNullLongvarchar(StringDataValue dataValue,
         StringDataValue         getNullClob(StringDataValue dataValue,
                 int collationType)
         throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
 
         /**
          * Get a User-defined data value with a SQL null value. If the supplied value
@@ -721,6 +726,7 @@ StringDataValue         getNullClob(StringDataValue dataValue,
          * @return Collator null if the collation type is UCS_BASIC.
          *  Collator based on territory if the collation type is TERRITORY_BASED
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
         RuleBasedCollator getCharacterCollator(int collationType) 
         throws StandardException;
         
@@ -741,6 +747,7 @@ RuleBasedCollator getCharacterCollator(int collationType)
          * @return DataValueDescriptor which will be constructed using the 
          * passed parameters 
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2557
         DataValueDescriptor getNull(int formatId, int collationType) 
         throws StandardException;
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
index af2c1d052c..d4e400745a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
@@ -76,6 +76,7 @@ public final class DataValueFactoryImpl implements DataValueFactory, ModuleContr
     	 */
     	public void boot(boolean create, Properties properties) throws StandardException {
     		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
     		ModuleFactory monitor = getMonitor();
     		//The Locale on monitor has already been set by the boot code in
     		//BasicDatabase so we can simply do a get here.
@@ -86,6 +87,7 @@ public void boot(boolean create, Properties properties) throws StandardException
     		//Locale object will be used to construct the Collator object which
     		//will be used if user has requested territory based collation.
     		databaseLocale = monitor.getLocale(this);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
 
     		//If we are here for database create time, verify that there is 
     		//Collator support for the database's locale. If not, then we 
@@ -116,6 +118,7 @@ public void boot(boolean create, Properties properties) throws StandardException
 	    		//If the user has requested for territory based database, then 
 	    		//verify that JVM has Collator support for the database locale.
 	    		String userDefinedCollation = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
 	    			properties.getProperty(Attribute.COLLATION);
 	    		if (userDefinedCollation != null) {//Invalid value handling
 					int collationType = DataTypeDescriptor.getCollationType(userDefinedCollation);
@@ -184,6 +187,7 @@ public NumberDataValue getDataValue(Short value, NumberDataValue previous)
                         throws StandardException
         {
                 if (previous == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
                         return new SQLSmallint(value);
                 previous.setValue(value);
                 return previous;
@@ -202,6 +206,7 @@ public NumberDataValue getDataValue(Byte value, NumberDataValue previous)
                                 throws StandardException
         {
                 if (previous == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
                         return new SQLTinyint(value);
                 previous.setValue(value);
                 return previous;
@@ -221,6 +226,7 @@ public NumberDataValue getDataValue(Long value, NumberDataValue previous)
                         throws StandardException
         {
                 if (previous == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
                         return new SQLLongint(value);
                 previous.setValue(value);
                 return previous;
@@ -239,6 +245,7 @@ public NumberDataValue getDataValue(Float value, NumberDataValue previous)
                         throws StandardException
         {
                 if (previous == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
                         return new SQLReal(value);
                 previous.setValue(value);
                 return previous;
@@ -257,6 +264,7 @@ public NumberDataValue getDataValue(Double value, NumberDataValue previous)
                         throws StandardException
         {
                 if (previous == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
                         return new SQLDouble(value);
                 previous.setValue(value);
                 return previous;
@@ -265,6 +273,7 @@ public NumberDataValue getDataValue(Double value, NumberDataValue previous)
         public final NumberDataValue getDecimalDataValue(Number value, NumberDataValue previous)
                         throws StandardException
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             NumberDataValue retValue =
                     (previous == null) ? getNullDecimal(null) : previous;
             retValue.setValue(value);
@@ -287,6 +296,7 @@ public BooleanDataValue getDataValue(Boolean value,
                         throws StandardException
         {
                 if (previous == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
                         return new SQLBoolean(value);
                 previous.setValue(value);
                 return previous;
@@ -467,6 +477,7 @@ public StringDataValue getClobDataValue(Clob value, StringDataValue previous) th
         }
 
         public StringDataValue getClobDataValue(Clob value,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
                 StringDataValue previous, int collationType)
             throws StandardException
         {
@@ -658,6 +669,7 @@ public NumberDataValue getNullDouble(NumberDataValue dataValue)
 
         public final NumberDataValue getNullDecimal(NumberDataValue dataValue)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             if (dataValue == null) {
                 return new SQLDecimal();
             }
@@ -850,6 +862,10 @@ public StringDataValue          getNullClob(StringDataValue dataValue)
          */
         public StringDataValue         getNullClob(StringDataValue previous,
                 int collationType)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
         throws StandardException
         {
             if (collationType == StringDataValue.COLLATION_TYPE_UCS_BASIC)
@@ -866,6 +882,7 @@ public UserDataValue            getNullObject(UserDataValue dataValue)
         {
                 if (dataValue == null)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
                         return new UserType((Object) null);
                 }
                 else
@@ -894,6 +911,7 @@ public DateTimeDataValue        getNullDate(DateTimeDataValue dataValue)
                 {
                     try
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
                         return new SQLDate((Date) null);
                     }
                     catch( StandardException se)
@@ -918,6 +936,7 @@ public DateTimeDataValue        getNullTime(DateTimeDataValue dataValue)
                 {
                     try
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
                         return new SQLTime((Time) null);
                     }
                     catch( StandardException se)
@@ -942,6 +961,7 @@ public DateTimeDataValue        getNullTimestamp(DateTimeDataValue dataValue)
                 {
                     try
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
                         return new SQLTimestamp((Timestamp) null);
                     }
                     catch( StandardException se)
@@ -1017,6 +1037,7 @@ public XMLDataValue getNullXML(XMLDataValue dataValue)
 
     /** @see DataValueFactory#getCharacterCollator(int) */
     public RuleBasedCollator getCharacterCollator(int collationType) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
     throws StandardException {
     	if (collationType == StringDataValue.COLLATION_TYPE_UCS_BASIC)
     		return (RuleBasedCollator)null;
@@ -1026,6 +1047,7 @@ else if (collatorForCharacterTypes == null) {
     		//the Collator for the database locale.
 			//	Calculate the collator strength. COLLATION_TYPE_TERRITORY_BASED use strength -1, i e unspecified.
 			int strength = collationType - StringDataValue.COLLATION_TYPE_TERRITORY_BASED_PRIMARY;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
     		collatorForCharacterTypes = verifyCollatorSupport(strength);
     		return collatorForCharacterTypes;    	    		
     	} else
@@ -1057,6 +1079,7 @@ private RuleBasedCollator verifyCollatorSupport(int strength)
 					databaseLocale.toString());
     	
     	RuleBasedCollator collator = (RuleBasedCollator)Collator.getInstance(databaseLocale);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
 
 		if (strength != -1)
 			collator.setStrength(strength);
@@ -1069,6 +1092,7 @@ private RuleBasedCollator verifyCollatorSupport(int strength)
     public DataValueDescriptor getNull(int formatId, int collationType) 
     throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         DataValueDescriptor returnDVD =
             DataValueFactoryImpl.getNullDVDWithUCS_BASICcollation(formatId);
 
@@ -1112,6 +1136,7 @@ public static DataValueDescriptor getNullDVDWithUCS_BASICcollation(
         case StoredFormatIds.SQL_BOOLEAN_ID: return new SQLBoolean();
         case StoredFormatIds.SQL_CHAR_ID: return new SQLChar();
         case StoredFormatIds.SQL_DATE_ID: return new SQLDate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         case StoredFormatIds.SQL_DECIMAL_ID: return new SQLDecimal();
         case StoredFormatIds.SQL_DOUBLE_ID: return new SQLDouble();
         case StoredFormatIds.SQL_INTEGER_ID: return new SQLInteger();
@@ -1130,6 +1155,7 @@ public static DataValueDescriptor getNullDVDWithUCS_BASICcollation(
         case StoredFormatIds.SQL_BLOB_ID: return new SQLBlob();
         case StoredFormatIds.SQL_CLOB_ID: return new SQLClob();
         case StoredFormatIds.XML_ID: return new XML();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         case StoredFormatIds.ACCESS_HEAP_ROW_LOCATION_V1_ID: 
         // This is an specific implementation of RowLocation, known to be
         // a DTD.  
@@ -1161,6 +1187,7 @@ private LocaleFinder getLocaleFinder()
      */
     static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<Context>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DateTimeDataValue.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DateTimeDataValue.java
index dfb1e72199..fb61e06132 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DateTimeDataValue.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DateTimeDataValue.java
@@ -135,6 +135,7 @@ NumberDataValue getSeconds(NumberDataValue result)
      *
      * @exception StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-81
     DateTimeDataValue timestampAdd( int intervalType,
                                     NumberDataValue intervalCount,
                                     java.sql.Date currentDate,
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DateTimeParser.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DateTimeParser.java
index 6945e6fcd4..2d79e1a1d0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/DateTimeParser.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/DateTimeParser.java
@@ -187,6 +187,7 @@ private void updateCurrentSeparator()
      *
      * @exception StandardException if there are more non-blank characters.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3173
     void checkEnd() throws StandardException
     {
         for( ; fieldStart < len; fieldStart++)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/HarmonySerialBlob.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/HarmonySerialBlob.java
index 28ac9fe3a5..d7d2898840 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/HarmonySerialBlob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/HarmonySerialBlob.java
@@ -110,6 +110,7 @@ public byte[] getBytes(long pos, int length) throws SQLException {
 
         if (pos < 1 || pos > len)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             throw makeSQLException( SQLState.BLOB_BAD_POSITION, new Object[] {pos} );
         }
         if (length < 0)
@@ -215,6 +216,7 @@ public int setBytes(long pos, byte[] theBytes, int offset, int length)
             throws SQLException {
         if (pos < 1 || length < 0 || pos > (len - length + 1))
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             throw makeSQLException( SQLState.BLOB_BAD_POSITION, new Object[] {pos} );
         }
         if (offset < 0 || length < 0 || offset > (theBytes.length - length))
@@ -228,6 +230,7 @@ public int setBytes(long pos, byte[] theBytes, int offset, int length)
     public void truncate(long length) throws SQLException {
         if (length > this.len)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             throw makeSQLException( SQLState.BLOB_LENGTH_TOO_LONG, new Object[] {len} );
         }
         buf = getBytes(1, (int) length);
@@ -242,6 +245,7 @@ public InputStream getBinaryStream(long pos, long length)
             throws SQLException {
         if (len < 0)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             throw makeSQLException( SQLState.BLOB_NONPOSITIVE_LENGTH, new Object[] {len} );
         }
         if (length < 0)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/HarmonySerialClob.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/HarmonySerialClob.java
index ad1d2bbfa5..db2acd2b32 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/HarmonySerialClob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/HarmonySerialClob.java
@@ -104,6 +104,7 @@ public String getSubString(long pos, int length) throws SQLException {
         checkValidation();
         if (length < 0)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             throw HarmonySerialBlob.makeSQLException( SQLState.BLOB_NONPOSITIVE_LENGTH, new Object[] {length} );
         }
         if (pos < 1 || pos > len || pos + length > len + 1)
@@ -179,6 +180,7 @@ public int setString(long pos, String str, int offset, int length)
         checkValidation();
         if (pos < 1)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             throw HarmonySerialBlob.makeSQLException( SQLState.BLOB_BAD_POSITION, new Object[] {pos} );
         }
         if (length < 0)
@@ -205,6 +207,7 @@ public void truncate(long length) throws SQLException {
         checkValidation();
         if (length < 0)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             throw HarmonySerialBlob.makeSQLException( SQLState.BLOB_NONPOSITIVE_LENGTH, new Object[] {length} );
         }
         if (length > len)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/JSQLType.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/JSQLType.java
index b65c5032fe..4a7bd99461 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/JSQLType.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/JSQLType.java
@@ -176,6 +176,7 @@ public final class JSQLType implements Formatable
 	public	DataTypeDescriptor	getSQLType
 	(
     )
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
 		// might not be filled in if this is a JAVA_CLASS or JAVA_PRIMITIVE
@@ -200,6 +201,7 @@ public final class JSQLType implements Formatable
 
     // Give read-only access to array of strings
 	public static String getPrimitiveName(byte index){
+//IC see: https://issues.apache.org/jira/browse/DERBY-4293
 	    return primitiveNames[index];
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/Like.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/Like.java
index 818c4f8af8..ec8b467ca9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/Like.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/Like.java
@@ -260,6 +260,7 @@ else if (pat[pLoc] == anyString) {
 	private static boolean checkEquality(char[] val, int vLoc,
 			char[] pat, int pLoc, RuleBasedCollator collator) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3136
 		if (val[vLoc] == pat[pLoc]) { 
 	        // same character, so two strings consisting of this 
 	        // single character must be equal regardless of territory 
@@ -278,6 +279,8 @@ private static boolean checkEquality(char[] val, int vLoc,
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
 		Calculate the shortest length string that could match this pattern
 	 */
 	static int getMinLen(char[] pattern, int pStart, int pEnd, boolean haveEsc, char escChar) 
@@ -344,6 +347,8 @@ else if (pLoc == pEnd)
 
 	/*
 		Most typical interface for character string types with UCS_BASIC and 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
 		territory based collation.
 	 */
 	public static Boolean like(char[] value, int valueLength, char[] pattern, 
@@ -368,6 +373,7 @@ public static Boolean like(char[] value, int valueLength, char[] pattern,
 
 	public static boolean isOptimizable(String pattern)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1231
 		if (pattern == null)
 		{
 			return false;
@@ -423,6 +429,7 @@ public static String greaterEqualString(String pattern, String escape, int maxWi
 		// what is there, while stripping escapes
 		//
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-44
 		if ((escape != null) && (escape.length() != 0))
 		{
 			char escChar = escape.charAt(0);
@@ -581,6 +588,7 @@ public static String lessThanString(String pattern, String escape, int maxWidth)
 		char	newLastChar;
 		final int escChar;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-44
 		if ((escape != null) && (escape.length() !=0))
 		{
 			escChar = escape.charAt(0);
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/NumberDataType.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/NumberDataType.java
index f60539a125..1992946c65 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/NumberDataType.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/NumberDataType.java
@@ -46,6 +46,7 @@ public abstract class NumberDataType extends DataType
 									 implements NumberDataValue
 {
     static final BigDecimal MAXLONG_PLUS_ONE =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             BigDecimal.valueOf(Long.MAX_VALUE).add(BigDecimal.ONE);
     static final BigDecimal MINLONG_MINUS_ONE =
             BigDecimal.valueOf(Long.MIN_VALUE).subtract(BigDecimal.ONE);
@@ -63,6 +64,7 @@ public final NumberDataValue absolute(NumberDataValue result)
             return minus(result);
 
         if(result == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5224
             result = (NumberDataValue)getNewNull();
         
         result.setValue(this);
@@ -96,6 +98,7 @@ public NumberDataValue sqrt(NumberDataValue result)
 
         if( this.isNegative() )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             if( doubleValue == -0.0d )
             {
                 doubleValue = 0.0d;
@@ -405,6 +408,7 @@ public void setValue(Number theValue) throws StandardException
 	 * Used for TINYINT, SMALLINT, INTEGER.
 	 * @throws StandardException 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	void setObject(Object theValue) throws StandardException
 	{
 		setValue(((Integer) theValue).intValue());
@@ -421,6 +425,7 @@ public void setBigDecimal(BigDecimal bigDecimal) throws StandardException
 
 		// See comment in SQLDecimal.getLong()
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		if (   (bigDecimal.compareTo(NumberDataType.MINLONG_MINUS_ONE) == 1)
 			&& (bigDecimal.compareTo(NumberDataType.MAXLONG_PLUS_ONE) == -1)) {
 
@@ -459,6 +464,7 @@ public static float normalizeREAL(float v) throws StandardException
 	{
         boolean invalid = Float.isNaN(v) || Float.isInfinite(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
         if (v < Limits.DB2_SMALLEST_REAL ||
             v > Limits.DB2_LARGEST_REAL ||
             (v > 0 && v < Limits.DB2_SMALLEST_POSITIVE_REAL) ||
@@ -502,6 +508,7 @@ public static float normalizeREAL(final double v) throws StandardException
         float fv = (float)v;
 
         boolean invalid =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
             Double.isNaN(v) ||
             Double.isInfinite(v) ||
             (fv == 0.0f && v != 0.0d); // too small to represent as REAL
@@ -570,7 +577,9 @@ public static double normalizeDOUBLE(double v) throws StandardException
      * @return false if dictionary is new enough, see DD_Version.
      */
      private static boolean useDB2Limits() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
          LanguageConnectionContext lcc =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
              (LanguageConnectionContext)getContextOrNull(
                  LanguageConnectionContext.CONTEXT_ID);
          if (lcc != null) {
@@ -591,6 +600,7 @@ private static boolean useDB2Limits() throws StandardException {
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContextOrNull( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/Orderable.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/Orderable.java
index 648fa596fe..224b2b87f5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/Orderable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/Orderable.java
@@ -28,6 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   The Orderable interface represents a value that can
   be linearly ordered.
   <P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
   Currently only supports linear (&lt;, =, &lt;=) operations.
   Eventually we may want to do other types of orderings,
   in which case there would probably be a number of interfaces
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/RawToBinaryFormatStream.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/RawToBinaryFormatStream.java
index 4b566b6783..e9f5f52635 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/RawToBinaryFormatStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/RawToBinaryFormatStream.java
@@ -203,6 +203,7 @@ private void checkSufficientData() throws IOException
 
 		int remainingBytes = clearLimit();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         if (length > -1 && remainingBytes > 0) {
             throw new DerbyIOException(
                         MessageService.getTextMessage(
@@ -221,6 +222,7 @@ private void checkSufficientData() throws IOException
 			catch (IOException ioe) {
 				c = -1;
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
 			if (c != -1) {
                 if (length > -1) {
                     // Stream is not capped, and should have matched the
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java
index f4b4f3b3d5..f4d6e3228d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/ReaderToUTF8Stream.java
@@ -125,6 +125,7 @@ public ReaderToUTF8Stream(Reader appReader,
                               int valueLength,
                               int numCharsToTruncate,
                               String typeName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                               StreamHeaderGenerator headerGenerator) {
         this.reader = new LimitReader(appReader);
         this.charsToTruncate = numCharsToTruncate;
@@ -133,7 +134,9 @@ public ReaderToUTF8Stream(Reader appReader,
         this.hdrGen = headerGenerator;
 
         int absValueLength = Math.abs(valueLength);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4661
         reader.setLimit(absValueLength);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         if (SanityManager.DEBUG) {
             // Check the type name
             // The national types (i.e. NVARCHAR) are not used/supported.
@@ -147,6 +150,7 @@ public ReaderToUTF8Stream(Reader appReader,
         // requirement during encoding/insertion.
         // Be conservative, assume three bytes per char.
         int bz = 32*1024; // 32 KB default
+//IC see: https://issues.apache.org/jira/browse/DERBY-4661
         if (absValueLength < bz / 3) {
             // Enforce a minimum size of the buffer, otherwise read may loop
             // indefinitely (must enter for loop in fillBuffer to detect EOF).
@@ -177,6 +181,7 @@ public ReaderToUTF8Stream(Reader appReader,
     public ReaderToUTF8Stream(Reader appReader,
                               int maximumLength,
                               String typeName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                               StreamHeaderGenerator headerGenerator) {
         this(appReader, -1 * maximumLength, 0, typeName, headerGenerator);
         if (maximumLength < 0) {
@@ -210,6 +215,7 @@ public int read() throws IOException {
 		// first read
 		if (blen < 0)
             fillBuffer(FIRST_READ);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
 
 		while (boff == blen)
 		{
@@ -257,6 +263,7 @@ public int read(byte b[], int off, int len) throws IOException {
         // first read
 		if (blen < 0)
             fillBuffer(FIRST_READ);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
 
 		int readCount = 0;
 
@@ -313,6 +320,7 @@ public int read(byte b[], int off, int len) throws IOException {
      */
 	private void fillBuffer(int startingOffset) throws IOException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         if (startingOffset == FIRST_READ) {
             // Generate the header. Provide the char length only if the header
             // encodes a char count and we actually know the char count.
@@ -330,6 +338,7 @@ private void fillBuffer(int startingOffset) throws IOException
         // starts, it shall point at the next byte the stream will deliver on
         // the next iteration of read or skip.
         boff = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4122
 
 		if (off == 0)
 			multipleBuffer = true;
@@ -362,6 +371,7 @@ private void fillBuffer(int startingOffset) throws IOException
 
 		// 6! need to leave room for a three byte UTF8 encoding
 		// and 3 bytes for our special end of file marker.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4661
         for (; off <= buffer.length - READ_BUFFER_RESERVATION; )
 		{
 			int c = reader.read();
@@ -370,6 +380,7 @@ private void fillBuffer(int startingOffset) throws IOException
 				break;
 			}
             charCount++; // Increment the character count.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
 
 			if ((c >= 0x0001) && (c <= 0x007F))
             {
@@ -413,6 +424,7 @@ private void checkSufficientData() throws IOException
         if (charsToTruncate > 0)
         {
             reader.setLimit(charsToTruncate);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
             truncate();
         }
         
@@ -456,6 +468,7 @@ private void checkSufficientData() throws IOException
         // can put the correct length into the stream.
         if (!multipleBuffer) {
             int newValueLen = -1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             if (hdrGen.expectsCharCount()) {
                 if (SanityManager.DEBUG && charCount == 0) {
                     SanityManager.ASSERT(eof);
@@ -484,10 +497,12 @@ private void checkSufficientData() throws IOException
      */
     private boolean canTruncate() {
         // Only a few types can be truncated, default is to not allow.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         if (typeName.equals(TypeId.CLOB_NAME)) {
             return true;
         } else if (typeName.equals(TypeId.VARCHAR_NAME)) {
             return true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         } else if (typeName.equals(TypeId.CHAR_NAME)) {
             return true;
         }
@@ -508,8 +523,10 @@ private void truncate()
             } else if (c != SPACE) {
                 throw new DerbyIOException(
                     MessageService.getTextMessage(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                         SQLState.LANG_STRING_TRUNCATION,
                         typeName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                         "<stream-value>", // Don't show the whole value.
                         String.valueOf(Math.abs(valueLength))),
                     SQLState.LANG_STRING_TRUNCATION);
@@ -542,6 +559,7 @@ public final int available()
        // from the reader object 
        // reader.getLimit() returns the remaining bytes available
        // on this stream
+//IC see: https://issues.apache.org/jira/browse/DERBY-4122
        return (buffer.length > remainingBytes ? remainingBytes : buffer.length);
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBinary.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBinary.java
index d27e88b73f..a75c2a9176 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBinary.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBinary.java
@@ -61,6 +61,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * </UL>
 
   <P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
   Format : &lt;encoded length&gt;&lt;raw data&gt;
   <BR>
   Length is encoded to support Cloudscape 5.x databases where the length was stored as the number of bits.
@@ -88,6 +89,7 @@ When the value was written from a stream (e.g. PreparedStatement.setBinaryStream
   <BR>
   The Cloudscape '5.x format bits' format I think was never used by Derby.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 abstract class SQLBinary
 	extends DataType implements BitDataValue
 {
@@ -208,6 +210,7 @@ else if (dataValue.length * 2 < 0)  //if converted to hex, length exceeds max in
 	 */
 	public final InputStream	getStream() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         if (!hasStream()) {
             throw StandardException.newException(
                     SQLState.LANG_STREAM_INVALID_ACCESS, getTypeName());
@@ -252,6 +255,7 @@ else if ((dataValue == null) && (stream != null) )
 		}
 		catch (IOException ioe)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3732
 			throwStreamingIOException(ioe);
 		}
 		catch (SQLException se) { throw StandardException.plainWrapException( se ); }
@@ -275,6 +279,7 @@ else if (stream instanceof Resetable){
 					// If we have the stream length encoded.
 					// just read that.
 					streamValueLength = readBinaryLength((ObjectInput) stream);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
                     if (streamValueLength == 0) {
                         // Otherwise we will have to read the whole stream.
                         streamValueLength =
@@ -355,8 +360,10 @@ private void writeBlob(ObjectOutput out) throws IOException
             
             int bytesRead = 0;
             int numOfBytes = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4686
             byte[] buffer = new byte[Math.min(len, LEN_OF_BUFFER_TO_WRITE_BLOB)];
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-4686
             while(bytesRead < len) {
                 numOfBytes = is.read(buffer);
                 
@@ -595,7 +602,9 @@ public final int compare(DataValueDescriptor other) throws StandardException
      *  Beetle 4896
      */
     public final DataValueDescriptor cloneHolder() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
         if (stream == null && _blobValue == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
             return cloneValue(false);
         } else {
             // Cast to SQLBinary to avoid having to catch StandardException.
@@ -629,6 +638,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization)
 		catch (StandardException se)
 		{
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unexpected exception", se);
 			return null;
 		}
@@ -956,6 +966,7 @@ public final BitDataValue concatenate(
 				BitDataValue result)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5246
         if (result == null)
         {
             result = (BitDataValue) getNewNull();
@@ -1168,6 +1179,7 @@ public final int hashCode()
 		catch (StandardException se)
 		{
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unexpected exception", se);
 			return 0;
 		}
@@ -1175,6 +1187,7 @@ public final int hashCode()
 		// Hash code should ignore trailing PAD bytes.
 		byte[] bytes = dataValue;
         int lastNonPadByte = bytes.length - 1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3981
         while (lastNonPadByte >= 0 && bytes[lastNonPadByte] == PAD) {
             lastNonPadByte--;
         }
@@ -1232,6 +1245,7 @@ private static int compare(byte[] left, byte[] right) {
       */
      public void setInto(PreparedStatement ps, int position) throws SQLException, StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-203
                   ps.setBytes(position, getBytes());
      }
 
@@ -1247,6 +1261,7 @@ public final String getTraceString() throws StandardException {
         }
 
         // Check if we have a stream.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         if (hasStream()) {
             return (getTypeName() + "(" + getStream().toString() + ")");
         }
@@ -1291,6 +1306,7 @@ void truncate(int sourceWidth, int desiredWidth, boolean warn)
                     getLength(), desiredWidth);
 
             StatementContext statementContext = (StatementContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 DataValueFactoryImpl.getContext(ContextId.LANG_STATEMENT);
             statementContext.getActivation().
                     getResultSet().addWarning(warning);
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBit.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBit.java
index 7b6f78dc2c..9d5eef6e0d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBit.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBit.java
@@ -97,6 +97,7 @@ public final void setValueFromResultSet(ResultSet resultSet, int colNumber,
 									  boolean isNullable)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			setValue(resultSet.getBytes(colNumber));
 	}
 
@@ -113,6 +114,7 @@ public int typePrecedence()
 	/**
 	 * Set the value from an non-null object.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	final void setObject(Object theValue)
 		throws StandardException
 	{
@@ -182,6 +184,7 @@ public void setWidth(int desiredWidth,
 		*/
 		if (getValue() == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			return;
 		}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBlob.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBlob.java
index c4d6fadf62..08c05d2e9f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBlob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBlob.java
@@ -85,6 +85,7 @@ int getMaxMemoryUsage()
      *      {@code false} otherwise.
      */
     public boolean hasStream() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         return stream != null;
     }
 
@@ -105,6 +106,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization) {
         //       may be more effective because the data doesn't have to be
         //       decoded multiple times.
         final SQLBlob clone = new SQLBlob();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 
         // Shortcut cases where value is NULL.
         if (isNull()) {
@@ -155,6 +157,7 @@ public DataValueDescriptor getNewNull()
       * Return a JDBC Blob. Originally implemented to support DERBY-2201.
       */
     public Object getObject()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4754
         throws StandardException
     {
         // the generated code for the DERBY-2201 codepath expects to get a Blob
@@ -167,6 +170,7 @@ public Object getObject()
             if ( bytes == null ) { return null; }
             else
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 return new HarmonySerialBlob( bytes );
             }
         }
@@ -216,6 +220,7 @@ public void setWidth(int desiredWidth,  // ignored!
 		// Input is a stream with unknown length. The length will be checked
 		// while reading the stream.
 		if (isLengthLess()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			return;
 		}
 
@@ -276,6 +281,8 @@ public int typePrecedence()
 		}
 
     public void setInto(PreparedStatement ps, int position)
+//IC see: https://issues.apache.org/jira/browse/DERBY-217
+//IC see: https://issues.apache.org/jira/browse/DERBY-175
 		throws SQLException, StandardException
 	{
 		if (isNull()) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBoolean.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBoolean.java
index 89845f3fe0..2903da8690 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBoolean.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLBoolean.java
@@ -162,6 +162,7 @@ public Object	getObject()
 		if (isNull())
 			return null;
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			return value;
 	}
 
@@ -274,6 +275,7 @@ public int compare(DataValueDescriptor other) throws StandardException
 		{
 			if (!thisNull)		// otherNull must be true
 				return -1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4716
 			if (!otherNull)		// thisNull must be true
 				return 1;
 			return 0;
@@ -501,6 +503,7 @@ public void setBigDecimal(BigDecimal bigDecimal) throws StandardException
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             value = BigDecimal.ZERO.compareTo(bigDecimal) != 0;
 			isnull = false;
 		}
@@ -537,6 +540,7 @@ public void setValue(String theValue)
 			if (cleanedValue.equals("TRUE"))
 			{
 				value = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4658
                 isnull = false;
 			}
 			else if (cleanedValue.equals("FALSE"))
@@ -560,12 +564,14 @@ else if (cleanedValue.equals("UNKNOWN"))
 	/**
 	 * @see DataValueDescriptor#setValue
 	 */	
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	void setObject(Object theValue)
 	{
 		setValue((Boolean) theValue);
 	}
 	protected void setFrom(DataValueDescriptor theValue) throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4684
         if ( theValue instanceof SQLChar ) { setValue( theValue.getString() ); }
 		else if ( theValue instanceof SQLBoolean ){ setValue(theValue.getBoolean()); }
         else
@@ -873,6 +879,7 @@ public BooleanDataValue throwExceptionIfFalse(
 	}
 
     public BooleanDataValue throwExceptionIfImmediateAndFalse(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                     String sqlState,
                                     String tableName,
                                     String constraintName,
@@ -885,6 +892,7 @@ public BooleanDataValue throwExceptionIfImmediateAndFalse(
             final UUID constrId = (UUID)ps.getSavedObject(savedUUIDIdx);
             final LanguageConnectionContext lcc =
                 a.getLanguageConnectionContext();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             final boolean isDeferred = lcc.isEffectivelyDeferred(
                    lcc.getCurrentSQLSessionContext(a), constrId);
 
@@ -1045,6 +1053,7 @@ public boolean equals(boolean val)
 	 */
 	public BooleanDataValue getImmutable()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 		if (isNull())
 			return SQLBoolean.UNKNOWN;
 		
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLChar.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLChar.java
index 46e3103cc9..702a54bcda 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLChar.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLChar.java
@@ -147,6 +147,7 @@ public class SQLChar
      */
     protected static final StreamHeaderGenerator CHAR_HEADER_GENERATOR =
             new CharStreamHeaderGenerator();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
 
     /**************************************************************************
      * Fields of the class
@@ -466,6 +467,7 @@ public float getFloat() throws StandardException
 
         try 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             return Float.parseFloat(getString().trim());
         } 
         catch (NumberFormatException nfe) 
@@ -492,6 +494,7 @@ public double getDouble() throws StandardException
 
         try 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             return Double.parseDouble(getString().trim());
         } 
         catch (NumberFormatException nfe) 
@@ -638,6 +641,7 @@ public Object   getObject() throws StandardException
      * @exception StandardException     Thrown on error
      */
     public InputStream  getStream() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         if (!hasStream()) {
             throw StandardException.newException(
                     SQLState.LANG_STREAM_INVALID_ACCESS, getTypeName());
@@ -678,6 +682,7 @@ public int getLength() throws StandardException {
             if (stream instanceof Resetable && stream instanceof ObjectInput) {
                 try {
                     // Skip the encoded byte length.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4040
                     InputStreamUtil.skipFully(stream, 2);
                     // Decode the whole stream to find the character length.
                     return (int)UTF8Util.skipUntilEOF(stream);
@@ -709,6 +714,7 @@ public int getLength() throws StandardException {
      * @throws StandardException the wrapping exception
      */
     protected void throwStreamingIOException(IOException ioe)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             throws StandardException {
 		throw StandardException.
 			newException(SQLState.LANG_STREAMING_COLUMN_I_O_EXCEPTION,
@@ -740,6 +746,7 @@ public String getString() throws StandardException
                 // data is stored in the char[] array
 
                 value = new String(rawData, 0, len);
+//IC see: https://issues.apache.org/jira/browse/DERBY-302
                 if (len > RETURN_SPACE_THRESHOLD) {
                     // free up this char[] array to reduce memory usage
                     rawData = null;
@@ -776,6 +783,7 @@ public String getString() throws StandardException
                     throw StandardException.newException(
                             SQLState.LANG_STREAMING_COLUMN_I_O_EXCEPTION, 
                             ioe, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4465
                             String.class.getName());
                 }
             }
@@ -845,6 +853,7 @@ public boolean isNull()
 
     /**
         Writes a non-Clob data value to the modified UTF-8 format used by Derby.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
 
         The maximum stored size is based upon the UTF format
         used to stored the String. The format consists of
@@ -941,6 +950,7 @@ else if (c > 0x07FF)
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         StreamHeaderGenerator header = getStreamHeaderGenerator();
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(!header.expectsCharCount());
@@ -1012,6 +1022,7 @@ else if (c > 0x07FF)
      * @throws IOException if writing to the destination stream fails
      */
     protected final void writeClobUTF(ObjectOutput out)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             throws IOException {
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(!isNull());
@@ -1078,6 +1089,7 @@ protected final void writeClobUTF(ObjectOutput out)
     public void readExternalFromArray(ArrayInputStream in) 
         throws IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         resetForMaterialization();
         int utfLen = (((in.read() & 0xFF) << 8) | (in.read() & 0xFF));
         if (rawData == null || rawData.length < utfLen) {
@@ -1104,6 +1116,7 @@ public void readExternalFromArray(ArrayInputStream in)
      * @throws IOException if reading from the source fails
      */
     protected void readExternalClobFromArray(ArrayInputStream in, int charLen)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             throws IOException {
         resetForMaterialization();
         if (rawData == null || rawData.length < charLen) {
@@ -1162,6 +1175,7 @@ protected void readExternal(ObjectInput in, int utflen,
             // OR
             // The original string was a 0 length string.
             requiredLength = in.available();
+//IC see: https://issues.apache.org/jira/browse/DERBY-302
             if (requiredLength < minGrowBy)
                 requiredLength = minGrowBy;
         }
@@ -1177,6 +1191,7 @@ protected void readExternal(ObjectInput in, int utflen,
 
         // Set these to null to allow GC of the array if required.
         rawData = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         resetForMaterialization();
         int count = 0;
         int strlen = 0;
@@ -1233,6 +1248,7 @@ protected void readExternal(ObjectInput in, int utflen,
                 // for char, growby 64 seems reasonable, but for varchar
                 // clob 4k or 32k is performant and hence
                 // growBy() is override correctly to ensure this
+//IC see: https://issues.apache.org/jira/browse/DERBY-302
                 if (growby < minGrowBy)
                     growby = minGrowBy;
 
@@ -1309,6 +1325,7 @@ else if ((c & 0x70) == 0x60) // we know the top bit is set here
                                            ((char3 & 0x3F) << 0));
             }
             else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 throw new UTFDataFormatException(
                         "Invalid code point: " + Integer.toHexString(c));
             }
@@ -1331,6 +1348,7 @@ else if ((c & 0x70) == 0x60) // we know the top bit is set here
      */
     protected int growBy()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-302
         return GROWBY_FOR_CHAR;  //seems reasonable for a char
     }
     /**
@@ -1340,6 +1358,7 @@ protected int growBy()
     public void restoreToNull()
     {
         value = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5162
         _clobValue = null;
         stream = null;
         rawLength = -1;
@@ -1401,6 +1420,7 @@ public int compare(DataValueDescriptor other) throws StandardException
      *  objectify a stream.
      */
     public DataValueDescriptor cloneHolder() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
         if ((stream == null) && (_clobValue == null)) {
             return cloneValue(false);
         }
@@ -1442,6 +1462,7 @@ public DataValueDescriptor getNewNull()
     /** @see StringDataValue#getValue(RuleBasedCollator) */
     public StringDataValue getValue(RuleBasedCollator collatorForComparison)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2534
         if (collatorForComparison == null)
         {//null collatorForComparison means use UCS_BASIC for collation
             return this;            
@@ -1581,6 +1602,7 @@ public void setValue(byte[] theValue) throws StandardException
     */
     public void setBigDecimal(BigDecimal bigDecimal)  throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
         if (bigDecimal == null)
             setToNull();
         else
@@ -1884,6 +1906,7 @@ public void setWidth(int desiredWidth,
         */
         if ( (_clobValue == null ) && (getString() == null) )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
             return;
         }
 
@@ -1944,6 +1967,7 @@ else if (sourceWidth > desiredWidth && desiredWidth > 0)
                 warning.initCause(se);
 
                 StatementContext statementContext = (StatementContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                     DataValueFactoryImpl.getContext(ContextId.LANG_STATEMENT);
                 statementContext.getActivation().
                         getResultSet().addWarning(warning);
@@ -1954,6 +1978,7 @@ else if (sourceWidth > desiredWidth && desiredWidth > 0)
             */
             setValue(getString().substring(0, desiredWidth));
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
         return;
     }
 
@@ -2235,6 +2260,7 @@ public StringDataValue concatenate(
                 StringDataValue result)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5246
         if (result == null)
         {
             result = (StringDataValue) getNewNull();
@@ -2324,6 +2350,10 @@ public BooleanDataValue like(
         // of the char array may be different than the
         // length we should be using (i.e. getLength()).
         // see getCharArray() for more info
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
         char[] evalCharArray = getCharArray();
         char[] patternCharArray = ((SQLChar)pattern).getCharArray();
         char[] escapeCharArray = (((SQLChar) escape).getCharArray());
@@ -2395,7 +2425,9 @@ public NumberDataValue locate(  StringDataValue searchFrom,
         {
             throw StandardException.newException(
                     SQLState.LANG_INVALID_PARAMETER_FOR_SEARCH_POSITION, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
                     getString(), mySearchFrom,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     startVal);
         }
         
@@ -2972,6 +3004,7 @@ public String toString()
 
         if (stream != null) {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4754
                 return getString();
             } catch (Exception e) {
                 return e.toString();
@@ -3000,6 +3033,7 @@ public int hashCode()
         catch (StandardException se)
         {
             if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
                 SanityManager.THROWASSERT("Unexpected exception", se);
             return 0;
         }
@@ -3021,6 +3055,7 @@ public int hashCode()
 
         // Find 1st non-blank from the right
         int lastNonPadChar = lvalue.length() - 1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3981
         while (lastNonPadChar >= 0 && lvalue.charAt(lastNonPadChar) == PAD) {
             lastNonPadChar--;
         }
@@ -3047,6 +3082,8 @@ int hashCodeForCollation() {
         } catch (StandardException se) {
             // ignore exceptions, like we do in hashCode()
             if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
                 SanityManager.THROWASSERT("Unexpected exception", se);
             }
         }
@@ -3080,6 +3117,7 @@ private Locale getLocale() throws StandardException
     protected RuleBasedCollator getCollatorForCollation() 
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
         if (SanityManager.DEBUG) {
             // Sub-classes that support collation will override this method,
             // do don't expect it to be called here in the base class.
@@ -3096,6 +3134,7 @@ protected LocaleFinder getLocaleFinder()
         if (localeFinder == null)
         {
             DatabaseContext dc = (DatabaseContext) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 DataValueFactoryImpl.getContext(DatabaseContext.CONTEXT_ID);
             if( dc != null)
                 localeFinder = dc.getDatabase();
@@ -3168,6 +3207,7 @@ public String getTraceString() throws StandardException {
      * @return A stream header generator.
      */
     public StreamHeaderGenerator getStreamHeaderGenerator() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         return CHAR_HEADER_GENERATOR;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLClob.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLClob.java
index 70f828cbd6..dffc56fccf 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLClob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLClob.java
@@ -65,6 +65,7 @@ public class SQLClob
     /** The header generator used for 10.5 databases. */
     private static final StreamHeaderGenerator TEN_FIVE_CLOB_HEADER_GENERATOR =
             new ClobStreamHeaderGenerator(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
 
     /**
      * The maximum number of bytes used by the stream header.
@@ -73,6 +74,7 @@ public class SQLClob
      */
     private static final int MAX_STREAM_HEADER_LENGTH =
             TEN_FIVE_CLOB_HEADER_GENERATOR.getMaxHeaderLength();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4661
 
     /**
      * The descriptor for the stream. If there is no stream this should be
@@ -120,6 +122,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization) {
         // TODO: Add optimization for materializing "smallish" streams. This
         //       may be more effective because the data doesn't have to be
         //       decoded multiple times.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
         final SQLClob clone = new SQLClob();
         // Copy the soft upgrade mode state.
         clone.inSoftUpgradeMode = inSoftUpgradeMode;
@@ -153,6 +156,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization) {
                 clone.setValue(getString());
             } catch (StandardException se) {
                 if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
                     SanityManager.THROWASSERT("Unexpected exception", se);
                 }
                 return null;
@@ -167,6 +171,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization) {
 	 */
 	public DataValueDescriptor getNewNull()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4278
         SQLClob newClob = new SQLClob();
         // Copy the soft upgrade mode state.
         newClob.inSoftUpgradeMode = inSoftUpgradeMode;
@@ -176,6 +181,7 @@ public DataValueDescriptor getNewNull()
 	/** @see StringDataValue#getValue(RuleBasedCollator) */
 	public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2534
 		if (collatorForComparison == null)
 		{//null collatorForComparison means use UCS_BASIC for collation
 		    return this;			
@@ -266,6 +272,7 @@ public int	getInt() throws StandardException
      * @throws StandardException if obtaining the length fails
      */
     public int getLength() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         if (stream == null) {
             return super.getLength();
         }
@@ -294,6 +301,7 @@ public int getLength() throws StandardException {
         long charLength = 0;
         try {
             if (repositionStream) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4245
                 rewindStream(stream, csd.getDataOffset());
             }
             charLength = UTF8Util.skipUntilEOF(stream);
@@ -344,6 +352,7 @@ public Date	getDate(java.util.Calendar cal) throws StandardException
      */
     public Object   getObject() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4754
         if ( _clobValue != null ) { return _clobValue; }
         else
         {
@@ -376,6 +385,7 @@ public CharacterStreamDescriptor getStreamWithDescriptor()
             // Lazily reset the descriptor here, to avoid further changes in
             // {@code SQLChar}.
             csd = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
             throw StandardException.newException(
                     SQLState.LANG_STREAM_INVALID_ACCESS, getTypeName());
         }
@@ -389,6 +399,7 @@ public CharacterStreamDescriptor getStreamWithDescriptor()
                 try {
                     ((Resetable)stream).resetStream();
                     // Make sure the stream is in sync with the descriptor.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                     InputStreamUtil.skipFully(stream, csd.getCurBytePos());
                 } catch (IOException ioe) {
                     throwStreamingIOException(ioe);
@@ -405,9 +416,11 @@ public CharacterStreamDescriptor getStreamWithDescriptor()
             // First time, read the header format of the stream.
             try {
                 // Assume new header format, adjust later if necessary.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 byte[] header = new byte[MAX_STREAM_HEADER_LENGTH];
                 int read = stream.read(header);
                 // Expect at least two header bytes.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4122
                 if (SanityManager.DEBUG) {
                     SanityManager.ASSERT(read > 1,
                             "Too few header bytes: " + read);
@@ -416,6 +429,7 @@ public CharacterStreamDescriptor getStreamWithDescriptor()
                 if (read > hdrInfo.headerLength()) {
                     // We have read too much. Reset the stream.
                     read = hdrInfo.headerLength();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4245
                     rewindStream(stream, read);
                 }
                 csd = new CharacterStreamDescriptor.Builder().stream(stream).
@@ -430,6 +444,7 @@ public CharacterStreamDescriptor getStreamWithDescriptor()
                 // Check here to see if the root cause is a container closed
                 // exception. If so, this most likely means that the Clob was
                 // accessed after a commit or rollback on the connection.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4122
                 Throwable rootCause = ioe;
                 while (rootCause.getCause() != null) {
                     rootCause = rootCause.getCause();
@@ -455,6 +470,7 @@ public CharacterStreamDescriptor getStreamWithDescriptor()
      *      {@code false} otherwise.
      */
     public boolean hasStream() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         return stream != null;
     }
 
@@ -475,11 +491,13 @@ public Timestamp	getTimestamp(java.util.Calendar cal) throws StandardException
      */
     public final String getTraceString() throws StandardException {
         // Check if the value is SQL NULL.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1693
         if (isNull()) {
             return "NULL";
         }
 
         // Check if we have a stream.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         if (hasStream()) {
             return (getTypeName() + "(" + getStream().toString() + ")");
         }
@@ -555,12 +573,14 @@ public void setBigDecimal(BigDecimal bigDecimal) throws StandardException
      * @param stream the new stream
      */
     public final void setStream(InputStream stream) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         super.setStream(stream);
         // Discard the old stream descriptor.
         this.csd = null;
     }
 
     public final void restoreToNull() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         this.csd = null;
         super.restoreToNull();
     }
@@ -623,11 +643,13 @@ final void setObject(Object theValue)
             // down this code path when in soft upgrade mode, because the code
             // reading the header bytes ends up reading zero bytes (i.e., it
             // doesn't get the header / EOF marker).
+//IC see: https://issues.apache.org/jira/browse/DERBY-4122
             if (vcl < 32*1024) {
                 setValue(vc.getSubString(1, (int)vcl));
             } else {
                 ReaderToUTF8Stream utfIn = new ReaderToUTF8Stream(
                         vc.getCharacterStream(), (int) vcl, 0, TypeId.CLOB_NAME,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                         getStreamHeaderGenerator());
                 setValue(utfIn, (int) vcl);
             }
@@ -644,6 +666,7 @@ final void setObject(Object theValue)
      * @throws IOException if writing to the destination stream fails
      */
     public void writeExternal(ObjectOutput out)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             throws IOException {
         super.writeClobUTF(out);
     }
@@ -770,6 +793,7 @@ public void readExternal(ObjectInput in)
                                             : (int)csd.getByteLength();
             hdrInfo = new HeaderInfo(hdrLen, valueLength);
             // Make sure the stream is correctly positioned.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4245
             rewindStream((InputStream)in, hdrLen);
         } else {
             final InputStream srcIn = (InputStream)in;
@@ -797,6 +821,7 @@ public void readExternal(ObjectInput in)
                     // 1) Reset the stream to the previously set mark.
                     srcIn.reset();
                     InputStreamUtil.skipFully(srcIn, hdrInfo.headerLength());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4245
                 } else if (in instanceof FormatIdInputStream) {
                     // 2) Add a push back stream on top of the underlying
                     // source, and unread the surplus bytes we read. Set the
@@ -840,6 +865,7 @@ public void readExternalFromArray(ArrayInputStream in)
         byte[] header = new byte[MAX_STREAM_HEADER_LENGTH];
         int read = in.read(header);
         // Expect at least two header bytes.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4122
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(read > 1, "Too few header bytes: " + read);
         }
@@ -868,6 +894,7 @@ public void readExternalFromArray(ArrayInputStream in)
     private void rewindStream(InputStream in, long offset)
             throws IOException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4245
             ((Resetable)in).resetStream();
             InputStreamUtil.skipFully(in, offset);
         } catch (StandardException se) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDate.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDate.java
index 6eac0a8538..e9a0608e3d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDate.java
@@ -77,6 +77,7 @@ public final class SQLDate extends DataType
 
     public int estimateMemoryUsage()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3173
         return BASE_MEMORY_USAGE;
     } // end of estimateMemoryUsage
 
@@ -95,6 +96,7 @@ public String getString()
 		//format is [yyy]y-mm-dd e.g. 1-01-01, 9999-99-99
 		if (!isNull())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3173
 			return encodedDateToString(encodedDate);
 		}
 		else
@@ -114,6 +116,7 @@ public Timestamp getTimestamp( Calendar cal)
 			return null;
 		}
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1985
         return new Timestamp(getTimeInMillis(cal));
     }
 
@@ -507,6 +510,7 @@ else if( cal == null)
 	 * Set the value from a correctly typed Date object.
 	 * @throws StandardException 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	void setObject(Object theValue) throws StandardException
 	{
 		setValue((Date) theValue);
@@ -554,6 +558,7 @@ public void setValue(String theValue)
 
 		if (theValue != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             DatabaseContext databaseContext = (DatabaseContext) DataValueFactoryImpl.getContext(DatabaseContext.CONTEXT_ID);
             parseDate( theValue,
                        false,
@@ -566,6 +571,7 @@ public void setValue(String theValue)
 	** SQL Operators
 	*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
     NumberDataValue nullValueInt() {
         return new SQLInteger();
     }
@@ -594,6 +600,7 @@ public NumberDataValue getYear(NumberDataValue result)
 	public NumberDataValue getMonth(NumberDataValue result)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueInt();
         } else {
@@ -609,6 +616,7 @@ public NumberDataValue getMonth(NumberDataValue result)
 	public NumberDataValue getDate(NumberDataValue result)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueInt();
         } else {
@@ -701,6 +709,7 @@ public final boolean isNull()
 	 */
 	public Date getDate( Calendar cal)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1985
         if (isNull())
             return null;
         
@@ -882,6 +891,7 @@ public static DateTimeDataValue computeDateFunction( DataValueDescriptor operand
                 return new SQLDate();
             if( operand instanceof SQLDate)
                 return (SQLDate) operand.cloneValue(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 
             if( operand instanceof SQLTimestamp)
             {
@@ -937,6 +947,7 @@ public static DateTimeDataValue computeDateFunction( DataValueDescriptor operand
       */     
     public void setInto(PreparedStatement ps, int position) throws SQLException, StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-203
                   ps.setDate(position, getDate((Calendar) null));
      }
 
@@ -956,6 +967,7 @@ public void setInto(PreparedStatement ps, int position) throws SQLException, Sta
      * @exception StandardException
      */
     public DateTimeDataValue timestampAdd( int intervalType,
+//IC see: https://issues.apache.org/jira/browse/DERBY-81
                                            NumberDataValue intervalCount,
                                            java.sql.Date currentDate,
                                            DateTimeDataValue resultHolder)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDecimal.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDecimal.java
index 632d84f30f..1935d2073c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDecimal.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDecimal.java
@@ -128,6 +128,7 @@ public SQLDecimal(BigDecimal val, int nprecision, int scale)
 		value = val;
 		if ((value != null) && (scale >= 0))
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			value = value.setScale(scale, RoundingMode.DOWN);
 		}
 	}
@@ -296,12 +297,14 @@ public boolean	getBoolean()
 		if (localValue == null)
 			return false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		return localValue.compareTo(BigDecimal.ZERO) != 0;
 	}
 
 	public String	getString()
 	{
 		BigDecimal localValue = getBigDecimal();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return (localValue == null) ? null : localValue.toPlainString();
 	}
 
@@ -317,6 +320,7 @@ public Object	getObject()
 	 * Set the value from a correctly typed BigDecimal object.
 	 * @throws StandardException 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	void setObject(Object theValue) throws StandardException
 	{
 		setValue((BigDecimal) theValue);
@@ -399,6 +403,7 @@ public void writeExternal(ObjectOutput out) throws IOException
 			//    a BigDecimal with scale -3 (unscaled value of 1)
 			// or a BigDecimal with scale 0 (unscaled value of 1000)
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-225
 			if (scale < 0) {			
 				scale = 0;
 				value = value.setScale(0);
@@ -598,6 +603,7 @@ public void setValue(int theValue)
 	*/
 	public void setBigDecimal(BigDecimal theValue) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		setCoreValue(theValue);
 	}
 
@@ -629,6 +635,7 @@ public void setValue(Number theValue) throws StandardException
 	 */
 	public void setValue(boolean theValue)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		setCoreValue(theValue ? BigDecimal.ONE : BigDecimal.ZERO);
 	}
 
@@ -650,6 +657,7 @@ private void setCoreValue(BigDecimal theValue)
 	}
 
 	private void setCoreValue(double theValue) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-123
 		value = new BigDecimal(Double.toString(theValue));
 		rawData = null;
 	}
@@ -841,6 +849,7 @@ public NumberDataValue divide(NumberDataValue dividend,
 
 		BigDecimal divisorBigDecimal = SQLDecimal.getBigDecimal(divisor);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		if (divisorBigDecimal.compareTo(BigDecimal.ZERO) == 0)
 		{
 			throw  StandardException.newException(SQLState.LANG_DIVIDE_BY_ZERO);
@@ -854,6 +863,7 @@ public NumberDataValue divide(NumberDataValue dividend,
 		** (for the whole result set column, eg.); otherwise dynamically
 		** calculates the scale according to actual values.  Beetle 3901
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		result.setBigDecimal
           (
            dividendBigDecimal.divide
@@ -910,6 +920,7 @@ public NumberDataValue minus(NumberDataValue result)
 
     protected boolean isNegative()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return !isNull() && (getBigDecimal().compareTo(BigDecimal.ZERO) == -1);
     }
     
@@ -983,14 +994,17 @@ public void setWidth(int desiredPrecision,
 			throws StandardException
 	{
 		if (isNull())
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			return;
 			
 		if (desiredPrecision != IGNORE_PRECISION &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-225
 			((desiredPrecision - desiredScale) <  SQLDecimal.getWholeDigits(getBigDecimal())))
 		{
 			throw StandardException.newException(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE, 
 									("DECIMAL/NUMERIC("+desiredPrecision+","+desiredScale+")"));
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		value = value.setScale(desiredScale, RoundingMode.DOWN);
 		rawData = null;
 	}
@@ -1003,6 +1017,7 @@ public void setWidth(int desiredPrecision,
 	 */
 	public int getDecimalValuePrecision()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-225
 		if (isNull())
 			return 0;
 			
@@ -1079,6 +1094,7 @@ private static int getWholeDigits(BigDecimal decimalValue)
          * if ONE > abs(value) then the number of whole digits is 0
          */
         decimalValue = decimalValue.abs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         if (BigDecimal.ONE.compareTo(decimalValue) == 1)
         {
             return 0;
@@ -1087,6 +1103,7 @@ private static int getWholeDigits(BigDecimal decimalValue)
         // precision is the number of digits in the unscaled value,
         // subtracting the scale (positive or negative) will give the
         // number of whole digits.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return decimalValue.precision() - decimalValue.scale();
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDouble.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDouble.java
index 4a371b52c7..0731aeb462 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDouble.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLDouble.java
@@ -125,6 +125,7 @@ public long	getLong() throws StandardException
 	 */
 	public float	getFloat() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1136
 		if (Float.isInfinite((float)value))
 			throw StandardException.newException(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE, TypeId.REAL_NAME);
 		return (float) value;
@@ -164,6 +165,7 @@ public Object	getObject()
 		if (isNull())
 			return null;
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			return value;
 	}
 
@@ -172,6 +174,7 @@ public Object	getObject()
 	 * Set the value from a correctly typed Double object.
 	 * @throws StandardException 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	void setObject(Object theValue) throws StandardException
 	{
 		setValue(((Double) theValue).doubleValue());
@@ -274,6 +277,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization)
 		{
 			if (SanityManager.DEBUG)
 				SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 					"error on clone, " +
 					" value = " + value +
 					" isnull = " + isnull, se);
@@ -446,6 +450,9 @@ public  void setBigDecimal(BigDecimal bigDecimal) throws StandardException
 
         double v = bigDecimal.doubleValue();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5546
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
+//IC see: https://issues.apache.org/jira/browse/DERBY-5534
         if (v == 0) {
             // We need to catch underflow here, since BigDecimal#doubleValue it
             // just returns 0 (i.e. no exception).
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLInteger.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLInteger.java
index aa25862625..c2e601b3e7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLInteger.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLInteger.java
@@ -115,6 +115,7 @@ public Object	getObject()
 		if (isNull())
 			return null;
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			return value;
 	}
 
@@ -305,6 +306,7 @@ public void setValue(String theValue)
 		else
 		{
 		    try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
 		        value = Integer.parseInt(theValue.trim());
 			} catch (NumberFormatException nfe) {
 			    throw invalidFormat();
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongVarbit.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongVarbit.java
index 9640509d34..bb13089efe 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongVarbit.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongVarbit.java
@@ -123,6 +123,7 @@ public void normalize(
 			this.dataValue = other.dataValue;
 		}
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			setValue(source.getBytes());
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongint.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongint.java
index 69da6fd03c..d1ecff97f7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongint.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongint.java
@@ -132,6 +132,7 @@ public Object	getObject()
 		if (isNull())
 			return null;
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			return value;
 	}
 
@@ -143,6 +144,8 @@ public int	getLength()
 	// this is for DataType's error generator
 	public String getTypeName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return TypeId.BIGINT_NAME;
 	}
 
@@ -409,6 +412,7 @@ public void setValue(boolean theValue)
 	 * Set the value from a correctly typed Long object.
 	 * @throws StandardException 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	void setObject(Object theValue)
 	{
 		setValue(((Long) theValue).longValue());
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongvarchar.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongvarchar.java
index 66df3af056..ce099c6861 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongvarchar.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLLongvarchar.java
@@ -69,6 +69,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization)
 		catch (StandardException se)
 		{
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unexpected exception", se);
 			return null;
 		}
@@ -86,6 +87,7 @@ public DataValueDescriptor getNewNull()
 	/** @see StringDataValue#getValue(RuleBasedCollator) */
 	public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2534
 		if (collatorForComparison == null)
 		{//null collatorForComparison means use UCS_BASIC for collation
 		    return this;			
@@ -146,6 +148,7 @@ public StringDataValue concatenate(
 		throws StandardException
 	{
 		result = super.concatenate(leftOperand, rightOperand, result);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5246
 
 		//bug 5600 - according to db2 concatenation documentation, for compatibility with previous versions, there is no automatic
 		//escalation of results involving LONG data types to LOB data types. For eg, concatenation of a CHAR(200) value and a
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLReal.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLReal.java
index 5ecc1242a6..398fb73698 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLReal.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLReal.java
@@ -185,6 +185,7 @@ public Object	getObject()
 		if (isNull())
 			return null;
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			return value;
 	}
 
@@ -369,6 +370,7 @@ public void setValue(String theValue)
             // what if String is rouned to zero?
             //System.out.println("SQLReal.setValue(String) - rounding issue?"+theValue);
 		    try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
 		        setValue(Double.parseDouble(theValue.trim()));
 			} catch (NumberFormatException nfe) {
 			    throw invalidFormat();
@@ -403,6 +405,9 @@ public  void setBigDecimal(BigDecimal bigDecimal) throws StandardException
 
         float v = bigDecimal.floatValue();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5546
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
+//IC see: https://issues.apache.org/jira/browse/DERBY-5534
         if (v == 0) {
             // We need to catch underflow here, since BigDecimal#floatValue it
             // just returns 0 (i.e. no exception).
@@ -469,6 +474,7 @@ public void setValue(boolean theValue)
 	 * Set the value from a correctly typed Float object.
 	 * @throws StandardException 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	void setObject(Object theValue) throws StandardException
 	{
 		setValue(((Float) theValue).floatValue());
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLRef.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLRef.java
index 4c65f4ced3..2a9150c07e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLRef.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLRef.java
@@ -76,6 +76,7 @@ public Object getObject()
 
 	protected void setFrom(DataValueDescriptor theValue) throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (theValue.isNull())
 			setToNull();
 		else
@@ -182,6 +183,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization)
 		if (value == null)
 			return new SQLRef();
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
            return new SQLRef((RowLocation) value.cloneValue(false));
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLSmallint.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLSmallint.java
index 0d252e267e..a4ec7bee93 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLSmallint.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLSmallint.java
@@ -158,6 +158,7 @@ public Object	getObject()
 		if (isNull())
 			return null;
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
           return (int) value;
 	}
 
@@ -326,6 +327,7 @@ private SQLSmallint(short val, boolean isnull) {
 	}
 
 	public SQLSmallint(Short obj) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 		if (isnull = (obj == null))
 			;
 		else
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTime.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTime.java
index 6e9a4fdbfb..1aa2956603 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTime.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTime.java
@@ -91,6 +91,7 @@ public final class SQLTime extends DataType
 
     public int estimateMemoryUsage()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3173
         return BASE_MEMORY_USAGE;
     } // end of estimateMemoryUsage
 
@@ -140,6 +141,7 @@ public Timestamp getTimestamp( Calendar cal)
                 // Set Calendar to current date and time
                 // to pick up the current date. Time portion
                 // will be overridden by this value's time.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1985
                 cal.setTimeInMillis(System.currentTimeMillis());
             }
             
@@ -513,6 +515,7 @@ else if( amPm == 1) // PM
                 else if( hour > 12)
                     throw StandardException.newException( SQLState.LANG_DATE_RANGE_EXCEPTION);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3173
             parser.checkEnd();
             encodedTime = computeEncodedTime( hour, minute, second);
         }
@@ -554,6 +557,7 @@ else if( cal == null)
 	 * Set the value from a correctly typed Time object.
 	 * @throws StandardException 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	void setObject(Object theValue) throws StandardException
 	{
 		setValue((Time) theValue);
@@ -605,6 +609,7 @@ public void setValue(String theValue)
 		restoreToNull();
 		if (theValue != null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             DatabaseContext databaseContext = (DatabaseContext) DataValueFactoryImpl.getContext(DatabaseContext.CONTEXT_ID);
             parseTime( theValue,
                        false,
@@ -617,6 +622,7 @@ public void setValue(String theValue)
 	** SQL Operators
 	*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
     NumberDataValue nullValueInt() {
         return new SQLInteger();
     }
@@ -665,6 +671,7 @@ public NumberDataValue getDate(NumberDataValue result)
 	public NumberDataValue getHours(NumberDataValue result)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueInt();
         } else {    
@@ -680,6 +687,7 @@ public NumberDataValue getHours(NumberDataValue result)
 	public NumberDataValue getMinutes(NumberDataValue result)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueInt();
         } else {    
@@ -695,6 +703,7 @@ public NumberDataValue getMinutes(NumberDataValue result)
 	public NumberDataValue getSeconds(NumberDataValue result)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueInt();
         } else {    
@@ -764,6 +773,7 @@ public Time getTime(java.util.Calendar cal)
         
         // Derby's SQL TIME type only has second resolution
         // so pass in 0 for nano-seconds
+//IC see: https://issues.apache.org/jira/browse/DERBY-1985
         return getTime(cal, encodedTime, 0);
 	}
     
@@ -931,6 +941,7 @@ static int computeEncodedTime(java.util.Date value, Calendar currentCal) throws
       */
     public void setInto(PreparedStatement ps, int position) throws SQLException, StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-203
 		      ps.setTime(position, getTime((Calendar) null));
    }
 
@@ -950,6 +961,7 @@ public void setInto(PreparedStatement ps, int position) throws SQLException, Sta
      * @exception StandardException
      */
     public DateTimeDataValue timestampAdd( int intervalType,
+//IC see: https://issues.apache.org/jira/browse/DERBY-81
                                            NumberDataValue intervalCount,
                                            java.sql.Date currentDate,
                                            DateTimeDataValue resultHolder)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTimestamp.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTimestamp.java
index 6abb69a474..210248b6ec 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTimestamp.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTimestamp.java
@@ -95,6 +95,7 @@ public String getString()
 	{
 		if (!isNull())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3173
             String valueString = getTimestamp((Calendar) null).toString();
             /* The java.sql.Timestamp.toString() method is supposed to return a string in
              * the JDBC escape format. However the JDK 1.3 libraries truncate leading zeros from
@@ -141,6 +142,7 @@ public Date	getDate( Calendar cal) throws StandardException
         cal.clear();
         
         SQLDate.setDateInCalendar(cal, encodedDate);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1985
 
 		return new Date(cal.getTimeInMillis());
 	}
@@ -161,6 +163,7 @@ public Time	getTime( Calendar cal) throws StandardException
         // to nano-seconds so ensure the Time object
         // maintains that since it has milli-second
         // resolutiuon.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1985
         return SQLTime.getTime(cal, encodedTime, nanos);
 	}
 
@@ -405,6 +408,7 @@ public SQLTimestamp(Timestamp value) throws StandardException
 	}
 
 	SQLTimestamp(int encodedDate, int encodedTime, int nanos) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-81
 
 		this.encodedDate = encodedDate;
 		this.encodedTime = encodedTime;
@@ -595,6 +599,7 @@ static int[] parseDateOrTimestamp( DateTimeParser parser, boolean timeRequired)
 	 * Set the value from a correctly typed Timestamp object.
 	 * @throws StandardException 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	void setObject(Object theValue) throws StandardException
 	{
 		setValue((Timestamp) theValue);
@@ -653,6 +658,7 @@ public void setValue(String theValue)
 
 		if (theValue != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             DatabaseContext databaseContext = (DatabaseContext) DataValueFactoryImpl.getContext(DatabaseContext.CONTEXT_ID);
             parseTimestamp( theValue,
                             false,
@@ -666,6 +672,7 @@ public void setValue(String theValue)
 	** SQL Operators
 	*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
     NumberDataValue nullValueInt() {
         return new SQLInteger();
     }
@@ -682,6 +689,7 @@ NumberDataValue nullValueDouble() {
 	public NumberDataValue getYear(NumberDataValue result)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueInt();
         } else {    
@@ -697,6 +705,7 @@ public NumberDataValue getYear(NumberDataValue result)
 	public NumberDataValue getMonth(NumberDataValue result)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueInt();
         } else {    
@@ -712,6 +721,7 @@ public NumberDataValue getMonth(NumberDataValue result)
 	public NumberDataValue getDate(NumberDataValue result)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueInt();
         } else {    
@@ -727,6 +737,7 @@ public NumberDataValue getDate(NumberDataValue result)
 	public NumberDataValue getHours(NumberDataValue result)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueInt();
         } else {    
@@ -742,6 +753,7 @@ public NumberDataValue getHours(NumberDataValue result)
 	public NumberDataValue getMinutes(NumberDataValue result)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueInt();
         } else {    
@@ -764,6 +776,7 @@ public NumberDataValue getSeconds(NumberDataValue source)
 		}
 		NumberDataValue result;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-729
         if (isNull()) {
             return nullValueDouble();
         }
@@ -836,6 +849,7 @@ public Timestamp getTimestamp(java.util.Calendar cal)
 		if (isNull())
 			return null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1985
         if (cal == null)
             cal = new GregorianCalendar();
         setCalendar(cal);
@@ -880,6 +894,7 @@ private void setNumericTimestamp(Timestamp value, Calendar cal) throws StandardE
 		computeEncodedDate sets the date in a Calendar object
 		and then uses the SQLDate function to compute an encoded date
 		The encoded date is
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			year &lt;&lt; 16 + month &lt;&lt; 8 + date
 		@param value	the value to convert
 		@return 		the encodedDate
@@ -896,6 +911,7 @@ private static int computeEncodedDate(java.util.Date value, Calendar currentCal)
 	/**
 		computeEncodedTime extracts the hour, minute and seconds from
 		a java.util.Date value and encodes them as
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			hour &lt;&lt; 16 + minute &lt;&lt; 8 + second
 		using the SQLTime function for encoding the data
 		@param value	the value to convert
@@ -911,6 +927,8 @@ private static int computeEncodedTime(java.util.Date value, Calendar currentCal)
     
     public void setInto(PreparedStatement ps, int position) throws SQLException, StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-174
+//IC see: https://issues.apache.org/jira/browse/DERBY-175
                   ps.setTimestamp(position, getTimestamp((Calendar) null));
      }
 
@@ -928,6 +946,7 @@ public static DateTimeDataValue computeTimestampFunction( DataValueDescriptor op
                 return new SQLTimestamp();
             if( operand instanceof SQLTimestamp)
                 return (SQLTimestamp) operand.cloneValue(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 
             String str = operand.getString();
             if( str.length() == 14)
@@ -983,6 +1002,7 @@ static int parseDateTimeInteger( String str, int start, int ndigits) throws Stan
      * @exception StandardException
      */
     public DateTimeDataValue timestampAdd( int intervalType,
+//IC see: https://issues.apache.org/jira/browse/DERBY-81
                                            NumberDataValue count,
                                            java.sql.Date currentDate,
                                            DateTimeDataValue resultHolder)
@@ -1054,6 +1074,7 @@ public DateTimeDataValue timestampAdd( int intervalType,
             break;
 
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
             throw StandardException.newException(SQLState.LANG_INVALID_FUNCTION_ARGUMENT, intervalType,
                                                   "TIMESTAMPADD");
         }
@@ -1103,6 +1124,7 @@ public NumberDataValue timestampDiff( int intervalType,
         throws StandardException
     {
         if( resultHolder == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2386
             resultHolder = new SQLLongint();
  
        if( isNull() || time1.isNull())
@@ -1235,9 +1257,11 @@ else if( nanosDiff > 0 && secondsDiff < 0)
             break;
 
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
             throw StandardException.newException(SQLState.LANG_INVALID_FUNCTION_ARGUMENT, intervalType,
                                                   "TIMESTAMPDIFF");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2386
         resultHolder.setValue(ldiff);
         return resultHolder;
     } // end of timestampDiff
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTinyint.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTinyint.java
index 2163f7cbd2..36a032faf3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTinyint.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLTinyint.java
@@ -106,6 +106,7 @@ private SQLTinyint(byte val, boolean isnull) {
 	}
 
 	public SQLTinyint(Byte obj) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 		if (isnull = (obj == null))
 			;
 		else
@@ -200,6 +201,7 @@ public Object	getObject()
 	{
 		return (isNull()) ?
 					null:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 					value;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLVarbit.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLVarbit.java
index 2d26971835..359284babe 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLVarbit.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLVarbit.java
@@ -92,6 +92,7 @@ public void normalize(
 		int		desiredWidth = desiredType.getMaximumWidth();
 
 		byte[] sourceData = source.getBytes();
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		setValue(sourceData);
 		if (sourceData.length > desiredWidth)
 			setWidth(desiredWidth, 0, true);
@@ -120,6 +121,7 @@ public void setWidth(int desiredWidth,
 		*/
 		if (getValue() == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			return;
 		}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLVarchar.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLVarchar.java
index 4ae976970b..e87c78a5d2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLVarchar.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SQLVarchar.java
@@ -65,6 +65,7 @@ public DataValueDescriptor cloneValue(boolean forceMaterialization)
 		catch (StandardException se)
 		{
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unexpected exception", se);
 			return null;
 		}
@@ -82,6 +83,7 @@ public DataValueDescriptor getNewNull()
 	/** @see StringDataValue#getValue(RuleBasedCollator) */
 	public StringDataValue getValue(RuleBasedCollator collatorForComparison)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2534
 		if (collatorForComparison == null)
 		{//null collatorForComparison means use UCS_BASIC for collation
 		    return this;			
@@ -211,6 +213,7 @@ public int typePrecedence()
      */
     protected final int growBy()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-302
         return RETURN_SPACE_THRESHOLD;  //seems reasonable for a varchar or clob 
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SqlXmlUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SqlXmlUtil.java
index 598399b331..bfe23d1c9c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/SqlXmlUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/SqlXmlUtil.java
@@ -235,6 +235,7 @@ public SqlXmlUtil() throws StandardException
              */ 
             throw StandardException.newException(
                 SQLState.LANG_UNEXPECTED_XML_EXCEPTION, t, t.getMessage());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1775
 
         }
 
@@ -263,6 +264,7 @@ public void compileXQExpr(String queryExpr, String opName)
              * is used).  In the future we may want to revisit this
              * to make it easier for users to query based on namespaces.
              */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6624
             XPath xpath = XPathFactory.newInstance().newXPath();
             xpath.setNamespaceContext(NullNamespaceContext.SINGLETON);
 
@@ -287,6 +289,7 @@ public void compileXQExpr(String queryExpr, String opName)
              */
             throw StandardException.newException(
                 SQLState.LANG_XML_QUERY_ERROR, te, opName, te.getMessage());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1775
 
         }
     }
@@ -307,6 +310,7 @@ protected String serializeToString(String xmlAsText)
         throws Exception
     {
         Document doc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6634
 
         /* The call to dBuilder.parse() is a call to an external
          * (w.r.t. to Derby) JAXP parser.  If the received XML
@@ -317,9 +321,12 @@ protected String serializeToString(String xmlAsText)
          * reading the DTD file.
          */
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2131
 
             final InputSource is = new InputSource(new StringReader(xmlAsText));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6634
             doc = java.security.AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 new java.security.PrivilegedExceptionAction<Document>()
                 {
                     public Document run() throws IOException, SAXException
@@ -350,6 +357,7 @@ public Document run() throws IOException, SAXException
          * don't have a top-level attribute node in the list,
          * so we don't have to worry.  Hence the "null" here.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6634
         return serializeToString(Collections.singletonList(doc), null);
     }
 
@@ -384,6 +392,7 @@ protected String serializeToString(List items,
         XMLDataValue xmlVal) throws TransformerException
     {
         // If we have an empty sequence, return an empty value immediately.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6634
         if (items.isEmpty()) {
             return "";
         }
@@ -405,8 +414,10 @@ protected String serializeToString(List items,
         }
 
         // Iterate through the list and serialize each item.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         for (Object obj : items)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6634
             if (obj instanceof Attr)
             {
                 /* Step 7a: Attribute nodes.  If there is an Attribute node
@@ -436,7 +447,9 @@ protected String serializeToString(List items,
                  * explicit call to serialize the sequence, we'll throw the
                  * appropriate error (see XML.XMLSerialize()).
                  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6634
                 xmlVal.markAsHavingTopLevelAttr();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
                 serializer.transform(
                         new DOMSource((Node) obj), new StreamResult(sWriter));
             }
@@ -471,6 +484,7 @@ protected String serializeToString(List items,
                      * "serialized" as an atomic value, attribute, or
                      * text node.
                      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
                     serializer.transform(
                             new DOMSource(n), new StreamResult(sWriter));
                 }
@@ -524,6 +538,7 @@ protected List evalXQExpression(XMLDataValue xmlContext,
         // Make sure we have a compiled query.
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
                 (query != null),
                 "Failed to locate compiled XML query expression.");
         }
@@ -543,6 +558,7 @@ protected List evalXQExpression(XMLDataValue xmlContext,
                 (returnResults ? "XMLQUERY" : "XMLEXISTS"));
         } 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6624
         Document docNode = dBuilder.parse(
             new InputSource(
                 new StringReader(xmlContext.getString())));
@@ -607,6 +623,7 @@ private Object evaluate(Document doc) throws XPathExpressionException {
 
         // If we know the return type, just evaluate the expression with
         // that type.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6624
         if (returnType != null) {
             return query.evaluate(doc, returnType);
         }
@@ -640,6 +657,7 @@ private void loadSerializer() throws TransformerConfigurationException
     {
         // Set serialization properties.
         Properties props = new Properties();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
 
         // SQL/XML[2006] 10.15:General Rules:6 says method is "xml".
         props.setProperty(OutputKeys.METHOD, "xml");
@@ -713,6 +731,7 @@ private static class NullNamespaceContext implements NamespaceContext {
 
         private final static NullNamespaceContext
                 SINGLETON = new NullNamespaceContext();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6624
 
         @Override
         public String getNamespaceURI(String prefix) {
@@ -726,6 +745,7 @@ public String getPrefix(String namespaceURI) {
 
         @Override
         public Iterator<String> getPrefixes(String namespaceURI) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6998
             List<String> emptylist = Collections.emptyList();
             return emptylist.iterator();
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/StringDataValue.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/StringDataValue.java
index 2d1677bf7b..b03b50f7e8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/StringDataValue.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/StringDataValue.java
@@ -38,6 +38,7 @@ public interface StringDataValue extends ConcatableDataValue
 	/**
 	  For a character string type, the collation derivation should always be 
 	  "explicit"(not possible in Derby 10.3), "implicit" or "none". We will 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
 	  start by setting it to "implicit" in TypeDescriptorImpl. At runtime, only 
 	  character string types which are results of aggregate methods dealing 
 	  with operands with different collation types should have a collation 
@@ -248,5 +249,6 @@ public CharacterStreamDescriptor getStreamWithDescriptor()
 	 * Stuff a StringDataValue with a Clob.
 	 */
 	public void setValue( Clob value )
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
 		throws StandardException;
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/TypeId.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/TypeId.java
index eadf134154..8416bc9b04 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/TypeId.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/TypeId.java
@@ -1086,6 +1086,8 @@ public boolean isDoubleTypeId()
 		 */
 		public boolean isFixedStringTypeId()
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
 				return (formatId == StoredFormatIds.CHAR_TYPE_ID);
 		}
 
@@ -1114,6 +1116,8 @@ public boolean isBlobTypeId()
 		 */
 		public boolean isLongVarcharTypeId()
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
 				return (formatId == StoredFormatIds.LONGVARCHAR_TYPE_ID);
 		}
 
@@ -1176,6 +1180,7 @@ public boolean orderable(ClassFactory cf)
                         case StoredFormatIds.CLOB_TYPE_ID:
                         case StoredFormatIds.LONGVARCHAR_TYPE_ID:
                         case StoredFormatIds.XML_TYPE_ID:
+//IC see: https://issues.apache.org/jira/browse/DERBY-392
                         case StoredFormatIds.LONGVARBIT_TYPE_ID:
                                 return false;
 
@@ -1431,6 +1436,7 @@ public DataValueDescriptor getNull()
                         // Implementation of DECIMAL can change.
                         case StoredFormatIds.DECIMAL_TYPE_ID:
                             return new SQLDecimal();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
                         case StoredFormatIds.DOUBLE_TYPE_ID:
                                 return new SQLDouble();
@@ -1438,6 +1444,8 @@ public DataValueDescriptor getNull()
                         case StoredFormatIds.INT_TYPE_ID:
                                 return new SQLInteger();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         case StoredFormatIds.BIGINT_TYPE_ID:
                                 return new SQLLongint();
 
@@ -1685,6 +1693,7 @@ public boolean variableLength()
                         case StoredFormatIds.CHAR_TYPE_ID:
                         case StoredFormatIds.VARCHAR_TYPE_ID:
                         case StoredFormatIds.BLOB_TYPE_ID:
+//IC see: https://issues.apache.org/jira/browse/DERBY-786
                         case StoredFormatIds.CLOB_TYPE_ID:
                                  return true;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/UserType.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/UserType.java
index 3b1442a43b..03e957a3c0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/UserType.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/UserType.java
@@ -255,6 +255,7 @@ public String getTypeName()
 	 * Get the type name of this value,  overriding
 	 * with the passed in class name (for user/java types).
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	String getTypeName(String className)
 	{
 		return className;
@@ -391,6 +392,7 @@ public int compare(DataValueDescriptor other)
 
 		try
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			comparison = ((java.lang.Comparable<Object>) value).compareTo(other.getObject());
 		}
 		catch (ClassCastException cce)
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/WorkHorseForCollatorDatatypes.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/WorkHorseForCollatorDatatypes.java
index 7b14d09a5c..dfd20332a5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/WorkHorseForCollatorDatatypes.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/WorkHorseForCollatorDatatypes.java
@@ -65,6 +65,7 @@ final class WorkHorseForCollatorDatatypes
 	
 	/** @see SQLChar#stringCompare(SQLChar, SQLChar) */
 	int stringCompare(SQLChar str1, SQLChar str2)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2334
 	throws StandardException
 	{
 		CollationKey ckey1 = str1.getCollationKey();
@@ -157,6 +158,7 @@ BooleanDataValue like(DataValueDescriptor pattern,
                 !escapeCharacter.hasSingleCollationElement())
 		{
 			throw StandardException.newException(SQLState.LANG_INVALID_ESCAPE_CHARACTER,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
 					escapeCharacter.toString());
 		}
 		likeResult = Like.like(stringData.getCharArray(), 
@@ -187,6 +189,7 @@ RuleBasedCollator getCollatorForCollation()
      * @see CollationElementsInterface#hasSingleCollationElement()
      */
     boolean hasSingleCollationElement() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2699
         if (stringData.isNull()) {
             return false;
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/XML.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/XML.java
index 2c1942090d..745604034b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/XML.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/XML.java
@@ -162,6 +162,7 @@ public XML()
      */
     private XML(SQLChar val, int xmlType, boolean seqWithAttr,
             boolean materialize) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
         xmlStringValue = (val == null ? null
                                       : (SQLChar)val.cloneValue(materialize));
         setXType(xmlType);
@@ -177,6 +178,7 @@ private XML(SQLChar val, int xmlType, boolean seqWithAttr,
      * @see DataValueDescriptor#cloneValue
      */
     public DataValueDescriptor cloneValue(boolean forceMaterialization) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
         return new XML(xmlStringValue, getXType(), hasTopLevelAttr(),
                 forceMaterialization);
     }
@@ -627,6 +629,8 @@ public XMLDataValue XMLParse(
             // So do a serialization now and just store the result,
             // so that we don't have to re-serialize every time a
             // call is made to XMLSERIALIZE.
+//IC see: https://issues.apache.org/jira/browse/DERBY-688
+//IC see: https://issues.apache.org/jira/browse/DERBY-567
                 text = sqlxUtil.serializeToString(text);
             }
             else {
@@ -653,6 +657,7 @@ public XMLDataValue XMLParse(
          */ 
             throw StandardException.newException(
                 SQLState.LANG_INVALID_XML_DOCUMENT, t, t.getMessage());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1775
 
         }
 
@@ -662,6 +667,8 @@ public XMLDataValue XMLParse(
         if (xmlStringValue == null)
             xmlStringValue = new SQLChar();
         xmlStringValue.setValue(text);
+//IC see: https://issues.apache.org/jira/browse/DERBY-688
+//IC see: https://issues.apache.org/jira/browse/DERBY-567
         return this;
     }
 
@@ -699,6 +706,8 @@ public StringDataValue XMLSerialize(StringDataValue result,
                     if (SanityManager.DEBUG) {
                         SanityManager.THROWASSERT(
                             "Should NOT have made it to XMLSerialize " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-688
+//IC see: https://issues.apache.org/jira/browse/DERBY-567
                             "with a non-string target type: " + targetType);
                     }
                     return null;
@@ -716,6 +725,7 @@ public StringDataValue XMLSerialize(StringDataValue result,
             // passed collation type in determining whether we should
             // generate SQLChar vs CollatorSQLChar for instance. Keep in mind
             // that collation applies only to character string types.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5077
             try {
                 RuleBasedCollator rbs = ConnectionUtil.getCurrentLCC().getDataValueFactory().
                 getCharacterCollator(targetCollationType);
@@ -761,6 +771,8 @@ public StringDataValue XMLSerialize(StringDataValue result,
         // we already have it as a UTF-8 string, so just use
         // that.
         result.setValue(getString());
+//IC see: https://issues.apache.org/jira/browse/DERBY-688
+//IC see: https://issues.apache.org/jira/browse/DERBY-567
 
         // Seems wrong to trunc an XML document, as it then becomes non-
         // well-formed and thus useless.  So we throw an error (that's
@@ -786,6 +798,8 @@ public StringDataValue XMLSerialize(StringDataValue result,
      * @exception StandardException Thrown on error
      */
     public BooleanDataValue XMLExists(SqlXmlUtil sqlxUtil)
+//IC see: https://issues.apache.org/jira/browse/DERBY-688
+//IC see: https://issues.apache.org/jira/browse/DERBY-567
         throws StandardException
     {
         if (this.isNull()) {
@@ -828,6 +842,8 @@ public BooleanDataValue XMLExists(SqlXmlUtil sqlxUtil)
          * fail but Derby will continue to run as normal. 
          */
             throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1775
+//IC see: https://issues.apache.org/jira/browse/DERBY-6624
                 SQLState.LANG_XML_QUERY_ERROR, xe,
                 "XMLEXISTS", xe.getMessage());
         }
@@ -867,6 +883,7 @@ public XMLDataValue XMLQuery(SqlXmlUtil sqlxUtil, XMLDataValue result)
             // Return an XML data value whose contents are the
             // serialized version of the query results.
             int [] xType = new int[1];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
             List itemRefs = sqlxUtil.evalXQExpression(
                 this, true, xType);
 
@@ -901,6 +918,8 @@ public XMLDataValue XMLQuery(SqlXmlUtil sqlxUtil, XMLDataValue result)
          * fail but Derby will continue to run as normal. 
          */
             throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1775
+//IC see: https://issues.apache.org/jira/browse/DERBY-6624
                 SQLState.LANG_XML_QUERY_ERROR, xe,
                 "XMLQUERY", xe.getMessage());
         }
@@ -995,6 +1014,7 @@ public static void checkXMLRequirements()
              * provided as part the JVM if it is jdk 1.4 or
              * greater.
              */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6624
             if (!checkJAXPRequirement()) {
                 xmlReqCheck = "JAXP";
             }
@@ -1021,6 +1041,7 @@ else if (!checkXPathRequirement()) {
      */
     private static boolean checkJAXPRequirement() {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6624
             Class.forName("javax.xml.parsers.DocumentBuilderFactory");
             return true;
         } catch (Throwable t) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/types/XMLDataValue.java b/java/org.apache.derby.engine/org/apache/derby/iapi/types/XMLDataValue.java
index 33e533a6eb..5bc84430b7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/types/XMLDataValue.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/types/XMLDataValue.java
@@ -105,6 +105,8 @@ public BooleanDataValue XMLExists(SqlXmlUtil sqlxUtil)
      */
     public XMLDataValue XMLQuery(SqlXmlUtil sqlxUtil, XMLDataValue result)
 		throws StandardException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-688
+//IC see: https://issues.apache.org/jira/browse/DERBY-567
 
     /* ****
      * Helper classes and methods.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/util/DoubleProperties.java b/java/org.apache.derby.engine/org/apache/derby/iapi/util/DoubleProperties.java
index 8c6bd697a2..e007023d94 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/util/DoubleProperties.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/util/DoubleProperties.java
@@ -33,6 +33,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	second. But any put() calls are always made directly to
 	the write object.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5830
+//IC see: https://issues.apache.org/jira/browse/DERBY-4269
     Only the put(), propertyNames() and getProperty() methods are supported
 	by this class.
 */
@@ -62,7 +64,10 @@ public String getProperty(String key, String defaultValue) {
 	}
 
 	public Enumeration<Object> propertyNames() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         HashSet<Object> names = new HashSet<Object>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5830
+//IC see: https://issues.apache.org/jira/browse/DERBY-4269
         addAllNames(write, names);
         addAllNames(read, names);
         return Collections.enumeration(names);
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/util/IdUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/util/IdUtil.java
index ad776bbd21..e4f32f1e46 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/util/IdUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/util/IdUtil.java
@@ -77,6 +77,8 @@ public static String mkQualifiedName(String id1,
 										 String id2)
 	{
         if( null == id1)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3158
+//IC see: https://issues.apache.org/jira/browse/DERBY-3159
             return normalToDelimited(id2);
 		return
         normalToDelimited(id1) +
@@ -93,6 +95,8 @@ public static String mkQualifiedName(String[] ids)
 		for (int ix=0; ix < ids.length; ix++)
 		{
 			if (ix!=0) sb.append(".");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3158
+//IC see: https://issues.apache.org/jira/browse/DERBY-3159
 			sb.append(normalToDelimited(ids[ix]));
 		}
 		return sb.toString();
@@ -126,10 +130,12 @@ public static String[] parseMultiPartSQLIdentifier(String s)
 	private static String[] parseMultiPartSQLIdentifier(StringReader r)
 		 throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Vector<String> v = new Vector<String>();
 		while (true)
 		{
 			String thisId = parseId(r,true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 			v.add(thisId);
 			int dot;
 
@@ -153,6 +159,7 @@ private static String[] parseMultiPartSQLIdentifier(StringReader r)
 	}
 	
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
       Parse a SQL identifier from the String provided. Raise an excepion
       if the string does not contain a valid SQL indentifier.
       The returned String  contains the normalized form of the
@@ -164,6 +171,7 @@ public static String parseSQLIdentifier(String s)
 		 throws StandardException
 	{
 		StringReader r = new StringReader(s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 		String id = parseId(r,true);
 		verifyEmpty(r);
 		return id;
@@ -194,6 +202,7 @@ private static String parseId(StringReader r, boolean normalize)
 			if (c == '"')
 				return parseQId(r,normalize);
 			else
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 				return parseUnQId(r,normalize);
 		}
 
@@ -264,6 +273,7 @@ public static String SQLIdentifier2CanonicalPropertyUsername(String authid){
 		if (!needsQuote) {
 			result = authid.toLowerCase();
 		} else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
 			result = normalToDelimited(authid);
 		}
 
@@ -300,6 +310,7 @@ private static String parseUnQId(StringReader r, boolean normalize)
 		if (c != -1) r.reset();
         
         String id = b.toString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 
 		if (normalize)
 			return StringUtil.SQLToUpperCase(id);
@@ -360,6 +371,8 @@ else if (c == -1)
 		if (normalize)
 			return b.toString();
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-3158
+//IC see: https://issues.apache.org/jira/browse/DERBY-3159
 			return normalToDelimited(b.toString()); //Put the quotes back.
 	}
 
@@ -412,16 +425,19 @@ public static String[][] parseDbClassPath(String input)
 		if (input.length() == 0)
 			return new String[0][];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Vector<String[]> v = new Vector<String[]>();
 		java.io.StringReader r = new java.io.StringReader(input);
 		//
 		while (true)
 		{
 			try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 				String[] thisQName = IdUtil.parseMultiPartSQLIdentifier(r);
 				if (thisQName.length != 2)
 					throw StandardException.newException(SQLState.DB_CLASS_PATH_PARSE_ERROR,input);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				v.add(thisQName);
 				int delim = r.read();
 				if (delim != ':')
@@ -456,6 +472,7 @@ public static String[][] parseDbClassPath(String input)
 
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 	  Scan a list of comma separated SQL identifiers from the string provided.
       This returns an array with containing the normalized forms of the identifiers.
       
@@ -470,12 +487,14 @@ public static String[] parseIdList(String p)
 		if (p==null) return null;
 		StringReader r = new StringReader(p);
 		String[] result = parseIdList(r, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 		verifyEmpty(r);
 		return result;
 	}
 	
 	
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 	  Parse a list of comma separated SQL identifiers returning
       them a as elements in an array.
 
@@ -487,12 +506,15 @@ public static String[] parseIdList(String p)
 	private static String[] parseIdList(StringReader r, boolean normalize)
 		 throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Vector<String> v = new Vector<String>();
 		while (true)
 		{
 			int delim;
 			try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 				String thisId = IdUtil.parseId(r,normalize);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				v.add(thisId);
 				r.mark(0);
 				delim = r.read();
@@ -530,9 +552,11 @@ private static String[] parseIdList(StringReader r, boolean normalize)
 	public static String intersect(String[] l1, String[] l2)
 	{
 		if (l1 == null || l2 == null) return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		HashSet<String> h = new HashSet<String>();
 		for(int ix=0;ix<l2.length;ix++) h.add(l2[ix]); 
 		Vector<String> v = new Vector<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 		for(int ix=0;ix<l1.length;ix++) if (h.contains(l1[ix])) v.add(l1[ix]);
 		return vectorToIdList(v,true); 
 	}
@@ -562,8 +586,10 @@ private static String vectorToIdList(Vector<String> v,boolean normal)
 	 */
 	public static String getUserAuthorizationId(String userName) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		try {
             if (userName != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 			    return parseSQLIdentifier(userName);
 		}
 		catch (StandardException se) {
@@ -597,6 +623,7 @@ public static String getUserNameFromURLProps(Properties params)
 	public static String dups(String[] l)
 	{
 		if (l == null) return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		HashSet<String> h = new HashSet<String>();
 		Vector<String> v = new Vector<String>();
 		for(int ix=0;ix<l.length;ix++)
@@ -604,6 +631,7 @@ public static String dups(String[] l)
 			if (!h.contains(l[ix]))
 				h.add(l[ix]);
 			else
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				v.add(l[ix]);
 		}
 		return vectorToIdList(v,true);
@@ -620,6 +648,7 @@ public static String pruneDups(String l) throws StandardException
 		String[] normal_a = parseIdList(l);
 		StringReader r = new StringReader(l);
 		String[] external_a = parseIdList(r,false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		HashSet<String> h = new HashSet<String>();
 		Vector<String> v = new Vector<String>();
 		for(int ix=0;ix<normal_a.length;ix++)
@@ -627,6 +656,7 @@ public static String pruneDups(String l) throws StandardException
 			if (!h.contains(normal_a[ix]))
 			{
 				h.add(normal_a[ix]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				v.add(external_a[ix]);
 			}
 		}
@@ -643,6 +673,8 @@ public static String mkIdList(String[] ids)
 		for (int ix=0;ix<ids.length; ix++)
 		{
 			if (ix != 0) sb.append(",");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3158
+//IC see: https://issues.apache.org/jira/browse/DERBY-3159
 			sb.append(IdUtil.normalToDelimited(ids[ix]));
 		}
 		return sb.toString();
@@ -663,6 +695,7 @@ private static String mkIdListAsEntered(String[] externalIds )
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 	  Return true if the normalized value of an indentifier is on the list 
       of SQL identifiers provided.
 	  @param id an id in normal form
@@ -680,6 +713,7 @@ public static boolean idOnList(String id, String list)
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 	  Delete an normal value from a list of SQL identifiers.
       The returned list maintains its remaining identifiers in the
       format they were upon entry to the call.
@@ -699,6 +733,7 @@ public static String deleteId(String id, String list)
 		 throws StandardException
 	{
 		if (list==null) return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Vector<String> v = new Vector<String>();
 		StringReader r = new StringReader(list);
 		String[] enteredList_a = parseIdList(r,false);
@@ -709,7 +744,9 @@ public static String deleteId(String id, String list)
 		//compare we parse each SQL indentifier in list to convert
 		//to normal form.
 		for (int ix=0; ix < enteredList_a.length; ix++)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 			if (!id.equals(IdUtil.parseSQLIdentifier(enteredList_a[ix])))
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				v.add(enteredList_a[ix]);
 		if (v.size() == 0)
 			return null;
@@ -730,6 +767,8 @@ public static String deleteId(String id, String list)
 	public static String appendNormalToList(String id, String list)
 		 throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3158
+//IC see: https://issues.apache.org/jira/browse/DERBY-3159
         String delimitedId = normalToDelimited(id);
 		if (list==null)
 			return delimitedId;
@@ -747,6 +786,7 @@ public static String appendNormalToList(String id, String list)
 	 */
 	public static String parseRoleId(String roleName) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4475
 		roleName = roleName.trim();
 		// NONE is a special case and is not allowed with its special
 		// meaning in SET ROLE <value specification>. Even if there is
@@ -754,6 +794,7 @@ public static String parseRoleId(String roleName) throws StandardException
 		// delimited here, since it would have had to be delimited to
 		// get created, too. We could have chosen to be lenient here,
 		// but it seems safer to be restrictive.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 		if (StringUtil.SQLToUpperCase(roleName).equals("NONE")) {
 			throw StandardException.newException(SQLState.ID_PARSE_ERROR);
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/util/InterruptDetectedException.java b/java/org.apache.derby.engine/org/apache/derby/iapi/util/InterruptDetectedException.java
index eaf0020b35..870baae3f2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/util/InterruptDetectedException.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/util/InterruptDetectedException.java
@@ -35,6 +35,7 @@ public class InterruptDetectedException extends StandardException {
     */
 
     public InterruptDetectedException() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         super("intrp.U");
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/util/InterruptStatus.java b/java/org.apache.derby.engine/org/apache/derby/iapi/util/InterruptStatus.java
index 645edb055e..dd375afe34 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/util/InterruptStatus.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/util/InterruptStatus.java
@@ -79,8 +79,10 @@ public class InterruptStatus {
      * also. Use lcc if available, else thread local variable.
      */
     public static void setInterrupted() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4920
         LanguageConnectionContext lcc = null;
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             lcc = (LanguageConnectionContext)getContextOrNull(
                 LanguageConnectionContext.CONTEXT_ID);
 
@@ -112,6 +114,7 @@ public static void setInterrupted() {
     public static void saveInfoFromLcc(LanguageConnectionContext lcc) {
         
         StandardException e = lcc.getInterruptedException();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5152
 
         if (e != null) {
             exception.set(e);
@@ -197,9 +200,11 @@ public static boolean noteAndClearInterrupt(String s,
      */
     public static void restoreIntrFlagIfSeen() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4911
         LanguageConnectionContext lcc = null;
         try {
             lcc =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 (LanguageConnectionContext)getContextOrNull(
                     LanguageConnectionContext.CONTEXT_ID);
         } catch (ShutdownException e) {
@@ -248,8 +253,10 @@ public static void restoreIntrFlagIfSeen() {
     public static void restoreIntrFlagIfSeen(LanguageConnectionContext lcc) {
 
         if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4920
             LanguageConnectionContext ctxLcc = null;
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 ctxLcc = (LanguageConnectionContext)
                     getContextOrNull(LanguageConnectionContext.CONTEXT_ID);
 
@@ -290,6 +297,7 @@ public static void restoreIntrFlagIfSeen(LanguageConnectionContext lcc) {
     public static void throwIf(LanguageConnectionContext lcc)
             throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         if (Thread.currentThread().isInterrupted()) {
             setInterrupted();
         }
@@ -312,6 +320,7 @@ public static void throwIf(LanguageConnectionContext lcc)
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContextOrNull( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/util/PropertyUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/util/PropertyUtil.java
index d0eafa7d4b..ac4d7ded37 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/util/PropertyUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/util/PropertyUtil.java
@@ -71,6 +71,7 @@ public	static	String	sortProperties( Properties list )
 	public	static	String	sortProperties( Properties list, String indent )
 	{
         // Get all property names, including any defaults.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6296
         Set<String> names = (list == null)
                 ? Collections.<String>emptySet()
                 : list.stringPropertyNames();
@@ -119,6 +120,7 @@ public	static	String	sortProperties( Properties list, String indent )
      **/
     public static void copyProperties(Properties src_prop, Properties dest_prop)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6296
         for (String key : src_prop.stringPropertyNames())
         {
             dest_prop.put(key, src_prop.get(key));
@@ -166,6 +168,7 @@ public static void loadWithTrimmedValues(InputStream iStr,
 		// Now, trim off any excess whitespace, if any, and then
 		// add the properties from file to the received Properties
 		// set.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6296
         for (String tmpKey : p.stringPropertyNames()) {
 		// get the value, trim off the whitespace, then store it
 		// in the received properties object.
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/util/StringUtil.java b/java/org.apache.derby.engine/org/apache/derby/iapi/util/StringUtil.java
index b9cc5c344c..a3ecd5ca6e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/util/StringUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/util/StringUtil.java
@@ -70,6 +70,7 @@ public final static String formatForPrint(String input)
      | 08 BS | 09 HT | 0A NL | 0B VT | 0C NP | 0D CR | 0E SO | 0F SI |
      | 10 DLE| 11 DC1| 12 DC2| 13 DC3| 14 DC4| 15 NAK| 16 SYN| 17 ETB|
      | 18 CAN| 19 EM | 1A SUB| 1B ESC| 1C FS | 1D GS | 1E RS | 1F US |
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
      | 20 SP | 21  ! | 22  " | 23  # | 24  $ | 25  % | 26  &amp; | 27  ' |
      | 28  ( | 29  ) | 2A  * | 2B  + | 2C  , | 2D  - | 2E  . | 2F  / |
      | 30  0 | 31  1 | 32  2 | 33  3 | 34  4 | 35  5 | 36  6 | 37  7 |
@@ -146,6 +147,7 @@ public static String slice(String value,
 			int beginOffset, int endOffset,
 			boolean trim)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-731
 		String retval = value.substring(beginOffset, endOffset + 1);
 		
 		if (trim)
@@ -156,6 +158,7 @@ public static String slice(String value,
 
 
 	private static char[] hex_table = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3531
         '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 
         'a', 'b', 'c', 'd', 'e', 'f'
     };
@@ -167,6 +170,7 @@ public static String slice(String value,
 		<BR>
 		For each byte (b) two characaters are generated, the first character
 		represents the high nibble (4 bits) in hexidecimal (<code>b &amp; 0xf0</code>), the second character
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		represents the low nibble (<code>b &amp; 0x0f</code>).
 		<BR>
 		The byte at <code>data[offset]</code> is represented by the first two characters in the returned String.
@@ -328,6 +332,7 @@ public static boolean SQLEqualsIgnoreCase(String s1, String s2)
 			return  false;
 		else
 			return SQLToUpperCase(s1).equals(SQLToUpperCase(s2));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 
 	}
 
@@ -340,6 +345,7 @@ public static boolean SQLEqualsIgnoreCase(String s1, String s2)
 	 * @param id syntacically correct SQL identifier
 	 */
 	public static String normalizeSQLIdentifier(String id) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
 		if (id.length() == 0) {
 			return id;
 		}
@@ -442,6 +448,7 @@ public static String quoteStringLiteral(String string) {
 	 */
 	public static String ensureIndent(String formatted, int depth) {
 		StringBuffer indent = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 
 		while (depth-- > 0) {
 			indent.append("\t");
@@ -557,6 +564,7 @@ private static String doRegExpC(String src, String indent) {
      */
     public  static  String  shortDBName
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
          String canonicalDBName,
          char   separatorChar
          )
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/util/UTF8Util.java b/java/org.apache.derby.engine/org/apache/derby/iapi/util/UTF8Util.java
index 3eeb0fc03a..0676417d2d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/util/UTF8Util.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/util/UTF8Util.java
@@ -58,6 +58,7 @@ public static final long skipUntilEOF(InputStream in)
         // No need to do the skip in a loop, as Reader.read() returning -1
         // means EOF has been reached.
         // Note that a loop should be used if skip is used instead of read.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2760
         return internalSkip(in, Long.MAX_VALUE).charsSkipped();
     }
 
@@ -74,6 +75,7 @@ public static final long skipUntilEOF(InputStream in)
      */
     public static final long skipFully(InputStream in, long charsToSkip)
             throws EOFException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2760
         SkipCount skipped = internalSkip(in, charsToSkip);
         if (skipped.charsSkipped() != charsToSkip) {
             throw new EOFException("Reached end-of-stream prematurely at " +
@@ -103,6 +105,7 @@ public static final long skipFully(InputStream in, long charsToSkip)
      * @throws UTFDataFormatException if an invalid UTF-8 encoding is detected
      */
     private static final SkipCount internalSkip(final InputStream in,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2760
                                                 final long charsToSkip)
             throws IOException {
         long charsSkipped = 0;
@@ -120,6 +123,7 @@ private static final SkipCount internalSkip(final InputStream in,
                 bytesSkipped++;
             } else if ((c & 0x60) == 0x40) { // 7th bit set, 6th bit unset
                 // Found char of two byte width.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
                 if (InputStreamUtil.skipPersistent(in, 1L) != 1L) {
                     // No second byte present.
                     throw new UTFDataFormatException(
@@ -146,6 +150,7 @@ private static final SkipCount internalSkip(final InputStream in,
                         skipped = 2;
                     }
                 } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
                     skipped = (int)InputStreamUtil.skipPersistent(in, 2L);
                 }
                 if (skipped != 2) {
@@ -163,6 +168,7 @@ private static final SkipCount internalSkip(final InputStream in,
         }
         // We don't close the stream, since it might be reused. One example of
         // this is use of Resetable streams.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2760
         return new SkipCount(charsSkipped, bytesSkipped);
     }
 
@@ -182,6 +188,7 @@ private static final class SkipCount {
          * @param byteCount number of bytes
          * @param charCount number of characters
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2760
         SkipCount(long charCount, long byteCount) {
             if (byteCount < 0 || charCount < 0) {
                 // Don't allow negative counts.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/db/BasicDatabase.java b/java/org.apache.derby.engine/org/apache/derby/impl/db/BasicDatabase.java
index 6abb33d5b9..d183045f57 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/db/BasicDatabase.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/db/BasicDatabase.java
@@ -132,6 +132,7 @@ public class BasicDatabase implements ModuleControl, ModuleSupportable, Property
 	public boolean canSupport(Properties startParams) {
         boolean supported =
             Monitor.isDesiredCreateType(startParams, getEngineType());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
 
         if (supported) {
             String repliMode =
@@ -149,6 +150,7 @@ public void boot(boolean create, Properties startParams)
 		throws StandardException
 	{
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		ModuleFactory monitor = getMonitor();
 		if (create)
 		{
@@ -158,6 +160,7 @@ public void boot(boolean create, Properties startParams)
 			String localeID = 
                 startParams.getProperty(
                     org.apache.derby.shared.common.reference.Attribute.TERRITORY);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 			if (localeID == null) {
 				localeID = Locale.getDefault().toString();
@@ -168,6 +171,7 @@ public void boot(boolean create, Properties startParams)
 			databaseLocale = monitor.getLocale(this);
 		}
 		setLocale(databaseLocale);      
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 
 		// boot the validation needed to do property validation, now property
 		// validation is separated from AccessFactory, therefore from store
@@ -177,9 +181,11 @@ public void boot(boolean create, Properties startParams)
 		// registered types (DECIMAL) are there before logical undo recovery 
         // might need them.
 		DataValueFactory dvf = (DataValueFactory) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             bootServiceModule(
                 create, 
                 this,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 				org.apache.derby.shared.common.reference.ClassName.DataValueFactory, 
                 startParams);
 
@@ -191,6 +197,7 @@ public void boot(boolean create, Properties startParams)
 
         // Add the database properties read from disk (not stored
         // in service.properties) into the set seen by booting modules.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2341
 		Properties allParams =
             new DoubleProperties(getAllDatabaseProperties(), startParams);
 
@@ -202,8 +209,10 @@ public void boot(boolean create, Properties startParams)
 		bootClassFactory(create, allParams);
         
         dd = (DataDictionary)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             bootServiceModule(create, this,
                     DataDictionary.MODULE, allParams);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2341
 
 		lcf = (LanguageConnectionFactory) 
             bootServiceModule(
@@ -227,6 +236,7 @@ public void boot(boolean create, Properties startParams)
 		//
 		authenticationService = bootAuthenticationService(create, allParams);
 		if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			SanityManager.ASSERT(
                 authenticationService != null,
                 "Failed to set the Authentication service for the database");
@@ -243,6 +253,7 @@ public void boot(boolean create, Properties startParams)
 		active = true;
 
         // Create an index statistics update daemon.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4936
         if (dd.doCreateIndexStatsRefresher()) {
             dd.createIndexStatsRefresher(this, allParams.getProperty(
                         Property.PROPERTY_RUNTIME_PREFIX + "serviceDirectory"));
@@ -252,6 +263,7 @@ public void boot(boolean create, Properties startParams)
 	public void stop() {
         // The data dictionary is not available if this database has the
         // role as an active replication slave database.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5390
         if (dd != null) {
             try {
                 // on orderly shutdown, try not to leak unused numbers from
@@ -278,6 +290,7 @@ public void stop() {
      * This implementation supports the standard database.
 	  */
 	public int getEngineType() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2164
         return EngineType.STANDALONE_DB;
     }
 
@@ -313,6 +326,7 @@ public LanguageConnectionContext setupConnection(ContextManager cm, String user,
 		//a bit of a hack. Unfortunately, we can't initialize this
 		//when we push it. We first must push a few more contexts. 
 		lctx.initialize();		
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 
 		// Need to commit this to release locks gotten in initialize.  
 		// Commit it but make sure transaction not have any updates. 
@@ -329,6 +343,7 @@ public LanguageConnectionContext setupConnection(ContextManager cm, String user,
      */
     public final DataDictionary getDataDictionary()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
         return dd;
     }
 
@@ -342,6 +357,7 @@ public void pushDbContext(ContextManager cm)
 
 	public AuthenticationService getAuthenticationService()
 		throws StandardException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
 
 		// Expected to find one - Sanity check being done at
 		// DB boot-up.
@@ -367,9 +383,11 @@ public AuthenticationService getAuthenticationService()
      * @exception SQLException Thrown on error
      */
     public void startReplicationMaster(String dbmaster, String host, int port,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
                                        String replicationMode)
         throws SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3189
             af.startReplicationMaster(dbmaster, host, port, replicationMode);
         } catch (StandardException se) {
             throw PublicAPI.wrapStandardException(se);
@@ -382,6 +400,7 @@ public void startReplicationMaster(String dbmaster, String host, int port,
      * @exception SQLException Thrown on error
      */
     public void stopReplicationMaster()  throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3189
         try {
             af.stopReplicationMaster();
         } catch (StandardException se) {
@@ -410,6 +429,7 @@ public boolean isInSlaveMode() {
      * @see org.apache.derby.iapi.db.Database#failover(String)
      */
     public void failover(String dbname) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3428
         af.failover(dbname);
     }
 
@@ -433,6 +453,8 @@ public void unfreeze() throws SQLException
 
 
     public void backup(String backupDir, boolean wait) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-523
         throws SQLException
     {
 		try {
@@ -456,6 +478,8 @@ public void backupAndEnableLogArchiveMode(String  backupDir,
 			af.backupAndEnableLogArchiveMode(backupDir, 
                                              deleteOnlineArchivedLogFiles,
                                              wait); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             if ( luceneLoaded() )
             {
                 backupLucene( backupDir );
@@ -586,6 +610,7 @@ protected	UUID	makeDatabaseID(boolean create, Properties startParams)
 		
 		TransactionController tc = af.getTransaction(
 				getContextService().getCurrentContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		String  upgradeID = null;
 		UUID	databaseID;
@@ -596,6 +621,7 @@ protected	UUID	makeDatabaseID(boolean create, Properties startParams)
 			// this could be an upgrade, see if it's stored in the service set
 
 			UUIDFactory	uuidFactory  = getMonitor().getUUIDFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			
 			upgradeID = startParams.getProperty(DataDictionary.DATABASE_ID);
@@ -662,6 +688,7 @@ public boolean validate(String key,
 		if (newClasspath != null) {
 			// parse it when it is set to ensure only valid values
 			// are written to the actual conglomerate.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 			dbcp = IdUtil.parseDbClassPath(newClasspath);
 		}
 
@@ -701,6 +728,7 @@ public Serviceable apply(String key, Serializable value, Dictionary p)
 
 			//
 			// Invalidate stored plans.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
             getDataDictionary().invalidateAllSPSPlans();
 		
 			String newClasspath = (String) value;
@@ -743,9 +771,12 @@ protected void bootClassFactory(boolean create,
 
 			// parse the class path and allow 2 part names.
 			IdUtil.parseDbClassPath(classpath);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 
 			startParams.put(Property.BOOT_DB_CLASSPATH, classpath);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			cfDB = (ClassFactory) bootServiceModule(create, this,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 					org.apache.derby.shared.common.reference.Module.ClassFactory, startParams);
 	}
 
@@ -763,12 +794,14 @@ protected TransactionController getConnectionTransaction(ContextManager cm)
 
 	protected AuthenticationService bootAuthenticationService(boolean create, Properties props) throws StandardException {
 		return (AuthenticationService)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				bootServiceModule(create, this, AuthenticationService.MODULE, props);
 	}
 
 	protected void bootValidation(boolean create, Properties startParams)
 		throws StandardException {
 		pf = (PropertyFactory) bootServiceModule(create, this,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 			org.apache.derby.shared.common.reference.Module.PropertyFactory, startParams);
 	}
 
@@ -785,6 +818,7 @@ protected Properties getAllDatabaseProperties()
 		throws StandardException {
 
 		TransactionController tc = af.getTransaction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                     getContextService().getCurrentContextManager());
 		Properties dbProps = tc.getProperties();
 		tc.commit();
@@ -808,7 +842,9 @@ protected void bootResourceAdapter(boolean create, Properties allParams) {
 		try
 		{
 			resourceAdapter = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				bootServiceModule(create, this,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 										 org.apache.derby.shared.common.reference.Module.ResourceAdapter,
 										 allParams);
 		}
@@ -835,9 +871,11 @@ public StorageFile getJarFile(String schemaName, String sqlName)
 
 		long generationId = fid.getGenerationId();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         ContextManager cm = getContextService().getCurrentContextManager();
 		FileResource fr = af.getTransaction(cm).getFileHandler();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
         String externalName = JarUtil.mkExternalName(
             fid.getUUID(), schemaName, sqlName, fr.getSeparatorChar());
 
@@ -856,6 +894,7 @@ public StorageFile getJarFile(String schemaName, String sqlName)
      * </p>
      */
     private boolean luceneLoaded()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws StandardException
     {
         try {
@@ -892,6 +931,7 @@ private StorageFactory  getStorageFactory()
         throws StandardException
     {
         DataFactory dataFactory = (DataFactory) findServiceModule( this, DataFactory.MODULE );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         return dataFactory.getStorageFactory();
     }
@@ -948,12 +988,14 @@ public Boolean run()
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/db/DatabaseContextImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/db/DatabaseContextImpl.java
index 28b14b3c80..c1b76633b3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/db/DatabaseContextImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/db/DatabaseContextImpl.java
@@ -38,6 +38,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
 	A context that shutdowns down the database on a databsae exception.
 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
 final class DatabaseContextImpl extends ContextImpl implements DatabaseContext
 {
 
@@ -54,11 +55,13 @@ public void cleanupOnError(Throwable t) {
 
         // Ensure the context is popped if the session is
         // going away.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
         if (se.getSeverity() < ExceptionSeverity.SESSION_SEVERITY)
             return;
 
         popMe();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5108
         if (se.getSeverity() >= ExceptionSeverity.DATABASE_SEVERITY) {
             // DERBY-5108: Shut down the istat daemon thread before shutting
             // down the various modules belonging to the database. An active
@@ -74,9 +77,11 @@ public void cleanupOnError(Throwable t) {
         }
 
         if (se.getSeverity() == ExceptionSeverity.DATABASE_SEVERITY) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		    getContextService().notifyAllActiveThreads(this);
             // This may be called multiple times, but is short-circuited
             // in the monitor.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		    getMonitor().shutdown(db);
         }
 	}
@@ -100,6 +105,7 @@ public int hashCode() {
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/db/SlaveDatabase.java b/java/org.apache.derby.engine/org/apache/derby/impl/db/SlaveDatabase.java
index d1b4842d7e..d80da4cf08 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/db/SlaveDatabase.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/db/SlaveDatabase.java
@@ -126,14 +126,18 @@ public void boot(boolean create, Properties startParams)
         throws StandardException {
 
         inReplicationSlaveMode = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3361
+//IC see: https://issues.apache.org/jira/browse/DERBY-3356
         inBoot = true;
         shutdownInitiated = false;
 
         dbname = startParams.getProperty(SlaveFactory.SLAVE_DB);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
 
         // SlaveDatabaseBootThread is an internal class
         SlaveDatabaseBootThread dbBootThread =
             new SlaveDatabaseBootThread(create, startParams);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3447
         Thread sdbThread = 
                 new Thread(dbBootThread, "derby.slave.boot-" + dbname);
         sdbThread.setDaemon(true);
@@ -142,6 +146,8 @@ public void boot(boolean create, Properties startParams)
         // Check that the database was booted successfully, or throw
         // the exception that caused the boot to fail.
         verifySuccessfulBoot();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3361
+//IC see: https://issues.apache.org/jira/browse/DERBY-3356
 
         inBoot = false;
 
@@ -202,6 +208,7 @@ public LanguageConnectionContext setupConnection(ContextManager cm,
     }
 
     public AuthenticationService getAuthenticationService()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
         throws StandardException{
         if (inReplicationSlaveMode) {
             // Cannot get authentication service for a database that
@@ -227,6 +234,7 @@ public void verifyShutdownSlave() throws StandardException {
             throw StandardException.
                 newException(SQLState.REPLICATION_STOPSLAVE_NOT_INITIATED);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         pushDbContext(getContextService().
                       getCurrentContextManager());
     }
@@ -266,6 +274,7 @@ public  void stopReplicationSlave() throws SQLException {
     }
 
     public void failover(String dbname) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3428
         if (inReplicationSlaveMode) {
             slaveFac.failover();
             // SlaveFactory#failover will make the
@@ -278,6 +287,7 @@ public void failover(String dbname) throws StandardException {
                 try {
                     Thread.sleep(500);
                 } catch (InterruptedException ie) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.setInterrupted();
                 }
             }
@@ -310,9 +320,11 @@ public void run() {
 
             // The thread needs a ContextManager since two threads
             // cannot share a context
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
             ContextManager bootThreadCm = null;
             try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 bootThreadCm = getContextService().newContextManager();
                 getContextService().
                     setCurrentContextManager(bootThreadCm);
@@ -324,10 +336,12 @@ public void run() {
                 inReplicationSlaveMode = false; 
 
                 if (bootThreadCm != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                     getContextService().
                         resetCurrentContextManager(bootThreadCm);
                     bootThreadCm = null;
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4269
             } catch (Exception e) {
                 // We get here when SlaveController#stopSlave has been called,
                 // a fatal Derby exception has been thrown, or if a run-time
@@ -358,6 +372,8 @@ public void run() {
      * to fail.
      */
     private void verifySuccessfulBoot() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3361
+//IC see: https://issues.apache.org/jira/browse/DERBY-3356
         while (!(isSlaveFactorySet() && slaveFac.isStarted())) {
             if (bootException != null) {
                 throw bootException;
@@ -365,12 +381,14 @@ private void verifySuccessfulBoot() throws StandardException {
                 try {
                     Thread.sleep(500);
                 } catch (InterruptedException ie) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.setInterrupted();
                 }
             }
         }
 
         if (bootException != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4186
 
             // DERBY-4186: This is a corner case. Master made us shut down
             // before the initial connect which establishes the slave has
@@ -398,6 +416,7 @@ private boolean isSlaveFactorySet() {
         }
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             slaveFac = (SlaveFactory)
                 findServiceModule(this, SlaveFactory.MODULE);
             return true;
@@ -437,6 +456,7 @@ private void handleShutdown(StandardException shutdownCause) {
 
             InternalDriver driver = InternalDriver.activeDriver();
             if (driver != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
                 driver.connect( conStr, (Properties) null, 0 );
             }
         } catch (Exception e) {
@@ -458,12 +478,14 @@ private void bootBasicDatabase(boolean create, Properties params)
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/db/StoreClassFactoryContext.java b/java/org.apache.derby.engine/org/apache/derby/impl/db/StoreClassFactoryContext.java
index 5cb4d85db2..257bcc2126 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/db/StoreClassFactoryContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/db/StoreClassFactoryContext.java
@@ -46,6 +46,7 @@ final class StoreClassFactoryContext extends ClassFactoryContext {
 	public CompatibilitySpace getLockSpace() throws StandardException {
 		if (store == null)
 			return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		return store.getTransaction(getContextManager()).getLockSpace();
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/BaseStorageFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/BaseStorageFactory.java
index d8e3fc4d5e..9c3da786c8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/BaseStorageFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/BaseStorageFactory.java
@@ -266,6 +266,7 @@ else if( isReadOnlyDatabase())
         tempDir.deleteAll();
 
         tempDir.mkdirs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
         tempDir.limitAccessToOwner();
         tempDirPath = tempDir.getPath();
     } // end of createTempDir
@@ -293,6 +294,7 @@ public int getStorageFactoryVersion()
      */
     public StorageFile createTemporaryFile (String prefix, String suffix)
                                                             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
         File tmpFile = File.createTempFile (prefix, suffix,
                 new File (getTempDir().getPath()));
         return newStorageFile (getTempDir(), tmpFile.getName());
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/CPFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/CPFile.java
index de6b43c471..54d8543405 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/CPFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/CPFile.java
@@ -34,6 +34,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * This class provides a class path based implementation of the StorageFile interface. It is used by the
  * database engine to access persistent data and transaction logs under the classpath subsubprotocol.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6535
 class CPFile extends InputStreamFile<CPStorageFactory>
 {
 
@@ -64,6 +65,7 @@ private CPFile( CPStorageFactory storageFactory, String child, int pathLen)
      */
     public boolean exists()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
     	return getURL() != null;
     } // end of exists
 
@@ -86,6 +88,7 @@ StorageFile getParentDir( int pathLen)
      */
     public InputStream getInputStream( ) throws FileNotFoundException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
         InputStream is = null;
         ClassLoader cl = getContextClassLoader(Thread.currentThread());
         if (cl != null) {
@@ -121,6 +124,7 @@ private URL getURL() {
 
         ClassLoader cl = getContextClassLoader(Thread.currentThread());
         if (cl != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6534
             URL myURL = getResource(cl, path);
             if (myURL != null)
                 return myURL;
@@ -133,6 +137,7 @@ private URL getURL() {
         // null as a return from Class.getClassLoader()
         // to indicate the system/bootstrap classloader.
         if (cl != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
             return getResource(cl, path);
         } else {
             return getSystemResource(path);
@@ -171,6 +176,7 @@ public URL run() {
      * Privileged wrapper for {@code ClassLoader.getResourceAsStream(String)}.
      */
     private static InputStream getResourceAsStream(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
             final ClassLoader cl, final String name) {
         return AccessController.doPrivileged(
                 new PrivilegedAction<InputStream>() {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/DirFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/DirFile.java
index 06c0fd464e..0f3a424324 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/DirFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/DirFile.java
@@ -109,6 +109,7 @@ public StorageFile getParentDir()
      */
     public OutputStream getOutputStream( ) throws FileNotFoundException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
         return getOutputStream(false);
     }
     
@@ -129,9 +130,12 @@ public OutputStream getOutputStream( final boolean append) throws FileNotFoundEx
     {
         boolean exists = exists();
         OutputStream result = new FileOutputStream(this, append);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         if (!exists) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
                 limitAccessToOwner();
             } catch (FileNotFoundException fnfe) {
                 // Throw FileNotFoundException unchanged.
@@ -190,6 +194,7 @@ public synchronized int getExclusiveFileLock() throws StandardException
         ** of a warning.
         **/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         try
         {
             //create the file that us used to acquire exclusive lock if it does not exists.
@@ -375,6 +380,7 @@ public boolean renameTo( StorageFile newName)
         boolean rename_status = super.renameTo( (File) newName);
         int     retry_count   = 1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5574
         while (!rename_status && (retry_count <= 5))
         {
             // retry operation, hoping a temporary I/O resource issue is 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/DirRandomAccessFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/DirRandomAccessFile.java
index 572f35ad4a..e48c5e53ab 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/DirRandomAccessFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/DirRandomAccessFile.java
@@ -58,6 +58,7 @@ class DirRandomAccessFile extends RandomAccessFile implements StorageRandomAcces
     DirRandomAccessFile( File name, String mode) throws FileNotFoundException
     {
         super( name, mode);
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         _name = name;
         _mode = mode;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/DirStorageFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/DirStorageFactory.java
index dfed1facea..72838fa495 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/DirStorageFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/DirStorageFactory.java
@@ -152,6 +152,7 @@ public void sync( OutputStream stream, boolean metaData) throws IOException, Syn
      */
     public boolean supportsWriteSync()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return true;
     }
 
@@ -184,6 +185,7 @@ else if( home != null && dataDirectory.startsWith( home))
             else
             {
                 databaseRoot = new File( home, dataDirectory);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1618
                 if (home != null)
                     dataDirectory = home + getSeparator() +  dataDirectory;
             }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/InputStreamFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/InputStreamFile.java
index a6c2d67f13..a537f86852 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/InputStreamFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/InputStreamFile.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * classpath, jar, http, and https subsubprotocols
  * @param <F> the storage factory class used by the subsubprotocol
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6535
 abstract class InputStreamFile<F extends BaseStorageFactory>
     implements StorageFile
 {
@@ -57,6 +58,7 @@ abstract class InputStreamFile<F extends BaseStorageFactory>
         }
         else
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6535
             StringBuilder sb =
                     new StringBuilder(storageFactory.separatedDataDirectory);
             if( File.separatorChar != '/')
@@ -68,6 +70,7 @@ abstract class InputStreamFile<F extends BaseStorageFactory>
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6535
     InputStreamFile(F storageFactory, String parent, String name)
     {
         this.storageFactory = storageFactory;
@@ -89,6 +92,7 @@ abstract class InputStreamFile<F extends BaseStorageFactory>
         nameStart = this.path.lastIndexOf( '/') + 1;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6535
     InputStreamFile(InputStreamFile<F> dir, String name)
     {
         this.storageFactory = dir.storageFactory;
@@ -102,6 +106,7 @@ abstract class InputStreamFile<F extends BaseStorageFactory>
         nameStart = this.path.lastIndexOf( '/') + 1;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6535
     InputStreamFile(F storageFactory, String child, int pathLen)
     {
         this.storageFactory = storageFactory;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/JarDBFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/JarDBFile.java
index eefdb93a29..7d478806e0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/JarDBFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/JarDBFile.java
@@ -31,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * This class provides a jar file based implementation of the StorageFile interface. It is used by the
  * database engine to access persistent data and transaction logs under the jar subsubprotocol.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6535
 class JarDBFile extends InputStreamFile<JarStorageFactory>
 {
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/JarStorageFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/JarStorageFactory.java
index 451542add9..44d583a71a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/JarStorageFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/JarStorageFactory.java
@@ -84,6 +84,7 @@ void doInit() throws IOException
             return;
         // Parse the dataDirectory name. It should be of the form "(jar-file)directory" or "jar-file"
         int offset = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4472
         while( offset < dataDirectory.length() && Character.isSpaceChar( dataDirectory.charAt( offset)))
             offset ++;
         int leftParen = -1;
@@ -99,6 +100,7 @@ void doInit() throws IOException
         {
             jarFile = getJarFile( dataDirectory.substring( leftParen + 1, rightParen));
             offset = rightParen + 1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4472
             while( offset < dataDirectory.length() && Character.isSpaceChar( dataDirectory.charAt( offset)))
                 offset ++;
             dataDirectory = dataDirectory.substring( offset, dataDirectory.length());
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/URLFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/URLFile.java
index ac91cf21b8..f0cff7145f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/URLFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/URLFile.java
@@ -33,6 +33,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * This class provides a http based implementation of the StorageFile interface. It is used by the
  * database engine to access persistent data and transaction logs under the http and https subsubprotocols.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6535
 class URLFile extends InputStreamFile<URLStorageFactory>
 {
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/VFMemoryStorageFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/VFMemoryStorageFactory.java
index 2f93068eb0..86bc2c17c5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/VFMemoryStorageFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/VFMemoryStorageFactory.java
@@ -98,17 +98,20 @@ public VFMemoryStorageFactory() {
      * @exception IOException on an error (unexpected).
      */
     public void init(String home, String databaseName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4093
                      String tempDirNameIgnored, String uniqueName)
             throws IOException {
         // Handle cases where a database name is specified.
         if (databaseName != null) {
             if (home != null &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
                     !new File(databaseName).isAbsolute()) {
                 canonicalName = new File(home, databaseName).getCanonicalPath();
             } else {
                 canonicalName = new File(databaseName).getCanonicalPath();
             }
             synchronized (DATABASES) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
                 this.dbData = (DataStore)DATABASES.get(canonicalName);
                 // If the store has been scheduled for deletion, purge it.
                 if (dbData != null && dbData.scheduledForDeletion()) {
@@ -122,6 +125,7 @@ public void init(String home, String databaseName,
                         // Create a new data store.
                         this.dbData = new DataStore(canonicalName);
                         DATABASES.put(canonicalName, dbData);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4432
                     } else {
                         // We have a database name, but no unique name.
                         // Assume that the client only wants to do some
@@ -133,6 +137,7 @@ public void init(String home, String databaseName,
             }
             // Specify the data directory and the temp directory.
             dataDirectory = new VirtualFile(canonicalName, dbData);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4094
             tempDir = new VirtualFile(normalizePath(canonicalName, "tmp"),
                                       dbData);
 
@@ -145,6 +150,7 @@ public void init(String home, String databaseName,
             // directory names of the database locations, but the
             // databases themselves will be stored in separate stores.
             final String absHome = new File(home).getCanonicalPath();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4432
             dbData = DUMMY_STORE;
             dataDirectory = new VirtualFile(absHome, dbData);
             tempDir = new VirtualFile(getSeparator() + "tmp", dbData);
@@ -154,8 +160,10 @@ public void init(String home, String databaseName,
         // Creating the temporary directory too early casues the
         // BaseDataFileFactory to fail, hence the check for uniqueName.
         // This check is also used by BaseStorageFactory.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4093
         if (uniqueName != null && tempDir != null && !tempDir.exists()) {
             tempDir.mkdirs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             tempDir.limitAccessToOwner(); // nop, but follow pattern
         }
     }
@@ -168,6 +176,7 @@ public void shutdown() {
         // If the data store has been scheduled for deletion, which happens
         // when the store detects that the service root has been deleted, then
         // delete the whole store to release the memory.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
         if (dbData.scheduledForDeletion()) {
             DataStore store;
             synchronized (DATABASES) {
@@ -212,6 +221,7 @@ public StorageFile newStorageFile(String path) {
             // Return the database directory as described by StorageFactory.
             return dataDirectory;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4094
         return new VirtualFile(normalizePath(path), dbData);
     }
 
@@ -223,6 +233,7 @@ public StorageFile newStorageFile(String path) {
      * @return A path handle.
      */
     public StorageFile newStorageFile(String directoryName, String fileName) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4094
             return new VirtualFile(
                                 normalizePath(directoryName, fileName), dbData);
     }
@@ -236,6 +247,7 @@ public StorageFile newStorageFile(String directoryName, String fileName) {
      */
     public StorageFile newStorageFile(StorageFile directoryName,
                                       String fileName) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4094
         return newStorageFile(directoryName == null ? null
                                                     : directoryName.getPath(),
                               fileName);
@@ -336,8 +348,11 @@ public boolean supportsWriteSync() {
      * @throws NullPointerException if {@code file} is {@code null}
      */
     private String normalizePath(String dir, String file) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5393
         if (dir == null || dir.length() == 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4094
             dir = dataDirectory.getPath();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         } else if (!new File(dir).isAbsolute()) {
             dir = new File(dataDirectory.getPath(), dir).getPath();
         }
@@ -353,8 +368,10 @@ private String normalizePath(String dir, String file) {
      * @return A path.
      */
     private String normalizePath(String path) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5393
         if (path == null || path.length() == 0) {
             return dataDirectory.getPath();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         } else if (new File(path).isAbsolute()) {
             return path;
         } else {
@@ -369,6 +386,7 @@ private String normalizePath(String path) {
      * @param dbPath absolute path of the dropped database
      */
     private void dbDropCleanupInDummy(String dbPath) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
         while (dbPath != null && DUMMY_STORE.deleteEntry(dbPath)) {
             dbPath = new File(dbPath).getParent();
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
index 8ed241dd74..b9efe0f057 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/BlockedByteArray.java
@@ -140,9 +140,11 @@ public synchronized long length() {
      */
     public synchronized void setLength(final long newLength) {
         // If capacity is requested before any writes has taken place.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4103
         if (blockSize == 0) {
             checkBlockSize((int)Math.min(Integer.MAX_VALUE, newLength));
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5098
         final long currentCapacity = (long)allocatedBlocks * blockSize;
         if (newLength > currentCapacity) {
             // Allocate more blocks.
@@ -187,6 +189,7 @@ public synchronized int writeBytes(final long pos, final byte[] buf,
             throw new ArrayIndexOutOfBoundsException(len);
         }
         // Increase the capacity if required.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5098
         increaseCapacity(pos + len);
         // Calculate the block number and the index within this block.
         int block = (int)(pos / blockSize);
@@ -224,6 +227,7 @@ public synchronized int writeByte(long pos, byte b) {
             checkBlockSize(0);
         }
         // Increase the capacity if required.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5098
         increaseCapacity(pos);
         // Calculate the block number and the index within this block.
         int block = (int)(pos / blockSize);
@@ -292,10 +296,12 @@ private void checkBlockSize(int len) {
      */
     //@GuardedBy("this")
     private void increaseCapacity(long lastIndex) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4103
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(blockSize > 0, "Invalid/unset block size");
         }
         // Safe-guard to avoid overwriting existing data.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5098
         if (lastIndex < (long)allocatedBlocks * blockSize) {
             return;
         }
@@ -308,6 +314,7 @@ private void increaseCapacity(long lastIndex) {
             // holder array, we don't fill it with data blocks before needed.
             int growTo = Math.max(
                     // Grow at least ~33%.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4103
                     blocks.length + (blocks.length / 3),
                     // For cases where we need to grow more than 33%.
                     blocksRequired + MIN_HOLDER_GROWTH);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/DataStore.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/DataStore.java
index 20e969703c..01d2aea5e9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/DataStore.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/DataStore.java
@@ -94,6 +94,7 @@ public String getDatabaseName() {
      *      {@code false} otherwise.
      */
     public boolean scheduledForDeletion() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
         return this.deleteMe;
     }
 
@@ -111,6 +112,7 @@ public boolean scheduledForDeletion() {
      */
     public DataStoreEntry createEntry(String iPath, boolean isDir) {
         // Normalize the path.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         final String nPath = new File(iPath).getPath();
         synchronized (LOCK) {
             if (files.containsKey(nPath)) {
@@ -119,6 +121,7 @@ public DataStoreEntry createEntry(String iPath, boolean isDir) {
             // Make sure the the parent directories exists.
             String[] parents = getParentList(nPath);
             for (int i=parents.length -1; i >= 0; i--) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 DataStoreEntry entry = files.get(parents[i]);
                 if (entry == null) {
                     return null;
@@ -139,12 +142,14 @@ public DataStoreEntry createEntry(String iPath, boolean isDir) {
      *      or were created, {@code false} otherwise
      */
     public boolean createAllParents(String path) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         final String nPath = new File(path).getPath();
         // Iterate through the list and create the missing parents.
         String[] parents = getParentList(nPath);
         synchronized (LOCK) {
             for (int i=parents.length -1; i >= 0; i--) {
                 String subPath = parents[i];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 DataStoreEntry entry = files.get(subPath);
                 if (entry == null) {
                     createEntry(subPath, true);
@@ -167,9 +172,11 @@ public boolean createAllParents(String path) {
      * @return {@code true} if the entry was deleted, {@code false} otherwise.
      */
     public boolean deleteEntry(String iPath) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         final String nPath = new File(iPath).getPath();
         DataStoreEntry entry;
         synchronized (LOCK) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             entry = files.remove(nPath);
             if (entry != null) {
                 if (entry.isDirectory()) {
@@ -181,6 +188,7 @@ public boolean deleteEntry(String iPath) {
                     }
                     // Check if we just deleted the service root. Normally the
                     // service would be deleted using deleteAll.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
                     if (nPath.equals(databaseName) &&
                             files.get(databaseName) == null) {
                         // Service root deleted, mark this store for removal.
@@ -203,6 +211,7 @@ public boolean deleteEntry(String iPath) {
     public DataStoreEntry getEntry(String iPath) {
         synchronized (LOCK) {
             // Use java.io.File to normalize the path.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             return files.get(new File(iPath).getPath());
         }
     }
@@ -217,6 +226,7 @@ public DataStoreEntry getEntry(String iPath) {
     public boolean deleteAll(String iPath) {
         final String nPath = new File(iPath).getPath();
         synchronized (LOCK) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             DataStoreEntry entry = files.remove(nPath);
             if (entry == null) {
                 // Delete root doesn't exist.
@@ -224,6 +234,7 @@ public boolean deleteAll(String iPath) {
             } else if (entry.isDirectory()) {
                 // Delete root is a directory.
                 boolean deleted = _deleteAll(nPath);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
                 if (files.get(databaseName) == null) {
                     // The service root has been deleted, which means that all
                     // the data has been deleted. Mark this store for removal.
@@ -250,11 +261,13 @@ public String[] listChildren(String iPath) {
             throw new IllegalArgumentException(
                     "The empty string is not a valid path");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         String nPath = new File(iPath).getPath();
         // Make sure the search path ends with the separator.
         if (nPath.charAt(nPath.length() -1) != SEP) {
             nPath += SEP;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<String> children = new ArrayList<String>();
         synchronized (LOCK) {
             Iterator<String> paths = files.keySet().iterator();
@@ -262,6 +275,7 @@ public String[] listChildren(String iPath) {
             while (paths.hasNext()) {
                 candidate = paths.next();
                 if (candidate.startsWith(nPath)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                     candidate = candidate.substring(nPath.length());
                     // don't include grandchildren
                     if ( candidate.indexOf( PathUtil.SEP_STR ) < 0 )
@@ -283,12 +297,14 @@ public String[] listChildren(String iPath) {
      *      file already existed or the existing file doesn't exist.
      */
     public boolean move(StorageFile currentFile, StorageFile newFile) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         final String currentPath = new File(currentFile.getPath()).getPath();
         final String newPath = new File(newFile.getPath()).getPath();
         synchronized (LOCK) {
             if (files.containsKey(newPath)) {
                 return false;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             DataStoreEntry current = files.remove(currentPath);
             if (current == null) {
                 return false;
@@ -303,6 +319,7 @@ public boolean move(StorageFile currentFile, StorageFile newFile) {
      */
     public void purge() {
         synchronized (LOCK) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             Iterator<DataStoreEntry> fileIter = files.values().iterator();
             while (fileIter.hasNext()) {
                 (fileIter.next()).release();
@@ -327,6 +344,7 @@ private boolean _deleteAll(String prefixPath) {
         if (prefixPath.charAt(prefixPath.length() -1) != SEP) {
             prefixPath += SEP;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<String> toDelete = new ArrayList<String>();
         Iterator<String> paths = files.keySet().iterator();
         // Find all the entries to delete.
@@ -341,7 +359,9 @@ private boolean _deleteAll(String prefixPath) {
         // Iterate through all entries found and release them.
         Iterator keys = toDelete.iterator();
         while (keys.hasNext()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             DataStoreEntry entry = files.remove((String)keys.next());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
             entry.release();
         }
         return true;
@@ -368,7 +388,9 @@ public long getTempFileCounter() {
      * @return A list of parents.
      */
     private String[] getParentList(String path) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<String> parents = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         String parent = path;
         // Build the list of parents.
         while ((parent = new File(parent).getParent()) != null) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/DataStoreEntry.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/DataStoreEntry.java
index 401b291e7d..c1d7174d9d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/DataStoreEntry.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/DataStoreEntry.java
@@ -147,6 +147,7 @@ public boolean isReadOnly() {
      */
     void release() {
         released = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         if (src != null) {
             src.release();
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/VirtualRandomAccessFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/VirtualRandomAccessFile.java
index 7e849f9321..243c04f367 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/VirtualRandomAccessFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/io/vfmem/VirtualRandomAccessFile.java
@@ -70,6 +70,7 @@ public class VirtualRandomAccessFile
     public VirtualRandomAccessFile(DataStoreEntry entry, boolean readOnly)
             throws FileNotFoundException {
         this.entry = entry;
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         _readOnly = readOnly;
         bIn = entry.getInputStream();
         bIn.setPosition(0L);
@@ -87,6 +88,7 @@ public VirtualRandomAccessFile(DataStoreEntry entry, boolean readOnly)
 
     public  VirtualRandomAccessFile clone()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         try {
             return new VirtualRandomAccessFile( entry, _readOnly );
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/AutoPositioningStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/AutoPositioningStream.java
index 8bde5b91fc..a7f4ca9def 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/AutoPositioningStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/AutoPositioningStream.java
@@ -156,6 +156,7 @@ private void setPosition () throws IOException {
             }
         }
         catch (StandardException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             throw Util.newIOException(se);
         }
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java
index 6b3bbbb2f3..64b8666429 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java
@@ -28,10 +28,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.io.EOFException;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 	Converts a stream containing the Derby stored binary form
 	to one that just contains the application's data.
 	Simply read and save the length information.
 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2812
 class BinaryToRawStream
 extends java.io.FilterInputStream
 {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ClobAsciiStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ClobAsciiStream.java
index 3eaaab81f6..e311e56288 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ClobAsciiStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ClobAsciiStream.java
@@ -56,6 +56,7 @@ final class ClobAsciiStream extends OutputStream {
      *             output stream has been closed.
      */
     public void write(int b) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2618
         writer.write(b & 0xff);
     }
 
@@ -90,10 +91,12 @@ public void write(int b) throws IOException {
      */
     public void write(byte[] b, int off, int len) throws IOException {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2618
         while (len > 0)
         {
             int clen = Math.min(len, buffer.length);
             for (int i = 0; i < clen; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2618
                 buffer[i] = (char)(b[off + i] & 0xff);
             }
             writer.write(buffer, 0, clen);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java
index e79ba7264c..fee5a74f3e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ClobUtf8Writer.java
@@ -42,6 +42,7 @@ final class ClobUtf8Writer extends Writer {
      * @param control worker object for the CLOB value
      * @param pos initial <b>byte</b> position in the CLOB value
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2827
     ClobUtf8Writer(TemporaryClob control, long pos) {
         this.control = control;
         this.pos = pos;
@@ -64,6 +65,7 @@ final class ClobUtf8Writer extends Writer {
     public void flush() throws IOException {
         if (closed)
             throw new IOException (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
                 MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         // A no-op.
         // Flushing is currently the responsibility of the underlying stream(s).
@@ -92,6 +94,7 @@ public void close() {
     public void write(char[] cbuf, int off, int len) throws IOException {
         if (closed)
             throw new IOException (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
                 MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         try {
             long ret = control.insertString (String.copyValueOf (
@@ -101,6 +104,7 @@ public void write(char[] cbuf, int off, int len) throws IOException {
                 pos += ret;
         }
         catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             throw Util.newIOException(e);
         }
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ConnectionChild.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ConnectionChild.java
index b8014b7443..40faaad1d8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ConnectionChild.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ConnectionChild.java
@@ -152,13 +152,16 @@ java.util.Calendar getCal() {
 	}
 
     static SQLException newSQLException(String messageId, Object... args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
         return EmbedConnection.newSQLException(messageId, args);
     }
 
     protected static void restoreIntrFlagIfSeen(
         boolean pushStack, EmbedConnection ec) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         if (pushStack) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
             InterruptStatus.restoreIntrFlagIfSeen( getLCC( ec ) );
         } else {
             // no lcc if connection is closed:
@@ -169,6 +172,7 @@ protected static void restoreIntrFlagIfSeen(
 	/**
 	  *	Get and cache the LanguageConnectionContext for this connection.
 	  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
 	LanguageConnectionContext	getLanguageConnectionContext( final EmbedConnection conn )
 	{
         if ( lcc == null ) { lcc = getLCC( conn ); }
@@ -180,6 +184,7 @@ LanguageConnectionContext	getLanguageConnectionContext( final EmbedConnection co
 	  */
 	static LanguageConnectionContext	getLCC( final EmbedConnection conn )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         return AccessController.doPrivileged
             (
              new PrivilegedAction<LanguageConnectionContext>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedBlob.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedBlob.java
index e0abbeb6e9..6de7848228 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedBlob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedBlob.java
@@ -68,6 +68,7 @@ multiple threads and sucks data from the stream (returned from
 
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3576
 final class EmbedBlob extends ConnectionChild implements Blob, EngineLOB
 {
     /**
@@ -132,6 +133,7 @@ final class EmbedBlob extends ConnectionChild implements Blob, EngineLOB
      *
      */
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
      EmbedBlob(byte [] blobBytes,EmbedConnection con) throws SQLException {
         super(con);
          try {
@@ -154,6 +156,7 @@ final class EmbedBlob extends ConnectionChild implements Blob, EngineLOB
       This constructor should only be called by EmbedResultSet.getBlob
     */
     protected EmbedBlob(DataValueDescriptor dvd, EmbedConnection con)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5760
         throws StandardException, SQLException
     {
         super(con);
@@ -163,6 +166,7 @@ protected EmbedBlob(DataValueDescriptor dvd, EmbedConnection con)
             SanityManager.ASSERT(!dvd.isNull(), "blob is created on top of a null column");
 
         /*
+//IC see: https://issues.apache.org/jira/browse/DERBY-4102
            We support three scenarios at this point:
             a) The Blob value is already represented as bytes in memory.
                This is the case for small Blobs (less than 32 KB).
@@ -174,10 +178,13 @@ This is the case for small Blobs (less than 32 KB).
                stream and store it temporarily until it is either discarded or
                inserted into the database.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         if (dvd.hasStream()) { // Cases b) and c)
             streamPositionOffset = handleStreamValue(dvd.getStream(), con);
         } else { // a) Blob already materialized in memory
             materialized = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
             streamPositionOffset = Integer.MIN_VALUE;
             // copy bytes into memory so that blob can live after result set
             // is closed
@@ -189,11 +196,17 @@ This is the case for small Blobs (less than 32 KB).
                 control = new LOBStreamControl (
                             getEmbedConnection(), dvdBytes);
             } catch (IOException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5760
                 throw Util.setStreamFailure(e);
             }
         }
         //add entry in connection so it can be cleared 
         //when transaction is not valid
+//IC see: https://issues.apache.org/jira/browse/DERBY-3354
+//IC see: https://issues.apache.org/jira/browse/DERBY-3354
+//IC see: https://issues.apache.org/jira/browse/DERBY-3354
+//IC see: https://issues.apache.org/jira/browse/DERBY-3354
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         con.addLOBReference (this);
     }
 
@@ -209,6 +222,7 @@ This is the case for small Blobs (less than 32 KB).
      *      data to temporary storage fails
      */
     private int handleStreamValue(InputStream dvdStream, EmbedConnection con)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5760
             throws StandardException, SQLException {
         int offset = 0;
         // b) Resetable stream
@@ -224,24 +238,30 @@ private int handleStreamValue(InputStream dvdStream, EmbedConnection con)
              implementing the getStream() method for dvd.getStream(), does not
              guarantee this for us
              */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
             if (SanityManager.DEBUG) {
                 SanityManager.ASSERT(dvdStream instanceof Resetable);
             }
             // Create a position aware stream on top of dvdStream so we can
             // more easily move back and forth in the Blob.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3970
                 myStream = new PositionedStoreStream(dvdStream);
                 // The BinaryToRawStream will read the encoded length bytes.
                 BinaryToRawStream tmpStream =
                         new BinaryToRawStream(myStream, con);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
                 offset = (int)myStream.getPosition();
                 // Check up front if the stream length is specified.
                 streamLength = tmpStream.getLength();
                 tmpStream.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3970
             } catch (StandardException se) {
                 if (se.getMessageId().equals(SQLState.DATA_CONTAINER_CLOSED)) {
                     throw StandardException
                             .newException(SQLState.BLOB_ACCESSED_AFTER_COMMIT);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3768
                 } else {
                     throw se;
                 }
@@ -252,8 +272,10 @@ implementing the getStream() method for dvd.getStream(), does not
         // c) Non-resetable stream
         //    This is most likely a stream coming in from the user, and we
         //    don't have any guarantees on how it behaves.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         } else {
             // The code below will only work for RawToBinaryFormatStream.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4102
             if (SanityManager.DEBUG) {
                 SanityManager.ASSERT(
                         dvdStream instanceof RawToBinaryFormatStream,
@@ -262,6 +284,7 @@ implementing the getStream() method for dvd.getStream(), does not
             // The source stream isn't resetable, so we have to write it to a
             // temporary location to be able to support the Blob operations.
             materialized = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
             offset = Integer.MIN_VALUE;
             try {
                 control = new LOBStreamControl(getEmbedConnection());
@@ -282,9 +305,11 @@ implementing the getStream() method for dvd.getStream(), does not
                 }
                 tmpStream.close();
             } catch (IOException ioe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5760
                 throw Util.setStreamFailure(ioe);
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         return offset;
     }
 
@@ -318,16 +343,19 @@ private long setBlobPosition(long logicalPos)
             // Nothing to do here, except checking if the position is valid.
             if (logicalPos >= control.getLength()) {
                 throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         SQLState.BLOB_POSITION_TOO_LARGE, logicalPos);
             }
         } else {
             // Reposition the store stream, account for the length field offset.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2379
             try {
                 this.myStream.reposition(
                         logicalPos + this.streamPositionOffset);
             } catch (EOFException eofe) {
                 throw StandardException.newException(
                         SQLState.BLOB_POSITION_TOO_LARGE, eofe,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         logicalPos);
             }
         }
@@ -347,6 +375,7 @@ private long setBlobPosition(long logicalPos)
      *      fails
      */
     private int read(long pos)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
             throws IOException, StandardException {
         int c;
         if (materialized) {
@@ -377,6 +406,7 @@ public long length()
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
         try {
             if (materialized)
                 return control.getLength ();
@@ -384,6 +414,7 @@ public long length()
         catch (IOException e) {
             throw Util.setStreamFailure (e);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3768
         if (streamLength != -1)
             return streamLength;
         
@@ -407,11 +438,13 @@ public long length()
                 }
 
                 streamLength = InputStreamUtil.skipUntilEOF(tmpStream);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
 
                 tmpStream.close();
                 // Save for future uses.
 
                 restoreIntrFlagIfSeen(pushStack, ec);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
 
                 return streamLength;
             }
@@ -463,16 +496,20 @@ public byte[] getBytes(long startPos, int length)
         {
             if (startPos < 1)
                 throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     SQLState.BLOB_BAD_POSITION, startPos);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1516
             if (length < 0)
                 throw StandardException.newException(
                     SQLState.BLOB_NONPOSITIVE_LENGTH, length);
 
             byte[] result;
             // if the blob is materialized
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             if (materialized) {
                  result = new byte [length];
                  int sz = control.read (result, 0, result.length, startPos - 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                  if (sz == -1) {
                      InterruptStatus.restoreIntrFlagIfSeen();
                      return new byte [0];
@@ -493,6 +530,7 @@ public byte[] getBytes(long startPos, int length)
                     if (pushStack)
                         setupContextStack();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
                     setBlobPosition(startPos-1);
                     // read length bytes into a string
                     result = new byte[length];
@@ -511,6 +549,7 @@ public byte[] getBytes(long startPos, int length)
                         System.arraycopy(result,0,result2,0,n);
 
                         restoreIntrFlagIfSeen(pushStack, ec);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
 
                         return result2;
                     }
@@ -524,8 +563,12 @@ public byte[] getBytes(long startPos, int length)
         }
         catch (StandardException e)
         {  // if this is a setPosition exception then we ran out of Blob
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
             if (e.getMessageId().equals(SQLState.BLOB_LENGTH_TOO_LONG))
                 e = StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     SQLState.BLOB_POSITION_TOO_LARGE, startPos);
             throw handleMyExceptions(e);
         }
@@ -560,8 +603,10 @@ public java.io.InputStream getBinaryStream()
         try
         {
             // if we have byte array, not a stream
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             if (materialized)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 java.io.InputStream result = control.getInputStream(0);
                 return result;
             }
@@ -571,6 +616,7 @@ public java.io.InputStream getBinaryStream()
 
                 synchronized (getConnectionSynchronization())
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     EmbedConnection ec = getEmbedConnection();
                     pushStack = !ec.isClosed();
                     if (pushStack)
@@ -578,6 +624,7 @@ public java.io.InputStream getBinaryStream()
 
                     // Reset stream, because AutoPositionigStream wants to read
                     // the encoded length bytes.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
                     myStream.resetStream();
                     UpdatableBlobStream result = new UpdatableBlobStream(
                         this,
@@ -627,8 +674,10 @@ public long position(byte[] pattern, long start)
         {
             if (start < 1)
                 throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     SQLState.BLOB_BAD_POSITION, start);
             if (pattern == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
                 throw StandardException.newException(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR);
             if (pattern.length == 0)
                 return start; // match DB2's SQL LOCATE function
@@ -641,6 +690,7 @@ public long position(byte[] pattern, long start)
                 if (pushStack)
                     setupContextStack();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
                 long pos = setBlobPosition(start -1);
                 // look for first character
                 int lookFor = pattern[0];
@@ -649,6 +699,7 @@ public long position(byte[] pattern, long start)
                 while (true)
                 {
                     c = read(pos++); // Note the position increment.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     if (c == -1) { // run out of stream
                         restoreIntrFlagIfSeen(pushStack, ec);
                         return -1;
@@ -692,6 +743,7 @@ public long position(byte[] pattern, long start)
      * @return {@code true} if a match is found, {@code false} if not.
      */
     private boolean checkMatch(byte[] pattern, long pos)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
             throws IOException, StandardException {
        // check whether rest matches
        // might improve performance by reading more
@@ -722,6 +774,10 @@ public long position(Blob pattern, long start)
     {
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
         checkValidity();
         
         boolean pushStack = false;
@@ -729,22 +785,29 @@ public long position(Blob pattern, long start)
         {
             if (start < 1)
                 throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     SQLState.BLOB_BAD_POSITION, start);
             if (pattern == null)
                 throw StandardException.newException(SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR);
+//IC see: https://issues.apache.org/jira/browse/DERBY-839
 
             synchronized (getConnectionSynchronization())
             {
                 EmbedConnection ec = getEmbedConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
 
                 pushStack = !ec.isClosed();
                 if (pushStack)
                     setupContextStack();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
                 long pos = setBlobPosition(start-1);
                 // look for first character
                 byte[] b;
                 try
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
                 { // pattern is not necessarily a Derby Blob
                     b = pattern.getBytes(1,1);
                 }
@@ -752,6 +815,7 @@ public long position(Blob pattern, long start)
                 {
                     throw StandardException.newException(SQLState.BLOB_UNABLE_TO_READ_PATTERN);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 if (b == null || b.length < 1) { // the 'empty' blob
                     restoreIntrFlagIfSeen(pushStack, ec);
                     return start; // match DB2's SQL LOCATE function
@@ -761,6 +825,7 @@ public long position(Blob pattern, long start)
                 long curPos;
                 while (true)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
                     c = read(pos++); // Note the position increment.
                     if (c == -1) {  // run out of stream
                         restoreIntrFlagIfSeen(pushStack, ec);
@@ -803,6 +868,7 @@ public long position(Blob pattern, long start)
      * @return {@code true} if a match is found, {@code false} if not.
      */
     private boolean checkMatch(Blob pattern, long pos)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
             throws IOException, StandardException {
         // check whether rest matches
         // might improve performance by reading buffer at a time
@@ -862,6 +928,7 @@ private SQLException handleMyExceptions(Throwable t)
     @SuppressWarnings("deprecation")
     protected void finalize()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
         if (!materialized)
             myStream.closeStream();
     }
@@ -893,6 +960,7 @@ protected void finalize()
      * @since 1.4
 	 */
 	public int setBytes(long pos, byte[] bytes) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             return setBytes(pos, bytes, 0, bytes.length);
 	}
 
@@ -923,6 +991,7 @@ public int setBytes(long pos,
 
         if (pos - 1 > length())
             throw Util.generateCsSQLException(SQLState.BLOB_POSITION_TOO_LARGE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     pos);
         if (pos < 1)
             throw Util.generateCsSQLException(SQLState.BLOB_BAD_POSITION,
@@ -952,10 +1021,12 @@ public int setBytes(long pos,
                 control.copyData(myStream, length());
                 control.write(bytes, offset, len, pos - 1);
                 myStream.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3768
                 streamLength = -1;
                 materialized = true;
             }
             return len;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
         } catch (IOException e) {
             throw Util.setStreamFailure(e);
         } catch (StandardException se) {
@@ -978,6 +1049,7 @@ public java.io.OutputStream setBinaryStream (long pos)
             checkValidity ();
             if (pos - 1 > length())
                 throw Util.generateCsSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     SQLState.BLOB_POSITION_TOO_LARGE, pos);
             if (pos < 1)
                 throw Util.generateCsSQLException(
@@ -991,6 +1063,7 @@ public java.io.OutputStream setBinaryStream (long pos)
                                             getEmbedConnection());
                     control.copyData (myStream, pos - 1);
                     myStream.close ();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3768
                     streamLength = -1;
                     materialized = true;
                     return control.getOutputStream(pos - 1);
@@ -1016,10 +1089,13 @@ public java.io.OutputStream setBinaryStream (long pos)
     * @exception SQLException Feature not implemented for now.
 	*/
 	public void truncate(long len)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2379
                                         throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             if (len > length())
                 throw Util.generateCsSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     SQLState.BLOB_LENGTH_TOO_LONG, len);
             try {
                 if (materialized) {
@@ -1030,6 +1106,7 @@ public void truncate(long len)
                     control = new LOBStreamControl (getEmbedConnection());
                     control.copyData (myStream, len);
                     myStream.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3768
                     streamLength = -1;
                     materialized = true;
                 }
@@ -1037,6 +1114,10 @@ public void truncate(long len)
             catch (IOException e) {
                 throw Util.setStreamFailure (e);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2379
+//IC see: https://issues.apache.org/jira/browse/DERBY-2379
+//IC see: https://issues.apache.org/jira/browse/DERBY-2379
+//IC see: https://issues.apache.org/jira/browse/DERBY-2379
             catch (StandardException se) {
                 throw Util.generateCsSQLException (se);
             }
@@ -1057,8 +1138,10 @@ public void truncate(long len)
      * the Blob's resources
      */
     public void free()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1180
         throws SQLException {
         //calling free() on a already freed object is treated as a no-op
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
         if (!isValid) return;
         
         //now that free has been called the Blob object is no longer
@@ -1066,6 +1149,7 @@ public void free()
         isValid = false;
         
         // Remove entry from connection if a locator has been created.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3768
         if (this.locator != 0) {
             localConn.removeLOBMapping(locator);
         }
@@ -1075,10 +1159,13 @@ public void free()
         //if it is a stream then close it.
         //if a array of bytes then initialize it to null
         //to free up space
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
         if (!materialized) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
             myStream.closeStream();
             myStream = null;
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             try {
                 control.free ();
                 control = null;
@@ -1107,11 +1194,13 @@ public InputStream getBinaryStream(long pos, long length)
         throws SQLException {
         //call checkValidity to exit by throwing a SQLException if
         //the Blob object has been freed by calling free() on it
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
         checkValidity();
         
         if (pos <= 0) {
             throw Util.generateCsSQLException(
                     SQLState.BLOB_BAD_POSITION,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     pos);
         }
         if (length < 0) {
@@ -1119,13 +1208,16 @@ public InputStream getBinaryStream(long pos, long length)
                     SQLState.BLOB_NONPOSITIVE_LENGTH,
                     length);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4060
         if (length > (this.length() - (pos -1))) {
             throw Util.generateCsSQLException(
                     SQLState.POS_AND_LENGTH_GREATER_THAN_LOB,
                     pos, length);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2730
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2830
             return new UpdatableBlobStream(this,
                                             getBinaryStream(),
                                             pos-1,
@@ -1145,7 +1237,9 @@ public InputStream getBinaryStream(long pos, long length)
     private void checkValidity() throws SQLException{
         //check for connection to maintain sqlcode for closed
         //connection
+//IC see: https://issues.apache.org/jira/browse/DERBY-2729
         getEmbedConnection().checkIfClosed();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
         if(!isValid)
             throw newSQLException(SQLState.LOB_OBJECT_INVALID);
     }
@@ -1155,6 +1249,7 @@ private void checkValidity() throws SQLException{
      * @return true if materialized else false
      */
     boolean isMaterialized () {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2711
         return materialized;
     }
 
@@ -1164,9 +1259,12 @@ boolean isMaterialized () {
      * @return The locator identifying this lob.
      */
     public int getLocator() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3354
+//IC see: https://issues.apache.org/jira/browse/DERBY-3354
         if (locator == 0) {
             locator = localConn.addLOBMapping(this);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3365
         return locator;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
index 663e3b214b..227330cad1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
@@ -64,6 +64,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 public class EmbedCallableStatement extends EmbedPreparedStatement
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
     implements EngineCallableStatement
 {
 	/*
@@ -87,6 +88,7 @@ public EmbedCallableStatement (EmbedConnection conn, String sql,
 			  resultSetType,
 			  resultSetConcurrency,
 			  resultSetHoldability,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			  Statement.NO_GENERATED_KEYS,
 			  null,
 			  null);
@@ -160,6 +162,7 @@ protected final boolean executeStatement(Activation a,
 
 				try
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 					DataValueDescriptor returnValue = pvs.getReturnValueForSet();
 					returnValue.setValueFromResultSet(results, 1, true);
 				} catch (StandardException e)
@@ -167,6 +170,7 @@ protected final boolean executeStatement(Activation a,
 					throw EmbedResultSet.noStateChangeException(e);
 				}
 				finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3496
 					results.close();
 					results = null;
 				}
@@ -212,6 +216,7 @@ public final void registerOutParameter(int parameterIndex, int sqlType, int scal
 		checkStatus();
 
 		if (scale < 0)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			throw newSQLException(SQLState.BAD_SCALE_VALUE, scale);
 		try {
 			getParms().registerOutParameter(parameterIndex-1, sqlType, scale);
@@ -234,6 +239,7 @@ public void registerOutParameter(int parameterIndex, int sqlType,
  									 String typeName) 
  		 throws SQLException
  	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
  		registerOutParameter( parameterIndex, sqlType );
  	}
  		 
@@ -564,6 +570,7 @@ public final Object getObject(int parameterIndex) throws SQLException
 	{
 		checkStatus();
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			Object v = getParms().getParameterForGet(parameterIndex-1).getObject();
 			wasNull = (v == null);
 			return v;
@@ -668,6 +675,7 @@ public void addBatch() throws SQLException {
 		for (int j=1; j<=numberOfParameters; j++) {
 
 			switch (pvs.getParameterMode(j)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             case (ParameterMetaData.parameterModeIn):
             case (ParameterMetaData.parameterModeUnknown):
 				break;
@@ -693,6 +701,7 @@ public void addBatch() throws SQLException {
      * @exception SQLException if a database-access error occurs.
      */
     public final Object getObject(int i, Map<String, Class<?>> map) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         checkStatus();
         if (map == null) {
             throw Util.generateCsSQLException(SQLState.INVALID_API_PARAMETER, map, "map",
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedCallableStatement42.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedCallableStatement42.java
index e92c16b479..1d2b769bb7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedCallableStatement42.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedCallableStatement42.java
@@ -39,6 +39,7 @@ public  void registerOutParameter( int parameterIndex, SQLType sqlType )
         throws SQLException
     {
         checkStatus();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
         registerOutParameter( parameterIndex, Util42.getTypeAsInt( sqlType ) );
     }
     
@@ -59,6 +60,7 @@ public  void registerOutParameter( int parameterIndex, SQLType sqlType, String t
     public  void registerOutParameter( String parameterName, SQLType sqlType )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         checkStatus();
         registerOutParameter( parameterName, Util42.getTypeAsInt( sqlType ) );
     }
@@ -82,6 +84,7 @@ public  void registerOutParameter( String parameterName,  SQLType sqlType, Strin
         throws SQLException
     {
         checkStatus();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
         setObject( parameterIndex, x, Util42.getTypeAsInt( targetSqlType ) );
     }
     
@@ -92,6 +95,7 @@ public  void registerOutParameter( String parameterName,  SQLType sqlType, Strin
          )  throws SQLException
     {
         checkStatus();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
         setObject( parameterIndex, x, Util42.getTypeAsInt( targetSqlType ), scaleOrLength );
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedClob.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedClob.java
index e9fa07ce85..e926aed573 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedClob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedClob.java
@@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
     If its data is small (less than 1 page) it is a byte array taken from
     the SQLChar class. If it is large (more than 1 page) it is a long column
     in the database. The long column is accessed as a stream, and is implemented
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
     in store as an OverflowInputStream. The Resetable interface allows sending
     messages to that stream to initialize itself (reopen its container and
     lock the corresponding row) and to reset itself to the beginning.
@@ -63,6 +64,7 @@ multiple threads and sucks data from the stream (returned from
         new update methods can safely be added into implementation.
    </UL>
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3576
 final class EmbedClob extends ConnectionChild implements Clob, EngineLOB
 {
 
@@ -84,6 +86,7 @@ final class EmbedClob extends ConnectionChild implements Clob, EngineLOB
      * @throws SQLException
      *
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
     EmbedClob(EmbedConnection con) throws SQLException {
         super(con);
         this.clob = new TemporaryClob (this);
@@ -102,6 +105,7 @@ final class EmbedClob extends ConnectionChild implements Clob, EngineLOB
      * @throws StandardException
      */
     protected EmbedClob(EmbedConnection con, StringDataValue dvd)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5760
         throws StandardException, SQLException
     {
         super(con);
@@ -112,6 +116,7 @@ protected EmbedClob(EmbedConnection con, StringDataValue dvd)
                                  "clob is created on top of a null column");
 
         // See if a String or a stream will be the source of the Clob.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
         if (dvd.hasStream()) {
             CharacterStreamDescriptor csd = dvd.getStreamWithDescriptor();
             /*
@@ -129,7 +134,9 @@ the class implementing the getStream() method for dvd.getStream(),
              */
             if (SanityManager.DEBUG)
                 SanityManager.ASSERT(csd.getStream() instanceof Resetable);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-265
             try {
                 this.clob = new StoreStreamClob(csd, this);
             } catch (StandardException se) {
@@ -145,9 +152,12 @@ the class implementing the getStream() method for dvd.getStream(),
                         this);
             }
             catch (IOException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5760
                 throw Util.setStreamFailure(e);
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3354
+//IC see: https://issues.apache.org/jira/browse/DERBY-3354
         con.addLOBReference (this);
     }
 
@@ -199,22 +209,28 @@ public String getSubString(long pos, int length) throws SQLException
         //call checkValidity to exit by throwing a SQLException if
         //the Clob object has been freed by calling free() on it
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
 
         if (pos < 1)
             throw Util.generateCsSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 SQLState.BLOB_BAD_POSITION, pos);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1516
         if (length < 0)
             throw Util.generateCsSQLException(
                 SQLState.BLOB_NONPOSITIVE_LENGTH, length);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         String result;
         // An exception will be thrown if the position is larger than the Clob.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
         Reader reader;
         try {
             try {
                 reader = this.clob.getInternalReader(pos);
             } catch (EOFException eofe) {
                 throw Util.generateCsSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                         SQLState.BLOB_POSITION_TOO_LARGE, eofe, pos);
             }
             char[] chars = new char[length];
@@ -252,6 +268,7 @@ public java.io.Reader getCharacterStream() throws SQLException
         //the Clob object has been freed by calling free() on it
         checkValidity();
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2823
             return new ClobUpdatableReader (this);
         } catch (IOException ioe) {
             throw Util.setStreamFailure(ioe);
@@ -317,6 +334,7 @@ public long position(String searchStr, long start)
         checkValidity();
         if (start < 1)
             throw Util.generateCsSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                             SQLState.BLOB_BAD_POSITION, start);
         if (searchStr == null)
             throw Util.generateCsSQLException(
@@ -325,6 +343,7 @@ public long position(String searchStr, long start)
             return start; // match DB2's SQL LOCATE function
 
         boolean pushStack = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         EmbedConnection ec = getEmbedConnection();
         try
         {
@@ -338,18 +357,21 @@ public long position(String searchStr, long start)
                 int matchCount = 0;
                 long pos = start;
                 long newStart = -1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
                 Reader reader = this.clob.getInternalReader(start);
                 char [] tmpClob = new char [4096];
                 boolean reset;
                 for (;;) {
                     reset = false;
                     int readCount = reader.read (tmpClob);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     if (readCount == -1) {
                         restoreIntrFlagIfSeen(pushStack, ec);
                         return -1;
                     }
                     for (int clobOffset = 0;
                                 clobOffset < readCount; clobOffset++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
                         if (tmpClob[clobOffset]
                                         == searchStr.charAt(matchCount)) {
                             //find the new starting position in
@@ -361,6 +383,7 @@ public long position(String searchStr, long start)
                             }
                             matchCount ++;
                             if (matchCount == searchStr.length()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                                 restoreIntrFlagIfSeen(pushStack, ec);
                                 return pos + clobOffset
                                         - searchStr.length() + 1;
@@ -380,6 +403,7 @@ public long position(String searchStr, long start)
                                 if (newStart < pos) {
                                     pos = newStart;
                                     reader.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
                                     reader = this.clob.getInternalReader(
                                                                     newStart);
                                     newStart = -1;
@@ -401,8 +425,11 @@ public long position(String searchStr, long start)
         } catch (EOFException eofe) {
             restoreIntrFlagIfSeen(pushStack, ec);
             throw Util.generateCsSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                     SQLState.BLOB_POSITION_TOO_LARGE, eofe, start);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         } catch (IOException ioe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             restoreIntrFlagIfSeen(pushStack, ec);
             throw Util.setStreamFailure(ioe);
         } finally {
@@ -430,21 +457,27 @@ public long position(Clob searchClob, long start)
     {
         //call checkValidity to exit by throwing a SQLException if
         //the Clob object has been freed by calling free() on it
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         if (start < 1)
             throw Util.generateCsSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                                 SQLState.BLOB_BAD_POSITION, start);
         if (searchClob == null)
             throw Util.generateCsSQLException(
                                 SQLState.BLOB_NULL_PATTERN_OR_SEARCH_STR);
 
         boolean pushStack = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         EmbedConnection ec = getEmbedConnection();
         try
         {
             synchronized (getConnectionSynchronization())
             {
                 char[] subPatternChar = new char[1024];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
 
                 boolean seenOneCharacter = false;
 
@@ -458,6 +491,7 @@ public long position(Clob searchClob, long start)
                                                         subPatternChar.length);
                             if (read == -1) {
                                 //empty pattern
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                                 if (!seenOneCharacter) {
                                     // matches DB2 SQL LOCATE function
                                     restoreIntrFlagIfSeen(pushStack, ec);
@@ -477,6 +511,7 @@ public long position(Clob searchClob, long start)
                             long position = position(subPattern, start);
                             if (position == -1) {
                                 // never seen any match
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                                 if (firstPosition == -1) {
                                     restoreIntrFlagIfSeen(pushStack, ec);
                                     return -1;
@@ -496,7 +531,9 @@ else if (position != start) {
 
                             // read is the length of the subPattern string
                             start = position + read;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
                     } // End inner for loop
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 } // End outer for loop
             } // End synchronized block
         } catch (IOException ioe) {
@@ -535,6 +572,7 @@ else if (position != start) {
      * @throws SQLException if writing the string fails
      */
     public int setString(long pos, String str) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
             return setString (pos, str, 0, str.length());
     }
 
@@ -554,10 +592,13 @@ public int setString(long pos, String str) throws SQLException {
      * @exception SQLException if writing the string fails
      */
     public int setString(long pos, String str, int offset, int len)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
             throws SQLException {
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2769
         if (pos < 1) {
             throw Util.generateCsSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 SQLState.BLOB_BAD_POSITION, pos);
         }
         
@@ -587,6 +628,7 @@ public int setString(long pos, String str, int offset, int len)
         if (len + offset > str.length()) {
             throw Util.generateCsSQLException(
                     SQLState.LANG_SUBSTR_START_ADDING_LEN_OUT_OF_RANGE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     offset, len, str);
         }
         
@@ -602,6 +644,7 @@ public int setString(long pos, String str, int offset, int len)
         } catch (EOFException eofe) {
             throw Util.generateCsSQLException(
                         SQLState.BLOB_POSITION_TOO_LARGE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         pos);
         } catch (IOException e) {
             throw Util.setStreamFailure(e);
@@ -620,7 +663,9 @@ public int setString(long pos, String str, int offset, int len)
      * @exception SQLException if obtaining the stream fails
      */
     public java.io.OutputStream setAsciiStream(long pos) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         checkValidity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
         try {
             return new ClobAsciiStream (this.clob.getWriter(pos));
         } catch (IOException e) {
@@ -639,6 +684,7 @@ public java.io.OutputStream setAsciiStream(long pos) throws SQLException {
      * @exception SQLException if obtaining the stream fails
      */
     public java.io.Writer setCharacterStream(long pos) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         checkValidity();
         try {
             if (!this.clob.isWritable()) {
@@ -665,6 +711,7 @@ public void truncate(long len) throws SQLException
         checkValidity();
         if (len < 0)
             throw Util.generateCsSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 SQLState.BLOB_NONPOSITIVE_LENGTH, len);
         try {
             if (!clob.isWritable()) {
@@ -677,6 +724,7 @@ public void truncate(long len) throws SQLException
         catch (EOFException eofe) {
             throw Util.generateCsSQLException(
                         SQLState.BLOB_LENGTH_TOO_LONG,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                         eofe, len);
         } catch (IOException e) {
             throw Util.setStreamFailure(e);
@@ -698,7 +746,9 @@ public void truncate(long len) throws SQLException
      * @throws SQLException if an error occurs releasing the Clobs resources
      */
     public void free()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1180
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         if (this.isValid) {
             this.isValid = false;
             // Release and nullify the internal Clob.
@@ -707,6 +757,7 @@ public void free()
             } catch (IOException e) {
                 throw Util.setStreamFailure(e);
             } finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3354
                 localConn.removeLOBMapping(locator);
                 this.clob = null;
             }
@@ -733,11 +784,15 @@ public java.io.Reader getCharacterStream(long pos, long length)
         throws SQLException {
         //call checkValidity to exit by throwing a SQLException if
         //the Clob object has been freed by calling free() on it
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
         checkValidity();
         
         if (pos <= 0) {
             throw Util.generateCsSQLException(
                     SQLState.BLOB_BAD_POSITION,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     pos);
         }
         if (length < 0) {
@@ -745,6 +800,7 @@ public java.io.Reader getCharacterStream(long pos, long length)
                     SQLState.BLOB_NONPOSITIVE_LENGTH,
                     length);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4060
         if (length > (this.length() - (pos -1))) {
             throw Util.generateCsSQLException(
                     SQLState.POS_AND_LENGTH_GREATER_THAN_LOB,
@@ -752,6 +808,7 @@ public java.io.Reader getCharacterStream(long pos, long length)
         }
         
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
             return new ClobUpdatableReader(this, pos, length);
         } catch (IOException ioe) {
             throw Util.setStreamFailure(ioe);
@@ -767,6 +824,7 @@ public java.io.Reader getCharacterStream(long pos, long length)
      * @throws SQLException if the Clob is not valid
      */
     private void checkValidity() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2787
         localConn.checkIfClosed();        
         if(!isValid)
             throw newSQLException(SQLState.LOB_OBJECT_INVALID);
@@ -783,8 +841,10 @@ private void checkValidity() throws SQLException{
      * @throws SQLException if accessing underlying resources fail
      */
     private void makeWritableClobClone()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
             throws IOException, SQLException {
         InternalClob toBeAbandoned = this.clob;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2827
         this.clob = TemporaryClob.cloneClobContent(
                         getEmbedConnection().getDBName(),
                         this, toBeAbandoned);
@@ -804,8 +864,10 @@ private void makeWritableClobClone()
      * @throws SQLException if accessing underlying resources fail
      */
     private void makeWritableClobClone(long len)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2800
             throws IOException, SQLException {
         InternalClob toBeAbandoned = this.clob;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2827
         this.clob = TemporaryClob.cloneClobContent(
                         getEmbedConnection().getDBName(),
                         this, toBeAbandoned, len);
@@ -823,6 +885,8 @@ private void makeWritableClobClone(long len)
      *
      * @return The current internal Clob representation.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2818
+//IC see: https://issues.apache.org/jira/browse/DERBY-2806
     InternalClob getInternalClob() {
         return this.clob;
     }
@@ -831,9 +895,11 @@ InternalClob getInternalClob() {
      * @return locator value for this Clob.
      */
     public int getLocator() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3354
         if (locator == 0) {
             locator = localConn.addLOBMapping(this);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3365
         return locator;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedConnection.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedConnection.java
index 179ec321c1..b1413eaa01 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedConnection.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedConnection.java
@@ -3994,6 +3994,7 @@ public void setNetworkTimeout( Executor executor, int milliseconds ) throws SQLE
      */
     static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
@@ -4105,6 +4106,7 @@ public Object run()
      */
     private LanguageConnectionContext privilegedGetLCC()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         return AccessController.doPrivileged
             (
              new PrivilegedAction<LanguageConnectionContext>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java
index fc93ee64b2..b074f8cfb2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.Enumeration;
 /**
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class EmbedConnectionContext extends ContextImpl 
 		implements ConnectionContext
 {
@@ -57,6 +58,7 @@ class EmbedConnectionContext extends ContextImpl
 	EmbedConnectionContext(ContextManager cm, EmbedConnection conn) {
 		super(cm, ConnectionContext.CONTEXT_ID);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		connRef = new java.lang.ref.SoftReference<EmbedConnection>(conn);
 	}
 
@@ -66,6 +68,7 @@ public void cleanupOnError(Throwable error) {
 			return;
 
 		EmbedConnection conn = connRef.get();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		if (error instanceof StandardException) {
 
@@ -106,11 +109,13 @@ public void cleanupOnError(Throwable error) {
 	public java.sql.Connection getNestedConnection(boolean internal) throws SQLException {
 
 		EmbedConnection conn = connRef.get();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		if ((conn == null) || conn.isClosed())
 			throw Util.noCurrentConnection();
 
 		if (!internal) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
 			StatementContext sc = privilegedGetLCC( conn ).getStatementContext();
 			if ((sc == null) || (sc.getSQLAllowed() < org.apache.derby.catalog.types.RoutineAliasInfo.MODIFIES_SQL_DATA))
 				throw Util.noCurrentConnection();
@@ -128,9 +133,11 @@ public java.sql.Connection getNestedConnection(boolean internal) throws SQLExcep
 	public java.sql.ResultSet getResultSet
 	(
 		ResultSet 				executionResultSet
+//IC see: https://issues.apache.org/jira/browse/DERBY-98
 	) throws SQLException
 	{
 		EmbedConnection conn = connRef.get();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		EmbedResultSet rs = conn.getLocalDriver().newEmbedResultSet(conn, executionResultSet, 
 							false, (EmbedStatement) null, true);
@@ -149,7 +156,9 @@ public java.sql.Connection getNestedConnection(boolean internal) throws SQLExcep
      *   @see EmbedStatement#processDynamicResult(EmbedConnection, java.sql.ResultSet, EmbedStatement)
      */
     public boolean processInaccessibleDynamicResult(java.sql.ResultSet resultSet) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         EmbedConnection conn = connRef.get();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1585
         if (conn == null)
             return false;
         
@@ -163,6 +172,7 @@ public boolean processInaccessibleDynamicResult(java.sql.ResultSet resultSet) {
      */
     private LanguageConnectionContext privilegedGetLCC( final EmbedConnection conn )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         return AccessController.doPrivileged
             (
              new PrivilegedAction<LanguageConnectionContext>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
index bfcf712c06..719b07f53b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
@@ -91,6 +91,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class EmbedDatabaseMetaData extends ConnectionChild
 	implements DatabaseMetaData, java.security.PrivilegedAction<Object> {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
     private static final int ILLEGAL_UDT_TYPE = 0;
     
@@ -136,6 +137,7 @@ public EmbedDatabaseMetaData (EmbedConnection connection, String url)
      * @return a <code>Properties</code> value with the queries
      */
     private Properties getQueryDescriptions(boolean net) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
         Properties p = net ? queryDescriptions_net : queryDescriptions;
         if (p != null) {
             return p;
@@ -277,6 +279,7 @@ public boolean nullsAreSortedAtEnd() {
      * @return database product name
      */
 	public String getDatabaseProductName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		return EmbedConnection.getMonitor().getEngineVersion().getProductName();
 	}
 
@@ -287,7 +290,10 @@ public String getDatabaseProductName() {
      */
 	public String getDatabaseProductVersion() {
 		ProductVersionHolder myPVH = EmbedConnection.getMonitor().getEngineVersion();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
+//IC see: https://issues.apache.org/jira/browse/DERBY-1547
 		return myPVH.getVersionBuildString(true);
 	}
 
@@ -345,6 +351,8 @@ public boolean usesLocalFiles() {
      * @return true if the database uses a local file for each table
      */
 	public boolean usesLocalFilePerTable() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6662
+//IC see: https://issues.apache.org/jira/browse/DERBY-6662
         if (url.contains("memory"))
             return false;
         else
@@ -456,6 +464,10 @@ public String getIdentifierQuoteString() {
      */
 	public String getSQLKeywords() {
 		return "ALIAS,BIGINT,BOOLEAN,CALL,CLASS,COPY,DB2J_DEBUG,EXECUTE,EXPLAIN,FILE,FILTER,"
+//IC see: https://issues.apache.org/jira/browse/DERBY-2258
+//IC see: https://issues.apache.org/jira/browse/DERBY-2259
+//IC see: https://issues.apache.org/jira/browse/DERBY-2260
+//IC see: https://issues.apache.org/jira/browse/DERBY-2245
 			+  "GETCURRENTCONNECTION,INDEX,INSTANCEOF,METHOD,NEW,OFF,PROPERTIES,RECOMPILE,"
 			+  "RENAME,RUNTIMESTATISTICS,STATEMENT,STATISTICS,TIMING,WAIT";
 	}
@@ -467,6 +479,7 @@ public String getSQLKeywords() {
      * @return the list
      */
 	public String getNumericFunctions() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3063
 		return "ABS,ACOS,ASIN,ATAN,ATAN2,CEILING,COS,COT,DEGREES,EXP,FLOOR,LOG,LOG10,MOD,PI,RADIANS,RAND,SIGN,SIN,SQRT,TAN";
 	}
 
@@ -497,6 +510,7 @@ public String getSystemFunctions()  {
       * @return the list
      */
 	public String getTimeDateFunctions() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-471
 		return "CURDATE,CURTIME,HOUR,MINUTE,MONTH,SECOND,TIMESTAMPADD,TIMESTAMPDIFF,YEAR";
 	}
 
@@ -989,6 +1003,7 @@ public boolean supportsPositionedUpdate() {
      */
 	public boolean supportsRefCursors()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 		return false;
 	}
     
@@ -1332,6 +1347,12 @@ public int getMaxTablesInSelect() {
      * @return max name length  in bytes
      */
 	public int getMaxUserNameLength() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
+//IC see: https://issues.apache.org/jira/browse/DERBY-3146
 		return Limits.MAX_IDENTIFIER_LENGTH;
 	}
 
@@ -1481,7 +1502,9 @@ public ResultSet getProcedures(String catalog, String schemaPattern,
         // Using the new JDBC 4.0 version of the query here. The query
         // was given a new name to allow the old query to
         // be used by ODBCMetaDataGenerator.
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		return doGetProcs(catalog, schemaPattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1093
 			procedureNamePattern, "getProcedures40");
 	}
 
@@ -1520,6 +1543,7 @@ public ResultSet getProceduresForODBC(String catalog, String schemaPattern,
      * @throws SQLException if any of the underlying jdbc methods fail
      */
     public ResultSet getFunctions(java.lang.String catalog,
+//IC see: https://issues.apache.org/jira/browse/DERBY-924
                                   java.lang.String schemaPattern,
                                   java.lang.String functionNamePattern)
         throws SQLException
@@ -1618,8 +1642,10 @@ public ResultSet getProcedureColumns(String catalog,
 		// Using the new JDBC 4.0 version of the query here. The query
 		// was given a new name to allow the old query to
 		// be used by ODBCMetaDataGenerator.
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		return doGetProcCols(catalog, schemaPattern,
 			procedureNamePattern, columnNamePattern,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1094
 			"getProcedureColumns40");
 	}
 
@@ -1667,6 +1693,7 @@ public ResultSet getFunctionColumns(String catalog,
 										   String parameterNamePattern) 
 		throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2145
         return doGetProcCols(catalog, 
                              schemaPattern,
                              functionNamePattern, 
@@ -1774,6 +1801,8 @@ public ResultSet getTables(String catalog, String schemaPattern,
 		// parameter to the metadata statement and handle it here.
 		
 		// Array for type parameters
+//IC see: https://issues.apache.org/jira/browse/DERBY-3000
+//IC see: https://issues.apache.org/jira/browse/DERBY-1790
 		final int numberOfTableTypesInDerby = 4;
 		if (types == null)  {// null means all types 
 			types = new String[] {"TABLE","VIEW","SYNONYM","SYSTEM TABLE"};
@@ -1821,6 +1850,7 @@ else if ("SYSTEM TABLE".equals(types[i]) ||
 	 * @exception SQLException thrown on failure.
      */
 	public ResultSet getSchemas() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-876
 		return getSchemas(null, null);
 	}
 
@@ -1938,6 +1968,7 @@ public ResultSet getColumns(String catalog, String schemaPattern,
 		String tableNamePattern, String columnNamePattern)
 					throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		return doGetCols(catalog, schemaPattern, tableNamePattern,
 			columnNamePattern, "getColumns");
 	}
@@ -2107,6 +2138,7 @@ public ResultSet getTablePrivileges(String catalog, String schemaPattern,
 	) throws SQLException
 	{
 		return doGetBestRowId(catalogPattern, schemaPattern, table,
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 			scope, nullable, "");
 	}
 
@@ -2185,6 +2217,7 @@ private ResultSet doGetBestRowId(String catalogPattern,
 				// this one's it, do the real thing and return it.
 				// we don't need to check catalog, schema, table name
 				// or scope again.
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 				ps = getPreparedQuery(queryPrefix + "getBestRowIdentifierPrimaryKeyColumns");
 				ps.setString(1,constraintId);
 				ps.setString(2,constraintId);
@@ -2218,6 +2251,7 @@ private ResultSet doGetBestRowId(String catalogPattern,
 			if (done) 
 			{
 				// this one's it, do the real thing and return it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 				ps = getPreparedQuery(queryPrefix + "getBestRowIdentifierUniqueKeyColumns");
 				ps.setString(1,constraintId);
 				ps.setString(2,constraintId);
@@ -2248,6 +2282,7 @@ private ResultSet doGetBestRowId(String catalogPattern,
 			ps.close();
 			if (done) {
 				// this one's it, do the real thing and return it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 				ps = getPreparedQuery(queryPrefix + "getBestRowIdentifierUniqueIndexColumns");
 				ps.setLong(1,indexNum);
 				ps.setInt(2,nullableInIntForm);
@@ -2256,6 +2291,7 @@ private ResultSet doGetBestRowId(String catalogPattern,
 
 			// last try -- just return all columns of the table
 			// the not null ones if that restriction is upon us.
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 			ps = getPreparedQuery(queryPrefix + "getBestRowIdentifierAllColumns");
 			ps.setString(1,catalogPattern);
 			ps.setString(2,schemaPattern);
@@ -2297,6 +2333,7 @@ private ResultSet doGetBestRowId(String catalogPattern,
      */
 	public ResultSet getVersionColumns(String catalog, String schema,
 				String table) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		return doGetVersionCols(catalog, schema, table, "getVersionColumns");
 	}
 
@@ -2348,11 +2385,13 @@ private ResultSet doGetVersionCols(String catalog, String schema,
      * @throws SQLException
      */
 	private boolean notInSoftUpgradeMode() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		throws SQLException {
 		if ( getEmbedConnection().isClosed())
 			throw Util.noCurrentConnection();
 
 		boolean notInSoftUpgradeMode;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         LanguageConnectionContext lcc = getLanguageConnectionContext();
 		try {
 			notInSoftUpgradeMode =
@@ -2391,6 +2430,7 @@ private boolean notInSoftUpgradeMode()
 	public ResultSet getPrimaryKeys(String catalog, String schema,
 			String table) throws SQLException {
 		PreparedStatement s = getPreparedQuery("getPrimaryKeys");
+//IC see: https://issues.apache.org/jira/browse/DERBY-137
 
         if (table == null) {
             throw Util.generateCsSQLException(
@@ -2556,6 +2596,7 @@ public ResultSet getImportedKeys(String catalog, String schema,
      */
 	public ResultSet getExportedKeys(String catalog, String schema,
 				String table) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 
         if (table == null) {
             throw Util.generateCsSQLException(
@@ -2825,6 +2866,7 @@ private ResultSet getTypeInfoMinion(String queryName) throws SQLException {
 	public ResultSet getIndexInfo(String catalog, String schema, String table,
 			boolean unique, boolean approximate)
 					throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-107
 		return doGetIndexInfo(catalog, schema, table, unique, approximate, "getIndexInfo");
 	}
 
@@ -2884,6 +2926,7 @@ private ResultSet doGetIndexInfo(String catalog, String schema, String table,
      * @see Connection
      */
 	public boolean supportsResultSetType(int type) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		if ((type == ResultSet.TYPE_FORWARD_ONLY) ||
 		    (type == ResultSet.TYPE_SCROLL_INSENSITIVE)) {
 			return true;
@@ -2904,8 +2947,10 @@ public boolean supportsResultSetType(int type) {
      * @see Connection
      */
 	public boolean supportsResultSetConcurrency(int type, int concurrency) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
  		if (type == ResultSet.TYPE_SCROLL_SENSITIVE) {
  			// (TYPE_SCROLL_SENSITIVE, *)
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
   			return false;
  		} else {
  			// (FORWARD_ONLY, CONCUR_UPDATABLE)
@@ -3001,6 +3046,9 @@ public boolean othersDeletesAreVisible(int type)  {
      * @return true if inserts are visible for the result set type
      */
     public boolean othersInsertsAreVisible(int type)  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		if (type == ResultSet.TYPE_FORWARD_ONLY)
 			return true;
 		return false;
@@ -3017,6 +3065,7 @@ public boolean othersInsertsAreVisible(int type)  {
      */
     public boolean updatesAreDetected(int type) {
 		if (type == ResultSet.TYPE_SCROLL_INSENSITIVE) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 			return true;
 		} else {
 			// For forward only resultsets, we move to before the next
@@ -3037,7 +3086,12 @@ public boolean updatesAreDetected(int type) {
      * @return true if deletes are detected by the resultset type
      */
     public boolean deletesAreDetected(int type) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		if (type == ResultSet.TYPE_SCROLL_INSENSITIVE) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 			return true;
 		} else {
 			// For forward only resultsets, we move to before the next
@@ -3234,6 +3288,9 @@ public boolean supportsGetGeneratedKeys()
                 * (such as support for specifying the returned columns for
                 * the autogenerated key)
                 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-66
+//IC see: https://issues.apache.org/jira/browse/DERBY-242
+//IC see: https://issues.apache.org/jira/browse/DERBY-462
 		return false;
 	}
 
@@ -3261,6 +3318,7 @@ public boolean supportsResultSetHoldability(int holdability)
 	*/
 	public int getResultSetHoldability()
   {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		return ResultSet.HOLD_CURSORS_OVER_COMMIT;
 	}
 
@@ -3290,6 +3348,8 @@ public int getDatabaseMajorVersion()
 	*/
 	public int getDatabaseMinorVersion()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		ProductVersionHolder pvh = EmbedConnection.getMonitor().getEngineVersion();
 		if (pvh == null)
 		{
@@ -3307,6 +3367,7 @@ public int getDatabaseMinorVersion()
 	*/
 	public int getJDBCMajorVersion()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         return 4;
 	}
 
@@ -3319,6 +3380,7 @@ public int getJDBCMajorVersion()
 	*/
 	public int getJDBCMinorVersion()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6324
         return JVMInfo.jdbcMinorVersion();
 	}
 
@@ -3332,6 +3394,7 @@ public int getJDBCMinorVersion()
 	*/
 	public int getSQLStateType()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		return sqlStateSQL99;
 	}
 
@@ -3371,6 +3434,9 @@ public boolean locatorsUpdateCopy()
 	public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern)
     throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-968
+//IC see: https://issues.apache.org/jira/browse/DERBY-924
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
 		return getSimpleQuery("getSuperTypes");
 	}
 
@@ -3390,6 +3456,9 @@ public ResultSet getSuperTypes(String catalog, String schemaPattern, String type
 	public ResultSet getSuperTables(String catalog, String schemaPattern, String typeNamePattern)
     throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-968
+//IC see: https://issues.apache.org/jira/browse/DERBY-924
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
 		return getSimpleQuery("getSuperTables");
 	}
 
@@ -3415,6 +3484,9 @@ public ResultSet getAttributes(String catalog, String schemaPattern,
   String typeNamePattern, String attributeNamePattern)
     throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-968
+//IC see: https://issues.apache.org/jira/browse/DERBY-924
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
         return getSimpleQuery("getAttributes");
 	}
 	
@@ -3474,6 +3546,7 @@ public ResultSet getClientInfoProperties() throws SQLException {
     public ResultSet getSchemas(String catalog, String schemaPattern)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-876
         PreparedStatement s = getPreparedQuery("getSchemas");
         s.setString(1, swapNull(catalog));
         s.setString(2, swapNull(schemaPattern));
@@ -3481,6 +3554,7 @@ public ResultSet getSchemas(String catalog, String schemaPattern)
     }
 
     public RowIdLifetime getRowIdLifetime() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         return RowIdLifetime.ROWID_UNSUPPORTED;
     }
 
@@ -3496,6 +3570,7 @@ public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException {
      * {@code ResultSet}s
      */
     public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2789
         return true;
     }
 
@@ -3544,6 +3619,7 @@ public final <T> T unwrap(Class<T> iface) throws SQLException {
     * not support pseudo columns.
 	*/
 	public ResultSet getPseudoColumns
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         ( String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern )
         throws SQLException
 	{
@@ -3564,6 +3640,7 @@ public final <T> T unwrap(Class<T> iface) throws SQLException {
      * @exception SQLException if a database error occurs
      */
     public ResultSet getClientCachedMetaData() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
         return getSimpleQuery("METADATA", true);
     }
 
@@ -3625,14 +3702,19 @@ private PreparedStatement getPreparedQueryUsingSystemTables(String nameKey,
 
 			try
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
 				String queryText =
 					getQueryDescriptions(net).getProperty(nameKey);
 				if (queryText == null)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-968
+//IC see: https://issues.apache.org/jira/browse/DERBY-924
+//IC see: https://issues.apache.org/jira/browse/DERBY-925
                     throw Util.notImplemented(nameKey);
 				}
 				
                 ps = prepareSPS(nameKey, queryText, net);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 InterruptStatus.
                     restoreIntrFlagIfSeen(getLanguageConnectionContext());
 			}
@@ -3683,6 +3765,7 @@ private PreparedStatement getPreparedQuery(String queryName,
 		//with this Derby release. We also need to be writable so 
                 // that we can update SPS statements (DERBY-3546)
 		if (notInSoftUpgradeMode() && !isReadOnly())
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
 			s = getPreparedQueryUsingSystemTables(queryName, net);
 		else {
 			try {
@@ -3690,6 +3773,7 @@ private PreparedStatement getPreparedQuery(String queryName,
 				//mode or are read only, and hence need to get metadata sql from 
                                 //metadata.properties file or metadata_net.properties
 				String queryText = getQueryFromDescription(queryName, net);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 s = getEmbedConnection().prepareMetaDataStatement(queryText);
                 // InterruptStatus.restoreIntrFlagIfSeen: called inside
                 // prepareMetaDataStatement while we still have context pushed.
@@ -3708,6 +3792,7 @@ private PreparedStatement getPreparedQuery(String queryName,
      * @exception SQLException if a database error occurs
      */
     protected PreparedStatement getPreparedQuery(String queryName)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
         throws SQLException
     {
         return getPreparedQuery(queryName, false);
@@ -3736,6 +3821,7 @@ protected PreparedStatement getPreparedQuery(String queryName)
 	 * @exception StandardException if an error occurs
 	 */
 	private String getQueryFromDescription(String queryName, boolean net)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1124
 		throws StandardException
 	{
 		DataDictionary dd = getLanguageConnectionContext().getDataDictionary();
@@ -3752,6 +3838,7 @@ private String getQueryFromDescription(String queryName, boolean net)
 				queryName = "getTablePrivileges_10_1";
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
 		return getQueryDescriptions(net).getProperty(queryName);
 	}
 
@@ -3762,6 +3849,7 @@ private String getQueryFromDescription(String queryName, boolean net)
 	** 
 	*/
 	private PreparedStatement prepareSPS(String	spsName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
 										 String	spsText,
 										 boolean net)
 		throws StandardException, SQLException
@@ -3778,6 +3866,7 @@ private PreparedStatement prepareSPS(String	spsName,
 		DataDictionary dd = getLanguageConnectionContext().getDataDictionary();
 		SPSDescriptor spsd = dd.getSPSDescriptor(
 										spsName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
 										net ? dd.getSysIBMSchemaDescriptor() :
 										dd.getSystemSchemaDescriptor());
 		lcc.commitNestedTransaction();
@@ -3797,6 +3886,7 @@ private PreparedStatement prepareSPS(String	spsName,
 		** statement, but we have no (easy) way of turning
 		** the statement into a java.sql.PreparedStatement.
 		*/	
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
 		String queryText =
 			"EXECUTE STATEMENT " + (net ? "SYSIBM" : "SYS") +
 			".\"" + spsName + "\"";
@@ -3816,6 +3906,7 @@ static final protected String swapNull(String s) {
 	  */
 	private	LanguageConnectionContext	getLanguageConnectionContext()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         return AccessController.doPrivileged
             (
              new PrivilegedAction<LanguageConnectionContext>()
@@ -3838,6 +3929,7 @@ public LanguageConnectionContext run()
      * <code>queryDescriptions_net</code>.
      */
     private void loadQueryDescriptions() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1176
         java.security.AccessController.doPrivileged(this);
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
index e6da675221..8ce5b0a4bc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
@@ -75,6 +75,7 @@ public int isNullable(int param) throws SQLException {
    		checkPosition(param);
 
    		if (types[param - 1].isNullable())
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             return (ParameterMetaData.parameterNullable);
    		else
             return (ParameterMetaData.parameterNoNulls);
@@ -112,6 +113,7 @@ public int getPrecision(int param) throws SQLException {
 			outparamPrecision = pvs.getPrecision(param);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5062
         if (outparamPrecision == -1)
         {
             return DataTypeUtilities.getPrecision(types[param - 1]);
@@ -200,6 +202,7 @@ public int getParameterMode(int param) throws SQLException {
    		//bug 4857 - only the return parameter is of type OUT. All the other output
    		//parameter are IN_OUT (it doesn't matter if their value is set or not).
    		if ((param == 1) && pvs.hasReturnOutputParameter())//only the first parameter can be of return type
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                 return (ParameterMetaData.parameterModeOut);
    		return pvs.getParameterMode(param);
     }
@@ -215,6 +218,7 @@ private void checkPosition(int parameterIndex) throws SQLException {
 			/* This message matches the one used by the DBMS */
 			throw Util.generateCsSQLException(
             SQLState.LANG_INVALID_PARAM_POSITION,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             parameterIndex, paramCount);
 		}
     }
@@ -231,6 +235,7 @@ private void checkPosition(int parameterIndex) throws SQLException {
      * a wrapper for an object with the given interface.
      */
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         return iface.isInstance(this);
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPooledConnection.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPooledConnection.java
index 0a7569bb0a..e6fb5293c4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPooledConnection.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPooledConnection.java
@@ -84,6 +84,7 @@ public class EmbedPooledConnection implements javax.sql.PooledConnection, Broker
      * the listeners fired in the same thread add or remove listeners.
      */
     private final CopyOnWriteArrayList<StatementEventListener>
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             statementEventListeners =
                     new CopyOnWriteArrayList<StatementEventListener>();
 
@@ -102,6 +103,7 @@ public class EmbedPooledConnection implements javax.sql.PooledConnection, Broker
 	BrokeredConnection currentConnectionHandle;
 
 	// set up once by the data source
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
     final EmbeddedDataSourceInterface dataSource;
 	private final String username;
 	private final String password;
@@ -198,8 +200,10 @@ final void openRealConnection() throws SQLException {
 			realConnection.setApplicationConnection(currentConnectionHandle);
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 	final Connection getNewCurrentConnectionHandle() throws SQLException {
 		Connection applicationConnection = currentConnectionHandle =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             realConnection.getLocalDriver().newBrokeredConnection(this);
 		realConnection.setApplicationConnection(applicationConnection);
 		return applicationConnection;
@@ -212,6 +216,7 @@ final Connection getNewCurrentConnectionHandle() throws SQLException {
 	private void closeCurrentConnectionHandle() throws SQLException {
 		if (currentConnectionHandle != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             ArrayList<ConnectionEventListener> tmpEventListener = eventListener;
 			eventListener = null;
 
@@ -246,10 +251,12 @@ void resetRealConnection() throws SQLException {
 		if (realConnection.isReadOnly() != defaultReadOnly)
 			realConnection.setReadOnly(defaultReadOnly);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		if (realConnection.getHoldability() != ResultSet.HOLD_CURSORS_OVER_COMMIT)
 			realConnection.setHoldability(ResultSet.HOLD_CURSORS_OVER_COMMIT);
 
 		// reset any remaining state of the connection
+//IC see: https://issues.apache.org/jira/browse/DERBY-130
 		realConnection.resetFromPool();
 		if (SanityManager.DEBUG)
 		{
@@ -293,6 +300,7 @@ public final synchronized void addConnectionEventListener(ConnectionEventListene
 		if (listener == null)
 			return;
         if (eventListener == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             eventListener = new ArrayList<ConnectionEventListener>();
         } else if (eventIterators > 0) {
             // DERBY-3401: Someone is iterating over the ArrayList, and since
@@ -318,6 +326,7 @@ public final synchronized void removeConnectionEventListener(ConnectionEventList
             // we were able to synchronize on this, that someone is us. Clone
             // the list of listeners in order to prevent invalidation of the
             // iterator.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             eventListener =
                 new ArrayList<ConnectionEventListener>(eventListener);
         }
@@ -342,6 +351,7 @@ public synchronized EngineConnection getRealConnection()
      * @return The underlying language connection.
      */
 	public synchronized LanguageConnectionContext getLanguageConnection()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
        throws SQLException
 	{
 		checkActive();
@@ -376,6 +386,7 @@ private void fireConnectionEventListeners(SQLException exception) {
             ConnectionEvent event = new ConnectionEvent(this, exception);
             eventIterators++;
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 for (ConnectionEventListener l : eventListener) {
                     if (exception == null) {
                         l.connectionClosed(event);
@@ -404,6 +415,7 @@ final void checkActive() throws SQLException {
 	 */
 	public boolean isIsolationLevelSetUsingSQLorJDBC() throws SQLException {
 		if (realConnection != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
 			return getLanguageConnectionContext( realConnection ).isIsolationLevelSetUsingSQLorJDBC();
 		else
 			return false;
@@ -416,6 +428,7 @@ public boolean isIsolationLevelSetUsingSQLorJDBC() throws SQLException {
 		and the end of a global transaction.
 	*/
 	public void resetIsolationLevelFlag() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
 		getLanguageConnectionContext( realConnection ).resetIsolationLevelFlagUsedForSQLandJDBC();
 	}
 
@@ -523,6 +536,7 @@ public PreparedStatement wrapStatement(PreparedStatement ps, String sql, Object
                /*
                     
                 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
                 EmbedPreparedStatement ps_ = (EmbedPreparedStatement)ps;
                 ps_.setBrokeredConnectionControl(this);
 		return (PreparedStatement)ps_;
@@ -562,6 +576,7 @@ public CallableStatement wrapStatement(CallableStatement cs, String sql) throws
      */
     public String toString()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-412
         if ( connString == null )
         {
             String physicalConnString = isActive ?
@@ -589,6 +604,7 @@ public String toString()
      * @param statement the {@code PreparedStatement} that was closed
      */
     public void onStatementClose(PreparedStatement statement) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         if (!statementEventListeners.isEmpty()) {
             StatementEvent event = new StatementEvent(this, statement);
             for (StatementEventListener l : statementEventListeners) {
@@ -654,6 +670,7 @@ public void addStatementEventListener(StatementEventListener listener) {
 	  */
 	private static LanguageConnectionContext	getLanguageConnectionContext( final EmbedConnection conn )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         return AccessController.doPrivileged
             (
              new PrivilegedAction<LanguageConnectionContext>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
index da0323ea6f..ca359448a7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
@@ -121,6 +121,7 @@ public EmbedPreparedStatement (EmbedConnection conn, String sql, boolean forMeta
 		super(conn, forMetaData, resultSetType, resultSetConcurrency, resultSetHoldability);
 		// PreparedStatement is poolable by default
 		isPoolable = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1235
 
 		// if the sql string is null, raise an error
 		if (sql == null)
@@ -131,6 +132,7 @@ public EmbedPreparedStatement (EmbedConnection conn, String sql, boolean forMeta
 
 			try {
 			    preparedStatement = lcc.prepareInternalStatement
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 				(lcc.getDefaultSchema(), sql,
                         resultSetConcurrency == java.sql.ResultSet.CONCUR_READ_ONLY,
                         forMetaData);
@@ -144,6 +146,7 @@ public EmbedPreparedStatement (EmbedConnection conn, String sql, boolean forMeta
 
 			//bug 4838 - save the auto-generated key information in activation. keeping this
 			//information in lcc will not work as it can be tampered by a nested transaction
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
   				if (autoGeneratedKeys == Statement.RETURN_GENERATED_KEYS)
   					activation.setAutoGeneratedKeysResultsetInfo(columnIndexes, columnNames);
 
@@ -236,7 +239,9 @@ public final void addBatch(String sql) throws SQLException {
 	 *
 	 */
 	void closeActions() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
 		if (bcc!=null) {
 			java.sql.PreparedStatement ps_app = 
 				(java.sql.PreparedStatement)applicationStatement;
@@ -257,6 +262,7 @@ void closeActions() throws SQLException {
 		    activation.close();
 			activation = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             InterruptStatus.restoreIntrFlagIfSeen();
 		} catch (Throwable t)
 		{
@@ -282,6 +288,7 @@ void closeActions() throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
 	public final java.sql.ResultSet executeQuery() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
             try {
                 executeStatement(activation, true, false);
             } catch(SQLException sqle) {
@@ -306,6 +313,7 @@ public final java.sql.ResultSet executeQuery() throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
         public final int executeUpdate() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             return (int) executeLargeUpdate();
         }
 
@@ -316,6 +324,7 @@ public final int executeUpdate() throws SQLException {
      * statements which may touch more than Integer.MAX_VALUE rows.
      */
         public final long executeLargeUpdate() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
             try {
                 executeStatement(activation, false, true);
             } catch(SQLException sqle) {
@@ -335,6 +344,7 @@ public final long executeLargeUpdate() throws SQLException {
      */
     public void setNull(int parameterIndex, int sqlType) throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
 		Util.checkForSupportedDataType(sqlType);
 		checkStatus();
 
@@ -609,6 +619,7 @@ public void setTimestamp(int parameterIndex, Timestamp x)
      */
     public final void setAsciiStream(int parameterIndex, InputStream x, long length)
 	    throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
         checkAsciiStreamConditions(parameterIndex);
 		java.io.Reader r = null;
 
@@ -637,6 +648,7 @@ public final void setAsciiStream(int parameterIndex, InputStream x, long length)
      */
 
     public final void setAsciiStream(int parameterIndex, InputStream x, int length)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
     throws SQLException {
         setAsciiStream(parameterIndex,x,(long)length);
     }
@@ -676,6 +688,7 @@ public void setUnicodeStream(int parameterIndex, InputStream x, int length)
      */
     public final void setCharacterStream(int parameterIndex,
        			  java.io.Reader reader,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
 			  long length) throws SQLException {
         checkCharacterStreamConditions(parameterIndex);
         setCharacterStreamInternal(parameterIndex, reader, false, length);
@@ -698,6 +711,7 @@ public final void setCharacterStream(int parameterIndex,
      * @exception SQLException if a database-access error occurs.
      */
     public final void setCharacterStream(int parameterIndex,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
         java.io.Reader reader,
         int length) throws SQLException {
         setCharacterStream(parameterIndex,reader,(long)length);
@@ -712,6 +726,7 @@ private final void checkCharacterStreamConditions(int parameterIndex)
             throws SQLException {
         checkStatus();
         int jdbcTypeId = getParameterJDBCType(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
         if (!DataTypeDescriptor.isCharacterStreamAssignable(jdbcTypeId)) {
             throw dataTypeConversion(parameterIndex, "java.io.Reader");
         }
@@ -724,6 +739,7 @@ private final void checkCharacterStreamConditions(int parameterIndex)
      */
     private final void checkAsciiStreamConditions(int parameterIndex)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkStatus();
         int jdbcTypeId = getParameterJDBCType(parameterIndex);
         if (!DataTypeDescriptor.isAsciiStreamAssignable(jdbcTypeId)) {
@@ -776,11 +792,14 @@ private void setCharacterStreamInternal(int parameterIndex,
         if (!lengthLess && length > Integer.MAX_VALUE)
                throw newSQLException(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE,
                                      getParameterSQLType(parameterIndex));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
 
         try {
             ReaderToUTF8Stream utfIn;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             final StringDataValue dvd = (StringDataValue)
                     getParms().getParameter(parameterIndex -1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4543
             dvd.setStreamHeaderFormat(usePreTenFiveHdrFormat());
             // Need column width to figure out if truncation is needed
             DataTypeDescriptor dtd[] = preparedStatement
@@ -793,6 +812,7 @@ private void setCharacterStreamInternal(int parameterIndex,
                 // We cast the length from long to int. This wouldn't be
                 // appropriate if the limit of 2G-1 is decided to be increased
                 // at a later stage.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4515
                 usableLength = (int)length;
                 int truncationLength = 0;
 
@@ -816,6 +836,7 @@ private void setCharacterStreamInternal(int parameterIndex,
                     // usableLength is the length of the data from stream that
                     // can be inserted which is min(colWidth,length) provided
                     // length - colWidth has trailing blanks only
+//IC see: https://issues.apache.org/jira/browse/DERBY-4515
                     if (usableLength > colWidth) {
                         truncationLength = usableLength - colWidth;
                         usableLength = colWidth;
@@ -824,6 +845,7 @@ private void setCharacterStreamInternal(int parameterIndex,
                 // Create a stream with truncation.
                 utfIn = new ReaderToUTF8Stream(reader, usableLength,
                         truncationLength, getParameterSQLType(parameterIndex),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                         dvd.getStreamHeaderGenerator());
             } else {
                 // Create a stream without exactness checks,
@@ -838,6 +860,7 @@ truncationLength, getParameterSQLType(parameterIndex),
             // the maximum length for the column. 
             // This is okay, based on the observation that
             // setValue does not use the value for anything at all.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             getParms().getParameterForSet(parameterIndex - 1).
                     setValue(utfIn, usableLength);
 
@@ -858,6 +881,7 @@ private Boolean usePreTenFiveHdrFormat()
             throws StandardException {
         // Determine the version of the database we are accessing.
         // This is required to write the correct stream header format for Clobs.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4543
         if (usePreTenFiveHdrFormat == null) {
             usePreTenFiveHdrFormat = Boolean.valueOf(
                 !lcc.getDataDictionary().checkVersion(
@@ -910,6 +934,7 @@ public final void setBinaryStream(int parameterIndex, InputStream x, long length
      * @exception SQLException thrown on failure.
      */
     public final void setBinaryStream(int parameterIndex, InputStream x, int length)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
     throws SQLException {
         setBinaryStream(parameterIndex,x,(long)length);
     }
@@ -953,14 +978,17 @@ private void setBinaryStreamInternal(int parameterIndex, InputStream x,
         // in that case the cast to int would not be appropriate.
         if ( !lengthLess && length > Integer.MAX_VALUE ) {
             throw newSQLException(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
                getParameterMetaData().getParameterTypeName(
                    parameterIndex));
         }
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
             RawToBinaryFormatStream rawStream;
             if (lengthLess) {
                 // Indicate that we don't know the logical length of the stream.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4515
                 length = DataValueDescriptor.UNKNOWN_LOGICAL_LENGTH;
                 DataTypeDescriptor dtd[] = 
                     preparedStatement.getParameterTypes();
@@ -985,8 +1013,10 @@ private void setBinaryStreamInternal(int parameterIndex, InputStream x,
      */
     private final void checkBinaryStreamConditions(int parameterIndex)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkStatus();
         int jdbcTypeId = getParameterJDBCType(parameterIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
         if (!DataTypeDescriptor.isBinaryStreamAssignable(jdbcTypeId)) {
             throw dataTypeConversion(parameterIndex, "java.io.InputStream");
         }
@@ -1041,12 +1071,14 @@ public void addBatch() throws SQLException {
   	  synchronized (getConnectionSynchronization()) {
   			if (batchStatements == null)
   				batchStatements = new Vector<Object>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
           //get a clone of the parameterValueSet and save it in the vector
           //which will be used later on at the time of batch execution.
           //This way we will get a copy of the current statement's parameter
           //values rather than a pointer to the statement's parameter value
           //set which will change with every new statement in the batch.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
           batchStatements.add(getParms().getClone());
           clearParameters();
   	  }
@@ -1145,6 +1177,8 @@ public java.sql.ResultSetMetaData getMetaData() throws SQLException
                         rMetaData = newEmbedResultSetMetaData(resd);
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 InterruptStatus.restoreIntrFlagIfSeen(lcc);
 			} catch (Throwable t) {
 				throw handleException(t);
@@ -1165,6 +1199,7 @@ public java.sql.ResultSetMetaData getMetaData() throws SQLException
      * @exception SQLException Feature not implemented for now.
      */
     public final void setRef(int i, Ref x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         throw Util.notImplemented();
     }
 
@@ -1212,6 +1247,7 @@ public final void setObject(int parameterIndex, Object x, int targetSqlType, int
 		}
 
 		Util.checkForSupportedDataType(targetSqlType);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
 
 		int paramJDBCType = getParameterJDBCType(parameterIndex);
 
@@ -1281,10 +1317,12 @@ public final void setObject(int parameterIndex, Object x) throws SQLException {
         // See DERBY-1938 for details.
 
 		if (x == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1938
             setNull(parameterIndex, colType);
             return;
 		}
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		if (colType == Types.JAVA_OBJECT) {
 			try {
 				/* JDBC is one-based, DBMS is zero-based */
@@ -1390,6 +1428,7 @@ public final void setObject(int parameterIndex, Object x) throws SQLException {
      */
         public final boolean execute() throws SQLException {
             boolean ret=false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
             try{
                 ret = executeStatement(activation, false, false);
             } catch(SQLException sqle) {
@@ -1529,6 +1568,7 @@ public void setClob (int i, Clob x)
             // will read from the stream and drain the stream. 
             // Hence the need to declare this local variable - streamLength
             long streamLength = x.length();
+//IC see: https://issues.apache.org/jira/browse/DERBY-856
 
             setCharacterStreamInternal(i, x.getCharacterStream(),
                                        false, streamLength);
@@ -1569,6 +1609,7 @@ public final ParameterValueSet getParms() {
 	/**
 		Get the target JDBC type for a parameter. Will throw exceptions
 		if the parameter index is out of range. The parameterIndex is 1-based.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 
 		@exception SQLException parameter is out of range
 	*/
@@ -1591,6 +1632,7 @@ protected int getParameterJDBCType(int parameterIndex)
      * @throws SQLException if parameter is out of range
      */
     protected final String getParameterSQLType(int parameterIndex)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
             throws SQLException
     {
         try {
@@ -1612,8 +1654,11 @@ private void setScale(int parameterIndex, int scale)
 		throws SQLException 
 	{
 		checkStatus();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 
 		if (scale < 0)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			throw newSQLException(SQLState.BAD_SCALE_VALUE, scale);
 		
 		try {
@@ -1668,8 +1713,10 @@ public final void setURL(int parameterIndex, java.net.URL x)
      * @exception SQLException if a database access error occurs
      */
     public final ParameterMetaData getParameterMetaData()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             throws SQLException {
         checkStatus();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         return new EmbedParameterSetMetaData(
                 getParms(), preparedStatement.getParameterTypes());
     }
@@ -1680,6 +1727,7 @@ public final ParameterMetaData getParameterMetaData()
 	//
 	protected EmbedResultSetMetaData newEmbedResultSetMetaData(ResultDescription resultDesc) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-940
 		return factory.newEmbedResultSetMetaData(resultDesc.getColumnInfo());
 	}
 
@@ -1711,6 +1759,7 @@ boolean executeStatement(Activation a,
 
 	final SQLException dataTypeConversion(int column, String sourceType)
 		throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         return newSQLException(SQLState.LANG_DATA_TYPE_GET_MISMATCH,
             getParameterMetaData().getParameterTypeName(column),
 			sourceType);
@@ -1757,6 +1806,7 @@ private void checkStatementValidity(SQLException sqle) throws SQLException {
              * Check if the exception has occurred because the connection
              * associated with the PreparedStatement has been closed
              */
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
             if(bcc != null && isClosed()) {
                 //call the BrokeredConnectionControl interface method
                 //onStatementErrorOccurred
@@ -1786,6 +1836,7 @@ private void checkStatementValidity(SQLException sqle) throws SQLException {
      */
     public void setAsciiStream(int parameterIndex, InputStream x)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
         checkAsciiStreamConditions(parameterIndex);
         java.io.Reader asciiStream = null;
 
@@ -1825,6 +1876,8 @@ public void setAsciiStream(int parameterIndex, InputStream x)
      */
     public void setCharacterStream(int parameterIndex, Reader reader)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
         checkCharacterStreamConditions(parameterIndex);
         setCharacterStreamInternal(parameterIndex, reader,
                                    true, -1);
@@ -1890,6 +1943,7 @@ public void setClob(int parameterIndex, Reader reader, long length)
      *      marker in the SQL statement
      */
     public void setBlob(int parameterIndex, InputStream inputStream)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
             throws SQLException {
         checkBlobConditions(parameterIndex);
         setBinaryStreamInternal(parameterIndex, inputStream, true, -1);
@@ -1923,6 +1977,8 @@ public void setBlob(int parameterIndex, InputStream inputStream, long length)
      */
     private final void checkBlobConditions(int parameterIndex)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkStatus();
         if (getParameterJDBCType(parameterIndex) != Types.BLOB) {
             throw dataTypeConversion(parameterIndex, "java.sql.Blob");
@@ -1930,6 +1986,7 @@ private final void checkBlobConditions(int parameterIndex)
     }
 
     public final void setRowId(int parameterIndex, RowId x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         throw Util.notImplemented();
     }
 
@@ -1965,6 +2022,8 @@ public final void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLExce
     }
 
     public final long getVersionCounter() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5459
+//IC see: https://issues.apache.org/jira/browse/DERBY-2402
         return preparedStatement.getVersionCounter();
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement42.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement42.java
index 01bd9982a8..2919c47a24 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement42.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement42.java
@@ -50,6 +50,7 @@ public class EmbedPreparedStatement42 extends EmbedPreparedStatement
         setObject
             (
              parameterIndex, x,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
              Util42.getTypeAsInt( targetSqlType )
              );
     }
@@ -64,6 +65,7 @@ public class EmbedPreparedStatement42 extends EmbedPreparedStatement
         setObject
             (
              parameterIndex, x,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
              Util42.getTypeAsInt( targetSqlType ),
              scaleOrLength
              );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
index d350cd788d..aaeae6a1f3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
@@ -143,9 +143,11 @@ public class EmbedResultSet extends ConnectionChild
 	/**
 	 This activation is set by EmbedStatement
 	 for a single execution Activation. Ie.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3247
 	 a ResultSet from a Statement.executeQuery() or
      a ResultSet that is now a dynamic result set.
 	 In this case the closing of this ResultSet will close
+//IC see: https://issues.apache.org/jira/browse/DERBY-3004
 	 the activation or the finalization of the parent EmbedStatement
 	 without it being closed will mark the Activation as unused.
 	 @see EmbedStatement#finalize()
@@ -229,6 +231,7 @@ public class EmbedResultSet extends ConnectionChild
 	public EmbedResultSet(EmbedConnection conn, ResultSet resultsToWrap,
 		boolean forMetaData, EmbedStatement stmt, boolean isAtomic)
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-98
 
 		super(conn);
 
@@ -239,13 +242,16 @@ public EmbedResultSet(EmbedConnection conn, ResultSet resultsToWrap,
 		// ResultSet's for metadata are single use, they are created
 		// with a PreparedStatement internally, but that statement is
 		// never returned to the application.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1142
 		if (this.forMetaData = forMetaData)
 			singleUseActivation = resultsToWrap.getActivation();
         this.applicationStmt = this.stmt = owningStmt = stmt;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
         this.timeoutMillis = stmt == null
             ? 0L
             : stmt.timeoutMillis;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
 
 		this.isAtomic = isAtomic;
                 
@@ -256,6 +262,7 @@ public EmbedResultSet(EmbedConnection conn, ResultSet resultsToWrap,
 		//If the underlying language resultset is not updateable, then the concurrency of the ResultSet object will be CONCUR_READ_ONLY
 		//and a warning will be issued on the ResultSet object.
 		if (stmt == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			concurrencyOfThisResultSet = java.sql.ResultSet.CONCUR_READ_ONLY;
 		else if (stmt.resultSetConcurrency == java.sql.ResultSet.CONCUR_READ_ONLY)
 			concurrencyOfThisResultSet = java.sql.ResultSet.CONCUR_READ_ONLY;
@@ -269,16 +276,22 @@ else if (stmt.resultSetConcurrency == java.sql.ResultSet.CONCUR_READ_ONLY)
 		}
 
 		// Fill in the column types
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		resultDescription = theResults.getResultDescription();
 		
 		// Only incur the cost of allocating and maintaining
 		// updated column information if the columns can be updated.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		if (concurrencyOfThisResultSet == java.sql.ResultSet.CONCUR_UPDATABLE)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
             final int columnCount = resultDescription.getColumnCount();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
             final ExecutionFactory factory = getLanguageConnectionContext( conn ).
             getLanguageConnectionFactory().getExecutionFactory();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
 			try{
 				//initialize arrays related to updateRow implementation
 				columnGotUpdated = new boolean[columnCount];
@@ -292,6 +305,7 @@ else if (stmt.resultSetConcurrency == java.sql.ResultSet.CONCUR_READ_ONLY)
 				throw noStateChangeException(t);
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
         else
         {
             updateRow = null;
@@ -301,6 +315,7 @@ else if (stmt.resultSetConcurrency == java.sql.ResultSet.CONCUR_READ_ONLY)
         if (stmt != null)
         {
            // At connectivity level we handle only for forward only cursor
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
            if (stmt.resultSetType == java.sql.ResultSet.TYPE_FORWARD_ONLY)
                maxRows = stmt.maxRows;
 
@@ -318,10 +333,12 @@ else if (stmt.resultSetConcurrency == java.sql.ResultSet.CONCUR_READ_ONLY)
      */
     public  static  void    setFetchedRowBase( long newBase )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         if (SanityManager.DEBUG)    { fetchedRowBase = newBase; }
     }
 
 	private void checkNotOnInsertRow() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
 		if (isOnInsertRow) {
 			throw newSQLException(SQLState.NO_CURRENT_ROW);
 		}
@@ -332,6 +349,7 @@ private void checkNotOnInsertRow() throws SQLException {
 	// or milder problems due to not having a row.
 	protected final void checkOnRow() throws SQLException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
 		if (currentRow == null) {
 			throw newSQLException(SQLState.NO_CURRENT_ROW);
 		} 
@@ -341,6 +359,7 @@ protected final void checkOnRow() throws SQLException
 	 * Initializes the currentRowHasBeenUpdated and columnGotUpdated fields
 	 */
 	private void initializeUpdateRowModifiers() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
 		currentRowHasBeenUpdated = false;
 		Arrays.fill(columnGotUpdated, false);
 	}
@@ -351,11 +370,13 @@ private void initializeUpdateRowModifiers() {
 		@exception SQLException ResultSet is not on a row or columnIndex is out of range.
 	*/
 	final int getColumnType(int columnIndex) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
 		if (!isOnInsertRow) checkOnRow(); // first make sure there's a row
 		
 		if (columnIndex < 1 ||
 		    columnIndex > resultDescription.getColumnCount())
 			throw newSQLException(SQLState.COLUMN_NOT_FOUND, columnIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		return resultDescription.getColumnDescriptor(columnIndex).getType().getJDBCTypeId();
 	}
@@ -411,6 +432,7 @@ protected boolean movePosition(int position, int row, String positionText)
 								// on the underlying connection.  Do this
 								// outside of the connection synchronization.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
 		if (isOnInsertRow) {
 			moveToCurrentRow();
 		}
@@ -420,7 +442,9 @@ protected boolean movePosition(int position, int row, String positionText)
 
 					setupContextStack();
 		    try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
 				LanguageConnectionContext lcc = getLanguageConnectionContext( getEmbedConnection() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
 				final ExecRow newRow;
 		    try {
 
@@ -431,6 +455,7 @@ protected boolean movePosition(int position, int row, String positionText)
 				 */
                 StatementContext statementContext =
                     lcc.pushStatementContext(isAtomic, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 					     concurrencyOfThisResultSet==java.sql.ResultSet.CONCUR_READ_ONLY, 
 					     getSQLText(),
 					     getParameterValueSet(),
@@ -439,6 +464,7 @@ protected boolean movePosition(int position, int row, String positionText)
 				switch (position)
 				{
 					case BEFOREFIRST:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
 						newRow = theResults.setBeforeFirstRow();
 						break;
 
@@ -492,6 +518,7 @@ protected boolean movePosition(int position, int row, String positionText)
          
 			SQLWarning w = theResults.getWarnings();
 			if (w != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5436
                 addWarning(w);
 			}
 			
@@ -528,8 +555,10 @@ protected boolean movePosition(int position, int row, String positionText)
 		    }
 
             // Clear the indication of which columns were fetched as streams.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
             if (columnUsedFlags != null)
                 Arrays.fill(columnUsedFlags, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
 			if (columnGotUpdated != null && currentRowHasBeenUpdated) {
 				initializeUpdateRowModifiers();
 			}
@@ -591,10 +620,13 @@ public void close() throws SQLException	{
 			try	{
                 LanguageConnectionContext lcc =
                     getLanguageConnectionContext( getEmbedConnection() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
 
 				try	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3037
 					theResults.close(); 
 				    
+//IC see: https://issues.apache.org/jira/browse/DERBY-1142
 				    if (this.singleUseActivation != null)
 				    {
 				    	this.singleUseActivation.close();
@@ -632,12 +664,14 @@ public void close() throws SQLException	{
 		     	}
 
 			} finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
 				markClosed();
 			    restoreContextStack();
 			}
 
 			// the idea is to release resources, so:
 			currentRow = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
 
 			// we hang on to theResults and messenger
 			// in case more calls come in on this resultSet
@@ -651,6 +685,7 @@ public void close() throws SQLException	{
      */
     private void    markClosed()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         if ( isClosed ) { return; }
         
         isClosed = true;
@@ -658,6 +693,7 @@ private void    markClosed()
         // to prevent infinite looping, tell our parent Statement
         // that we have closed AFTER
         // we have marked ourself as closed
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         if ( stmt != null) { stmt.closeMeOnCompletion(); }
         if ( (owningStmt != null) && (owningStmt != stmt) ) { owningStmt.closeMeOnCompletion(); }
     }
@@ -695,6 +731,7 @@ public final boolean wasNull() throws SQLException {
     public final String getString(int columnIndex) throws SQLException {
         checkIfClosed("getString");
         int columnType = getColumnType(columnIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
         if (columnType == Types.BLOB || columnType == Types.CLOB) {
             checkLOBMultiCall(columnIndex);
             // If the above didn't fail, this is the first getter invocation,
@@ -712,6 +749,7 @@ public final String getString(int columnIndex) throws SQLException {
 				String value = dvd.getString();
 
 				// check for the max field size limit 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
                 if (maxFieldSize > 0 && isMaxFieldSizeType(columnType))
                 {
                     if (value.length() > maxFieldSize )
@@ -901,6 +939,7 @@ public final double getDouble(int columnIndex) throws SQLException {
     public final byte[] getBytes(int columnIndex) throws SQLException	{
 		checkIfClosed("getBytes");
         int columnType = getColumnType(columnIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
         if (columnType == Types.BLOB) {
             checkLOBMultiCall(columnIndex);
             // If the above didn't fail, this is the first getter invocation,
@@ -917,6 +956,7 @@ public final byte[] getBytes(int columnIndex) throws SQLException	{
 			byte[] value = dvd.getBytes();
 
             // check for the max field size limit 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
             if (maxFieldSize > 0 && isMaxFieldSizeType(columnType))
             {
                  if (value.length > maxFieldSize)
@@ -1018,6 +1058,7 @@ public java.sql.Date getDate(int columnIndex, Calendar cal)
     public java.sql.Date getDate(String columnName, Calendar cal) 
                 throws SQLException 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
                 checkIfClosed("getDate");
                 return getDate( findColumnName(columnName), cal);
         }
@@ -1071,6 +1112,7 @@ public java.sql.Time getTime(int columnIndex, Calendar cal)
     public java.sql.Time getTime(String columnName, Calendar cal)
            throws SQLException 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
                 checkIfClosed("getTime");
                 return getTime( findColumnName( columnName), cal);
         }
@@ -1091,6 +1133,7 @@ public java.sql.Time getTime(String columnName, Calendar cal)
     public java.sql.Timestamp getTimestamp(String columnName, Calendar cal)     
       throws SQLException 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
                 checkIfClosed("getTimestamp");
                 return getTimestamp(findColumnName(columnName), cal);
         }
@@ -1138,6 +1181,7 @@ public java.sql.Timestamp getTimestamp(int columnIndex, Calendar cal)
     public final java.io.Reader getCharacterStream(int columnIndex)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("getCharacterStream");
 		int lmfs;
 		int colType = getColumnType(columnIndex);
@@ -1187,10 +1231,12 @@ public final java.io.Reader getCharacterStream(int columnIndex)
 			pushStack = true;
 			setupContextStack();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
             java.io.Reader ret; // The reader we will return to the user
             if (dvd.hasStream()) {
                 CharacterStreamDescriptor csd = dvd.getStreamWithDescriptor();
                 // See if we have to enforce a max field size.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 if (lmfs > 0) {
                     csd = new CharacterStreamDescriptor.Builder().copyState(csd).
                             maxCharLength(lmfs).build();
@@ -1265,6 +1311,7 @@ public final InputStream getAsciiStream(int columnIndex) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final InputStream getBinaryStream(int columnIndex) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("getBinaryStream");
 		int lmfs;
 		int colType = getColumnType(columnIndex);
@@ -1298,10 +1345,12 @@ public final InputStream getBinaryStream(int columnIndex) throws SQLException {
 			pushStack = true;
 			setupContextStack();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
             InputStream stream; // The stream we will return to the user
             if (dvd.hasStream()) {
                 stream = new BinaryToRawStream(dvd.getStream(), dvd);
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
                 stream = new ByteArrayInputStream(dvd.getBytes());
             }
 
@@ -1313,6 +1362,7 @@ public final InputStream getBinaryStream(int columnIndex) throws SQLException {
                 stream = limitResultIn;
             }
             // Wrap in a stream throwing exception on invocations when closed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
             stream = new CloseFilterInputStream(stream);
             currentStream = stream;
 			return stream;
@@ -1338,6 +1388,8 @@ public final InputStream getBinaryStream(int columnIndex) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final String getString(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getString");
     	return (getString(findColumnName(columnName)));
 	}
@@ -1350,6 +1402,8 @@ public final String getString(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final boolean getBoolean(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getBoolean");
     	return (getBoolean(findColumnName(columnName)));
 	}
@@ -1362,6 +1416,8 @@ public final boolean getBoolean(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final byte getByte(String columnName) throws SQLException	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getByte");
     	return (getByte(findColumnName(columnName)));
 	}
@@ -1374,6 +1430,8 @@ public final byte getByte(String columnName) throws SQLException	{
 	 * @exception SQLException thrown on failure.
      */
     public final short getShort(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getShort");
     	return (getShort(findColumnName(columnName)));
 	}
@@ -1386,6 +1444,8 @@ public final short getShort(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final int getInt(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getInt");
     	return (getInt(findColumnName(columnName)));
 	}
@@ -1398,6 +1458,8 @@ public final int getInt(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final long getLong(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getLong");
     	return (getLong(findColumnName(columnName)));
 	}
@@ -1410,6 +1472,8 @@ public final long getLong(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final float getFloat(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getFloat");
     	return (getFloat(findColumnName(columnName)));
 	}
@@ -1422,6 +1486,8 @@ public final float getFloat(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final double getDouble(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getDouble");
     	return (getDouble(findColumnName(columnName)));
 	}
@@ -1438,6 +1504,7 @@ public final double getDouble(String columnName) throws SQLException {
     @Deprecated
     public final BigDecimal getBigDecimal(int columnIndex, int scale)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
 
         BigDecimal ret = getBigDecimal(columnIndex);
         if (ret != null) {
@@ -1452,6 +1519,8 @@ public final BigDecimal getBigDecimal(int columnIndex)
         try {
 
             DataValueDescriptor dvd = getColumn(columnIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
 
             if (wasNull = dvd.isNull()) {
                 return null;
@@ -1500,6 +1569,8 @@ public final BigDecimal getBigDecimal(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final byte[] getBytes(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getBytes");
     	return (getBytes(findColumnName(columnName)));
 	}
@@ -1512,6 +1583,8 @@ public final byte[] getBytes(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final Date getDate(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getDate");
     	return (getDate(findColumnName(columnName)));
 	}
@@ -1524,6 +1597,8 @@ public final Date getDate(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final Time getTime(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getTime");
     	return (getTime(findColumnName(columnName)));
 	}
@@ -1536,6 +1611,8 @@ public final Time getTime(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final Timestamp getTimestamp(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getTimestamp");
     	return (getTimestamp(findColumnName(columnName)));
 	}
@@ -1549,6 +1626,7 @@ public final Timestamp getTimestamp(String columnName) throws SQLException {
      */
     public final java.io.Reader getCharacterStream(String columnName)
     throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getCharacterStream");
     	return (getCharacterStream(findColumnName(columnName)));
     }
@@ -1570,6 +1648,8 @@ public final java.io.Reader getCharacterStream(String columnName)
 	 * @exception SQLException thrown on failure.
      */
     public final InputStream getAsciiStream(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getAsciiStream");
     	return (getAsciiStream(findColumnName(columnName)));
 	}
@@ -1590,6 +1670,7 @@ public final InputStream getAsciiStream(String columnName) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final InputStream getBinaryStream(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getBinaryStream");
     	return (getBinaryStream(findColumnName(columnName)));
 	}
@@ -1603,6 +1684,7 @@ public final InputStream getBinaryStream(String columnName) throws SQLException
      */
     @Deprecated
     public final java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         throw Util.notImplemented("getUnicodeStream");
     }
 
@@ -1728,6 +1810,8 @@ public final ResultSetMetaData getMetaData() throws SQLException {
 	  checkIfClosed("getMetaData");	// checking result set closure does not depend
 								// on the underlying connection.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1879
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
       ResultSetMetaData rMetaData =
           resultDescription.getMetaData();
 
@@ -1755,6 +1839,7 @@ public final ResultSetMetaData getMetaData() throws SQLException {
     public final int getHoldability() throws SQLException {
         checkIfClosed("getHoldability");
         if (theResults.getActivation().getResultSetHoldability()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
             return java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT;
         }
         return java.sql.ResultSet.CLOSE_CURSORS_AT_COMMIT;
@@ -1786,6 +1871,7 @@ public final int getHoldability() throws SQLException {
      */
     public final Object getObject(int columnIndex) throws SQLException {
         checkIfClosed("getObject");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 
 		// need special handling for some types.
 		int colType = getColumnType(columnIndex);
@@ -1850,6 +1936,7 @@ public final Object getObject(int columnIndex) throws SQLException {
 	 * @exception SQLException thrown on failure.
      */
     public final Object getObject(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkIfClosed("getObject");
     	return (getObject(findColumnName(columnName)));
 	}
@@ -1867,6 +1954,7 @@ public final Object getObject(String columnName) throws SQLException {
      * @exception SQLException Feature not implemented for now.
      */
     public Object getObject(int columnIndex, Map<String, Class<?>> map) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         checkIfClosed("getObject");
         if (map == null) {
             throw Util.generateCsSQLException(SQLState.INVALID_API_PARAMETER, map, "map",
@@ -1958,6 +2046,7 @@ public final void setApplicationStatement(Statement applicationStmt)
      * @exception SQLException Feature not implemented for now.
      */
     public final Ref getRef(int i) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         throw Util.notImplemented();
     }
 
@@ -2298,7 +2387,9 @@ public int getFetchDirection() throws SQLException {
 	 */
 	public void setFetchSize(int rows) throws SQLException {
 		checkIfClosed("setFetchSize");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3573
 		if (rows < 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			throw Util.generateCsSQLException(SQLState.INVALID_FETCH_SIZE, rows);
 		} else if (rows > 0) // if it is zero ignore the call
 		{
@@ -2386,6 +2477,7 @@ public boolean rowUpdated() throws SQLException {
 
         boolean rvalue = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		try {
 			if (isForUpdate() && 
 					getType() == java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE) {
@@ -2433,11 +2525,15 @@ public boolean rowInserted() throws SQLException {
 	 */
 	public boolean rowDeleted() throws SQLException {
 		checkIfClosed("rowDeleted");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1323
+//IC see: https://issues.apache.org/jira/browse/DERBY-1323
+//IC see: https://issues.apache.org/jira/browse/DERBY-1323
 		checkNotOnInsertRow();
 		checkOnRow();
 
         boolean rvalue = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		try {
 			if (isForUpdate() && 
 					getType() == java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE) {
@@ -2454,10 +2550,14 @@ protected void checksBeforeUpdateXXX(String methodName, int columnIndex) throws
       checksBeforeUpdateOrDelete(methodName, columnIndex);
 
       //1)Make sure for updateXXX methods, the column position is not out of range
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
       ResultDescription rd = theResults.getResultDescription();
       if (columnIndex < 1 || columnIndex > rd.getColumnCount())
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
         throw Util.generateCsSQLException(SQLState.LANG_INVALID_COLUMN_POSITION,
 					columnIndex, String.valueOf(rd.getColumnCount()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
       //2)Make sure the column corresponds to a column in the base table and it is not a derived column
       if (rd.getColumnDescriptor(columnIndex).getSourceTableName() == null)
@@ -2482,8 +2582,10 @@ protected void checksBeforeUpdateOrDelete(String methodName, int columnIndex) th
 
       //2)Make sure this is an updatable ResultSet
       checkUpdatableCursor(methodName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
 
       //3)Make sure JDBC ResultSet is positioned on a row
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
       if (!isOnInsertRow) checkOnRow(); // make sure there's a current row
 	}
 
@@ -2491,6 +2593,7 @@ protected void checksBeforeUpdateOrDelete(String methodName, int columnIndex) th
 	protected DataValueDescriptor getDVDforColumnToBeUpdated(int columnIndex, String updateMethodName) throws StandardException, SQLException {
       checksBeforeUpdateXXX(updateMethodName, columnIndex);
       columnGotUpdated[columnIndex-1] = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
       currentRowHasBeenUpdated = true;
       
       return updateRow.getColumn(columnIndex);
@@ -2511,6 +2614,7 @@ protected void checksBeforeInsert() throws SQLException {
 
         // 3)Make sure JDBC ResultSet is positioned on insertRow
         if (!isOnInsertRow) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-842
             throw newSQLException(SQLState.CURSOR_NOT_POSITIONED_ON_INSERT_ROW);
         }
     }
@@ -2524,6 +2628,7 @@ protected void checksBeforeInsert() throws SQLException {
      * <code>updateAsciiStream()</code>
      */
     private void checksBeforeUpdateAsciiStream(int columnIndex)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
         throws SQLException
     {
         checksBeforeUpdateXXX("updateAsciiStream", columnIndex);
@@ -2768,6 +2873,7 @@ public void updateDouble(int columnIndex, double x) throws SQLException {
 	}
 
     public void updateBigDecimal(int columnIndex, BigDecimal x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             throws SQLException {
         try {
             getDVDforColumnToBeUpdated(columnIndex, "updateBigDecimal").setBigDecimal(x);
@@ -2945,6 +3051,7 @@ public void updateTimestamp(int columnIndex, java.sql.Timestamp x)
 	public void updateAsciiStream(int columnIndex, java.io.InputStream x,
 			long length) throws SQLException {
 		checksBeforeUpdateAsciiStream(columnIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
 
 		java.io.Reader r = null;
 		if (x != null)
@@ -2979,6 +3086,7 @@ public void updateAsciiStream(int columnIndex, java.io.InputStream x,
     public void updateAsciiStream(int columnIndex, InputStream x)
             throws SQLException {
         checksBeforeUpdateAsciiStream(columnIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
 
         java.io.Reader r = null;
         if (x != null) {
@@ -3043,6 +3151,8 @@ public void updateBinaryStream(int columnIndex, java.io.InputStream x,
      */
     public void updateBinaryStream(int columnIndex, InputStream x)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
         checksBeforeUpdateBinaryStream(columnIndex);
         updateBinaryStreamInternal(columnIndex, x, true, -1,
                                    "updateBinaryStream");
@@ -3072,6 +3182,7 @@ public void updateBinaryStream(int columnIndex, InputStream x)
     private void updateBinaryStreamInternal(int columnIndex, InputStream x,
                 final boolean lengthLess, long length, String updateMethodName)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         RawToBinaryFormatStream rawStream;
         if (!lengthLess) {
             if (length < 0)
@@ -3084,9 +3195,11 @@ private void updateBinaryStreamInternal(int columnIndex, InputStream x,
                 throw newSQLException(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE,
                         getColumnSQLType(columnIndex));
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
             rawStream = new RawToBinaryFormatStream(x, (int)length);
         } else {
             // Force length to UNKNOWN_LOGICAL_LENGTH if stream is length less.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4515
             length = DataValueDescriptor.UNKNOWN_LOGICAL_LENGTH;
             rawStream = new RawToBinaryFormatStream(x,
                     getMaxColumnWidth(columnIndex),
@@ -3122,6 +3235,7 @@ private void updateBinaryStreamInternal(int columnIndex, InputStream x,
 	 */
 	public void updateCharacterStream(int columnIndex, java.io.Reader x,
 			long length) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
 		checksBeforeUpdateCharacterStream(columnIndex);
 		updateCharacterStreamInternal(columnIndex, x, false, length,
                                       "updateCharacterStream");
@@ -3146,6 +3260,7 @@ public void updateCharacterStream(int columnIndex, java.io.Reader x,
      */
     public void updateCharacterStream(int columnIndex, Reader x)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1527
         checksBeforeUpdateCharacterStream(columnIndex);
         updateCharacterStreamInternal(columnIndex, x, true, -1,
                                       "updateCharacterStream");
@@ -3184,11 +3299,13 @@ private void updateCharacterStreamInternal(int columnIndex, Reader reader,
                 return;
             }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             final StringDataValue dvd = (StringDataValue)
                     getDVDforColumnToBeUpdated(columnIndex, updateMethodName);
             // In the case of updatable result sets, we cannot guarantee that a
             // context is pushed when the header needs to be generated. To fix
             // this, tell the DVD/generator which header format to use.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4543
             dvd.setStreamHeaderFormat(Boolean.valueOf(
                     !getEmbedConnection().getDatabase().getDataDictionary().
                     checkVersion(DataDictionary.DD_VERSION_DERBY_10_5, null)));
@@ -3242,6 +3359,7 @@ private void updateCharacterStreamInternal(int columnIndex, Reader reader,
 
                 utfIn = new ReaderToUTF8Stream(reader, usableLength,
                         truncationLength, getColumnSQLType(columnIndex),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                         dvd.getStreamHeaderGenerator());
             } else {
                 int colWidth = getMaxColumnWidth(columnIndex);
@@ -3280,6 +3398,7 @@ truncationLength, getColumnSQLType(columnIndex),
 	public void updateObject(int columnIndex, Object x, int scale)
 			throws SQLException {
 		updateObject(columnIndex, x);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         adjustScale( columnIndex, scale );
 	}
 
@@ -3299,9 +3418,11 @@ protected   void    adjustScale( int columnIndex, int scale )
 		if ((colType == Types.DECIMAL) || (colType == Types.NUMERIC)) {
 			if (scale < 0)
 				throw newSQLException(SQLState.BAD_SCALE_VALUE, scale);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 			try {
 				DataValueDescriptor value = updateRow.getColumn(columnIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
 
 				int origvaluelen = value.getLength();
 				((VariableSizeDataValue)
@@ -3335,8 +3456,10 @@ protected   void    adjustScale( int columnIndex, int scale )
 	public void updateObject(int columnIndex, Object x) throws SQLException {
 		checksBeforeUpdateXXX("updateObject", columnIndex);
 		int colType = getColumnType(columnIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		if (colType == Types.JAVA_OBJECT) {
 			try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 				((UserDataValue) getDVDforColumnToBeUpdated(columnIndex, "updateObject")).setValue(x);
 				return;
 			} catch (StandardException t) {
@@ -3384,6 +3507,7 @@ public void updateObject(int columnIndex, Object x) throws SQLException {
 			return;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         if (x instanceof BigDecimal) {
             updateBigDecimal(columnIndex, (BigDecimal) x);
             return;
@@ -3438,6 +3562,7 @@ public void updateObject(int columnIndex, Object x) throws SQLException {
 	 *                if a database-access error occurs
 	 */
 	public void updateNull(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateNull");
 		updateNull(findColumnName(columnName));
 	}
@@ -3460,6 +3585,7 @@ public void updateNull(String columnName) throws SQLException {
 	 *                if a database-access error occurs
 	 */
 	public void updateBoolean(String columnName, boolean x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateBoolean");
 		updateBoolean(findColumnName(columnName), x);
 	}
@@ -3482,6 +3608,7 @@ public void updateBoolean(String columnName, boolean x) throws SQLException {
 	 *                if a database-access error occurs
 	 */
 	public void updateByte(String columnName, byte x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateByte");
 		updateByte(findColumnName(columnName), x);
 	}
@@ -3504,6 +3631,7 @@ public void updateByte(String columnName, byte x) throws SQLException {
 	 *                if a database-access error occurs
 	 */
 	public void updateShort(String columnName, short x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateShort");
 		updateShort(findColumnName(columnName), x);
 	}
@@ -3526,6 +3654,7 @@ public void updateShort(String columnName, short x) throws SQLException {
 	 *                if a database-access error occurs
 	 */
 	public void updateInt(String columnName, int x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateInt");
 		updateInt(findColumnName(columnName), x);
 	}
@@ -3548,6 +3677,7 @@ public void updateInt(String columnName, int x) throws SQLException {
 	 *                if a database-access error occurs
 	 */
 	public void updateLong(String columnName, long x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateLong");
 		updateLong(findColumnName(columnName), x);
 	}
@@ -3570,6 +3700,7 @@ public void updateLong(String columnName, long x) throws SQLException {
 	 *                if a database-access error occurs
 	 */
 	public void updateFloat(String columnName, float x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateFloat");
 		updateFloat(findColumnName(columnName), x);
 	}
@@ -3592,6 +3723,7 @@ public void updateFloat(String columnName, float x) throws SQLException {
 	 *                if a database-access error occurs
 	 */
 	public void updateDouble(String columnName, double x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateDouble");
 		updateDouble(findColumnName(columnName), x);
 	}
@@ -3614,6 +3746,7 @@ public void updateDouble(String columnName, double x) throws SQLException {
 	 *                if a database-access error occurs
 	 */
 	public void updateString(String columnName, String x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateString");
 		updateString(findColumnName(columnName), x);
 	}
@@ -3636,6 +3769,7 @@ public void updateString(String columnName, String x) throws SQLException {
 	 *                if a database-access error occurs
 	 */
 	public void updateBytes(String columnName, byte x[]) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateBytes");
 		updateBytes(findColumnName(columnName), x);
 	}
@@ -3659,6 +3793,7 @@ public void updateBytes(String columnName, byte x[]) throws SQLException {
 	 */
 	public void updateDate(String columnName, java.sql.Date x)
 			throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateDate");
 		updateDate(findColumnName(columnName), x);
 	}
@@ -3682,6 +3817,7 @@ public void updateDate(String columnName, java.sql.Date x)
 	 */
 	public void updateTime(String columnName, java.sql.Time x)
 			throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateTime");
 		updateTime(findColumnName(columnName), x);
 	}
@@ -3705,6 +3841,7 @@ public void updateTime(String columnName, java.sql.Time x)
 	 */
 	public void updateTimestamp(String columnName, java.sql.Timestamp x)
 			throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateTimestamp");
 		updateTimestamp(findColumnName(columnName), x);
 	}
@@ -3730,6 +3867,7 @@ public void updateTimestamp(String columnName, java.sql.Timestamp x)
 	 */
 	public void updateAsciiStream(String columnName, java.io.InputStream x,
 			int length) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateAsciiStream");
 		updateAsciiStream(findColumnName(columnName), x, length);
 	}
@@ -3755,6 +3893,7 @@ public void updateAsciiStream(String columnName, java.io.InputStream x,
 	 */
 	public void updateBinaryStream(String columnName, java.io.InputStream x,
 			int length) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateBinaryStream");
 		updateBinaryStream(findColumnName(columnName), x, length);
 	}
@@ -3780,6 +3919,7 @@ public void updateBinaryStream(String columnName, java.io.InputStream x,
 	 */
 	public void updateCharacterStream(String columnName, java.io.Reader reader,
 			int length) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateCharacterStream");
 		updateCharacterStream(findColumnName(columnName), reader, length);
 	}
@@ -3803,6 +3943,7 @@ public void updateCharacterStream(String columnName, java.io.Reader reader,
 	 */
 	public void updateObject(String columnName, Object x, int scale)
       throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateObject");
 		updateObject(findColumnName(columnName), x, scale);
 	}
@@ -3825,6 +3966,7 @@ public void updateObject(String columnName, Object x, int scale)
 	 *                if a database-access error occurs
 	 */
 	public void updateObject(String columnName, Object x) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("updateObject");
 		updateObject(findColumnName(columnName), x);
 	}
@@ -3841,6 +3983,7 @@ public void updateObject(String columnName, Object x) throws SQLException {
 	 *                insert row have not been given a value
 	 */
 	public void insertRow() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
         synchronized (getConnectionSynchronization()) {
             checksBeforeInsert();
             setupContextStack();
@@ -3866,6 +4009,8 @@ public void insertRow() throws SQLException {
                 // got the underlying (schema.)table name
                 insertSQL.append(getFullBaseTableName(targetTable));
                 ResultDescription rd = theResults.getResultDescription();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 
                 insertSQL.append(" (");
                 // in this for loop we are constructing list of column-names 
@@ -3877,7 +4022,10 @@ public void insertRow() throws SQLException {
                     }
                     // using quotes around the column name 
                     // to preserve case sensitivity
+//IC see: https://issues.apache.org/jira/browse/DERBY-4044
                     insertSQL.append(IdUtil.normalToDelimited(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
                             rd.getColumnDescriptor(i).getName()));
                     if (columnGotUpdated[i-1]) { 
                         valuesSQL.append("?");
@@ -3890,6 +4038,7 @@ public void insertRow() throws SQLException {
                 valuesSQL.append(") ");
                 insertSQL.append(valuesSQL);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 StatementContext currSC = lcc.getStatementContext();
                 Activation parentAct = null;
 
@@ -3912,20 +4061,26 @@ public void insertRow() throws SQLException {
                 // which will be the activation of the pushed statement
                 // context.
                 statementContext.setActivation(parentAct);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
                 org.apache.derby.iapi.sql.PreparedStatement ps = 
                         lcc.prepareInternalStatement(insertSQL.toString());
                 Activation act = ps.getActivation(lcc, false);
 
                 statementContext.setActivation(act);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
 
                 // in this for loop we are assigning values for parameters 
                 //in sql constructed earlier VALUES (?, ..)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
                 for (int i=1, paramPosition=0; i<=rd.getColumnCount(); i++) { 
                     // if the column got updated, do following
                     if (columnGotUpdated[i-1]) {  
                         act.getParameterValueSet().
                                 getParameterForSet(paramPosition++).
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
                                 setValue(updateRow.getColumn(i));
                     }
                 }
@@ -3964,6 +4119,7 @@ public void updateRow() throws SQLException {
         checkNotOnInsertRow();
         
         setupContextStack();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         LanguageConnectionContext lcc = getLanguageConnectionContext( getEmbedConnection() );
         StatementContext statementContext = null;
         try {
@@ -3980,12 +4136,15 @@ public void updateRow() throws SQLException {
             updateWhereCurrentOfSQL.append(getFullBaseTableName(targetTable));//got the underlying (schema.)table name
             updateWhereCurrentOfSQL.append(" SET ");
             ResultDescription rd = theResults.getResultDescription();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 
             for (int i=1; i<=rd.getColumnCount(); i++) { //in this for loop we are constructing columnname=?,... part of the update sql
                 if (columnGotUpdated[i-1]) { //if the column got updated, do following
                     if (foundOneColumnAlready)
                         updateWhereCurrentOfSQL.append(",");
                     //using quotes around the column name to preserve case sensitivity
+//IC see: https://issues.apache.org/jira/browse/DERBY-4044
                     updateWhereCurrentOfSQL.append(IdUtil.normalToDelimited(
                             rd.getColumnDescriptor(i).getName()) + "=?");
                     foundOneColumnAlready = true;
@@ -3995,6 +4154,7 @@ public void updateRow() throws SQLException {
             updateWhereCurrentOfSQL.append(" WHERE CURRENT OF " + 
                     IdUtil.normalToDelimited(getCursorName()));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             StatementContext currSC = lcc.getStatementContext();
             Activation parentAct = null;
 
@@ -4004,6 +4164,7 @@ public void updateRow() throws SQLException {
 
             // Context used for preparing, don't set any timeout (use 0)
             statementContext = lcc.pushStatementContext(isAtomic, false, updateWhereCurrentOfSQL.toString(), null, false, 0L);
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 
             // A priori, the new statement context inherits the activation of
             // the existing statementContext, so that that activation ends up
@@ -4015,23 +4176,31 @@ public void updateRow() throws SQLException {
             Activation act = ps.getActivation(lcc, false);
 
             statementContext.setActivation(act);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
 
             //in this for loop we are assigning values for parameters in sql constructed earlier with columnname=?,... 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
             for (int i=1, paramPosition=0; i<=rd.getColumnCount(); i++) { 
                 if (columnGotUpdated[i-1])  //if the column got updated, do following
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
                     act.getParameterValueSet().getParameterForSet(paramPosition++).setValue(updateRow.getColumn(i));
             }
             // Don't set any timeout when updating rows (use 0)
             // Execute the update where current of sql.
             org.apache.derby.iapi.sql.ResultSet rs =
 				ps.executeSubStatement(activation, act, true, 0L);
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
             SQLWarning w = act.getWarnings();
             if (w != null) {
                 addWarning(w);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2566
             act.close();
             //For forward only resultsets, after a update, the ResultSet will be positioned right before the next row.
             if (getType() == TYPE_FORWARD_ONLY) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
                 currentRow = null;
             } else {
                 movePosition(RELATIVE, 0, "relative");
@@ -4064,9 +4233,13 @@ public void deleteRow() throws SQLException {
         
             // Check that the cursor is not positioned on insertRow
             checkNotOnInsertRow();
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
 
             setupContextStack();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
             LanguageConnectionContext lcc = getLanguageConnectionContext( getEmbedConnection() );
             StatementContext statementContext = null;
             
@@ -4078,7 +4251,9 @@ public void deleteRow() throws SQLException {
                 //using quotes around the cursor name to preserve case sensitivity
                 deleteWhereCurrentOfSQL.append(" WHERE CURRENT OF " + 
                         IdUtil.normalToDelimited(getCursorName()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4044
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 StatementContext currSC = lcc.getStatementContext();
                 Activation parentAct = null;
 
@@ -4099,23 +4274,36 @@ public void deleteRow() throws SQLException {
                 org.apache.derby.iapi.sql.PreparedStatement ps = lcc.prepareInternalStatement(deleteWhereCurrentOfSQL.toString());
                 // Get activation, so that we can get the warning from it
                 Activation act = ps.getActivation(lcc, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 
                 statementContext.setActivation(act);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
 
                 // Don't set any timeout when deleting rows (use 0)
                 //execute delete where current of sql
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
                 org.apache.derby.iapi.sql.ResultSet rs = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 					ps.executeSubStatement(activation, act, true, 0L);
                 SQLWarning w = act.getWarnings();
                 if (w != null) {
                     addWarning(w);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2566
+//IC see: https://issues.apache.org/jira/browse/DERBY-2566
                 act.close();
                 //After a delete, the ResultSet will be positioned right before 
                 //the next row.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
                 currentRow = null;
                 lcc.popStatementContext(statementContext, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 InterruptStatus.restoreIntrFlagIfSeen(lcc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
             } catch (Throwable t) {
                     throw closeOnTransactionError(t);
             } finally {
@@ -4129,6 +4317,7 @@ public void deleteRow() throws SQLException {
 
 	private String getFullBaseTableName(ExecCursorTableReference targetTable) {
 		//using quotes to preserve case sensitivity
+//IC see: https://issues.apache.org/jira/browse/DERBY-4044
         return IdUtil.mkQualifiedName(targetTable.getSchemaName(),
                                       targetTable.getBaseName());
 	}
@@ -4176,6 +4365,7 @@ public void cancelRowUpdates () throws SQLException {
         checksBeforeUpdateOrDelete("cancelRowUpdates", -1);
         
         checkNotOnInsertRow();
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
 
         initializeUpdateRowModifiers();        
     }
@@ -4215,6 +4405,7 @@ public void moveToInsertRow() throws SQLException {
 				//when dealing with character string datatypes.
 				setupContextStack();
 				// initialize state corresponding to insertRow/updateRow impl.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
 				initializeUpdateRowModifiers();
  				isOnInsertRow = true;
 				
@@ -4222,6 +4413,7 @@ public void moveToInsertRow() throws SQLException {
 					updateRow.setColumn(i, 
 						resultDescription.getColumnDescriptor(i).getType().getNull());
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
                 InterruptStatus.restoreIntrFlagIfSeen
                     ( getLanguageConnectionContext( getEmbedConnection() ) );
 			} catch (Throwable ex) {
@@ -4254,11 +4446,15 @@ public void moveToCurrentRow() throws SQLException {
 				if (isOnInsertRow) {
 					// initialize state corresponding to insertRow/updateRow impl.
 					initializeUpdateRowModifiers();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
 
 					isOnInsertRow = false;
 				}
 
                 InterruptStatus.restoreIntrFlagIfSeen();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
 
 			} catch (Throwable ex) {
 				handleException(ex);
@@ -4297,6 +4493,7 @@ public Blob getBlob(int columnIndex) throws SQLException {
 			try {
 				DataValueDescriptor dvd = getColumn(columnIndex);
                 EmbedConnection ec = getEmbedConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
 
                 if (wasNull = dvd.isNull()) {
                     InterruptStatus.restoreIntrFlagIfSeen();
@@ -4306,12 +4503,14 @@ public Blob getBlob(int columnIndex) throws SQLException {
 				// should set up a context stack if we have a long column,
 				// since a blob may keep a pointer to a long column in the
 				// database
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
 				if (dvd.hasStream())
 					pushStack = true;
 
 				if (pushStack)
 					setupContextStack();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 EmbedBlob result = new EmbedBlob(dvd, ec);
                 restoreIntrFlagIfSeen(pushStack, ec);
                 return result;
@@ -4343,6 +4542,10 @@ public final Clob getClob(int columnIndex) throws SQLException {
 		// outside of the connection synchronization.
 
         useStreamOrLOB(columnIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
 
 		synchronized (getConnectionSynchronization()) {
 			int colType = getColumnType(columnIndex);
@@ -4352,11 +4555,13 @@ public final Clob getClob(int columnIndex) throws SQLException {
 				throw dataTypeConversion("java.sql.Clob", columnIndex);
 
 			boolean pushStack = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             EmbedConnection ec = getEmbedConnection();
 			try {
 
 				StringDataValue dvd = (StringDataValue)getColumn(columnIndex);
                 LanguageConnectionContext lcc = getLanguageConnectionContext( ec );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
 
                 if (wasNull = dvd.isNull()) {
                     InterruptStatus.restoreIntrFlagIfSeen();
@@ -4365,11 +4570,13 @@ public final Clob getClob(int columnIndex) throws SQLException {
 
                 // Set up a context stack if we have CLOB whose value is a long
                 // column in the database.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
                 if (dvd.hasStream()) {
                     pushStack = true;
                     setupContextStack();
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 EmbedClob result =  new EmbedClob(ec, dvd);
                 restoreIntrFlagIfSeen(pushStack, ec);
                 return result;
@@ -4391,6 +4598,7 @@ public final Clob getClob(int columnIndex) throws SQLException {
 	 * @return an object representing a BLOB
 	 */
 	public final Blob getBlob(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("getBlob");
 		return (getBlob(findColumnName(columnName)));
 	}
@@ -4406,6 +4614,7 @@ public final Blob getBlob(String columnName) throws SQLException {
 	 *                Feature not implemented for now.
 	 */
 	public final Clob getClob(String columnName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed("getClob");
 		return (getClob(findColumnName(columnName)));
 	}	
@@ -4542,6 +4751,8 @@ protected int findColumnName(String columnName)
         
         int position = resultDescription.findColumnInsenstive(columnName);
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-1879
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
 		if (position == -1) {
 			throw newSQLException(SQLState.COLUMN_NOT_FOUND, columnName);
 		} else {
@@ -4581,6 +4792,7 @@ private final void closeCurrentStream() {
 	 *
 	 * @exception SQLException		Thrown if this ResultSet is closed.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
 	final void checkIfClosed(String operation) throws SQLException {
 		// If the JDBC ResultSet has been explicitly closed, isClosed is
 		// true. In some cases, the underlying language ResultSet can be closed
@@ -4594,6 +4806,7 @@ final void checkIfClosed(String operation) throws SQLException {
 			// basic cleanup and mark it as closed.
 			if (!isClosed) {
 				closeCurrentStream();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
                 markClosed();
 			}
 
@@ -4619,6 +4832,7 @@ final void checkExecIfClosed(String operation) throws SQLException {
             
 		if (appConn.isClosed()) {
             closeCurrentStream();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
             markClosed();
 			throw Util.noCurrentConnection();
         }
@@ -4658,6 +4872,7 @@ private static boolean isMaxFieldSizeType(int colType){
 	/*
 	 * close result set if we have a transaction level error 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
 	final SQLException closeOnTransactionError(Throwable thrownException) throws SQLException
 	{
 		SQLException sqle = handleException(thrownException);
@@ -4670,6 +4885,7 @@ final SQLException closeOnTransactionError(Throwable thrownException) throws SQL
 				try {
 					close();
 	    		} catch (Throwable t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 					sqle.setNextException(handleException(t));
 				}
 			}
@@ -4695,7 +4911,9 @@ protected final DataValueDescriptor getColumn(int columnIndex)
 
 	  closeCurrentStream();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
 	  if (columnIndex < 1 || columnIndex > resultDescription.getColumnCount()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		  throw newSQLException(SQLState.COLUMN_NOT_FOUND, columnIndex);
 	  }
 	  if (isOnInsertRow || currentRowHasBeenUpdated && columnGotUpdated[columnIndex -1]) {
@@ -4726,10 +4944,13 @@ static final SQLException noStateChangeException(Throwable thrownException) {
 		// to convert the exception to a SQLException.
 
 		return TransactionResourceImpl.wrapInSQLException(thrownException);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-1585
 		A dynamic result was created in a procedure by a nested connection.
 		Once the procedure returns, there is a good chance that connection is closed,
 		so we re-attach the result set to the connection of the statement the called
@@ -4745,6 +4966,7 @@ void setDynamicResultSet(EmbedStatement owningStmt) {
         
         if (owningStmt != null) {
 		    this.owningStmt = owningStmt;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
             this.applicationStmt = owningStmt.applicationStatement;
             this.localConn = owningStmt.getEmbedConnection();
         }
@@ -4759,6 +4981,7 @@ void setDynamicResultSet(EmbedStatement owningStmt) {
         // or CallableStatement. Dynamic result sets created
         // by Statement objects will already be marked as
         // single use.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3247
         this.singleUseActivation = theResults.getActivation();
 	}
 
@@ -4782,14 +5005,19 @@ public final int compareTo(Object other) {
      * is <code>TYPE_FORWARD_ONLY</code>
      */
     private void checkScrollCursor(String methodName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
 		checkIfClosed(methodName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		if (stmt.getResultSetType() == java.sql.ResultSet.TYPE_FORWARD_ONLY)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
             throw Util.generateCsSQLException(
                     SQLState.NOT_ON_FORWARD_ONLY_CURSOR, methodName);
 	}
     
     private void checkUpdatableCursor(String operation) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
         if (getConcurrency() != java.sql.ResultSet.CONCUR_UPDATABLE) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
             throw Util.generateCsSQLException(
                     SQLState.UPDATABLE_RESULTSET_API_DISALLOWED, 
                     operation);
@@ -4805,8 +5033,10 @@ private boolean checkRowPosition(int position, String positionText)
 		synchronized (getConnectionSynchronization()) {
 			setupContextStack();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             LanguageConnectionContext lcc =
                 getLanguageConnectionContext( getEmbedConnection() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
 
             try {
 				try {
@@ -4817,8 +5047,10 @@ private boolean checkRowPosition(int position, String positionText)
 					 * error. (Cache the LanguageConnectionContext)
 					 */
                     // No timeout for this operation (use 0)
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
 					StatementContext statementContext =
                         lcc.pushStatementContext(isAtomic, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 						 concurrencyOfThisResultSet==java.sql.ResultSet.CONCUR_READ_ONLY,
 						 getSQLText(),
                                                  getParameterValueSet(),
@@ -4827,6 +5059,11 @@ private boolean checkRowPosition(int position, String positionText)
 					boolean result = theResults.checkRowPosition(position);
 
 					lcc.popStatementContext(statementContext, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.restoreIntrFlagIfSeen(lcc);
 					return result;
 
@@ -4870,6 +5107,7 @@ final String getColumnSQLType(int column)
      * @return the maximum length of the column
      */
     private final int getMaxColumnWidth(int columnIndex) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         return resultDescription.getColumnDescriptor(columnIndex).
                     getType().getMaximumWidth();
     }
@@ -4891,7 +5129,9 @@ private final SQLException dataTypeConversion(int column, String targetType) {
      * @param columnIndex 1-based column index
      * @throws SQLException if the column has already been accessed
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
     final void useStreamOrLOB(int columnIndex) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
         checkLOBMultiCall(columnIndex);
         columnUsedFlags[columnIndex - 1] = true;
     }
@@ -4932,12 +5172,14 @@ private void checkLOBMultiCall(int columnIndex)
      * @exception SQLException if a database error occurs
      */
     public final boolean isClosed() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
         if (isClosed) return true;
         try {
             // isClosed is not updated when EmbedConnection.close() is
             // called, so we need to check the status of the
             // connection
             checkExecIfClosed("");
+//IC see: https://issues.apache.org/jira/browse/DERBY-100
             return false;
         } catch (SQLException sqle) {
             return isClosed;
@@ -4950,6 +5192,7 @@ public final boolean isClosed() throws SQLException {
       * @param w The warning to add to the warning chain.
       */
      private void addWarning(SQLWarning w) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
          if (topWarning == null) {
              topWarning = w;
          } else {
@@ -5158,6 +5401,9 @@ public void updateBinaryStream(String columnName, InputStream x)
       *                if a database-access error occurs
       */
      public void updateCharacterStream(String columnName, java.io.Reader reader,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
          long length) throws SQLException {
          checkIfClosed("updateCharacterStream");
          updateCharacterStream(findColumnName(columnName),reader,length);
@@ -5294,6 +5540,7 @@ public void updateBlob(String columnName, InputStream x, long length)
      */
     public void updateBlob(String columnName, InputStream x)
            throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
        checkIfClosed("updateBlob");
        updateBlob(findColumnName(columnName), x);
     }
@@ -5408,6 +5655,7 @@ public void updateClob(String columnName, Reader x, long length)
      */
     public void updateClob(String columnName, Reader x)
            throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
        checkIfClosed("updateClob");
        updateClob(findColumnName(columnName), x);
     }
@@ -5425,6 +5673,7 @@ public void updateClob(String columnName, Reader x)
      * @exception SQLException Feature not implemented for now.
      */
     public void updateRef(int columnIndex, Ref x)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             throws SQLException {
         throw Util.notImplemented();
     }
@@ -5736,6 +5985,7 @@ public <T> T getObject(String columnName, Class<T> type)
      * @see org.apache.derby.iapi.jdbc.EngineResultSet#isNull(int)
      */
     public boolean isNull(int columnIndex) throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2941
         try {
             DataValueDescriptor dvd = getColumn(columnIndex);
             return dvd.isNull();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSet42.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSet42.java
index 4a55ad5568..d2767fbae7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSet42.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSet42.java
@@ -55,7 +55,10 @@ public EmbedResultSet42(org.apache.derby.impl.jdbc.EmbedConnection conn,
         ( int columnIndex, Object x, SQLType targetSqlType, int scaleOrLength )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         checkIfClosed("updateObject");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
         updateObject( columnIndex, x, Util42.getTypeAsInt( targetSqlType ) );
         adjustScale( columnIndex, scaleOrLength );
     }
@@ -65,6 +68,7 @@ public EmbedResultSet42(org.apache.derby.impl.jdbc.EmbedConnection conn,
         throws SQLException
     {
         checkIfClosed("updateObject");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
         updateObject( columnName, x, Util42.getTypeAsInt( targetSqlType ) );
     }
 
@@ -72,6 +76,9 @@ public EmbedResultSet42(org.apache.derby.impl.jdbc.EmbedConnection conn,
         ( String columnName, Object x, SQLType targetSqlType, int scaleOrLength )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         checkIfClosed("updateObject");
         updateObject( findColumnName( columnName ), x, targetSqlType, scaleOrLength );
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java
index 5a7e74873e..6f7824d209 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java
@@ -43,6 +43,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
    <P>
    This class can be used outside of this package to convert a
    ResultDescription into a ResultSetMetaData object.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1879
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
    <P>
    EmbedResultSetMetaData objects are shared across multiple threads
    by being stored in the ResultDescription for a compiled plan.
@@ -60,6 +62,7 @@ public class EmbedResultSetMetaData implements ResultSetMetaData {
 	// constructor
 	//
 	public EmbedResultSetMetaData(ResultColumnDescriptor[] columnInfo) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.columnInfo = ArrayUtil.copy(columnInfo);
 	}
 
@@ -73,6 +76,8 @@ public EmbedResultSetMetaData(ResultColumnDescriptor[] columnInfo) {
      * @return the number
      */
 	public final int getColumnCount()	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1879
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
 		return columnInfo.length;
 	}
 
@@ -85,6 +90,8 @@ public final int getColumnCount()	{
      *
      */
 	public final boolean isAutoIncrement(int column) throws SQLException	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1879
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
         validColumnNumber(column);
 		ResultColumnDescriptor rcd = columnInfo[column - 1];
 		return rcd.isAutoincrement();
@@ -206,6 +213,7 @@ public final String getColumnName(int column) throws SQLException	{
 	public final String getSchemaName(int column) throws SQLException	{
 		ResultColumnDescriptor cd = columnInfo[column - 1];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		String s = cd.getSourceSchemaName();
 		// database returns null when no schema name to differentiate from empty name
 		return (s==null? "" : s);
@@ -310,6 +318,7 @@ public final boolean isReadOnly(int column) throws SQLException {
      */
 	public final boolean isWritable(int column) throws SQLException {
 		validColumnNumber(column);
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		return columnInfo[column - 1].updatableByCursor();
 	}
 
@@ -324,6 +333,7 @@ public final boolean isDefinitelyWritable(int column) throws SQLException	{
 		validColumnNumber(column);
 
 		// we just don't know if it is a base table column or not
+//IC see: https://issues.apache.org/jira/browse/DERBY-2423
 		return false;
 	}
 
@@ -335,6 +345,7 @@ private void validColumnNumber(int column) throws SQLException {
 	  if (column < 1 ||
 		        column > getColumnCount() )
 			    throw Util.generateCsSQLException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                       SQLState.COLUMN_NOT_FOUND, column);
 	}
 
@@ -392,6 +403,7 @@ public static ResultColumnDescriptor getResultColumnDescriptor(String name, Data
      * @return true if this implements the interface
      */
     public final boolean isWrapperFor(Class<?> iface) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         return iface.isInstance(this);
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedSavepoint.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedSavepoint.java
index 78304be96a..3e07f95cd1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedSavepoint.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedSavepoint.java
@@ -45,6 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * @see java.sql.Savepoint
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 final class EmbedSavepoint extends ConnectionChild
     implements Savepoint {
 
@@ -63,12 +64,14 @@ final class EmbedSavepoint extends ConnectionChild
 		and restore it.
 	    @exception SQLException on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     EmbedSavepoint(EmbedConnection conn, String name)
     throws StandardException {
    		super(conn);
    		if (name == null) //this is an unnamed savepoint
    		{
             //Generating a unique internal name for unnamed savepoints
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
             savepointName = "i." + getLanguageConnectionContext( conn ).getUniqueSavepointName();
             savepointID = getLanguageConnectionContext( conn ).getUniqueSavepointID();
    		} else
@@ -88,6 +91,7 @@ final class EmbedSavepoint extends ConnectionChild
     * @exception SQLException if this is a named savepoint
     */
     public int getSavepointId() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
    		if (savepointID == -1) {
 			throw newSQLException(SQLState.NO_ID_FOR_NAMED_SAVEPOINT);
         }
@@ -103,6 +107,7 @@ public int getSavepointId() throws SQLException {
     * @exception SQLException if this is an un-named savepoint
     */
     public String getSavepointName() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
    		if (savepointID != -1) {
 			throw newSQLException(SQLState.NO_NAME_FOR_UNNAMED_SAVEPOINT);
         }
@@ -120,6 +125,7 @@ String getInternalName() {
     boolean sameConnection(EmbedConnection con) {
    		return
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
              getLCC( getEmbedConnection() ) ==
              getLCC( con )
              );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedStatement.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedStatement.java
index df888e9006..a3f9e88b19 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedStatement.java
@@ -1483,7 +1483,9 @@ public ParameterValueSet getParameterValueSet()
      * 
      * @see #checkExecStatus()
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
     final void checkStatus() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1395
 		if (!active) {
             // 
             // Check the status of the connection first
@@ -1506,7 +1508,9 @@ its connection (as the underlying Connection is still active).
 		To avoid this heavier weight check on every method of [Prepared]Statement it is only used
 		on those methods that would end up using the database's connection to read or modify data.
 		E.g. execute*(), but not setXXX, etc.
+//IC see: https://issues.apache.org/jira/browse/DERBY-953
         <BR>
+//IC see: https://issues.apache.org/jira/browse/DERBY-953
         If this Statement's Connection is closed an exception will
         be thrown and the active field will be set to false,
         completely marking the Statement as closed.
@@ -1534,6 +1538,7 @@ final void checkExecStatus() throws SQLException {
         
         // Now this connection is closed for all
         // future use.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
         active = false;
         	
 		throw Util.noCurrentConnection();
@@ -1543,6 +1548,7 @@ final void checkExecStatus() throws SQLException {
 		Close and clear all result sets associated with this statement
 		from the last execution.
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
 	void clearResultSets() throws SQLException
     {
         //
@@ -1593,6 +1599,7 @@ private void    clearResultSetsMinion() throws SQLException
 					continue;
 
 				try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
 					lrs.close();
 				} catch (SQLException sdynamic) {
 					if (sqle == null)
@@ -1611,6 +1618,7 @@ relies on it being there for subsequent (post-close) execution
 		*/
 
 		updateCount = -1L; // reset field
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
 		if (sqle != null)
 			throw sqle;
@@ -1669,6 +1677,9 @@ public final void setApplicationStatement(EngineStatement s) {
      */
     private int processDynamicResults(java.sql.ResultSet[][] holder,
                                       int maxDynamicResultSets)
+//IC see: https://issues.apache.org/jira/browse/DERBY-501
+//IC see: https://issues.apache.org/jira/browse/DERBY-1314
+//IC see: https://issues.apache.org/jira/browse/DERBY-1364
         throws SQLException
     {
 
@@ -1690,6 +1701,7 @@ private int processDynamicResults(java.sql.ResultSet[][] holder,
             
             // ignore non-Derby result sets or results sets from another connection
             // and closed result sets.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1585
             EmbedResultSet lrs = EmbedStatement.processDynamicResult(
                     getEmbedConnection(), rs, this);
             
@@ -1722,6 +1734,7 @@ private int processDynamicResults(java.sql.ResultSet[][] holder,
 			}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 			updateCount = -1L;
 			results = sorted[0];
 			currentDynamicResultSet = 0;
@@ -1731,6 +1744,9 @@ private int processDynamicResults(java.sql.ResultSet[][] holder,
 		}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-501
+//IC see: https://issues.apache.org/jira/browse/DERBY-1314
+//IC see: https://issues.apache.org/jira/browse/DERBY-1364
 		return actualCount;
 	}
     
@@ -1753,6 +1769,7 @@ private int processDynamicResults(java.sql.ResultSet[][] holder,
      * dynamic result.
      */
     static EmbedResultSet processDynamicResult(EmbedConnection conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1585
             java.sql.ResultSet resultSet,
             EmbedStatement callStatement)
     {
@@ -1831,6 +1848,7 @@ void resultSetClosing(EmbedResultSet closingLRS) throws SQLException {
      */
     private boolean getExecuteHoldable() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
         if (resultSetHoldability  == java.sql.ResultSet.CLOSE_CURSORS_AT_COMMIT)
             return false;
         
@@ -1839,6 +1857,7 @@ private boolean getExecuteHoldable() throws SQLException
             return true;
         
         return applicationStatement.getResultSetHoldability() ==
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
             java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT;
     }
 
@@ -1853,6 +1872,7 @@ private boolean getExecuteHoldable() throws SQLException
 	public boolean isPoolable() throws SQLException {
 		// Assert the statement is still active (not closed)
 		checkStatus();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1235
 
 		return isPoolable;
 	}                
@@ -1882,6 +1902,7 @@ public void setPoolable(boolean poolable) throws SQLException {
      * whether this is a wrapper for an object with the given interface.
      */
     public final boolean isWrapperFor(Class<?> interfaces) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         checkStatus();
         return interfaces.isInstance(this);
     }
@@ -1912,6 +1933,7 @@ public final <T> T unwrap(java.lang.Class<T> interfaces)
     public  void    closeOnCompletion() throws SQLException
     {
 		// Assert the statement is still active (not closed)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         checkStatus();
         
         closeOnCompletion = true;
@@ -1920,6 +1942,7 @@ public  void    closeOnCompletion() throws SQLException
     public  boolean isCloseOnCompletion() throws SQLException
     {
 		// Assert the statement is still active (not closed)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1234
         checkStatus();
         
         return closeOnCompletion;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedXAConnection.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedXAConnection.java
index 7d5097200d..2ff8b22cce 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedXAConnection.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedXAConnection.java
@@ -48,6 +48,7 @@ public class EmbedXAConnection extends EmbedPooledConnection implements XAConnec
         private EmbedXAResource xaRes;
 
     public EmbedXAConnection(EmbeddedDataSourceInterface ds,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
                       ResourceAdapter ra,
                       String u,
                       String p,
@@ -78,6 +79,7 @@ private boolean isGlobal() {
 
 	public final synchronized XAResource getXAResource() throws SQLException {
 		checkActive();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1155
 		return xaRes;
 	}
 
@@ -104,6 +106,7 @@ public void checkAutoCommit(boolean autoCommit) throws SQLException {
 	public int  checkHoldCursors(int holdability, boolean downgrade)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		if (holdability == ResultSet.HOLD_CURSORS_OVER_COMMIT) {		
 			if (isGlobal()) {
                 if (!downgrade)
@@ -199,6 +202,7 @@ public Statement wrapStatement(Statement s) throws SQLException {
 		Wrap and control a PreparedStatement
 	*/
 	public PreparedStatement wrapStatement(PreparedStatement ps, String sql, Object generatedKeys) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
                 ps = super.wrapStatement(ps,sql,generatedKeys);
 		XAStatementControl sc = new XAStatementControl(this, ps, sql, generatedKeys);
 		return (PreparedStatement) sc.applicationStatement;
@@ -207,6 +211,7 @@ public PreparedStatement wrapStatement(PreparedStatement ps, String sql, Object
 		Wrap and control a PreparedStatement
 	*/
 	public CallableStatement wrapStatement(CallableStatement cs, String sql) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-941
                 cs = super.wrapStatement(cs,sql);
 		XAStatementControl sc = new XAStatementControl(this, cs, sql);
 		return (CallableStatement) sc.applicationStatement;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedXAResource.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedXAResource.java
index 1b47eb2ac1..5e9fb35a05 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedXAResource.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EmbedXAResource.java
@@ -70,6 +70,7 @@ class EmbedXAResource implements XAResource {
         this.con = con;
         this.ra = ra;
         // Setup the default value for the transaction timeout.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
         this.timeoutSeconds = 0;
     }
     
@@ -101,6 +102,7 @@ public final synchronized void commit(Xid xid, boolean onePhase)
             // RM also does not know about this xid.
             if (inDoubtCM == null)
                 throw new XAException(XAException.XAER_NOTA);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             ContextService csf = getContextService();
             csf.setCurrentContextManager(inDoubtCM);
             try {
@@ -146,6 +148,7 @@ public final synchronized void commit(Xid xid, boolean onePhase)
                 throw new XAException(XAException.XAER_PROTO);
             
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
                 tranState.xa_commit(onePhase);
             } catch (SQLException sqle) {
                 throw wrapInXAException(sqle);
@@ -299,6 +302,7 @@ public final synchronized int prepare(Xid xid) throws XAException {
                     
                     returnConnectionToResource(tranState, xid_im);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
 					if (SanityManager.DEBUG) {
 						if (con.realConnection != null) {
 							SanityManager.ASSERT(
@@ -314,6 +318,7 @@ public final synchronized int prepare(Xid xid) throws XAException {
             } catch (SQLException sqle) {
                 XAException xe = wrapInXAException(sqle);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 if (ExceptionUtil.
                         isDeferredConstraintViolation(sqle.getSQLState())) {
                     // We are rolling back
@@ -336,6 +341,7 @@ public final synchronized int prepare(Xid xid) throws XAException {
      * is equal to Integer.MAX_VALUE it means no timeout.
      */
     public synchronized int getTransactionTimeout() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
         return timeoutSeconds;
     }
 
@@ -463,6 +469,8 @@ public final synchronized void rollback(Xid xid) throws XAException {
             if (inDoubtCM == null)
                 throw new XAException(XAException.XAER_NOTA);
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             ContextService csf = getContextService();
             
             csf.setCurrentContextManager(inDoubtCM);
@@ -506,6 +514,7 @@ public final synchronized void rollback(Xid xid) throws XAException {
             
             try {
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
                 tranState.xa_rollback();
             } catch (SQLException sqle) {
                 throw wrapInXAException(sqle);
@@ -536,6 +545,7 @@ public final synchronized void rollback(Xid xid) throws XAException {
      * values are XAER_RMERR, XAER_RMFAIL, or XAER_INVAL.
      */
     public synchronized boolean setTransactionTimeout(int seconds)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
     throws XAException {
         if (seconds < 0) {
             // throw an exception if invalid value was specified
@@ -550,6 +560,7 @@ public synchronized boolean setTransactionTimeout(int seconds)
      */
     private long getDefaultXATransactionTimeout() throws XAException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
             LanguageConnectionContext lcc = getLanguageConnectionContext( con );
             TransactionController tc = lcc.getTransactionExecute();
 
@@ -661,8 +672,10 @@ public final synchronized void start(Xid xid,
                     // and holdability false (cannot hold cursors across 
                     // XA transactions.
                     con.realConnection.setHoldability(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
                             ResultSet.CLOSE_CURSORS_AT_COMMIT);
                     
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
                     getLanguageConnectionContext( con.realConnection ).
                             getTransactionExecute().
                             createXATransactionFromLocalTransaction(
@@ -677,11 +690,13 @@ public final synchronized void start(Xid xid,
                     throw wrapInXAException(sqle);
                 }
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6741
                 tranState = new XATransactionState
                     (
                      getContextManager( con.realConnection ),
                      con.realConnection, this, xid_im
                      );
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
                 if (!ra.addConnection(xid_im, tranState))
                     throw new XAException(XAException.XAER_DUPID);
                 
@@ -728,6 +743,7 @@ public final synchronized void start(Xid xid,
                         // get this state and store in the connection handle so 
                         // that we can restore the isolation when we are in the 
                         // local mode.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1325
                         try {
 	                    	if (con.currentConnectionHandle != null) {
 	                    		con.currentConnectionHandle.getIsolationUptoDate();
@@ -839,6 +855,7 @@ else if (sqlstate.equals(SQLState.LOCK_TIMEOUT))
             xaErrorCode = XAException.XA_RBTIMEOUT;
         else if (seErrorCode >=  ExceptionSeverity.SESSION_SEVERITY)
             xaErrorCode = XAException.XAER_RMFAIL;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         else if (ExceptionUtil.isDeferredConstraintViolation(sqlstate)) {
             xaErrorCode = XAException.XA_RBINTEGRITY;
         } else {
@@ -847,6 +864,7 @@ else if (ExceptionUtil.isDeferredConstraintViolation(sqlstate)) {
         
         xae = new XAException(message);
         xae.errorCode = xaErrorCode;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5542
         xae.initCause(se);
         return xae;
     }
@@ -857,6 +875,8 @@ else if (ExceptionUtil.isDeferredConstraintViolation(sqlstate)) {
      */
     private static XAException wrapInXAException(StandardException se) {
         return wrapInXAException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
                 TransactionResourceImpl.wrapInSQLException(se));
     }
     
@@ -866,6 +886,7 @@ private static XAException wrapInXAException(StandardException se) {
      * @param tranState 
      * @param xid_im 
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
     void returnConnectionToResource(XATransactionState tranState,
                                                             XAXactId xid_im) {
         
@@ -927,6 +948,7 @@ private static void closeUnusedConnection(EmbedConnection conn) {
      * Removes the xid from currently active transactions
      * @param xid_im 
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
     void removeXATransaction(XAXactId xid_im) {
         XATransactionState tranState = 
                 (XATransactionState) ra.removeConnection(xid_im);
@@ -945,12 +967,14 @@ void setCurrentXid(XAXactId aCurrentXid) {
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6741
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
@@ -980,6 +1004,7 @@ public ContextManager run()
 	  */
 	private	LanguageConnectionContext	getLanguageConnectionContext( final EmbedConnection conn )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         return AccessController.doPrivileged
             (
              new PrivilegedAction<LanguageConnectionContext>()
@@ -999,6 +1024,7 @@ public LanguageConnectionContext run()
 	private	LanguageConnectionContext	getLanguageConnectionContext( final EmbedPooledConnection conn )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         if ( lcc == null )
         {
             try {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EncryptedLOBFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EncryptedLOBFile.java
index 4fc58cadd6..bf53e50791 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EncryptedLOBFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/EncryptedLOBFile.java
@@ -78,6 +78,7 @@ class EncryptedLOBFile extends LOBFile {
         if (len < 0)
             throw new IndexOutOfBoundsException (
                     MessageService.getTextMessage (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         SQLState.BLOB_NONPOSITIVE_LENGTH, len));
         //starting position of the 1st block
         long startPos = pos - pos % blockSize;
@@ -113,6 +114,7 @@ long getFilePointer() {
      * @throws IOException
      */
     void seek (long pos) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2379
         long fileLength = super.length();
         if (pos > fileLength + tailSize) {
             //this should never happen
@@ -262,6 +264,7 @@ void write(byte[] b) throws IOException, StandardException {
      */
     int readByte() throws IOException, StandardException {
         long fileLength = super.length();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2379
         if (currentPos >= fileLength + tailSize)
             throw new EOFException ();
         if (currentPos >= fileLength)
@@ -332,6 +335,7 @@ int read(byte[] buff, int off, int len)
      * @throws StandardException if error occurred during decryption
      */
     void setLength(long size) throws IOException, StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2379
         long fileLength = super.length();
         if (size > fileLength + tailSize) {
             //this should never happen
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/InternalClob.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/InternalClob.java
index 4f8c683cda..33ec5cbbd9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/InternalClob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/InternalClob.java
@@ -62,6 +62,7 @@ interface InternalClob {
      *      currently unknown (not cached).
      */
     long getCharLengthIfKnown();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4241
 
     /**
      * Returns a stream serving the raw bytes of the Clob.
@@ -121,6 +122,7 @@ interface InternalClob {
      * @throws IOException if accessing underlying I/O resources fail
      * @throws SQLException if accessing underlying resources fail
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
     Reader getInternalReader(long characterPosition)
             throws IOException, SQLException;
 
@@ -133,6 +135,7 @@ Reader getInternalReader(long characterPosition)
      * @return Update count, starting at zero.
      */
     long getUpdateCount();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
 
     /**
      * Returns a writer to write data into the Clob.
@@ -148,6 +151,7 @@ Reader getInternalReader(long characterPosition)
      *      read-only
      */
     Writer getWriter(long charPos) throws IOException, SQLException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
 
     /**
      * Inserts the given string at the specified character position.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBFile.java
index 951c16c0ff..1cf54ddfc1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBFile.java
@@ -46,6 +46,7 @@ class LOBFile {
      * cannot be opened
      */
     LOBFile(StorageFile lobFile) throws FileNotFoundException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3889
         storageFile = lobFile;
         randomAccessFile = lobFile.getRandomAccessFile("rw");
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBInputStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBInputStream.java
index 30b162c7e1..2185885add 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBInputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBInputStream.java
@@ -40,6 +40,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 
 public class LOBInputStream
+//IC see: https://issues.apache.org/jira/browse/DERBY-3935
     extends InputStream
     implements PositionedStream {
 
@@ -52,6 +53,7 @@ public class LOBInputStream
         closed = false;
         this.control = control;
         pos = position;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
         updateCount = control.getUpdateCount ();
     }
 
@@ -120,14 +122,17 @@ public class LOBInputStream
     public int read(byte[] b, int off, int len) throws IOException {
         if (closed)
             throw new IOException (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
                    MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         try {
             int ret = control.read(b, off, len, pos);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             if (ret != -1) {
                 pos += ret;
                 return ret;
             }
             return -1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
         } catch (StandardException se) {
             String state = se.getSQLState();
             if (state.equals(ExceptionUtil.getSQLStateFromIdentifier(
@@ -172,6 +177,7 @@ public void close() throws IOException {
     public int read() throws IOException {
         if (closed)
             throw new IOException (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
                    MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         try {
             int ret = control.read(pos);
@@ -179,6 +185,8 @@ public int read() throws IOException {
                 pos += 1;
             return ret;
         } catch (StandardException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             throw Util.newIOException(se);
         }
     }
@@ -188,6 +196,7 @@ public int read() throws IOException {
      * @return if stream is modified since created
      */
     boolean isObsolete () {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
         return updateCount != control.getUpdateCount();
     }
     
@@ -213,6 +222,7 @@ long length () throws IOException {
     //   - reposition
 
     public InputStream asInputStream() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3935
         return this;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBOutputStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBOutputStream.java
index fc1973037b..702dd73170 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBOutputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBOutputStream.java
@@ -64,6 +64,7 @@ public class LOBOutputStream extends OutputStream {
     public void write(int b) throws IOException {
         if (closed)
             throw new IOException (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
                     MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         try {
             pos = control.write(b, pos);
@@ -103,15 +104,19 @@ public void write(int b) throws IOException {
     public void write(byte[] b, int off, int len) throws IOException {
         if (closed)
             throw new IOException (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5090
                     MessageService.getTextMessage(MessageId.OBJECT_CLOSED));
         try {
             pos = control.write(b, off, len, pos);
         } catch (StandardException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             if (se.getSQLState().equals(
                     ExceptionUtil.getSQLStateFromIdentifier(
                                             SQLState.BLOB_INVALID_OFFSET))) {
                 throw new ArrayIndexOutOfBoundsException(se.getMessage());
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             throw Util.newIOException(se);
         }
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBStoredProcedure.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBStoredProcedure.java
index f4116efb06..7155e5ead1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBStoredProcedure.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBStoredProcedure.java
@@ -43,6 +43,7 @@ public class LOBStoredProcedure {
      * @throws SQLException
      */
     public static int CLOBCREATELOCATOR() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3576
         EngineLOB clob = (EngineLOB)getEmbedConnection().createClob();
         return clob.getLocator();
     }
@@ -149,6 +150,7 @@ public static String CLOBGETSUBSTRING(int LOCATOR,
         long pos, int len) throws SQLException {
         // Don't read more than what we can represent as a VARCHAR.
         // See DERBY-3769.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         len = Math.min(len, Limits.MAX_CLOB_RETURN_LEN);
         return getClobObjectCorrespondingtoLOCATOR(LOCATOR).getSubString(pos, len);
     }
@@ -211,6 +213,7 @@ private static Clob getClobObjectCorrespondingtoLOCATOR(int LOCATOR)
      * @throws SQLException
      */
     public static int BLOBCREATELOCATOR() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3576
         EngineLOB blob = (EngineLOB)getEmbedConnection().createBlob();
         return blob.getLocator();
     }
@@ -308,6 +311,7 @@ public static byte[] BLOBGETBYTES(int LOCATOR, long pos, int len)
     throws SQLException {
         // Don't read more than what we can represent as a VARBINARY.
         // See DERBY-3769.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         len = Math.min(len, Limits.MAX_BLOB_RETURN_LEN);
         return getBlobObjectCorrespondingtoLOCATOR(LOCATOR).getBytes(pos, len);
     }
@@ -369,8 +373,11 @@ private static Blob getBlobObjectCorrespondingtoLOCATOR(int LOCATOR)
     private static EmbedConnection getEmbedConnection() throws SQLException {
         //DERBY-4664 Do not use DriverManager("jdbc:default:connection") because
         // some other product's Driver might hijack our stored procedure.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4664
+//IC see: https://issues.apache.org/jira/browse/DERBY-4668
         InternalDriver id = InternalDriver.activeDriver();
         if (id != null) { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
             EmbedConnection conn = (EmbedConnection) id.connect( "jdbc:default:connection", null, 0 );
             if (conn != null)
                 return conn;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBStreamControl.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBStreamControl.java
index b80e6414f7..225f569df9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBStreamControl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/LOBStreamControl.java
@@ -56,6 +56,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * blob data irrespective of if its in memory or in file.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6161
 final class LOBStreamControl {
     private LOBFile tmpFile;
     private byte [] dataBytes = new byte [0];
@@ -83,8 +84,10 @@ final class LOBStreamControl {
      * @param data initial value
      */
     LOBStreamControl (EmbedConnection conn, byte [] data)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             throws IOException, StandardException {
         this.conn = conn;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
         updateCount = 0;
         bufferSize =
             Math.min(Math.max(DEFAULT_BUF_SIZE, data.length), MAX_BUF_SIZE);
@@ -93,14 +96,18 @@ final class LOBStreamControl {
 
     private void init(byte [] b, long len)
             throws IOException, StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         Object monitor = findService(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6161
                 Property.DATABASE_MODULE, conn.getDBName());
         final DataFactory df = (DataFactory) findServiceModule(
                 monitor, DataFactory.MODULE);
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             AccessController.doPrivileged (new PrivilegedExceptionAction<Object>() {
                 public Object run() throws IOException {
                     //create a temporary file
+//IC see: https://issues.apache.org/jira/browse/DERBY-3889
                     StorageFile lobFile =
                         df.getStorageFactory().createTemporaryFile("lob", null);
                     if (df.databaseEncrypted()) {
@@ -121,10 +128,12 @@ public Object run() throws IOException {
         //now this call will write into the file
         if (len != 0)
             write(b, 0, (int) len, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2713
         dataBytes = null;
     }
 
     private long updateData(byte[] bytes, int offset, int len, long pos)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             throws StandardException {
         if (dataBytes == null) {
             if ((int) pos == 0) {
@@ -134,7 +143,9 @@ private long updateData(byte[] bytes, int offset, int len, long pos)
             }
             else {
                 //invalid postion
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
                 throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         SQLState.BLOB_POSITION_TOO_LARGE, pos);
             }
         }
@@ -160,9 +171,11 @@ private long updateData(byte[] bytes, int offset, int len, long pos)
     }
 
     private void isValidPostion(long pos)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             throws IOException, StandardException {
         if (pos < 0)
             throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 SQLState.BLOB_NONPOSITIVE_LENGTH, (pos + 1));
         if (pos > Integer.MAX_VALUE)
             throw StandardException.newException(
@@ -200,8 +213,10 @@ private void isValidOffset(int off, int length) throws StandardException {
     synchronized long write(int b, long pos)
             throws IOException, StandardException {
         isValidPostion(pos);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
         updateCount++;
         if (isBytes) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2713
             if (pos < bufferSize) {
                 byte [] bytes = {(byte) b};
                 updateData(bytes, 0, 1, pos);
@@ -210,6 +225,7 @@ synchronized long write(int b, long pos)
                 init(dataBytes, pos);
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
         tmpFile.seek(pos);
         tmpFile.write(b);
         return tmpFile.getFilePointer();
@@ -240,8 +256,10 @@ synchronized long write(byte[] b, int off, int len, long pos)
                     throw new ArrayIndexOutOfBoundsException (e.getMessage());
             throw e;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
         updateCount++;
         if (isBytes) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2713
             if (pos + len <= bufferSize)
                 return updateData(b, off, len, pos);
             else {
@@ -279,6 +297,7 @@ synchronized int read(long pos)
     }
 
     private int readBytes(byte [] b, int off, int len, long pos) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
         if (pos >= dataBytes.length)
             return -1;
         int lengthFromPos = dataBytes.length - (int) pos;
@@ -305,6 +324,7 @@ synchronized int read(byte[] buff, int off, int len, long pos)
         if (isBytes) {
             return readBytes(buff, off, len, pos);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
         tmpFile.seek(pos);
         return tmpFile.read (buff, off, len);
     }
@@ -344,20 +364,26 @@ long getLength() throws IOException {
      * @throws IOException
      */
     synchronized void truncate(long size)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             throws IOException, StandardException {
         isValidPostion(size);
         if (isBytes) {
             byte [] tmpByte = new byte [(int) size];
             System.arraycopy(dataBytes, 0, tmpByte, 0, (int) size);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2345
             dataBytes = tmpByte;
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2713
             if (size < bufferSize) {
                 dataBytes = new byte [(int) size];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
                 read(dataBytes, 0, dataBytes.length, 0);
                 isBytes = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3889
                 releaseTempFile(tmpFile);
                 tmpFile = null;
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
                 tmpFile.setLength(size);
             }
         }
@@ -378,16 +404,19 @@ synchronized void truncate(long size)
      */
     synchronized void copyData(InputStream inStream, long length)
             throws IOException, StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2713
         byte [] data = new byte [bufferSize];
         long sz = 0;
         while (sz < length) {
             int len = (int) Math.min (length - sz, bufferSize);
             len = inStream.read(data, 0, len);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3793
             if (len == -1) {
                 if (length != Long.MAX_VALUE) {
                     // We reached EOF before all the requested bytes are read.
                     throw new EOFException(MessageService.getTextMessage(
                             MessageId.STREAM_PREMATURE_EOF,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                             length, sz));
                 } else {
                     // End of data, but no length checking.
@@ -399,6 +428,7 @@ synchronized void copyData(InputStream inStream, long length)
         }
         // If we copied until EOF, and we read more data than the length of the
         // marker, see if we have a Derby end-of-stream marker.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4241
         long curLength = getLength();
         if (length == Long.MAX_VALUE && curLength > 2) {
             byte[] eos = new byte[3];
@@ -429,6 +459,7 @@ synchronized void copyData(InputStream inStream, long length)
      *      {@code LOBStreamControl}-object fails
      * @throws UTFDataFormatException if an invalid UTF-8 encoding is detected
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4241
     synchronized long copyUtf8Data(final InputStream utf8Stream,
                                    final long charLength)
             throws IOException, StandardException {
@@ -484,6 +515,7 @@ synchronized long copyUtf8Data(final InputStream utf8Stream,
         if (charLength != Long.MAX_VALUE && charCount != charLength) {
             throw new EOFException(MessageService.getTextMessage(
                     MessageId.STREAM_PREMATURE_EOF,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     charLength, charCount));
         }
         return charCount;
@@ -499,8 +531,10 @@ protected void finalize() throws Throwable {
     }
 
     private void deleteFile(final StorageFile file) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         AccessController.doPrivileged(new PrivilegedAction<Object>() {
             public Object run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6161
                 file.delete();
                 return null;
             }
@@ -514,6 +548,7 @@ public Object run() {
     void free() throws IOException {
         dataBytes = null;
         if (tmpFile != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3889
             releaseTempFile(tmpFile);
             tmpFile = null;
         }
@@ -561,12 +596,18 @@ private void releaseTempFile(LOBFile file) throws IOException {
      * @throws IOException if writing to the temporary file fails
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
     synchronized long replaceBytes (byte [] buf, long stPos, long endPos)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             throws IOException, StandardException {
         long length = getLength();
         if (isBytes) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5062
             long finalLength = length - endPos + stPos + buf.length;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2713
             if (finalLength > bufferSize) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2802
                 byte [] tmpBytes = dataBytes;
                 init (tmpBytes, stPos);
                 write (buf, 0, buf.length, getLength());
@@ -589,6 +630,7 @@ synchronized long replaceBytes (byte [] buf, long stPos, long endPos)
             //create new file with 0 size
             
             byte tmp [] = new byte [0];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2379
             LOBFile oldFile = tmpFile;
             init (tmp, 0);
             byte [] tmpByte = new byte [1024];
@@ -613,6 +655,7 @@ synchronized long replaceBytes (byte [] buf, long stPos, long endPos)
                     tmpFile.write (tmpByte, 0, rdLen);
                 }while (true);
             }            
+//IC see: https://issues.apache.org/jira/browse/DERBY-3889
             releaseTempFile(oldFile);
         }
         updateCount++;
@@ -633,6 +676,7 @@ long getUpdateCount() {
      * can't call this entry point.
      */
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/PositionedStoreStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/PositionedStoreStream.java
index 6a7eb9098b..f30aeab6dc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/PositionedStoreStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/PositionedStoreStream.java
@@ -59,6 +59,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 public class PositionedStoreStream
     extends InputStream
     implements PositionedStream, Resetable {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3935
 
     /** Underlying store stream serving bytes. */
     //@GuardedBy("EmbedConnection.getConnectionSynchronization()")
@@ -83,6 +84,7 @@ public class PositionedStoreStream
      * @param in a {@link Resetable}-stream
      */
     public PositionedStoreStream(InputStream in)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3970
             throws IOException, StandardException {
         this.stream = in;
         // We need to know the stream is in a consistent state.
@@ -100,6 +102,7 @@ public PositionedStoreStream(InputStream in)
      */
     public int read(byte[] b)
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3735
         return read(b, 0, b.length);
     }
 
@@ -114,6 +117,7 @@ public int read(byte[] b)
     public int read(byte[] b, int off, int len)
             throws IOException {
         int ret = this.stream.read(b, off, len);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3735
         if (ret > -1) {
             this.pos += ret;
         }
@@ -129,6 +133,7 @@ public int read(byte[] b, int off, int len)
     public int read()
             throws IOException {
         int ret = this.stream.read();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3735
         if (ret > -1) {
             this.pos++;
         }
@@ -157,6 +162,7 @@ public long skip(long toSkip)
      */
     public void resetStream()
             throws IOException, StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3781
         ((Resetable)this.stream).resetStream();
         this.pos = 0L;
     }
@@ -169,6 +175,7 @@ public void resetStream()
      */
     public void initStream()
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3781
         ((Resetable)this.stream).initStream();
     }
 
@@ -178,6 +185,7 @@ public void initStream()
      * @see Resetable#closeStream
      */
     public void closeStream() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3781
         ((Resetable)this.stream).closeStream();
     }
 
@@ -202,17 +210,20 @@ public void closeStream() {
      */
     public void reposition(final long requestedPos)
             throws IOException, StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3935
         if (SanityManager.DEBUG) {
             if (requestedPos < 0) {
                 SanityManager.THROWASSERT("Negative position: " + requestedPos);
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3781
         if (this.pos > requestedPos) {
             // Reset stream to reposition from start.
             resetStream();
         }
         if (this.pos < requestedPos) {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
                 InputStreamUtil.skipFully(stream, requestedPos - pos);
             } catch (EOFException eofe) {
                 // A position after the end of the stream was requested.
@@ -235,6 +246,7 @@ public long getPosition() {
     }
 
     public InputStream asInputStream() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3935
         return this;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ResourceAdapterImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ResourceAdapterImpl.java
index 0357c28bbd..e3fbe80a9c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ResourceAdapterImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/ResourceAdapterImpl.java
@@ -67,9 +67,11 @@ public void boot(boolean create, Properties properties)
 		// loaded.
 
         connectionTable = new Hashtable<XAXactId, XATransactionState>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 		AccessFactory af = 
 			(AccessFactory)findServiceModule(this, AccessFactory.MODULE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		rm = (XAResourceManager) af.getXAResourceManager();
 
@@ -80,6 +82,7 @@ public void stop()
 	{
 		active = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Enumeration<XATransactionState> e = connectionTable.elements();
                 e.hasMoreElements(); ) {
 
@@ -115,6 +118,7 @@ public synchronized boolean addConnection(XAXactId xid, Object conn) {
 		// put this into the transaction table, if the xid is already
 		// present as an in-doubt transaction, we need to remove it from
 		// the run time list
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         connectionTable.put(xid, (XATransactionState) conn);
 		return true;
 	}
@@ -128,6 +132,7 @@ public synchronized Object removeConnection(XAXactId xid) {
 	/** @see org.apache.derby.iapi.jdbc.ResourceAdapter#cancelXATransaction(XAXactId, String)
 	 */
 	public void cancelXATransaction(XAXactId xid, String messageId)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
 	throws XAException
 	{
 		XATransactionState xaState = (XATransactionState) findConnection(xid);
@@ -150,6 +155,7 @@ public XAResourceManager getXAResourceManager()
      * can't call this entry point.
      */
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/SQLExceptionFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/SQLExceptionFactory.java
index fc967c255d..d66b1fe22d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/SQLExceptionFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/SQLExceptionFactory.java
@@ -71,6 +71,7 @@ public SQLException getSQLException(String message, String messageId,
         // Create dummy exception which ferries arguments needed to serialize
         // SQLExceptions across the DRDA network layer.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
         StandardException ferry =
                 wrapArgsForTransportAcrossDRDA(messageId, t, args);
 
@@ -136,8 +137,10 @@ else if (sqlState.startsWith(SQLState.TRANSACTION_PREFIX)) {
     @Override
     public final SQLException getSQLException(String messageId,
             SQLException next, Throwable cause, Object... args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
         String message = MessageService.getTextMessage(messageId, args);
         int severity = StandardException.getSeverityFromIdentifier(messageId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         return getSQLException(message, messageId, next, severity, cause, args);
     }
 
@@ -155,6 +158,7 @@ public final SQLException getSQLException(String messageId,
 	 */
     private StandardException wrapArgsForTransportAcrossDRDA(
             String messageId, Throwable cause, Object[] args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
 
         // If the cause is a StandardException with the same message id, we
         // already have what we need. Just return that exception.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/StoreStreamClob.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/StoreStreamClob.java
index 4d56326b40..7b0d7681cf 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/StoreStreamClob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/StoreStreamClob.java
@@ -96,6 +96,7 @@ final class StoreStreamClob
      * @param conChild the connection (child) this Clob belongs to
      */
     public StoreStreamClob(CharacterStreamDescriptor csd,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                            ConnectionChild conChild)
             throws StandardException {
         if (SanityManager.DEBUG) {
@@ -103,6 +104,7 @@ public StoreStreamClob(CharacterStreamDescriptor csd,
             // supposed to be a position aware stream already!
             SanityManager.ASSERT(!csd.isPositionAware());
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3970
         try {
             this.positionedStoreStream = 
                     new PositionedStoreStream(csd.getStream());
@@ -119,6 +121,7 @@ public StoreStreamClob(CharacterStreamDescriptor csd,
         }
         this.conChild = conChild;
         this.synchronizationObject = conChild.getConnectionSynchronization();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         if (SanityManager.DEBUG) {
             // Creating the positioned stream should reset the stream.
             SanityManager.ASSERT(positionedStoreStream.getPosition() == 0);
@@ -136,6 +139,7 @@ public StoreStreamClob(CharacterStreamDescriptor csd,
      */
     public void release() {
         if (!released) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
             if (this.internalReader != null) {
                 this.internalReader.close();
             }
@@ -154,6 +158,7 @@ public void release() {
     public long getCharLength()
             throws SQLException {
         checkIfValid();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         if (this.csd.getCharLength() == 0) {
             // Decode the stream to find the length.
             long charLength = 0;
@@ -165,12 +170,14 @@ public long getCharLength()
                 } catch (Throwable t) {
                     throw noStateChangeLOB(t);
                 } finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5055
                     ConnectionChild.restoreIntrFlagIfSeen(
                         true, conChild.getEmbedConnection());
                     conChild.restoreContextStack();
                 }
             }
             // Update the stream descriptor.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             this.csd = new CharacterStreamDescriptor.Builder().
                     copyState(this.csd).charLength(charLength).build();
         }
@@ -183,6 +190,7 @@ public long getCharLength()
      * @return The number of characters in the Clob, or {@code -1} if unknown.
      */
     public long getCharLengthIfKnown() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4241
         checkIfValid();
         // Treat a cached value of zero as a special case.
         return (csd.getCharLength() == 0 ? -1 : csd.getCharLength());
@@ -205,6 +213,7 @@ public InputStream getRawByteStream()
         checkIfValid();
         try {
             // Skip the encoded length.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             this.positionedStoreStream.reposition(this.csd.getDataOffset());
         } catch (StandardException se) {
             throw Util.generateCsSQLException(se);
@@ -257,6 +266,7 @@ public Reader getReader(long pos)
      * @throws SQLException if accessing the store resources fail
      */
     public Reader getInternalReader(long characterPosition)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
             throws IOException, SQLException {
         if (this.internalReader == null) {
             if (positionedStoreStream.getPosition() != 0) {
@@ -292,6 +302,7 @@ public void close() {
      * @return Zero (read-only Clob).
      */
     public long getUpdateCount() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         return 0L;
     }
 
@@ -321,6 +332,7 @@ public long insertString(String str, long pos) {
      * @return {@code true} if released, {@code false} if not.
      */
     public boolean isReleased() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         return released;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/TemporaryClob.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/TemporaryClob.java
index 7f54691d50..ab3707e234 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/TemporaryClob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/TemporaryClob.java
@@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * 1-based. Byte positions are always 0-based.
  */
 final class TemporaryClob implements InternalClob {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2827
 
     /**
      * Connection child assoicated with this Clob.
@@ -113,6 +114,7 @@ static InternalClob cloneClobContent(String dbName,
      * @throws SQLException if accessing underlying resources fail
      */
     static InternalClob cloneClobContent(String dbName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2800
                                          ConnectionChild conChild,
                                          InternalClob clob,
                                          long length)
@@ -131,6 +133,7 @@ static InternalClob cloneClobContent(String dbName,
      *      <code>null</code>
      */
     TemporaryClob (ConnectionChild conChild) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         if (conChild == null) {
             throw new NullPointerException("conChild cannot be <null>");
         }
@@ -179,12 +182,14 @@ public synchronized InputStream getRawByteStream()
      * @param conChild connection object used to obtain synchronization object
      */
     TemporaryClob (String data, ConnectionChild conChild)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5760
                           throws IOException, StandardException {
         if (conChild == null) {
             throw new NullPointerException("conChild cannot be <null>");
         }
         this.conChild = conChild;
         bytes = new LOBStreamControl(conChild.getEmbedConnection(), getByteFromString (data));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4023
         this.cachedCharLength = data.length();
     }
     /**
@@ -201,6 +206,7 @@ public synchronized InputStream getRawByteStream()
      */
     //@GuardedBy(this)
     private long getBytePosition (final long charPos)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
             throws IOException {
         long bytePos;
         if (charPos == this.posCache.getCharPos()) {
@@ -230,6 +236,7 @@ private long getBytePosition (final long charPos)
      * @return Update count.
      */
     public long getUpdateCount() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         return bytes.getUpdateCount();
     }
 
@@ -243,6 +250,7 @@ public long getUpdateCount() {
      */
     public synchronized Writer getWriter (long pos)
             throws IOException, SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         checkIfValid();
         // If pos is too large, an error will first be thrown when the writer
         // is written to. Is this okay behavior, is does it break the spec?
@@ -271,6 +279,7 @@ public synchronized Reader getReader (long pos)
         }
         // getCSD obtains a descriptor for the stream to allow the reader
         // to configure itself.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         Reader isr = new UTF8Reader(getCSD(), conChild,
                 conChild.getConnectionSynchronization());
 
@@ -293,6 +302,7 @@ public synchronized Reader getReader (long pos)
      */
     public Reader getInternalReader(long characterPosition)
             throws IOException, SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         if (this.internalReader == null) {
             // getCSD obtains a descriptor for the stream to allow the reader
             // to configure itself.
@@ -322,6 +332,7 @@ public void close() {
      */
     public synchronized long getCharLength() throws IOException {
         checkIfValid();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         if (cachedCharLength == 0) {
             cachedCharLength = UTF8Util.skipUntilEOF(
                     new BufferedInputStream(getRawByteStream()));
@@ -335,6 +346,7 @@ public synchronized long getCharLength() throws IOException {
      * @return The number of characters in the Clob, or {@code -1} if unknown.
      */
     public synchronized long getCharLengthIfKnown() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4241
         checkIfValid();
         // Treat a cached value of zero as a special case.
         return (cachedCharLength == 0 ? -1 : cachedCharLength);
@@ -368,6 +380,7 @@ public synchronized long insertString (String str, long insertionPoint)
             throw new IllegalArgumentException(
                 "Position must be positive: " + insertionPoint);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         long prevLength = cachedCharLength;
         updateInternalState(insertionPoint);
         long byteInsertionPoint = getBytePosition(insertionPoint);
@@ -401,6 +414,7 @@ public synchronized long insertString (String str, long insertionPoint)
                 throw Util.generateCsSQLException(se);
             }
             // Update the length if we know the previous length.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
             if (prevLength != 0) {
                 long newLength = (insertionPoint -1) + str.length();
                 if (newLength > prevLength) {
@@ -420,6 +434,7 @@ public synchronized long insertString (String str, long insertionPoint)
      * @return {@code true} if released, {@code false} if not.
      */
     public synchronized boolean isReleased() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         return released;
     }
 
@@ -447,6 +462,7 @@ public synchronized void truncate(long newCharLength)
                     new BufferedInputStream(getRawByteStream()), newCharLength);
             this.bytes.truncate(byteLength);
             // Reset the internal state, and then update the length.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
             updateInternalState(newCharLength);
             cachedCharLength = newCharLength;
         } catch (StandardException se) {
@@ -495,6 +511,7 @@ else if (c > 0x07FF) {
     private void copyClobContent(InternalClob clob)
             throws IOException, SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4241
             long knownLength = clob.getCharLengthIfKnown();
             if (knownLength == -1) {
                 // Decode UTF-8 data and copy until EOF, obtain char length.
@@ -523,8 +540,11 @@ private void copyClobContent(InternalClob clob)
      * @throws SQLException if accessing underlying resources fail
      */
     private void copyClobContent(InternalClob clob, long charLength)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2800
             throws IOException, SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4241
             long knownLength = clob.getCharLengthIfKnown();
             if (knownLength > charLength || knownLength == -1) {
                 // Decode and copy the requested number of chars.
@@ -534,6 +554,7 @@ private void copyClobContent(InternalClob clob, long charLength)
                 this.cachedCharLength = knownLength;
                 // Copy raw bytes until EOF.
                 // Special case optimization, avoids UTF-8 decoding.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3793
                 this.bytes.copyData(clob.getRawByteStream(), Long.MAX_VALUE);
             } else {
                 // The known length must be smaller than the requested length.
@@ -570,6 +591,8 @@ private final void checkIfValid() {
      */
     private final void updateInternalState(long charChangePosition) {
         // Discard the internal reader, don't want to deliver stale data.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         if (internalReader != null) {
             internalReader.close();
             internalReader = null;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
index cce450b4bd..8249b582e9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
@@ -154,6 +154,7 @@ public final class TransactionResourceImpl
 		// interface is used.  Thus, we look there first.
 		// Default to APP.
 		username = IdUtil.getUserNameFromURLProps(info);
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 
 		drdaID = info.getProperty(Attribute.DRDAID_ATTR, null);
 
@@ -240,6 +241,7 @@ StandardException shutdownDatabaseException() {
 	 * XAResource, which uses the xa_commit or xa_rollback interface as a 
 	 * safeguard. 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	void commit() throws StandardException
 	{
 		lcc.userCommit();
@@ -268,6 +270,7 @@ void clearContextInError()
 	/**
 	 * Resolve: probably superfluous
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	void clearLcc()
 	{
 		lcc = null;
@@ -283,6 +286,7 @@ final void setupContextStack()
 	}
 
 	final void restoreContextStack() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 		if ((csf == null) || (cm == null))
 			return;
@@ -296,6 +300,7 @@ final void restoreContextStack() {
 	/**
 	 * clean up the error and wrap the real exception in some SQLException.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	final SQLException handleException(Throwable thrownException,
 									   boolean autoCommit,	
 									   boolean rollbackOnAutoCommit)
@@ -356,8 +361,11 @@ final SQLException handleException(Throwable thrownException,
 			}
 
             InterruptStatus.restoreIntrFlagIfSeen();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
 
 			return wrapInSQLException(thrownException);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 
 		} catch (Throwable t) {
 
@@ -366,6 +374,8 @@ final SQLException handleException(Throwable thrownException,
 			}
 
             InterruptStatus.restoreIntrFlagIfSeen();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
 
 			/*
 			   We'd rather throw the Throwable,
@@ -373,6 +383,8 @@ final SQLException handleException(Throwable thrownException,
 			   We assume if we are in this degenerate
 			   case that it is actually a java exception
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 			throw wrapInSQLException(t);
 			//throw t;
 		}
@@ -391,6 +403,7 @@ final SQLException handleException(Throwable thrownException,
      * @return true if this is a login failure exception
      */
     private boolean isLoginException(Throwable thrownException) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6426
        if ((thrownException instanceof StandardException) &&
            ((StandardException) thrownException).getSQLState().equals(SQLState.LOGIN_FAILED)) {
            return true;
@@ -414,6 +427,7 @@ public static SQLException wrapInSQLException(Throwable thrownException) {
 		if (thrownException instanceof SQLException) {
             // Server side JDBC can end up with a SQLException in the nested
             // stack. Return the exception with no wrapper.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
             return (SQLException) thrownException;
 		}
 
@@ -421,6 +435,7 @@ public static SQLException wrapInSQLException(Throwable thrownException) {
 
 			StandardException se = (StandardException) thrownException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5243
             if (SQLState.CONN_INTERRUPT.equals(se.getSQLState())) {
                 Thread.currentThread().interrupt();
             }
@@ -436,6 +451,7 @@ public static SQLException wrapInSQLException(Throwable thrownException) {
             // chain. Therefore, call wrapInSQLException() recursively to
             // convert the cause chain into a chain of SQLExceptions.
             return Util.seeNextException(se.getMessageId(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
                         wrapInSQLException(se.getCause()), se.getCause(),
                         se.getArguments());
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/UTF8Reader.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/UTF8Reader.java
index e3143ef76f..8f0f504318 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/UTF8Reader.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/UTF8Reader.java
@@ -119,6 +119,7 @@ public UTF8Reader(CharacterStreamDescriptor csd, ConnectionChild conChild,
         int buffersize = calculateBufferSize(csd);
         this.buffer = new char[buffersize];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         if (csd.isPositionAware()) {
             // Check and save the stream state.
             if (SanityManager.DEBUG) {
@@ -145,6 +146,7 @@ public UTF8Reader(CharacterStreamDescriptor csd, ConnectionChild conChild,
             this.in = csd.getStream();
         }
         // Add the header portion to the utfCount.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         utfCount = csd.getDataOffset();
     }
 
@@ -162,6 +164,7 @@ public UTF8Reader(CharacterStreamDescriptor csd, ConnectionChild conChild,
     public int read() throws IOException
     {
         synchronized (lock) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
 
             // check if closed..
             if (noMoreReads)
@@ -220,16 +223,22 @@ public int read(char[] cbuf, int off, int len) throws IOException
     public long skip(long len) throws IOException {
         if (len < 0) {
             throw new IllegalArgumentException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
                 "Number of characters to skip must be positive: " + len);
         }
         synchronized (lock) {
             // check if closed..
             if (noMoreReads)
                 throw new IOException(READER_CLOSED);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
 
             if (readPositionInBuffer >= charactersInBuffer) {
                 // do somthing
                 if (fillBuffer()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2868
+//IC see: https://issues.apache.org/jira/browse/DERBY-2686
                     return 0L;
                 }
             }
@@ -253,6 +262,7 @@ public void close()
     {
         synchronized (lock) {
             closeIn();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
             parent = null;
             noMoreReads = true;
         }
@@ -389,6 +399,7 @@ private boolean fillBuffer() throws IOException
 
         charactersInBuffer = 0;
         readPositionInBuffer = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
 
         try {
         try {
@@ -403,9 +414,11 @@ private boolean fillBuffer() throws IOException
                 }
             }
             // Keep track of how much we are allowed to read.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             final long utfLen = csd.getByteLength();
             final long maxFieldSize = csd.getMaxCharLength();
 readChars:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
         while (
                 (charactersInBuffer < buffer.length) &&
                 ((utfCount < utfLen) || (utfLen == 0)) &&
@@ -416,16 +429,19 @@ private boolean fillBuffer() throws IOException
             if (c == -1) {
                 if (utfLen == 0) {
                     // Close the stream if it cannot be reset.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
                     if (!csd.isPositionAware()) {
                         closeIn();
                     }
                     break readChars;
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
                 throw utfFormatException("Reached EOF prematurely, " +
                     "read " + utfCount + " out of " + utfLen + " bytes");
             }
 
             int finalChar;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
             switch (c >> 4) {
                 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
                     // 0xxxxxxx
@@ -439,6 +455,7 @@ private boolean fillBuffer() throws IOException
                     utfCount += 2;
                     int char2 = in.read();
                     if (char2 == -1)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
                         throw utfFormatException("Reached EOF when reading " +
                             "second byte in a two byte character encoding; " +
                             "byte/char position " + utfCount + "/" +
@@ -460,6 +477,7 @@ private boolean fillBuffer() throws IOException
                     int char2 = in.read();
                     int char3 = in.read();
                     if (char2 == -1 || char3 == -1)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
                         throw utfFormatException("Reached EOF when reading " +
                             "second/third byte in a three byte character " +
                             "encoding; byte/char position " + utfCount + "/" +
@@ -472,11 +490,13 @@ private boolean fillBuffer() throws IOException
                             // that was terminated with
                             // (11100000, 00000000, 00000000)
                             // Close the stream if it cannot be reset.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
                             if (!csd.isPositionAware()) {
                                 closeIn();
                             }
                             break readChars;
                         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
                         throw utfFormatException("Internal error: Derby-" +
                             "specific EOF marker read");
                     }
@@ -495,6 +515,7 @@ private boolean fillBuffer() throws IOException
 
                 default:
                     // 10xx xxxx,  1111 xxxx
+//IC see: https://issues.apache.org/jira/browse/DERBY-2824
                     throw utfFormatException("Invalid UTF encoding at " +
                         "byte/char position " + utfCount + "/" +
                         readerCharCount + ": (int)" + c);
@@ -517,15 +538,18 @@ private boolean fillBuffer() throws IOException
         }
 
         // Close the stream if it cannot be reset.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         if (!csd.isPositionAware()) {
             closeIn();
         }
         return true;
         } finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5055
             ConnectionChild.restoreIntrFlagIfSeen(true, parent.getEmbedConnection());
             parent.restoreContextStack();
         }
         } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
             throw Util.newIOException(sqle);
         }
     }
@@ -542,7 +566,9 @@ private boolean fillBuffer() throws IOException
     private void resetUTF8Reader()
             throws IOException, StandardException {
         // Skip the length encoding bytes.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         this.positionedIn.reposition(csd.getDataOffset());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         this.utfCount = this.rawStreamPos = this.positionedIn.getPosition();
         // If bufferable, discard buffered stream and create a new one.
         if (csd.isBufferable()) {
@@ -574,6 +600,7 @@ void reposition(long requestedCharPos)
             SanityManager.ASSERT(this.positionedIn != null);
             SanityManager.ASSERT(requestedCharPos > 0);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
         if (requestedCharPos <= readerCharCount - charactersInBuffer) {
             // The stream must be reset, because the requested position is
             // before the current lower buffer boundary.
@@ -606,6 +633,7 @@ private final int calculateBufferSize(CharacterStreamDescriptor csd) {
         // Using the maximum buffer size will be optimal,
         // unless the data is smaller than the maximum buffer.
         int bufferSize = MAXIMUM_BUFFER_SIZE;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         long knownLength = csd.getCharLength();
         long maxCharLength = csd.getMaxCharLength();
         if (knownLength < 1) {
@@ -629,6 +657,7 @@ private final int calculateBufferSize(CharacterStreamDescriptor csd) {
      * @throws IOException if reading from the stream fails
      */
     private final void persistentSkip(long toSkip)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
             throws IOException {
         long remaining = toSkip;
         while (remaining > 0) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/UpdatableBlobStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/UpdatableBlobStream.java
index 6b4a13dbdf..ac748fb425 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/UpdatableBlobStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/UpdatableBlobStream.java
@@ -35,6 +35,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * it will update itself to point to LOBInputStream and reflect changes made to
  * the Blob after the current position of the stream.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2830
 class UpdatableBlobStream extends InputStream {
     /**
      * Flag to check if it is using stream from LOBStreamControl or from DVD.
@@ -61,6 +62,7 @@ class UpdatableBlobStream extends InputStream {
      * @param is InputStream this class is going to use internally.
      * @throws IOException if an I/O error occurs
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2890
     UpdatableBlobStream (EmbedBlob blob, InputStream is)
             throws IOException {
         // The entire Blob has been requested, hence set length to infinity (or
@@ -81,15 +83,19 @@ class UpdatableBlobStream extends InputStream {
      *            has to be restricted.
      * @throws IOException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2830
     UpdatableBlobStream (EmbedBlob blob, InputStream is, long pos, long len) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2890
             throws IOException {
         this.blob = blob;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2711
         stream = is;
         maxPos = pos + len;
         
         //Skip to the requested position
         //inside the stream.
         if (pos > 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2730
             skip(pos);
         }
     }
@@ -109,8 +115,10 @@ private void updateIfRequired () throws IOException {
             try {
                 stream = blob.getBinaryStream();
             } catch (SQLException ex) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3783
                 throw Util.newIOException(ex);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
             InputStreamUtil.skipFully(stream, pos);
         }
     }
@@ -134,10 +142,12 @@ private void updateIfRequired () throws IOException {
      * @see InputStream#read
      */
     public int read() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2711
         updateIfRequired();
         
         //If the current position inside the stream has exceeded maxPos, the
         //read should return -1 signifying end of stream.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2890
         if (pos >= maxPos) {
             return -1;
         }
@@ -174,6 +184,7 @@ public int read() throws IOException {
      */
     public int read(byte[] b, int off, int len) throws IOException {
         updateIfRequired();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4061
         long remaining = maxPos - pos;
         // Return EOF if the maximum allowed position has been reached,
         // and we're trying to read at least one byte.
@@ -207,6 +218,7 @@ public int read(byte[] b, int off, int len) throws IOException {
      * @see java.io.InputStream#read(byte[])
      */
     public int read(byte[] b) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4061
         return read(b, 0, b.length);
     }
 
@@ -229,6 +241,7 @@ public int read(byte[] b) throws IOException {
      * @see java.io.InputStream#skip(long)
      */
     public long skip(long n) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2711
         updateIfRequired();
         long retValue = stream.skip(n);
         if (retValue > 0)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/Util.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/Util.java
index 2f34bde65a..7620077a03 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/Util.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/Util.java
@@ -47,6 +47,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 	REMIND: May want to investigate putting some of this in the protocol
 	side, for the errors that any Derby JDBC driver might return.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 
 	The ASSERT mechanism is a wrapper of the basic services,
 	to ensure that failed asserts at this level will behave
@@ -104,6 +105,7 @@ public static void logSQLException(SQLException se) {
     			(message != null) && (message.equals("Connection refused : java.lang.OutOfMemoryError")))				
     		return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         logError( "\nERROR " +  se.getSQLState() + ": "  + se.getMessage() + "\n", se );
     }
     private static  void    logError( String errorMessage, Throwable t )
@@ -136,6 +138,7 @@ public static void ASSERT(EmbedConnection conn, boolean mustBeTrue, String msg)
 			try {
 				SanityManager.ASSERT(mustBeTrue, msg);
 			} catch (Throwable t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
                 throw conn.handleException(t);
 			}
 		}
@@ -147,6 +150,7 @@ public static void ASSERT(EmbedConnection conn, boolean mustBeTrue, String msg)
      */
     public static   void checkForSupportedDataType(int dataType) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
         if ( !isSupportedType( dataType ) )
         {
             throw generateCsSQLException( SQLState.DATA_TYPE_NOT_SUPPORTED, typeName( dataType ) );
@@ -189,6 +193,7 @@ private static   boolean isSupportedType(int dataType)
         case Types.ARRAY:
         case Types.DATALINK:
         case Types.DISTINCT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
         case Types.NCHAR:
         case Types.NCLOB:
         case Types.NVARCHAR:
@@ -217,6 +222,7 @@ private static   boolean isSupportedType(int dataType)
 
     public static SQLException generateCsSQLException(
             String error, Object... args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
         return generateCsSQLException(error, null, args);
 	}
 
@@ -227,12 +233,14 @@ static SQLException generateCsSQLException(
 	}
 
 	public static SQLException generateCsSQLException(StandardException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6253
         return ExceptionFactory.getInstance().getSQLException(
                 se.getMessage(), se.getMessageId(), (SQLException) null,
                 se.getSeverity(), se, se.getArguments());
     }
 
 	public static SQLException noCurrentConnection() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
         return generateCsSQLException(SQLState.NO_CURRENT_CONNECTION);
 	}
 
@@ -248,7 +256,9 @@ public static SQLException noCurrentConnection() {
      * @return an SQLException wrapping another SQLException
      */
     static SQLException seeNextException(String messageId, SQLException next,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
                                          Throwable cause, Object... args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6253
         return ExceptionFactory.getInstance().getSQLException(
                 messageId, next, cause, args);
     }
@@ -259,6 +269,8 @@ public static SQLException javaException(Throwable t) {
 		msg = t.getMessage();
 		if (msg == null) msg = "";
 		name = t.getClass().getName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
         SQLException next = null;
         Throwable cause = t.getCause();
         if (cause != null) {
@@ -271,9 +283,11 @@ public static SQLException javaException(Throwable t) {
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
         SQLException result = seeNextException(
                 SQLState.JAVA_EXCEPTION, next, t, name, msg);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6346
     	if ( result.getErrorCode() >= logSeverityLevel ) { logSQLException( result ); }
         
         return result;
@@ -281,16 +295,19 @@ public static SQLException javaException(Throwable t) {
 
 
 	public static SQLException policyNotReloaded( Throwable t ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
         return generateCsSQLException(
                 SQLState.POLICY_NOT_RELOADED, t, t.getMessage());
 	}
 
 	public static SQLException notImplemented() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-955
 		return notImplemented( MessageService.getTextMessage(MessageId.CONN_NO_DETAILS) );
 	}
 
 	public static SQLException notImplemented(String feature) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
         return generateCsSQLException(SQLState.NOT_IMPLEMENTED, feature);
 	}
 
@@ -300,10 +317,12 @@ static SQLException setStreamFailure(IOException e) {
 		msg = e.getMessage();
 		if (msg == null) 
 			msg = e.getClass().getName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
         return generateCsSQLException(SQLState.SET_STREAM_FAILURE, e, msg);
 	}
 
 	static SQLException typeMisMatch(int targetSQLType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
         return generateCsSQLException(
                 SQLState.TYPE_MISMATCH, typeName(targetSQLType));
 	}
@@ -325,6 +344,7 @@ public static  int[]   squashLongs( long[] longs )
      * @return an {@code IOException} linked to {@code cause}
      */
     static IOException newIOException(Throwable cause) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6253
         return new IOException(cause);
     }
 
@@ -332,12 +352,15 @@ public static String typeName(int jdbcType) {
 		switch (jdbcType) {
 			case Types.ARRAY: return TypeId.ARRAY_NAME;
 			case Types.BIT 		:  return TypeId.BIT_NAME;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.BOOLEAN  : return TypeId.BOOLEAN_NAME;
 			case Types.DATALINK: return TypeId.DATALINK_NAME;
 			case Types.TINYINT 	:  return TypeId.TINYINT_NAME;
 			case Types.SMALLINT	:  return TypeId.SMALLINT_NAME;
 			case Types.INTEGER 	:  return TypeId.INTEGER_NAME;
             case Types.BIGINT   :  return TypeId.BIGINT_NAME;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			case Types.FLOAT 	:  return TypeId.FLOAT_NAME;
 			case Types.REAL 	:  return TypeId.REAL_NAME;
@@ -363,7 +386,9 @@ public static String typeName(int jdbcType) {
 			case Types.OTHER		:  return "OTHER";
 			case Types.JAVA_OBJECT	:  return "Types.JAVA_OBJECT";
 			case Types.REF : return TypeId.REF_NAME;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 			case JDBC40Translation.REF_CURSOR: return TypeId.REF_CURSOR;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             case Types.ROWID: return TypeId.ROWID_NAME;
 			case Types.STRUCT: return TypeId.STRUCT_NAME;
 			case StoredFormatIds.XML_TYPE_ID :  return TypeId.XML_NAME;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/Util42.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/Util42.java
index e99b038db4..b048effb9b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/Util42.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/Util42.java
@@ -48,6 +48,7 @@ public  static  int getTypeAsInt( SQLType sqlType )
         {
             int     jdbcType = ((JDBCType) sqlType).getVendorTypeNumber();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
             Util.checkForSupportedDataType( jdbcType );
         
             return jdbcType;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XAStatementControl.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XAStatementControl.java
index 7afde0aad6..9a410702de 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XAStatementControl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XAStatementControl.java
@@ -56,6 +56,7 @@ private XAStatementControl(EmbedXAConnection xaConnection) {
 		this.applicationConnection = xaConnection.currentConnectionHandle;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1163
 	XAStatementControl(EmbedXAConnection xaConnection, 
                                 Statement realStatement) throws SQLException {
 		this(xaConnection);
@@ -65,6 +66,7 @@ private XAStatementControl(EmbedXAConnection xaConnection) {
         ((EmbedStatement) realStatement).setApplicationStatement(
                 applicationStatement);
 	}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1163
 	XAStatementControl(EmbedXAConnection xaConnection, 
                 PreparedStatement realPreparedStatement, 
                 String sql, Object generatedKeys) throws SQLException {            
@@ -74,6 +76,7 @@ private XAStatementControl(EmbedXAConnection xaConnection) {
         ((EmbedStatement) realPreparedStatement).setApplicationStatement(
                 applicationStatement);
 	}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1163
 	XAStatementControl(EmbedXAConnection xaConnection, 
                 CallableStatement realCallableStatement, 
                 String sql) throws SQLException {
@@ -88,6 +91,8 @@ private XAStatementControl(EmbedXAConnection xaConnection) {
 	 * Close the realStatement within this control. 
 	 */
 	public void closeRealStatement() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
 		realStatement.close();
 	}
 	
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XATransactionState.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XATransactionState.java
index a9e23bb7b7..6461c880ad 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XATransactionState.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/XATransactionState.java
@@ -46,8 +46,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /** 
 */
 final class XATransactionState extends ContextImpl {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
     /** Rollback-only due to timeout */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
     final static int TRO_TIMEOUT                = -3;
 	/** Rollback-only due to deadlock */
 	final static int TRO_DEADLOCK				= -2;
@@ -58,7 +60,9 @@ final class XATransactionState extends ContextImpl {
 	// final static int T2_ASSOCIATION_SUSPENDED	= 2;
 	final static int TC_COMPLETED				= 3; // rollback/commit called
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	final EmbedConnection	conn;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1155
 	final EmbedXAResource creatingResource;
         // owning XAResource
 	private EmbedXAResource  associatedResource;	
@@ -117,6 +121,7 @@ private synchronized boolean okToCleanup() {
     
 	/**
 		When an XAResource suspends a transaction (end(TMSUSPEND)) it must be resumed
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 		using the same XAConnection. This has been the traditional Cloudscape/Derby behaviour,
 		though there does not seem to be a specific reference to this behaviour in
 		the JTA spec. Note that while the transaction is suspended by this XAResource,
@@ -124,6 +129,7 @@ When an XAResource suspends a transaction (end(TMSUSPEND)) it must be resumed
 	*/
     HashMap<EmbedXAResource, XATransactionState> suspendedList;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 	/**
 		Association state of the transaction.
@@ -156,6 +162,7 @@ private static class CancelXATransactionTask extends TimerTask {
          * @param xaState the XA state object for the transaction to cancel
          */
         public CancelXATransactionTask(XATransactionState xaState) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4137
             this.xaState = xaState;
         }
         
@@ -178,9 +185,11 @@ public synchronized void run() {
     }
 
     private static TimerFactory getTimerFactory() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return getMonitor().getTimerFactory();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1155
 	XATransactionState(ContextManager cm, EmbedConnection conn, 
                 EmbedXAResource resource, XAXactId xid) {
 
@@ -190,6 +199,7 @@ private static TimerFactory getTimerFactory() {
 		this.creatingResource = resource;
 		this.associationState = XATransactionState.T1_ASSOCIATED;
 		this.xid = xid;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
 		this.performTimeoutRollback = false; // there is no transaction yet
 	}
 
@@ -200,6 +210,7 @@ public void cleanupOnError(Throwable t) {
 
                 StandardException se = (StandardException) t;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
                 if (se.getSeverity() >= ExceptionSeverity.SESSION_SEVERITY) {
                     popMe();
                     return;
@@ -226,6 +237,7 @@ else if (se.isLockTimeout())
 	}
 
 	void start(EmbedXAResource resource, int flags) throws XAException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1155
 
         synchronized (this) {
             if (associationState == XATransactionState.TRO_FAIL)
@@ -257,6 +269,7 @@ void start(EmbedXAResource resource, int flags) throws XAException {
             case XATransactionState.T0_NOT_ASSOCIATED:
                 break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
             case XATransactionState.TRO_DEADLOCK:
             case XATransactionState.TRO_TIMEOUT:
             case XATransactionState.TRO_FAIL:
@@ -353,6 +366,7 @@ boolean end(EmbedXAResource resource, int flags,
                 if (resource != associatedResource)
                     throw new XAException(XAException.XAER_PROTO);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 if (suspendedList == null) {
                     suspendedList =
                         new HashMap<EmbedXAResource, XATransactionState>();
@@ -384,8 +398,10 @@ boolean end(EmbedXAResource resource, int flags,
     * @param timeoutMillis The number of milliseconds to be elapsed before
     *                      the transaction will be rolled back.
     */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
     synchronized void scheduleTimeoutTask(long timeoutMillis) {
         // Mark the transaction to be rolled back bby timeout
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
         performTimeoutRollback = true;
         // schedule a time out task if the timeout was specified
         if (timeoutMillis > 0) {
@@ -424,6 +440,7 @@ synchronized int xa_prepare() throws SQLException {
         try {
             retVal = conn.xa_prepare();
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             if (ExceptionUtil.isDeferredConstraintViolation(e.getSQLState())) {
                 // we are rolling back
                 xa_finalize();
@@ -448,8 +465,10 @@ synchronized int xa_prepare() throws SQLException {
     private void xa_finalize() {
         if (timeoutTask != null) {
             getTimerFactory().cancel(timeoutTask);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4137
             timeoutTask = null;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
         performTimeoutRollback = false;
     }
 
@@ -474,6 +493,7 @@ void cancel(String messageId) throws XAException {
                 // just before the xa_commit/rollback
                 // obtained this object's monitor.
                 if (performTimeoutRollback) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
 
                     // Log the message about the transaction cancelled
                     if (messageId != null)
@@ -509,6 +529,7 @@ void cancel(String messageId) throws XAException {
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
index 56d415e7f4..c393886cb6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
@@ -81,6 +81,7 @@ public boolean canSupport(Properties properties) {
 		String authenticationProvider = PropertyUtil.getPropertyFromSet(
 					properties,
 					org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 		if ( (authenticationProvider != null) &&
 			 (authenticationProvider.length() != 0) &&
@@ -185,6 +186,7 @@ public boolean	authenticateUser(String userName,
 		// be retrieved at the datbase level only).
 		//
         String userNameProperty =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
           org.apache.derby.shared.common.reference.Property.USER_PROPERTY_PREFIX.concat(
                         userName);
 
@@ -197,6 +199,7 @@ public boolean	authenticateUser(String userName,
             {
                 // hash passed-in password
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5693
                     passedUserPassword = hashPasswordUsingStoredAlgorithm(
                             userName, userPassword, definedUserPassword);
                 } catch (StandardException se) {
@@ -235,6 +238,7 @@ public boolean	authenticateUser(String userName,
             try {
                 Properties props = getDatabaseProperties();
                 if (props != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5693
                     hashUsingDefaultAlgorithm(
                             userName, userPassword, props);
                 }
@@ -293,6 +297,7 @@ private String hashPasswordUsingStoredAlgorithm(
             throws StandardException
     {
         if (storedPassword.startsWith( PasswordHasher.ID_PATTERN_SHA1_SCHEME )) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5693
             return hashPasswordSHA1Scheme(password);
         }
         else
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
index 8bed29f533..d237a24338 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
@@ -103,6 +103,7 @@ private void setInitDirContextEnv(Properties dbProps) {
 		//
 		initDirContextEnv = new Properties();
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1174
 		if(dbProps != null) {
 			for (Enumeration keys = dbProps.propertyNames(); keys.hasMoreElements(); ) {
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
index a37ae165b7..35d77aa279 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
@@ -80,6 +80,7 @@ public boolean canSupport(Properties properties) {
 		authenticationProvider = PropertyUtil.getPropertyFromSet(
 					properties,
 						org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 		 if ( (authenticationProvider != null) &&
 			   (StringUtil.SQLEqualsIgnoreCase(authenticationProvider,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
index 9aa95c6d0a..d9d8bef9b4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
@@ -146,6 +146,7 @@ public boolean	authenticateUser(String userName,
 				userDN =
 					authenticationService.getProperty(
 						org.apache.derby.shared.common.reference.Property.USER_PROPERTY_PREFIX);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 			if (userDN == (String) null) {
 				userDN = getDNFromUID(userName);
@@ -167,6 +168,7 @@ public boolean	authenticateUser(String userName,
 
 			// it is happening right here
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-857
             DirContext ctx =   privInitialDirContext(env);
           
             
@@ -197,6 +199,7 @@ public boolean	authenticateUser(String userName,
      */
     private DirContext privInitialDirContext(final Properties env) throws NamingException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return AccessController.doPrivileged(
                     new PrivilegedExceptionAction<DirContext>() {
                         public DirContext run() throws NamingException {
@@ -233,6 +236,7 @@ protected void setJNDIProviderProperties()
 			//
 			String ldapServer = authenticationService.getProperty(
 						org.apache.derby.shared.common.reference.Property.AUTHENTICATION_SERVER_PARAMETER);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 			if (ldapServer == (String) null) {
 
@@ -245,6 +249,7 @@ protected void setJNDIProviderProperties()
 
 			} else {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1000
 				if (ldapServer.startsWith(dfltLDAPURL) || ldapServer.startsWith("ldaps://") )
 					this.providerURL = ldapServer;
 				else if (ldapServer.startsWith("//"))
@@ -368,6 +373,7 @@ else if (ldapServer.startsWith("//"))
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         if (SanityManager.DEBUG &&
             SanityManager.DEBUG_ON(
                 AuthenticationServiceBase.AuthenticationTrace)) {
@@ -427,6 +433,7 @@ private String getDNFromUID(String uid)
 			env = initDirContextEnv;
 
 		DirContext ctx = privInitialDirContext(env);
+//IC see: https://issues.apache.org/jira/browse/DERBY-857
 
 		// Construct Search Filter
 		SearchControls ctls = new SearchControls();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java
index 9027c7461e..179f92da13 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java
@@ -208,6 +208,7 @@ private boolean validAuthenticationProvider()
         if ( _credentialsDB != null )
         {
             // make sure that it is a well-formed database name
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             if ( getMonitor().getCanonicalServiceName( _credentialsDB ) == null )
             {
                 throw StandardException.newException( SQLState.BAD_CREDENTIALS_DB_NAME, _credentialsDB );
@@ -342,6 +343,7 @@ public void boot(boolean create, Properties properties)
     private boolean authenticatingInThisDatabase( String userVisibleDatabaseName )
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return authenticatingInThisService( getMonitor().getCanonicalServiceName( userVisibleDatabaseName ) );
     }
 
@@ -368,6 +370,7 @@ private boolean isCredentialsService( String canonicalDatabaseName )
         String  canonicalCredentialsDBName = getCanonicalServiceName( _credentialsDB );
 
         String canonicalDB = getMonitor().getCanonicalServiceName( canonicalDatabaseName );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         if ( canonicalCredentialsDBName == null ) { return false; }
         else { return canonicalCredentialsDBName.equals( canonicalDatabaseName ); }
@@ -384,6 +387,7 @@ private String  getCanonicalServiceName()
     private String  getCanonicalServiceName( String rawName )
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return getMonitor().getCanonicalServiceName( rawName );
     }
 
@@ -420,12 +424,14 @@ private String  getCanonicalServiceName( String rawName )
         SQLWarning  warnings = null;
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5607
             Properties  properties = new Properties();
             properties.setProperty( Attribute.USERNAME_ATTR, userName );
             properties.setProperty( Attribute.PASSWORD_ATTR, userPassword );
 
             String  connectionURL = Attribute.PROTOCOL + _credentialsDB;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
             Connection  conn = InternalDriver.activeDriver().connect( connectionURL, properties, 0 );
             
             warnings = conn.getWarnings();
@@ -496,6 +502,7 @@ else if ( SQLState.DATABASE_NOT_FOUND.startsWith( sqlState ) )
         //
         // we expect to find a data dictionary
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         DataDictionary      dd = (DataDictionary) AuthenticationServiceBase.getServiceModule( this, DataDictionary.MODULE );        
         UserDescriptor      userDescriptor = dd.getUser( userName );
         
@@ -555,6 +562,7 @@ else if ( SQLState.DATABASE_NOT_FOUND.startsWith( sqlState ) )
             
             if ( remainingLifetime <= expirationThreshold )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5647
                 if ( dd.getAuthorizationDatabaseOwner().equals( userName ) )
                 {
                     throw SQLWarningFactory.newSQLWarning( SQLState.DBO_PASSWORD_EXPIRES_SOON, databaseName );
@@ -575,6 +583,7 @@ else if ( SQLState.DATABASE_NOT_FOUND.startsWith( sqlState ) )
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
index a951fbf5b1..7d6231ae40 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
@@ -76,6 +76,7 @@ public boolean canSupport(Properties properties) {
 
 		specificAuthenticationScheme = PropertyUtil.getPropertyFromSet(
 					properties,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 					org.apache.derby.shared.common.reference.Property.AUTHENTICATION_PROVIDER_PARAMETER);
 		if (
 			 ((specificAuthenticationScheme != null) &&
@@ -116,6 +117,7 @@ public void boot(boolean create, Properties properties)
 		Throwable t;
 		try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			Class<?> sasClass = Class.forName(specificAuthenticationScheme);
 			if (!UserAuthenticator.class.isAssignableFrom(sasClass)) {
 				throw StandardException.newException(SQLState.AUTHENTICATION_NOT_IMPLEMENTED,
@@ -137,12 +139,14 @@ public void boot(boolean create, Properties properties)
 			t = ie;
 		} catch (IllegalAccessException iae) {
 			t = iae;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		} catch (NoSuchMethodException nsme) {
 			t = nsme;
 		} catch (java.lang.reflect.InvocationTargetException ite) {
 			t = ite;
 		}
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5741
         String  detail = t.getClass().getName() + ": " + t.getMessage();
 		throw StandardException.newException
             ( SQLState.AUTHENTICATION_SCHEME_ERROR, specificAuthenticationScheme, detail );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/ColumnInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/ColumnInfo.java
index 5dada6fefa..5733dfb2c0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/ColumnInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/ColumnInfo.java
@@ -76,11 +76,14 @@ public ColumnInfo(Connection conn,
 					  String tName,
 					  String insertColumnList, 
 					  String vtiColumnIndexes,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
 					  String vtiColumnPrefix,
 					  String[] headerColumnNames)
 		throws SQLException 
 	{
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		vtiColumnNames = new ArrayList<String>(1);
 		insertColumnNames = new ArrayList<String>(1);
 		columnTypes = new ArrayList<String>(1);
@@ -88,6 +91,8 @@ public ColumnInfo(Connection conn,
         udtClassNames = new HashMap<String,String>();
 		noOfColumns = 0;
 		this.conn = conn;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
 		this.headerColumnNames=headerColumnNames;
         if (sName == null) {
             // Use the current schema if no schema is specified.
@@ -138,6 +143,8 @@ public ColumnInfo(Connection conn,
 			while (st.hasMoreTokens()) 
 			{
 				int cIndex;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
 				String columnIndex = (st.nextToken()).trim();
 				if("\"".equals(columnIndex.substring(0,1))){
 					
@@ -170,6 +177,8 @@ public ColumnInfo(Connection conn,
 
 	//Check for matchng patterns of column names
 	private int readHeaders(String columnPattern) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
 		throws SQLException
 	{
 	    	if(headerColumnNames!=null){
@@ -226,9 +235,11 @@ private boolean initializeColumnInfo(String columnPattern)
 				insertColumnNames.add(columnName);
 				String sqlType = typeName + getTypeOption(typeName , columnSize , columnSize , decimalDigits);
 				columnTypes.add(sqlType);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 jdbcColumnTypes.add((int) dataType);
 				noOfColumns++;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
                 if ( dataType == java.sql.Types.JAVA_OBJECT )
                 {
                     udtClassNames.put( "COLUMN" +  noOfColumns, getUDTClassName( dmd, typeName ) );
@@ -248,6 +259,7 @@ private boolean initializeColumnInfo(String columnPattern)
 
     // look up the class name of a UDT
     private String getUDTClassName( DatabaseMetaData dmd, String sqlTypeName )
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws SQLException
     {
         String className = null;
@@ -270,6 +282,7 @@ private String getUDTClassName( DatabaseMetaData dmd, String sqlTypeName )
             rs.close();
         }
         catch (Exception e) { throw LoadError.unexpectedError( e ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
 
         if ( className == null ) { className = "???"; }
         
@@ -282,6 +295,7 @@ public  static final boolean importExportSupportedType(int type){
 
 		return !(type == java.sql.Types.BIT ||
 				 type == java.sql.Types.OTHER ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                  type == Types.SQLXML );
 	}
 
@@ -325,6 +339,7 @@ else if(precision == 0 && scale!=0)
      * Get the column type names.
      */
     public String getColumnTypeNames()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws Exception
     {
         // we use the object serializer logic
@@ -461,6 +476,7 @@ private boolean tableExists() throws SQLException
      */
 	public String getExpectedVtiColumnTypesAsString() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         StringBuffer vtiColumnTypes = new StringBuffer();
         // expected types of data in the import file, based on 
         // the how columns in the data file are  mapped to 
@@ -550,9 +566,11 @@ public static int[] getExpectedVtiColumnTypes(String columnTypesStr,
      * @see getColumnTypeNames()
      */
     public static String[] getExpectedColumnTypeNames
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         ( String columnTypeNamesString, int noOfColumns )
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList list = (ArrayList)
                 ImportAbstract.destringifyObject( columnTypeNamesString );
 
@@ -582,8 +600,10 @@ public static HashMap getExpectedUDTClasses( String stringVersion )
 
         if ( stringMap == null ) { return null; }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         HashMap<String,Class<?>> retval = new HashMap<String,Class<?>>();
         Iterator entries = stringMap.entrySet().iterator();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5021
 
         while ( entries.hasNext() )
         {
@@ -592,6 +612,7 @@ public static HashMap getExpectedUDTClasses( String stringVersion )
             String className = (String) entry.getValue();
 
             Class<?> classValue = Class.forName( className );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
             retval.put( columnName, classValue );
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/Export.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/Export.java
index b029949912..f9370439d0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/Export.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/Export.java
@@ -66,6 +66,7 @@ private void doExport() throws SQLException
 				doAllTheWork();
 			} catch (IOException iex) {
 				//in case of ioexception, catch it and throw it as our own exception
+//IC see: https://issues.apache.org/jira/browse/DERBY-2858
 				throw LoadError.errorWritingData(iex);
 			}
 		} catch (Exception ex) {
@@ -74,6 +75,7 @@ private void doExport() throws SQLException
 	}
 	
 	private Export(Connection con, String schemaName , 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
 				   String tableName, String selectStatement ,
 				   String outputFileName, String characterDelimeter, 
 				   String columnDelimeter, String codeset)
@@ -103,12 +105,14 @@ private Export(Connection con, String schemaName ,
      */
 	private void setLobsExtFileName(String lobsFileName) throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
 		if (lobsFileName == null) {
             throw PublicAPI.wrapStandardException(
                       StandardException.newException(
                       SQLState.LOB_DATA_FILE_NULL));
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
 		this.lobsFileName = lobsFileName;
 		lobsInExtFile = true;
 	}
@@ -146,6 +150,7 @@ private boolean dataFileExists(String fileName) throws SQLException {
             fileName = FileUtil.stripProtocolFromFileName( fileName );
             File file = new File(fileName);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2556
             return fileExists(file);
         }
 
@@ -157,9 +162,11 @@ private boolean dataFileExists(String fileName) throws SQLException {
      * @throws SecurityException if the required privileges are missing
      */
     private final boolean fileExists(final File file) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return (AccessController.doPrivileged(
                 new PrivilegedAction<Boolean>() {
                     public Boolean run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         return file.exists();
                     }
             })).booleanValue();
@@ -185,6 +192,7 @@ public static void exportTable(Connection con, String schemaName,
 		throws SQLException {
 
         /** Make sure that the current user has permission to perform this operation */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         try {
             SecurityUtil.authorize( Securable.EXPORT_TABLE );
         }
@@ -280,6 +288,7 @@ public static void exportQuery(Connection con, String selectStatement,
      * @exception SQLException on errors
      */
     public static void exportQuery(Connection con, String selectStatement,
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                                    String outputFileName, String columnDelimeter, 
                                    String characterDelimeter, String codeset, 
                                    String lobsFileName)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportAbstract.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportAbstract.java
index df866e083a..9eb58037df 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportAbstract.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportAbstract.java
@@ -75,11 +75,13 @@ protected ResultSet resultSetForEntity() throws Exception {
     private String[] getOneRowAtATime(ResultSet rs, 
                                       boolean[] isLargeBinary, 
                                       boolean[] isLargeChar) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         throws Exception 
 	{
 
     if (rs.next()){
        int columnCount = exportResultSetForObject.getColumnCount();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5017
 	   ResultSetMetaData rsm=rs.getMetaData();
        String[] rowObjects = new String[columnCount];
        for (int colNum = 0; colNum < columnCount; colNum++) {
@@ -114,6 +116,7 @@ private String[] getOneRowAtATime(ResultSet rs,
                // TODO : handling of Nulls. 
            }
 		   else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
                String columnValue;
                int jdbcColumnNumber = colNum + 1;
                
@@ -134,6 +137,7 @@ private String[] getOneRowAtATime(ResultSet rs,
     // write a Serializable as a string
     public static String stringifyObject( Object udt ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         DynamicByteArrayOutputStream dbaos = new DynamicByteArrayOutputStream();
         ObjectOutputStream oos = new ObjectOutputStream( dbaos );
         
@@ -169,6 +173,7 @@ protected void doAllTheWork() throws Exception {
 						ctype == Types.FLOAT ||ctype == Types.INTEGER || ctype == Types.NUMERIC ||
 						ctype == Types.REAL ||ctype == Types.SMALLINT || ctype == Types.TINYINT)
     				isNumeric[i] = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
 				else 
 					isNumeric[i] = false;
 					
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportWriteData.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportWriteData.java
index 94cbb9fe65..ec8a1d5b6b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportWriteData.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportWriteData.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 final class ExportWriteData extends ExportWriteDataAbstract
 	implements java.security.PrivilegedExceptionAction<Object> {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	private String outputFileName;
 	private String lobsFileName;
@@ -57,6 +58,8 @@ final class ExportWriteData extends ExportWriteDataAbstract
     private char[] charBuf;
 
 	//writes data into the o/p file using control file properties
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
 	ExportWriteData(String outputFileName, ControlInfo controlFileReader)
 		throws Exception {
 		this.outputFileName = outputFileName;
@@ -100,26 +103,31 @@ private void openFiles() throws Exception {
     outputFileName = FileUtil.stripProtocolFromFileName( outputFileName );
     if ( lobsInExtFile ) { lobsFileName = FileUtil.stripProtocolFromFileName( lobsFileName ); }
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-2456
     FileOutputStream anOutputStream = null;
     BufferedOutputStream buffered = null;
     FileOutputStream lobOutputStream = null;
 
     try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
         File outputFile = new File(outputFileName);
         anOutputStream = new FileOutputStream(outputFileName);
         FileUtil.limitAccessToOwner(outputFile);
 
         buffered = new BufferedOutputStream(anOutputStream);
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-777
         aStream = dataCodeset == null ?
     		new OutputStreamWriter(buffered) :
     		new OutputStreamWriter(buffered, dataCodeset);    	        
 
         // if lobs are exported to an external file, then 
         // setup the required streams to write lob data.
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         if (lobsInExtFile) 
         {
             // setup streams to write large objects into the external file. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
             File lobsFile =  new File(lobsFileName);
             if (lobsFile.getParentFile() == null) {
                 // lob file name is unqualified. Make lobs file 
@@ -133,6 +141,7 @@ private void openFiles() throws Exception {
 
             lobOutputStream = new FileOutputStream(lobsFile);
             FileUtil.limitAccessToOwner(lobsFile);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
             lobOutBinaryStream = new BufferedOutputStream(lobOutputStream);
 
@@ -176,6 +185,7 @@ private void openFiles() throws Exception {
   *  data file
  	* @exception	Exception if there is an error
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
   void writeColumnDefinitionOptionally(String[] columnNames,
   											  String[] columnTypes)
   														throws Exception {
@@ -183,6 +193,7 @@ void writeColumnDefinitionOptionally(String[] columnNames,
 
     //do uppercase because the ui shows the values as True and False
     if (columnDefinition.toUpperCase(java.util.Locale.ENGLISH).equals(ControlInfo.INTERNAL_TRUE.toUpperCase(java.util.Locale.ENGLISH))) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
        String tempStr="";
        //put the start and stop delimiters around the column name and type
        for (int i=0; i<columnNames.length; i++) {
@@ -239,6 +250,7 @@ private void writeNextColumn(String oneColumn, boolean isNumeric) throws Excepti
      * @return Location where the column data written in the external file. 
      * @exception Exception  if any error occurs while writing the data.  
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
     String writeBinaryColumnToExternalFile(InputStream istream) 
         throws Exception
     {
@@ -248,6 +260,7 @@ String writeBinaryColumnToExternalFile(InputStream istream)
 
         long blobSize = 0;
         int noBytes = 0 ;
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         if (istream != null ) {
             noBytes = istream.read(byteBuf) ;
             while(noBytes != -1) 
@@ -306,6 +319,7 @@ String writeCharColumnToExternalFile(Reader ir)
 
         long clobSize = 0;
         int noChars = 0 ;
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         if (ir != null ) {
             noChars = ir.read(charBuf) ;
             while(noChars != -1) 
@@ -376,6 +390,7 @@ public void writeData(String[] oneRow, boolean[] isNumeric) throws Exception {
   public void noMoreRows() throws IOException {
     aStream.flush();
     aStream.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
     if (lobsInExtFile) {
         // close the streams associated with lob data.
         if (lobOutBinaryStream != null) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java
index 297277b534..e930cdd91b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java
@@ -55,6 +55,7 @@ protected void loadPropertiesInfo() throws Exception {
 
   //if control file says true for column definition, write it as first line of the
   //data file
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
   abstract void writeColumnDefinitionOptionally(String[] columnNames,
   													   String[] columnTypes)
   											throws Exception;
@@ -76,6 +77,7 @@ public void setColumnLengths(int[] columnLengths) {
      * @return Location where the column data written in the external file. 
      * @exception Exception  if any error occurs while writing the data.  
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
     abstract String writeBinaryColumnToExternalFile(InputStream istream) 
         throws Exception;
     
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/Import.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/Import.java
index 48a1087b39..cb212d0dbe 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/Import.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/Import.java
@@ -63,10 +63,12 @@ public class Import extends ImportAbstract{
      * @exception SQLException on error
 	 */
 	public Import(String inputFileName, String columnDelimiter,
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                   String characterDelimiter,  String codeset, 
                   int noOfColumnsExpected,  String columnTypes, 
                   boolean lobsInExtFile,
                   int importCounter,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
                   String columnTypeNames, String udtClassNamesString ) throws SQLException 
 	{
 		try{
@@ -80,12 +82,14 @@ public Import(String inputFileName, String columnDelimiter,
 												   columnDelimiter, codeset);
             this.lobsInExtFile = lobsInExtFile;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             _importers.put( importCounter, this );
             
 			doImport();
 
 		}catch(Exception e)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3068
 			throw importError(e);
 		}
 	}
@@ -123,14 +127,18 @@ private void doImport() throws Exception
 	 */
 
 	public static void importTable(Connection connection, String schemaName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                                    String tableName, String inputFileName,  
                                    String columnDelimiter, 
                                    String characterDelimiter,String codeset, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6892
                                    short replace, boolean lobsInExtFile, short... extraArgs)
 		throws SQLException {
 
 
         /** Make sure that the current user has permission to perform this operation */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         try {
             if ( lobsInExtFile )
             {
@@ -143,6 +151,8 @@ public static void importTable(Connection connection, String schemaName,
         }
         catch (StandardException se) { throw PublicAPI.wrapStandardException( se ); }
         if(extraArgs.length>0){
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6892
              skip=extraArgs[0];
 	     if(skip<0) throw PublicAPI.wrapStandardException(StandardException.newException
 				(SQLState.LANG_INVALID_NUMBEROF_HEADER_LINES)); 
@@ -181,6 +191,7 @@ public static void importTable(Connection connection, String schemaName,
      * @exception SQLException on errors
 	 */
 	public static void importData(Connection connection, String schemaName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                                   String tableName, String insertColumnList, 
                                   String columnIndexes, String inputFileName, 
                                   String columnDelimiter, 
@@ -190,6 +201,7 @@ public static void importData(Connection connection, String schemaName,
 		throws SQLException 
 	{
         /** Make sure that the current user has permission to perform this operation */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         try {
             if ( lobsInExtFile )
             {
@@ -201,6 +213,10 @@ public static void importData(Connection connection, String schemaName,
             }
         }
         catch (StandardException se) { throw PublicAPI.wrapStandardException( se ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
 	if(extraArgs.length>0){
 	    skip=extraArgs[0];
 	    if(skip<0) throw PublicAPI.wrapStandardException(StandardException.newException
@@ -224,7 +240,9 @@ public static void importData(Connection connection, String schemaName,
 	 *
 	 */
     private static void performImport
+//IC see: https://issues.apache.org/jira/browse/DERBY-2193
         (Connection connection, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
          String schemaName, 
          String insertColumnList, 
          String columnIndexes,
@@ -237,6 +255,7 @@ public static void importData(Connection connection, String schemaName,
          boolean lobsInExtFile)
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Integer     importCounter = bumpImportCounter();
         
         try {
@@ -251,11 +270,14 @@ public static void importData(Connection connection, String schemaName,
             
             ColumnInfo columnInfo = new ColumnInfo(connection , schemaName ,
                                                    tableName, insertColumnList, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
                                                    columnIndexes, COLUMNNAMEPREFIX,readHeaders(inputFileName ,
 												characterDelimiter,
 												columnDelimiter,
 												codeset));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
             String columnTypeNames = null;
             String udtClassNames = null;
             try {
@@ -278,6 +300,7 @@ public static void importData(Connection connection, String schemaName,
             sb.append(",") ;
             sb.append(quoteStringArgument(codeset));
             sb.append(", ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
             sb.append( columnInfo.getExpectedNumberOfColumnsInFile());
             sb.append(", ");
             sb.append(quoteStringArgument(
@@ -286,6 +309,7 @@ public static void importData(Connection connection, String schemaName,
             sb.append(lobsInExtFile);
             sb.append(", ");
             sb.append( importCounter.intValue() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
             sb.append(", ");
             sb.append(quoteStringArgument( columnTypeNames ) );
             sb.append(", ");
@@ -319,6 +343,7 @@ public static void importData(Connection connection, String schemaName,
             else
                 insertColumnNames = "";
             String insertSql = "INSERT INTO " + entityName +  insertColumnNames + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
                 " --DERBY-PROPERTIES insertMode=" + insertModeValue + "\n" +
                 " SELECT " + cNamesWithCasts + " from " + 
                 importvti + " AS importvti" ;
@@ -357,6 +382,8 @@ public static void importData(Connection connection, String schemaName,
     
     //Read the header lines to get column names to identify columns by name
     private static String[] readHeaders(String inputFileName ,String characterDelimiter,String columnDelimiter,String codeset) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
 	throws SQLException
 	{
 	try {
@@ -395,7 +422,10 @@ private static String[] readHeaders(String inputFileName ,String characterDelimi
 	/** virtual method from the abstract class
 	 * @exception	Exception on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	ImportReadData getImportReadData() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6892
 		return new ImportReadData(inputFileName, controlFileReader, skip);
 	}
 
@@ -405,6 +435,7 @@ ImportReadData getImportReadData() throws Exception {
      */
     private static  synchronized    int bumpImportCounter()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2193
         return ++_importCounter;
     }
     
@@ -419,8 +450,10 @@ private static  SQLException    formatImportError( Import importer, String input
         if ( importer != null ) { lineNumber = importer.getCurrentLineNumber(); }
         
         StandardException se = StandardException.newException
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             ( SQLState.UNEXPECTED_IMPORT_ERROR, lineNumber, inputFile, t.getMessage() );
         se.initCause(t);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 
         return PublicAPI.wrapStandardException(se);
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportAbstract.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportAbstract.java
index 28478f43c2..e2e7478c64 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportAbstract.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportAbstract.java
@@ -41,6 +41,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 abstract class ImportAbstract extends VTITemplate {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
   ControlInfo controlFileReader;
   ImportReadData importReadData;
 
@@ -51,11 +52,13 @@ abstract class ImportAbstract extends VTITemplate {
   int lineNumber = 0;
   String[] nextRow;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
   ImportResultSetMetaData importResultSetMetaData;
   int noOfColumnsExpected;
 
   protected boolean lobsInExtFile = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
   String tableColumnTypesStr;
   int[] tableColumnTypes;
   String columnTypeNamesString;
@@ -90,6 +93,7 @@ void doAllTheWork() throws Exception {
     nextRow = new String[numberOfColumns];
     tableColumnTypes = ColumnInfo.getExpectedVtiColumnTypes(tableColumnTypesStr,
                                                             numberOfColumns);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
     columnTypeNames =  ColumnInfo.getExpectedColumnTypeNames( columnTypeNamesString, numberOfColumns );
     udtClasses = ColumnInfo.getExpectedUDTClasses( udtClassNamesString );
 	// get the ResultSetMetaData now as we know it's needed
@@ -102,6 +106,7 @@ void doAllTheWork() throws Exception {
 //    while (next()) ;
   }
   //the column names will be Column#
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
   void loadColumnNames() {
     for (int i=1; i<=numberOfColumns; i++)
       columnNames[i-1] = COLUMNNAMEPREFIX + i;
@@ -129,9 +134,11 @@ public int getRow() throws SQLException {
     
   public boolean next() throws SQLException {
     try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2193
       lineNumber++;
       return (importReadData.readNextRow(nextRow));
     } catch (Exception ex) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3068
 		throw importError(ex);
 	}
   }
@@ -157,8 +164,11 @@ public boolean wasNull() {
 	*/
   public String getString(int columnIndex) throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
     if (columnIndex <= numberOfColumns) {
 		String val = nextRow[columnIndex-1];
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
+//IC see: https://issues.apache.org/jira/browse/DERBY-2465
         if (isColumnInExtFile(columnIndex)) {
             // a clob column data is stored in an external 
             // file, the reference to it is in the main file. 
@@ -184,6 +194,8 @@ public String getString(int columnIndex) throws SQLException {
      */
 	public java.sql.Clob getClob(int columnIndex) throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
+//IC see: https://issues.apache.org/jira/browse/DERBY-2465
         java.sql.Clob clob = null;
 		if (lobsInExtFile) 
         {
@@ -211,11 +223,14 @@ public java.sql.Clob getClob(int columnIndex) throws SQLException {
      */
 	public java.sql.Blob getBlob(int columnIndex) throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         java.sql.Blob blob = null;
 		if (lobsInExtFile) 
         {
             // lob data is in another file, read from the external file.
             blob = importReadData.getBlobColumnFromExtFile(
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
+//IC see: https://issues.apache.org/jira/browse/DERBY-2465
                                          nextRow[columnIndex-1], columnIndex);
         } else {
             // data is in the main export file, stored in hex format.
@@ -263,6 +278,7 @@ public java.sql.Blob getBlob(int columnIndex) throws SQLException {
 	public Object getObject(int columnIndex) throws SQLException
     {
         byte[] bytes = getBytes( columnIndex );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
 
         try {
             Class udtClass = importResultSetMetaData.getUDTClass( columnIndex );
@@ -322,6 +338,7 @@ public byte[] getBytes(int columnIndex) throws SQLException {
         // if hex data is null, then column value is SQL NULL
         wasNull = (hexData == null);
         byte[] data = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         if (hexData != null) {
             // Derby export calls Resultset.getString() method
             // to write binary data types.  Derby getString() 
@@ -375,6 +392,7 @@ private boolean isColumnInExtFile(int colIndex)
          * @throws SQLException
          */
         public  SQLException importError(Exception ex) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3068
             Exception closeException = null;
             if (importReadData != null)
                 try {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportBlob.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportBlob.java
index e431b06723..706cfa1bf3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportBlob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportBlob.java
@@ -66,6 +66,7 @@ public ImportBlob(ImportLobFile lobFile, long position, long length)
      */
     public ImportBlob(byte[] data) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         blobData = data;
         blobLength = data.length;
     }
@@ -180,6 +181,7 @@ public java.io.InputStream getBinaryStream () throws SQLException
     /** Return an unimplemented feature error */
     private SQLException   methodNotImplemented()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		return LoadError.unexpectedError( new Exception("Method not implemented")) ;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportClob.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportClob.java
index 709bb2e17e..8ef33c31f1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportClob.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportClob.java
@@ -168,6 +168,7 @@ public java.io.Reader getCharacterStream() throws SQLException {
      */
     public int setString(long pos, String str, int offset, int len) 
         throws SQLException { throw methodNotImplemented(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
     /**
      * This routine is not used by the VTI to read the data, so no 
@@ -202,6 +203,7 @@ public int setString(long pos, String str, int offset, int len)
     /** Return an unimplemented feature error */
     private SQLException   methodNotImplemented()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		return LoadError.unexpectedError( new Exception("Method not implemented")) ;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportLobFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportLobFile.java
index 03fa22246f..c5f69abdd5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportLobFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportLobFile.java
@@ -53,6 +53,7 @@ class ImportLobFile
      * @param lobFile the file which has the LOB Data.
      * @param dataCodeset the code set to use char data in the file.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
     ImportLobFile(File lobFile, String dataCodeset) throws Exception {
         this.dataCodeset = dataCodeset;
         openLobFile(lobFile);
@@ -71,9 +72,11 @@ private void openLobFile(final File lobFile)
         try {
             // open the lob file under a privelged block.
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 lobRaf = AccessController.doPrivileged
                 (new java.security.PrivilegedExceptionAction<RandomAccessFile>(){
                         public RandomAccessFile run() throws IOException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                             return new RandomAccessFile(lobFile, "r");
                         }   
                     }
@@ -82,6 +85,7 @@ public RandomAccessFile run() throws IOException{
                 throw pae.getException();
             }
         } catch (FileNotFoundException ex) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
             throw PublicAPI.wrapStandardException(
                       StandardException.newException(
                       SQLState.LOB_DATA_FILE_NOT_FOUND, 
@@ -136,6 +140,8 @@ public String getString(long offset, int length) throws IOException {
         // wrap a reader on top of the stream, so that calls 
         // to read the clob data from the file can read the 
         // with approapriate  data code set. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
+//IC see: https://issues.apache.org/jira/browse/DERBY-2465
         lobReader = dataCodeset == null ?
     		new InputStreamReader(lobLimitIn) : 
             new InputStreamReader(lobLimitIn, dataCodeset);    
@@ -160,6 +166,8 @@ public String getString(long offset, int length) throws IOException {
      * @exception  IOException  on any I/O error.     
      */
     public java.io.Reader getCharacterStream(long offset, long length) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
+//IC see: https://issues.apache.org/jira/browse/DERBY-2465
         throws IOException 
     {
         lobInputStream.seek(offset);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportReadData.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportReadData.java
index 2539e2f908..2b1785bb9f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportReadData.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportReadData.java
@@ -33,6 +33,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.sanity.SanityManager;
 import java.sql.SQLException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 final class ImportReadData implements java.security.PrivilegedExceptionAction<Object> {
   //Read data from this file
   private String inputFileName;
@@ -144,6 +145,8 @@ private void loadPropertiesInfo() throws Exception {
   }
   //inputFileName: File to read data from
   //controlFileReader: File used to interpret data in the inputFileName
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6892
   ImportReadData(String inputFileName, ControlInfo controlFileReader,short skipLines)
   throws Exception {
     this.skipLines=skipLines;
@@ -158,6 +161,8 @@ private void loadPropertiesInfo() throws Exception {
     loadMetaData();
 
     lobFileHandles = new ImportLobFile[numberOfColumns];
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
+//IC see: https://issues.apache.org/jira/browse/DERBY-2465
 
   }
 
@@ -179,6 +184,8 @@ protected void ignoreFirstRow() throws Exception {
  	* @exception	Exception if there is an error
 	*/
   protected void ignoreHeaderLines() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
     for(int i =0;i<skipLines;i++){
        if(!readNextToken(recordSeparator, 0, recordSeparatorLength, true))
           throw LoadError.unexpectedEndOfFile(lineNumber+1);
@@ -244,6 +251,7 @@ public final Object run() throws Exception {
 
   //open the input data file for reading
   private void realOpenFile() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-777
 	  InputStream inputStream;
     try {
       try {
@@ -252,16 +260,19 @@ private void realOpenFile() throws Exception {
            inputFileName = url.getFile(); //seems like you can't do openstream on file
            throw new MalformedURLException(); //so, get the filename from url and do it ususal way
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-777
         inputStream =  url.openStream();
       } catch (MalformedURLException ex) {
         inputStream = new FileInputStream(inputFileName);
         
       }
     } catch (FileNotFoundException ex) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
         throw LoadError.dataFileNotFound(inputFileName, ex);
     } catch (SecurityException se) {
 		throw LoadError.dataFileNotFound(inputFileName, se);
 	}
+//IC see: https://issues.apache.org/jira/browse/DERBY-777
     java.io.Reader rd = dataCodeset == null ?
     		new InputStreamReader(inputStream) : new InputStreamReader(inputStream, dataCodeset);    
     bufferedReader = new BufferedReader(rd, 32*1024);
@@ -290,6 +301,7 @@ private void loadMetaData() throws Exception {
   /**close the input data file
  	* @exception	Exception if there is an error
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
   void closeStream() throws Exception {
     if (streamOpenForReading) {
        bufferedReader.close();
@@ -297,6 +309,8 @@ void closeStream() throws Exception {
     }
 
     // close external lob file resources.
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
+//IC see: https://issues.apache.org/jira/browse/DERBY-2465
     if (lobFileHandles != null) {
         for (int i = 0 ; i < numberOfColumns ; i++) 
         {
@@ -666,6 +680,8 @@ boolean readNextRow(String[] returnStringArray) throws Exception {
        if (hasColumnDefinition){
           ignoreFirstRow();
        }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
        ignoreHeaderLines();
     }
     if (formatCode == DEFAULT_FORMAT_CODE)
@@ -844,6 +860,7 @@ private boolean readNextDelimitedRow(String[] returnStringArray) throws Exceptio
     }
 
     if (totalCharsSoFar > -1) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2193
 
       /* This is a hack to fix a problem: When there is missing data in columns
       and hasDelimiterAtEnd==true, then the last delimiter was read as the last column data.
@@ -853,6 +870,7 @@ private boolean readNextDelimitedRow(String[] returnStringArray) throws Exceptio
       actually same as the delimiter.
       */
       if (!hasDelimiterAtEnd) {//normal path:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2193
           returnStringArray[upperLimit] = new String(currentToken,
                           positionOfNonWhiteSpaceCharInFront, totalCharsSoFar);
       }
@@ -883,6 +901,8 @@ else if (totalCharsSoFar==fieldSeparatorLength && isFieldSep(currentToken) ){
     else
       returnStringArray[upperLimit] = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
     lineNumber++;
     return true;
   }
@@ -963,6 +983,8 @@ boolean readNextToken(char[] delimiter, int delimiterIndex,
      * @param colIndex number of the column. starts at 1.      
      * @exception  SQLException  on any errors. 
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
+//IC see: https://issues.apache.org/jira/browse/DERBY-2465
     String getClobColumnFromExtFileAsString(String lobLocationStr, int colIndex) 
         throws SQLException 
     {
@@ -994,6 +1016,7 @@ java.sql.Clob getClobColumnFromExtFile(String lobLocationStr, int colIndex)
     {
 		try {
             initExternalLobFile(lobLocationStr, colIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
             if (lobLength == -1 ){
                 // lob length -1 indicates columnn value is a NULL, 
                 // just return null. 
@@ -1015,10 +1038,13 @@ java.sql.Clob getClobColumnFromExtFile(String lobLocationStr, int colIndex)
      * @param colIndex number of the column. starts at 1.                   
      * @exception  SQLException  on any errors. 
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
+//IC see: https://issues.apache.org/jira/browse/DERBY-2465
     java.sql.Blob getBlobColumnFromExtFile(String lobLocationStr, int colIndex)
         throws SQLException
     {
         initExternalLobFile(lobLocationStr, colIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         if (lobLength == -1) {
             // lob length -1 indicates columnn value is a NULL, 
             // just return null. 
@@ -1050,6 +1076,7 @@ private void initExternalLobFile(String lobLocationStr, int colIndex)
         int lengthIndex = lobLocationStr.lastIndexOf(".") ;
         int offsetIndex = lobLocationStr.lastIndexOf(".", 
                                                      lengthIndex -1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
 
         lobLength = Integer.parseInt(lobLocationStr.substring(
                                      lengthIndex + 1, 
@@ -1058,12 +1085,15 @@ private void initExternalLobFile(String lobLocationStr, int colIndex)
                                      offsetIndex+1, 
                                      lengthIndex));
         lobFileName = lobLocationStr.substring(0 , offsetIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
+//IC see: https://issues.apache.org/jira/browse/DERBY-2465
         if (lobFileHandles[colIndex-1] == null) {
             // open external file where the lobs are stored.
             try {
                 // each lob column in the table has it's own file handle. 
                 // separate file handles are must, lob stream objects
                 // can not be reused until the whole row is inserted.
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                 File lobsFile = new File (lobFileName);
                 if (lobsFile.getParentFile() == null) {
                     // lob file name is unqualified. lob file 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportResultSetMetaData.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
index dd53e1aaf9..f475e1195d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
@@ -38,9 +38,11 @@ class ImportResultSetMetaData extends VTIMetaDataTemplate {
   private final HashMap udtClasses;
 
   public ImportResultSetMetaData(int numberOfColumns, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                                  String[] columnNames,
                                  int[] columnWidths, 
                                  int[] tableColumnTypes,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
                                  String[] columnTypeNames,
                                  HashMap udtClasses ) {
     this.numberOfColumns = numberOfColumns;
@@ -106,6 +108,7 @@ public int getColumnType(int column) {
             // CHAR FOR BIT DATA 
             colType = java.sql.Types.BINARY;
             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         case java.sql.Types.JAVA_OBJECT: 
             // User-defined type
             colType = java.sql.Types.JAVA_OBJECT;
@@ -124,6 +127,7 @@ public int isNullable(int column) {
   }
 	public int getColumnDisplaySize(int column) {
     if (columnWidths == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
        return Limits.DB2_VARCHAR_MAXWIDTH;
     else
        return columnWidths[column-1];
@@ -131,12 +135,14 @@ public int getColumnDisplaySize(int column) {
 
 	public  String getColumnTypeName(int column) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
 		return columnTypeNames[ column - 1 ];
 	}
 
     /**
      * Get the class bound to a UDT column.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6621
     Class getUDTClass( int column ) throws SQLException
     {
         String columnName = getColumnName( column );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/load/LoadError.java b/java/org.apache.derby.engine/org/apache/derby/impl/load/LoadError.java
index cbe965263f..9f7c3d94ab 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/load/LoadError.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/load/LoadError.java
@@ -37,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 class LoadError {
 	
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 	 Raised if, the Derby database connection is null.
 	*/
 
@@ -53,6 +54,7 @@ static SQLException connectionNull() {
 	static SQLException dataAfterStopDelimiter(int lineNumber, int columnNumber) {
 		return PublicAPI.wrapStandardException(
 			   StandardException.newException(SQLState.DATA_AFTER_STOP_DELIMITER,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 											  lineNumber, columnNumber));				 	
 	}
 
@@ -64,6 +66,7 @@ static SQLException dataAfterStopDelimiter(int lineNumber, int columnNumber) {
 	static SQLException dataFileNotFound(String fileName, Exception ex) {
 
 		return PublicAPI.wrapStandardException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 			   StandardException.newException(SQLState.DATA_FILE_NOT_FOUND, ex,
 											  fileName));
 	}
@@ -102,6 +105,7 @@ static SQLException entityNameMissing() {
 
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	   Raised if, field and record separators are substring of each other.
 	*/
 	static SQLException fieldAndRecordSeparatorsSubset() {
@@ -127,6 +131,7 @@ static SQLException invalidColumnName(String columnName) {
 	static SQLException invalidColumnNumber(int numberOfColumns) {
 		
 		return PublicAPI.wrapStandardException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				StandardException.newException(SQLState.INVALID_COLUMN_NUMBER, numberOfColumns ));
 	}
 
@@ -159,6 +164,8 @@ static SQLException recordSeparatorMissing(int lineNumber) {
 	static SQLException unexpectedEndOfFile(int lineNumber) {
     return  PublicAPI.wrapStandardException(
 			StandardException.newException(SQLState.UNEXPECTED_END_OF_FILE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 										   lineNumber));
 	}
 
@@ -167,6 +174,7 @@ static SQLException unexpectedEndOfFile(int lineNumber) {
 	*/
 	static SQLException errorWritingData(IOException ioe) {
 		return PublicAPI.wrapStandardException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2858
 			StandardException.newException(SQLState.ERROR_WRITING_DATA, ioe));
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCClass.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCClass.java
index 2fa0719c8d..58c1d335f9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCClass.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCClass.java
@@ -348,6 +348,7 @@ ClassFactory getClassFactory() {
 	 * @param limit
 	 * @param value
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 	void addLimitExceeded(BCMethod mb, String limitName, int limit, int value)
 	{
 		StringBuffer sb = new StringBuffer();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCJava.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCJava.java
index 465b1d69af..23c10b1ef4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCJava.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCJava.java
@@ -283,6 +283,8 @@ String vmType(BCMethodDescriptor md) {
 
 		} catch (StandardException se) {
 			if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unexpected exception", se);
 			}
 
@@ -328,6 +330,7 @@ static short vmTypeId(String vmTypeS) {
      * can't call this entry point.
      */
     private  static  Object  startSystemModule( final String factoryInterface )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCMethod.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCMethod.java
index e84a0d7d3b..fbafa60868 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCMethod.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/BCMethod.java
@@ -64,6 +64,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Method Builder implementation for generating bytecode.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 class BCMethod implements MethodBuilder {
     
     /**
@@ -89,6 +90,8 @@ class BCMethod implements MethodBuilder {
      * Fast access for the parametes, will be null
      * if the method has no parameters.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 	BCLocalField[] parameters; 
     
     /**
@@ -99,7 +102,9 @@ class BCMethod implements MethodBuilder {
     
     
 	Vector<String> thrownExceptions; // expected to be names of Classes under Throwable
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 	CodeChunk myCode;
 	protected ClassMember myEntry;
 
@@ -127,6 +132,7 @@ class BCMethod implements MethodBuilder {
 
 		this.cb = (BCClass) cb;
 		modClass = this.cb.modify();
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		myReturnType = returnType;
 		myName = methodName;
 
@@ -140,6 +146,8 @@ class BCMethod implements MethodBuilder {
 
 		String[] vmParamterTypes;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (parms != null && parms.length != 0) {
 			int len = parms.length;
 			vmParamterTypes = new String[len];
@@ -165,6 +173,8 @@ class BCMethod implements MethodBuilder {
 		// get code chunk
 		myCode = new CodeChunk(this.cb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
         parameterTypes = parms;
 	}
 	//
@@ -177,6 +187,7 @@ class BCMethod implements MethodBuilder {
 	 * overflowing to. Those sub-methods are hidden from any caller.
 	 */
 	public String getName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		return myName;
 	}
 
@@ -202,6 +213,7 @@ public void addThrownException(String exceptionClass) {
 		// Allowing this would cause the method overflow/split to
 		// break as the top-level method would not have the exception
 		// added in the sub method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		if (SanityManager.DEBUG)
 		{
 			if (myCode.getPC() != 0)
@@ -210,7 +222,9 @@ public void addThrownException(String exceptionClass) {
 		}
 
 		if (thrownExceptions == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			thrownExceptions = new Vector<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 		thrownExceptions.add(exceptionClass);
 	}
 
@@ -230,7 +244,11 @@ public void complete() {
         // the last instruction. Note this value can
         // be changed by the splitMethod call.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-766
         if (myCode.getPC() > CODE_SPLIT_LENGTH)
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
             splitMethod();
                          
        // write exceptions attribute info
@@ -238,6 +256,7 @@ public void complete() {
         	
 		// get the code attribute to put itself into the class
 		// provide the final header information needed
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		myCode.complete(this, modClass, myEntry, maxStack, currentVarNum);
 	}
     
@@ -358,6 +377,7 @@ protected void writeExceptions() {
 
 				for (int i = 0; i < numExc; i++) {
 					// put each exception into the constant pool
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 					String e = thrownExceptions.get(i).toString();
 					int ei2 = modClass.addClassReference(e);
 
@@ -443,6 +463,7 @@ private Type popStack() {
 	
 	private Type[] copyStack()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 		Type[] stack = new Type[stackTypeOffset];
 		System.arraycopy(stackTypes, 0, stack, 0, stackTypeOffset);
 		return stack;
@@ -537,6 +558,8 @@ else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE)
 			int cpe = modClass.addConstant(value);
 			addInstrCPE(VMOpcode.LDC, cpe);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-766
 		growStack(type.width(), type);
 		
 	}
@@ -590,6 +613,8 @@ else if (value == 2.0)
 		else 
 		{
 			int cpe = modClass.addConstant(value);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			addInstrCPE(VMOpcode.LDC, cpe);
 		}
 		growStack(1, Type.FLOAT);
@@ -609,6 +634,10 @@ public void push(double value) {
 	}
 	public void push(String value) {
 		int cpe = modClass.addConstant(value);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		addInstrCPE(VMOpcode.LDC, cpe);
 		growStack(1, Type.STRING);
 	}
@@ -733,8 +762,12 @@ public int callMethod(short opcode, String declaringClass, String methodName,
 		int rw = rt.width();
 		if (rw != 0)
 			growStack(rw, rt);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
             overflowMethodCheck();
 		}
 		// Check the declared type of the method
@@ -796,6 +829,7 @@ public void cast(String className) {
 		// classes to check relationships or any other
 		// information. Thus other optimizations where a cast
 		// is not required are not implemented.
+//IC see: https://issues.apache.org/jira/browse/DERBY-740
 		Type tbc = stackTypes[stackTypeOffset - 1];
 		
 		short sourceType = tbc.vmType();
@@ -935,12 +969,15 @@ Upon entry the top word(s) on the stack is
 		word
 		</PRE>
 		word2,word1 -&gt; word2, word1, word2
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		So that we are left with word after the put.
 
 	*/
 	public void putField(LocalField field) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		BCLocalField lf = (BCLocalField) field;
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		putField(lf.type, lf.cpi, true);
 	}
 
@@ -952,6 +989,7 @@ public void putField(String fieldName, String fieldType) {
 		Type ft = cb.factory.type(fieldType);
 		int cpi = modClass.addFieldReference(cb.classType.vmNameSimple, fieldName, ft.vmName());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		putField(ft, cpi, true);
 	}
 
@@ -1036,12 +1074,14 @@ private void conditionalIf(short opcode) {
 		// 'if' so that we can set up the 'else' block with the
 		// correct stack on entry.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 		condition = new Conditional(condition, myCode, opcode, copyStack());
 	}
 
 	public void startElseCode() {
 		
 		// start the else code
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		Type[] entryStack = condition.startElse(this, myCode, copyStack());
 		
 		for (int i = stackDepth = 0; i  < entryStack.length; i++)
@@ -1052,10 +1092,12 @@ public void startElseCode() {
 
 	}
 	public void completeConditional() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		condition = condition.end(this, myCode, stackTypes, stackTypeOffset);
 	}
 	
 	public void pop() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 		if (SanityManager.DEBUG) {
 			if (stackDepth == 0)
 				SanityManager.THROWASSERT("pop when stack is empty!");
@@ -1064,6 +1106,7 @@ public void pop() {
 
 		myCode.addInstr(toPop.width() == 2  ? VMOpcode.POP2 : VMOpcode.POP);
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
         overflowMethodCheck();
 	}	
 
@@ -1139,6 +1182,7 @@ public void setArrayElement(int element) {
 	/**
 		Create an array instance
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Stack ... =&gt;
 		      ...,arrayref
 	*/
@@ -1189,6 +1233,8 @@ public void pushNewArray(String className, int size) {
      */
     private void addInstrCPE(short opcode, int cpe)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
         if (cpe >= VMOpcode.MAX_CONSTANT_POOL_ENTRIES)
             cb.addLimitExceeded(this, "constant_pool_count",
                     VMOpcode.MAX_CONSTANT_POOL_ENTRIES, cpe);
@@ -1228,6 +1274,7 @@ public boolean statementNumHitLimit(int noStatementsAdded)
 	 * <CODE>
 	 public Object e23()
 	 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 	   ... existing code
 	   // split point
 	   return e23_0();
@@ -1262,6 +1309,7 @@ private Object e23_1()
 	 */
 	private void overflowMethodCheck()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
         if (stackDepth != 0) {
             // Can only overflow to new method if the stack is empty.
             return;
@@ -1294,6 +1342,8 @@ private void overflowMethodCheck()
 				return;
 		}
         		
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		BCMethod subMethod = getNewSubMethod(myReturnType, false);
 				
 		// stop any recursion
@@ -1340,6 +1390,8 @@ private void overflowMethodCheck()
      *            define it with no parameters.
      * @return A valid empty sub method.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
     final BCMethod getNewSubMethod(String returnType, boolean withParameters) {
         int modifiers = myEntry.getModifier();
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/CodeChunk.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
index 5f94057d89..0867342a8e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
@@ -756,6 +756,7 @@ private void fixLengths(BCMethod mb, int maxStack, int maxLocals, int codeLength
 	 * now that it holds all of the instructions and
 	 * the exception table.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 	void complete(BCMethod mb, ClassHolder ch,
 			ClassMember method, int maxStack, int maxLocals) {
 
@@ -794,6 +795,7 @@ void complete(BCMethod mb, ClassHolder ch,
             limitHit(ioe);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		fixLengths(mb, maxStack, maxLocals, codeLength);
 		method.addAttribute("Code", out);
 		
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/Conditional.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/Conditional.java
index 0fd6962aa0..bd4e19d376 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/Conditional.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/Conditional.java
@@ -53,6 +53,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 Note all branches here are using relative offsets, not absolute program counters.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 If the then code leads to the conditional branch offset being too big (&gt;32k)
 because the then code is larger than 32767 bytes then this is built:
 <code>
@@ -97,9 +98,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
      if condition branch to tb: (relative offset +8)
      goto_w eb: // indirect for else block (5 bytes)
      tb:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	    then code (&gt; 32767 bytes)
 	    goto_w end:
 	 eb:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	  else code (&gt; 32767 bytes)
 	 end:
 </code>
@@ -147,6 +151,7 @@ class Conditional {
 	 * @param ifOpcode Opcode for the if check.
 	 * @param entryStack Type stack on entering the conditional then block.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 	Conditional(Conditional parent, CodeChunk chunk, short ifOpcode, Type[] entryStack) {
 		this.parent = parent;
 		if_pc = chunk.getPC();
@@ -163,6 +168,7 @@ class Conditional {
 	 * @param thenStack Type stack on completing the conditional then block.
 	 * @return the type stack on entering the then block
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 	Type[] startElse(BCMethod mb, CodeChunk chunk, Type[] thenStack) {
 		
 		// reserve space for the goto end we will be adding
@@ -178,6 +184,7 @@ Type[] startElse(BCMethod mb, CodeChunk chunk, Type[] thenStack) {
 		// instructions in a goto to get its pc.
 		thenGoto_pc = chunk.getPC() - 3;
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 		Type[] entryStack = stack;
 		stack = thenStack;
 		
@@ -204,8 +211,10 @@ Conditional end(BCMethod mb, CodeChunk chunk, Type[] elseStack, int stackNumber)
 		
 		fillIn(mb, chunk, branch_pc, chunk.getPC());
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6699
 			if (stackNumber != stack.length) {
                 StringBuilder sb = new StringBuilder();
                 
@@ -229,6 +238,7 @@ Conditional end(BCMethod mb, CodeChunk chunk, Type[] elseStack, int stackNumber)
             
 			for (int i = 0; i < stackNumber; i++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2230
 				if (stack[i].vmType() != elseStack[i].vmType()) {
 				    if(  !stack[i].vmName().equals(elseStack[i].vmName()))
 					SanityManager.THROWASSERT("ByteCode Conditional then/else stack mismatch: then: "
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/GClass.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/GClass.java
index d1faf22eb0..97a9cf2c3b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/GClass.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/GClass.java
@@ -65,6 +65,7 @@ public GeneratedClass getGeneratedClass() throws StandardException {
 
 	protected void writeClassFile(String dir, boolean logMessage, Throwable t)
 		throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 		if (SanityManager.DEBUG) {
 
@@ -77,10 +78,12 @@ protected void writeClassFile(String dir, boolean logMessage, Throwable t)
 		filename = filename + ".class";
 
 		final File classFile = new File(dir,filename);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4287
 
 		FileOutputStream fos = null;
 		try {
 			try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				fos =  AccessController.doPrivileged(
 						new PrivilegedExceptionAction<FileOutputStream>() {
 							public FileOutputStream run()
@@ -96,12 +99,14 @@ public FileOutputStream run()
 			fos.flush();
 			if (logMessage) {
 		        // find the error stream
+//IC see: https://issues.apache.org/jira/browse/DERBY-5062
 		        HeaderPrintWriter errorStream = Monitor.getStream();
 				errorStream.printlnWithHeader("Wrote class "+getFullName()+" to file "+classFile.toString()+". Please provide support with the file and the following exception message: "+t);
 			}
 			fos.close();
 		} catch (IOException e) {
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unable to write .class file", e);
 		}
 		}
@@ -144,6 +149,7 @@ final void validateType(String typeName1)
 				else
 					cf.loadApplicationClass(typeName);
 			} catch (ClassNotFoundException cnfe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Class "+typeName+" not found", cnfe);
 			}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/Type.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/Type.java
index 24863efb48..b6afc3e40d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/Type.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/Type.java
@@ -49,6 +49,7 @@ final class Type {
 
     @Override
     public String toString() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6699
         StringBuilder sb = new StringBuilder();
         sb.append("[");
         sb.append(javaName);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java
index 37388d6c57..e03585d44a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java
@@ -58,6 +58,7 @@ static void checkMethod(short opcode, Type dt, String methodName, String[] debug
 
 
 		if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-624
 			String reason = null;
 			try {
 
@@ -77,6 +78,7 @@ static void checkMethod(short opcode, Type dt, String methodName, String[] debug
 				Class[] params = NO_PARAMS;
 
 				Class<?> declaring = loadClass(declaringClass);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 				if (debugParameterTypes != null) {
 					params = new Class[debugParameterTypes.length];
@@ -94,8 +96,10 @@ static void checkMethod(short opcode, Type dt, String methodName, String[] debug
 				// we try to fall into these categories to avoid having to grant
 				// permissions to derby jars for the function tests.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-624
 				ClassLoader myLoader = d_BCValidate.class.getClassLoader();
                 boolean sameClassLoader;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6854
                 try {
                     ClassLoader declareLoader = AccessController.doPrivileged(
                             (PrivilegedAction<ClassLoader>)
@@ -114,6 +118,7 @@ static void checkMethod(short opcode, Type dt, String methodName, String[] debug
 				String actualReturnType;
 
 				if (methodName.equals("<init>")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					Constructor<?> c;
 					
 					if (sameClassLoader)
@@ -205,6 +210,7 @@ static void checkMethod(short opcode, Type dt, String methodName, String[] debug
 
 	static {
 		if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			primitives = new Hashtable<String,Class<?>>();
 			primitives.put("boolean", Boolean.TYPE);
 			primitives.put("byte", Byte.TYPE);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/cache/ClockPolicy.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/cache/ClockPolicy.java
index 41706c011f..2af7511b1b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/cache/ClockPolicy.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/cache/ClockPolicy.java
@@ -136,6 +136,7 @@ final class ClockPolicy implements ReplacementPolicy {
 
     @Override
     public int size() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         synchronized (clock) {
             return clock.size();
         }
@@ -366,6 +367,7 @@ synchronized boolean isEvicted() {
      */
     private Holder moveHand() {
         synchronized (clock) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3582
             if (clock.isEmpty()) {
                 return null;
             }
@@ -414,6 +416,7 @@ private Holder rotateClock(CacheEntry entry, boolean allowEvictions)
 
             final Holder h = moveHand();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3582
             if (h == null) {
                 // There are no elements in the clock, hence there is no
                 // reusable entry.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/cache/ConcurrentCache.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/cache/ConcurrentCache.java
index 0ee7b56e4c..c4c26610e9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/cache/ConcurrentCache.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/cache/ConcurrentCache.java
@@ -207,6 +207,7 @@ void evictEntry(Object key) {
         CacheEntry entry = cache.remove(key);
         entry.getCacheable().clearIdentity();
         entry.setCacheable(null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         countEviction();
     }
 
@@ -226,6 +227,8 @@ private Cacheable insertIntoFreeSlot(Object key, CacheEntry entry)
             throws StandardException {
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2911
+//IC see: https://issues.apache.org/jira/browse/DERBY-3493
             replacementPolicy.insertEntry(entry);
         } catch (StandardException se) {
             // Failed to insert the entry into the replacement policy. Make
@@ -285,6 +288,8 @@ private void settingIdentityComplete(
      */
     public Cacheable find(Object key) throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2911
+//IC see: https://issues.apache.org/jira/browse/DERBY-3493
         if (stopped) {
             return null;
         }
@@ -298,6 +303,7 @@ public Cacheable find(Object key) throws StandardException {
                 // The object is already cached. Increase the use count and
                 // return it.
                 entry.keep(true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
                 countHit();
                 return item;
             } else {
@@ -361,9 +367,11 @@ public Cacheable findCached(Object key) throws StandardException {
             // locked it, getCacheable() returns null and so should we do.
             Cacheable item = entry.getCacheable();
             if (item != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
                 countHit();
                 entry.keep(true);
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
                 countMiss();
             }
             return item;
@@ -388,6 +396,8 @@ public Cacheable findCached(Object key) throws StandardException {
     public Cacheable create(Object key, Object createParameter)
             throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2911
+//IC see: https://issues.apache.org/jira/browse/DERBY-3493
         if (stopped) {
             return null;
         }
@@ -627,6 +637,7 @@ public void shutdown() throws StandardException {
         if (cleaner != null) {
             cleaner.unsubscribe();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         deregisterMBean();
     }
 
@@ -713,12 +724,14 @@ public Collection<Cacheable> values() {
 
     @Override
     public void registerMBean(String dbName) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(mbean == null, "registerMBean() called twice");
         }
 
         ManagementService managementService =
                 (ManagementService) getSystemModule(Module.JMX);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         if (managementService != null) {
             mbean = managementService.registerMBean(
@@ -731,8 +744,11 @@ public void registerMBean(String dbName) throws StandardException {
 
     @Override
     public void deregisterMBean() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         if (mbean != null) {
             ManagementService managementService =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 (ManagementService) getSystemModule(Module.JMX);
             if (managementService != null) {
                 managementService.unregisterMBean(mbean);
@@ -794,6 +810,7 @@ long getMaxEntries() {
 
     /** Get the number of allocated entries in the cache. */
     long getAllocatedEntries() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         return replacementPolicy.size();
     }
 
@@ -808,6 +825,7 @@ long getUsedEntries() {
      */
     private static  Object getSystemModule( final String factoryInterface )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<Object>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/BasicDaemon.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
index f06c7fa61a..b34bdcb685 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
@@ -759,6 +759,7 @@ public Void run() {
      */
     static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java
index c1c049a601..8127ce2fda 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java
@@ -223,12 +223,15 @@ public IndexStatisticsDaemonImpl(HeaderPrintWriter log, boolean doLog,
         // For now allow users to override the new behavior through a debug
         // property. Will be removed or renamed in a future release.
         boolean keepDisposableStats = PropertyUtil.getSystemBoolean(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
               Property.STORAGE_AUTO_INDEX_STATS_DEBUG_KEEP_DISPOSABLE_STATS);
         this.skipDisposableStats = dbAtLeast10_9(db) && !keepDisposableStats;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
 
         this.db = db;
         this.dbOwner = userName;
         this.databaseName = databaseName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         this.ctxMgr = getContextService().newContextManager();
         this.timeOfCreation = System.currentTimeMillis();
         trace(0, "created{log=" + doLog + ", traceLog=" +
@@ -246,6 +249,7 @@ public IndexStatisticsDaemonImpl(HeaderPrintWriter log, boolean doLog,
     /** Tells if the database is 10.9 or newer. */
     private boolean dbAtLeast10_9(Database db) {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
             return db.getDataDictionary().checkVersion(
                 DataDictionary.DD_VERSION_DERBY_10_9, null);
         } catch (StandardException se) {
@@ -266,6 +270,7 @@ private boolean dbAtLeast10_9(Database db) {
      * @param td base table descriptor to update index statistics for
      */
     public void schedule(TableDescriptor td) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4939
         String schedulingReason = td.getIndexStatsUpdateReason();
         synchronized (queue) {
             if (acceptWork(td)) {
@@ -273,6 +278,7 @@ public void schedule(TableDescriptor td) {
                 queue.add(td);
                 wuScheduled++;
                 log(AS_BACKGROUND_TASK, td,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5089
                         "update scheduled" +
                         (schedulingReason == null
                             ? ""
@@ -282,6 +288,7 @@ public void schedule(TableDescriptor td) {
                 if (runningThread == null) {
                     //DERBY-5582. Make sure the thread is in the derby group
                     // to avoid potential security manager issues
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                     runningThread = BasicDaemon.getMonitor().getDaemonThread(this, "index-stat-thread", false);
                     runningThread.start();
                 }
@@ -308,6 +315,7 @@ private boolean acceptWork(TableDescriptor td) {
             // duplicates should yield acceptable performance. Also, we don't
             // look for duplicates if the queue is already full.
             for (int i=0; i < queue.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 TableDescriptor work = queue.get(i);
                 if (work.tableNameEquals(table, schema)) {
                     accept = false;
@@ -318,6 +326,7 @@ private boolean acceptWork(TableDescriptor td) {
 
         // If the work was rejected, trace it.
         if (!accept) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5089
             String msg = td.getQualifiedName() + " rejected, ";
             if (daemonDisabled) {
                 wuRejectedOther++;
@@ -347,10 +356,12 @@ private boolean acceptWork(TableDescriptor td) {
     private void generateStatistics(LanguageConnectionContext lcc,
                                     TableDescriptor td)
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5089
         trace(1, "processing " + td.getQualifiedName());
         boolean lockConflictSeen = false;
         while (true) {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
                 updateIndexStatsMinion(lcc, td, null, AS_BACKGROUND_TASK);
                 break;
             } catch (StandardException se) {
@@ -385,6 +396,7 @@ private void generateStatistics(LanguageConnectionContext lcc,
     /** Return true if we are being shutdown */
     private boolean isShuttingDown() {
         synchronized (queue) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5088
             if (daemonDisabled || daemonLCC == null){
                 return true;
             } else {
@@ -420,6 +432,8 @@ private void updateIndexStatsMinion(LanguageConnectionContext lcc,
         // can only properly identify disposable stats if cds == null, 
         // which means we are processing all indexes on the conglomerate.
         final boolean identifyDisposableStats = (cds == null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
 
         // Fetch descriptors if we're updating statistics for all indexes.
         if (cds == null) {
@@ -447,6 +461,8 @@ private void updateIndexStatsMinion(LanguageConnectionContext lcc,
         // unique single column indexes.  This set is the "non disposable
         // stat list".
         UUID[] non_disposable_objectUUID    = new UUID[cds.length];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
 
         try
         {
@@ -460,6 +476,7 @@ private void updateIndexStatsMinion(LanguageConnectionContext lcc,
                 }
 
                 IndexRowGenerator irg = cds[i].getIndexDescriptor();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
 
                 // Skip single-column unique indexes unless we're told not to,
                 // or we are running in soft-upgrade-mode on a pre 10.9 db.
@@ -473,6 +490,8 @@ private void updateIndexStatsMinion(LanguageConnectionContext lcc,
                 // at this point have found a stat for an existing
                 // index which is not a single column unique index, add it
                 // to the list of "non disposable stats"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
                 conglomerateNumber[i]        = cds[i].getConglomerateNumber();
                 non_disposable_objectUUID[i] = cds[i].getUUID();
 
@@ -495,6 +514,7 @@ private void updateIndexStatsMinion(LanguageConnectionContext lcc,
         // are not single column unique.
 
         if (identifyDisposableStats) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
 
             // Note this loop is not controlled by the skipDisposableStats 
             // flag.  The above loop controls if we drop single column unique
@@ -502,6 +522,7 @@ private void updateIndexStatsMinion(LanguageConnectionContext lcc,
             // stats with no associated index (orphaned stats).
             
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             List<StatisticsDescriptor> existingStats = td.getStatistics();
             StatisticsDescriptor[] stats = (StatisticsDescriptor[])
                     existingStats.toArray(
@@ -518,6 +539,8 @@ private void updateIndexStatsMinion(LanguageConnectionContext lcc,
                 UUID referencedIndex = stats[si].getReferenceID();
                 boolean isValid = false;
                 for (int ci=0; ci < conglomerateNumber.length; ci++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
                     if (referencedIndex.equals(non_disposable_objectUUID[ci])) {
                         isValid = true;
                         break;
@@ -532,6 +555,7 @@ private void updateIndexStatsMinion(LanguageConnectionContext lcc,
                 // mechanism in case of another bug like DERBY-5681 in Derby.
                 if (!isValid) {
                     String msg = "dropping disposable statistics entry " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5789
                             stats[si].getUUID() + " for index " +
                             stats[si].getReferenceID() + " (cols=" +
                             stats[si].getColumnCount() + ")";
@@ -572,6 +596,8 @@ private void updateIndexStatsMinion(LanguageConnectionContext lcc,
 
             // Subtract one for the RowLocation added for indexes.
             int           numCols     = indexRow[indexNumber].nColumns() - 1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
             long[]        cardinality = new long[numCols];
             KeyComparator cmp         = new KeyComparator(indexRow[indexNumber]);
 
@@ -640,6 +666,8 @@ not hold record locks */
             int retries = 0;
             while (true) {
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
                     writeUpdatedStats(lcc, td, 
                             non_disposable_objectUUID[indexNumber],
                             cmp.getRowCount(), cardinality, asBackgroundTask);
@@ -692,6 +720,7 @@ private void writeUpdatedStats(LanguageConnectionContext lcc,
         // Update the heap row count estimate.
         setHeapRowEstimate(tc, td.getHeapConglomerateId(), numRows);
         // Drop existing index statistics for this index.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5770
         if (!lcc.dataDictionaryInWriteMode()) {
             dd.startWriting(lcc);
         }
@@ -713,6 +742,7 @@ private void writeUpdatedStats(LanguageConnectionContext lcc,
             }
 
             // Log some information.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5124
             ConglomerateDescriptor cd = dd.getConglomerateDescriptor(index);
             log(asBackgroundTask, td,
                     "wrote stats for index "  + 
@@ -731,6 +761,7 @@ private void writeUpdatedStats(LanguageConnectionContext lcc,
                     "rolled back index stats because index has been dropped");
                 lcc.internalRollback();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5770
             conglomerateGone = (cd == null);
         }
 
@@ -764,6 +795,7 @@ private void invalidateStatements(LanguageConnectionContext lcc,
         int retries = 0;
         while (true) {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5770
                 if (!lcc.dataDictionaryInWriteMode()) {
                     dd.startWriting(lcc);
                 }
@@ -841,16 +873,19 @@ private void setHeapRowEstimate(TransactionController tc, long tableId,
      */
     public void run() {
         final long runStart = System.currentTimeMillis();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5088
         ContextService ctxService = null;
         // Implement the outer-level exception handling here.
         try {
             // DERBY-5088: Factory-call may fail.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             ctxService = getContextService();
             ctxService.setCurrentContextManager(ctxMgr);
             processingLoop();
         } catch (ShutdownException se) {
             // The database is/has been shut down.
             // Log processing statistics and exit.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5089
             trace(1, "swallowed shutdown exception: " + extractIstatInfo(se));
             stop();
             ctxMgr.cleanupOnError(se, db.isActive());
@@ -862,6 +897,7 @@ public void run() {
             //    happens because the background thread interacts with store
             //    on a lower level
             if (!isShuttingDown()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5089
                 log(AS_BACKGROUND_TASK, null, re,
                         "runtime exception during normal operation");
                 throw re;
@@ -895,6 +931,7 @@ private void processingLoop() {
                 daemonLCC.getTransactionExecute().setNoLockWait(true);
             } catch (StandardException se) {
                 log(AS_BACKGROUND_TASK, null, se,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5088
                         "failed to initialize index statistics updater");
                 return;
             }
@@ -920,13 +957,16 @@ private void processingLoop() {
                         tc = null;
                         daemonLCC = null;
                         queue.clear();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5089
                         trace(1, "daemon disabled");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5082
                         break;
                     }
                     if (queue.isEmpty()) {
                         trace(1, "queue empty");
                         break;
                     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     td = queue.get(0);
                 }
                 try {
@@ -1012,6 +1052,7 @@ public void runExplicitly(LanguageConnectionContext lcc,
                               String runContext)
             throws StandardException {
         updateIndexStatsMinion(lcc, td, cds, AS_EXPLICIT_TASK);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5089
         trace(0, "explicit run completed" + (runContext != null
                                         ? " (" + runContext + "): "
                                         : ": ") +
@@ -1031,8 +1072,10 @@ public void stop() {
         // 'queue' and the value of 'daemonDisabled'.
         boolean clearContext = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5087
         synchronized (queue) {
             if (!daemonDisabled) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5447
                 clearContext = true;
                 StringBuffer sb = new StringBuffer(100);
                 sb.append("stopping daemon, active=").
@@ -1044,7 +1087,9 @@ public void stop() {
                 log(AS_BACKGROUND_TASK, null, sb.toString());
                 // If there is no running thread and the daemon lcc is still
                 // around, destroy the transaction and clear the lcc reference.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5082
                 if (runningThread == null && daemonLCC != null &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-5088
                         !isShuttingDown()) {
                     // try/catch as safe-guard against shutdown race condition.
                     try {
@@ -1080,10 +1125,12 @@ public void stop() {
         //             (if any) has been shut down to avoid Java deadlocks
         //             when closing the container handles obtained with this
         //             context.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5447
         if (clearContext) {
             // DERBY-5336: Trigger cleanup code to remove the context
             //             from the context service. This pattern was
             //             copied from BasicDaemon.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5336
             ctxMgr.cleanupOnError(StandardException.normalClose(), false);
         }
     }
@@ -1102,11 +1149,13 @@ private boolean handleFatalErrors(ContextManager cm, StandardException se) {
             // We are not allowed to write into the database, most likely the
             // data dictionary. No point to keep doing work we can't gain from.
             disable = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5088
         } else if (isShuttingDown() ||
                 se.getSeverity() >= ExceptionSeverity.DATABASE_SEVERITY) {
             // DERBY-4037: Swallow exceptions raised during shutdown.
             // The database or system is going down. Probably handled elsewhere
             // but disable daemon anyway.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5089
             trace(1, "swallowed exception during shutdown: " +
                     extractIstatInfo(se));
             disable = true;
@@ -1179,6 +1228,7 @@ private static void sleep(long ms) {
         try {
             Thread.sleep(ms);
         } catch (InterruptedException ie) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             InterruptStatus.setInterrupted();
         }
     }
@@ -1188,6 +1238,7 @@ private static String fmtScanTimes(long[][] timings) {
         // timings[x] = [conglomId, start, end]
         StringBuffer sb = new StringBuffer("scan durations (");
         for (int i=0; i < timings.length && timings[i][0] > 0; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5108
             sb.append('c').append(timings[i][0]).append('=');
             // Handle corner-case where the scans are aborted due to the
             // index statistics daemon being shut down under us.
@@ -1222,6 +1273,7 @@ private void log(boolean asBackgroundTask, TableDescriptor td, String msg) {
     private void log(boolean asBackgroundTask, TableDescriptor td, Throwable t,
             String msg) {
         if (asBackgroundTask && (doLog || t != null)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
             logAlways(td, t, msg);
         }
     }
@@ -1313,6 +1365,7 @@ private static String cardToStr(long[] cardinality) {
 
     /** Purely for debugging, to avoid printing too much info. */
     private static String extractIstatInfo(Throwable t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5089
         String istatClass = IndexStatisticsDaemonImpl.class.getName();
         StackTraceElement[] stack = t.getStackTrace();
         String trace = "<no stacktrace>";
@@ -1329,6 +1382,7 @@ private static String extractIstatInfo(Throwable t) {
                 break;
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5089
         if (t instanceof StandardException) {
             sqlState = ", SQLSTate=" + ((StandardException)t).getSQLState();
         }
@@ -1342,6 +1396,7 @@ private static String extractIstatInfo(Throwable t) {
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getFactory();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java
index 239b957c8f..da8f7b498a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java
@@ -37,6 +37,7 @@ public class SingleThreadDaemonFactory implements DaemonFactory
 	
 	public SingleThreadDaemonFactory()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		contextService = getContextService();
 	}
 
@@ -49,11 +50,13 @@ public DaemonService createNewDaemon(String name)
 	{
 		BasicDaemon daemon = new BasicDaemon(contextService);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		final Thread daemonThread = BasicDaemon.getMonitor().getDaemonThread(daemon, name, false);
 		// DERBY-3745.  setContextClassLoader for thread to null to avoid
 		// leaking class loaders.
 		try {
             AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
              new PrivilegedAction<Object>() {
                 public Object run()  {
                     daemonThread.setContextClassLoader(null);
@@ -78,6 +81,7 @@ public Object run()  {
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getFactory();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
index 5f96f3ca33..e136b70741 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
@@ -540,7 +540,9 @@ else if (cryptoAlgorithmShort.equals(DES)) {
 				// provider package should be set by property
 				if (Security.getProvider(cryptoProviderShort) == null)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     Class<?> cryptoClass = Class.forName(cryptoProvider);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
                     if (!Provider.class.isAssignableFrom(cryptoClass)) {
                         throw StandardException.newException(
                                 SQLState.ENCRYPTION_NOT_A_PROVIDER,
@@ -568,6 +570,7 @@ public Void run() {
 			if (externalKey != null) {
 
 				// incorrect to specify external key and boot password
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 				if (properties.getProperty((newAttrs ? 
                                             Attribute.NEW_BOOT_PASSWORD :
                                             Attribute.BOOT_PASSWORD)) != null)
@@ -577,6 +580,7 @@ public Void run() {
                     org.apache.derby.iapi.util.StringUtil.fromHexString(externalKey, 
                                                                         0, 
                                                                         externalKey.length());
+//IC see: https://issues.apache.org/jira/browse/DERBY-746
                 if (generatedKey == null) {
                     throw StandardException.newException(
                         // If length is even, we assume invalid character(s),
@@ -588,8 +592,10 @@ public Void run() {
 
 			} else {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 				generatedKey = handleBootPassword(create, properties, newAttrs);
 				if(create || newAttrs)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 				   persistentProperties.put(Attribute.CRYPTO_KEY_LENGTH,
                                             keyLengthBits+"-"+generatedKey.length);
 			}
@@ -601,6 +607,7 @@ public Void run() {
 			if (create)
 			{
 				persistentProperties.put(Attribute.DATA_ENCRYPTION, "true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 
 				// Set two new properties to allow for future changes to the log and data encryption
 				// schemes. This property is introduced in version 10 , value starts at 1.
@@ -612,6 +619,7 @@ public Void run() {
 
 			return;
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
         catch (ClassNotFoundException cnfe)
         {
             t = StandardException.newException(
@@ -627,6 +635,7 @@ public Void run() {
         {
             t = iae;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         catch (NoSuchMethodException nsme)
         {
             t = nsme;
@@ -653,6 +662,7 @@ public Void run() {
 
 
 	private byte[] handleBootPassword(boolean create, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
                                       Properties properties, 
                                       boolean newPasswd)
 		throws StandardException {
@@ -689,11 +699,13 @@ private byte[] handleBootPassword(boolean create,
 
 		byte[] generatedKey;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 		if (create || newPasswd)
 		{
 			//
 			generatedKey = generateUniqueBytes();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 			persistentProperties.put(RawStoreFactory.ENCRYPTED_KEY, 
                                            saveSecretKey(generatedKey, bootPassword));
 
@@ -716,6 +728,7 @@ public void saveProperties(Properties properties)
     {
         // put the cipher properties to be persistent into the 
         // system perisistent properties. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
         for (Enumeration e = persistentProperties.keys(); 
              e.hasMoreElements(); ) 
         {
@@ -808,6 +821,7 @@ public String changeBootPassword(String changeString, Properties properties, Cip
 		if (newBPAscii == null || newBPAscii.length < CipherFactory.MIN_BOOTPASS_LENGTH)
 			throw StandardException.newException(SQLState.ILLEGAL_BP_LENGTH,
                 CipherFactory.MIN_BOOTPASS_LENGTH);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		// verify old key
 
@@ -900,6 +914,7 @@ public String changeBootPassword(String changeString, Properties properties, Cip
 	    Please note, this process of verifying the key  does not provide any added security but only is 
 	    intended to allow to fail gracefully if a wrong encryption key is used
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-862
 	    StandardException is thrown if there are any problems during the process of verification
 	    		of the encryption key or if there is any mismatch of the encryption key.
 
@@ -937,6 +952,8 @@ public void verifyKey(boolean create, StorageFactory sf, Properties properties)
 				verifyKeyFile.writeInt(checksum.length);
 				verifyKeyFile.write(checksum);
 				verifyKeyFile.write(data);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
                 verifyKeyFile.sync();
 			}
 			else
@@ -1023,6 +1040,7 @@ private byte[] getMD5Checksum(byte[] data)
 		@exception IOException Any exception during accessing the file for read/write
 	 */
     private StorageRandomAccessFile privAccessFile(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
             StorageFactory storageFactory,
             String fileName,
             final String filePerms)
@@ -1056,6 +1074,7 @@ public StorageRandomAccessFile run() throws IOException {
 	private InputStream privAccessGetInputStream(StorageFactory storageFactory,String fileName)
 	throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
         final StorageFile verifyKeyFile
                 = storageFactory.newStorageFile("", fileName);
 	    try
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherProvider.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
index 96bf3da1d5..81fa6d0357 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
@@ -338,6 +338,8 @@ else if (mode == CipherFactory.DECRYPT)
 		{
 			// should never happen
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT(ise);
 		}
 		catch (GeneralSecurityException gse)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/jmx/JMXManagementService.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/jmx/JMXManagementService.java
index e316debc8b..0fef083379 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/jmx/JMXManagementService.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/jmx/JMXManagementService.java
@@ -111,11 +111,14 @@ public JMXManagementService() {
     public synchronized void boot(boolean create, Properties properties)
             throws StandardException {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
         registeredMbeans = new HashMap<ObjectName,StandardMBean>();
         
         systemIdentifier =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             getMonitor().getUUIDFactory().createUUID().toString();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3429
         findServer();
              
         myManagementBean = (ObjectName) registerMBean(this,
@@ -125,7 +128,9 @@ public synchronized void boot(boolean create, Properties properties)
         
         registerMBean(
                 new Version(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                         getMonitor().getEngineVersion(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
                         SystemPermission.ENGINE),
                 VersionMBean.class,
                 "type=Version,jar=derby.jar");
@@ -158,6 +163,8 @@ public synchronized void stop() {
         registeredMbeans = null;
         
         myManagementServer = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         systemIdentifier = null;
     }
 
@@ -203,6 +210,7 @@ public MBeanServer run() {
      * 
      */
     public synchronized <T> Object registerMBean(final T bean,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             final Class<T> beanInterface,
             final String keyProperties)
             throws StandardException {
@@ -213,6 +221,8 @@ public synchronized <T> Object registerMBean(final T bean,
                     + ",system=" + systemIdentifier);
 
             final StandardMBean standardMBean =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1378
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
                 new StandardMBean(bean, beanInterface) {
                 
                 /**
@@ -229,6 +239,7 @@ protected String getClassName(MBeanInfo info) {
             };
                 // new StandardMBean(bean, beanInterface);
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
             registeredMbeans.put(beanName, standardMBean);
             if (mbeanServer != null)
                 jmxRegister(standardMBean, beanName);
@@ -289,9 +300,11 @@ public void unregisterMBean(Object mbeanIdentifier)
     private synchronized void unregisterMBean(final ObjectName mbeanName)
     {
         //Has this service been shut down?
+//IC see: https://issues.apache.org/jira/browse/DERBY-4306
         if (registeredMbeans == null)
             return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
         if (registeredMbeans.remove(mbeanName) == null)
             return;
         
@@ -339,12 +352,15 @@ public Object run() throws JMException {
     }
 
     public synchronized boolean isManagementActive() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
+//IC see: https://issues.apache.org/jira/browse/DERBY-1387
         return mbeanServer != null;
     }
 
     public synchronized void startManagement() {
         
         //Has this service been shut down?
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
         if (registeredMbeans == null)
             return;
         
@@ -365,6 +381,7 @@ public synchronized void startManagement() {
             // If we registered this as a management bean
             // then leave it registered to allow the mbeans
             // to be re-registered with JMX
+//IC see: https://issues.apache.org/jira/browse/DERBY-3499
             if (mbeanName.equals(myManagementBean) &&
                     mbeanServer.isRegistered(myManagementBean))
                 continue;
@@ -395,6 +412,8 @@ public synchronized void stopManagement() {
                     continue;
                 jmxUnregister(mbeanName);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
+//IC see: https://issues.apache.org/jira/browse/DERBY-1387
             mbeanServer = null;
         }
     }
@@ -403,6 +422,7 @@ public synchronized void stopManagement() {
      * Control permission (permissions are immutable).
      */
     private final static SystemPermission CONTROL =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3491
         new SystemPermission(
                 SystemPermission.JMX, SystemPermission.CONTROL);
 
@@ -412,6 +432,7 @@ public synchronized void stopManagement() {
      */
     private void checkJMXControl() {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
             if (System.getSecurityManager() != null)
                 AccessController.checkPermission(CONTROL);
         } catch (AccessControlException e) {
@@ -428,6 +449,7 @@ public synchronized String getSystemIdentifier() {
 
     @Override
     public String quotePropertyValue(String value) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         return ObjectName.quote(value);
     }
     
@@ -437,6 +459,7 @@ public String quotePropertyValue(String value) {
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/jmxnone/NoManagementService.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/jmxnone/NoManagementService.java
index c43311df1f..e313001cc1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/jmxnone/NoManagementService.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/jmxnone/NoManagementService.java
@@ -31,6 +31,7 @@ public final class NoManagementService implements ManagementService {
     public NoManagementService() {
     }
     public <T> Object registerMBean(T bean,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Class<T> beanInterface,
             String keyProperties)
     {
@@ -39,6 +40,8 @@ public <T> Object registerMBean(T bean,
     public void unregisterMBean(Object mbeanIdentifier) {
     }
     public boolean isManagementActive() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
+//IC see: https://issues.apache.org/jira/browse/DERBY-1387
         return false;
     }
     public void startManagement() {
@@ -49,6 +52,7 @@ public String getSystemIdentifier() {
         return null;
     }
     public String quotePropertyValue(String value) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/AbstractPool.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/AbstractPool.java
index 125775cbe9..90fa3b4edb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/AbstractPool.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/AbstractPool.java
@@ -396,6 +396,7 @@ private void getAndApply(boolean dbOnly, Dictionary p, String key) {
 
 		try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5224
 			Serializable value = (Serializable) PropertyUtil.getPropertyFromSet(dbOnly, p, key);
 			if (value != null) {
 				validate(key, value, p);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/ActiveLock.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/ActiveLock.java
index 28487244ca..3616961e2e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/ActiveLock.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/ActiveLock.java
@@ -52,6 +52,7 @@ public final class ActiveLock extends Lock {
 	/**
 		If true then this lock can be granted even if
 		it is not the first lock request on the wait queue.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		This can occur if the compatibility space already holds
 		a lock on the object.
 	*/
@@ -64,6 +65,7 @@ version of this class may become mutable - mutable identity.
 		MT - single thread required
 	*/
 	protected ActiveLock(CompatibilitySpace space, Lockable ref,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 						 Object qualifier) {
 		super(space, ref, qualifier);
 	}
@@ -94,6 +96,7 @@ protected void clearPotentiallyGranted() {
 	/**
 		Wait for a lock to be granted, returns when the lock is granted.
 		<P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		The sleep wakeup scheme depends on the two booleans wakeUpNow and potentiallyGranted.
 		  
 		MT - Single thread required - and assumed to be the thread requesting the lock.
@@ -119,6 +122,10 @@ else if (timeout > 0) {
 				}
 
 			} catch (InterruptedException ie) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4769
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4967
+//IC see: https://issues.apache.org/jira/browse/DERBY-4967
                 wakeUpNow = Constants.WAITING_LOCK_INTERRUPTED;
 			}
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/ConcurrentLockSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/ConcurrentLockSet.java
index 1eb440ed99..ea92d401a5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/ConcurrentLockSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/ConcurrentLockSet.java
@@ -359,6 +359,7 @@ public Lock lockObject(CompatibilitySpace compatibilitySpace, Lockable ref,
             //
             // This logic supports the use-case of DERBY-6554.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
             blockedByParent =
                 (timeout == 0) &&
                 compatibilitySpace.getOwner().isNestedOwner() &&
@@ -403,6 +404,7 @@ public Lock lockObject(CompatibilitySpace compatibilitySpace, Lockable ref,
                     }
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                return null;
 			}
 
@@ -616,6 +618,7 @@ public Lock lockObject(CompatibilitySpace compatibilitySpace, Lockable ref,
                         {
                             // ending wait because of lock timeout or interrupt
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4967
                             if (wakeupReason ==
                                     Constants.WAITING_LOCK_INTERRUPTED) {
 
@@ -942,6 +945,7 @@ private String toDebugString()
         if (SanityManager.DEBUG)
         {
             String str = "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
 
             int i = 0;
             for (Entry entry : locks.values())
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Control.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Control.java
index f103779afd..117ac020a2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Control.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Control.java
@@ -35,6 +35,7 @@ public interface Control {
 
 	public Lock getLock(CompatibilitySpace compatibilitySpace,
 						Object qualifier);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 
 //EXCLUDE-START-lockdiag- 
 	/**
@@ -59,6 +60,7 @@ public Lock getLock(CompatibilitySpace compatibilitySpace,
 	public List getWaiting();
 
 	public boolean isGrantable(boolean otherWaiters,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 							   CompatibilitySpace compatibilitySpace,
 							   Object qualifier);
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/D_LockControl.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/D_LockControl.java
index fc844649e1..c03b1c0ba8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/D_LockControl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/D_LockControl.java
@@ -118,6 +118,7 @@ public void diag_detail(Properties prop) {}
 	*/
 
 	static void debugLock(String type, CompatibilitySpace compatibilitySpace,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 						  Object group, Lockable ref, Object qualifier,
 						  int timeout) {
 
@@ -169,6 +170,7 @@ static String debugLockString(CompatibilitySpace compatibilitySpace,
 
 	static String debugLockString(CompatibilitySpace compatibilitySpace,
 								  Object group, Lockable ref) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 
 		if (SanityManager.DEBUG) {
 
@@ -189,6 +191,7 @@ static String debugLockString(CompatibilitySpace compatibilitySpace,
 
 
 	static String debugLockString(CompatibilitySpace compatibilitySpace,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 								  Object group, Lockable ref,
 								  Object qualifier, int timeout) {
 
@@ -198,6 +201,7 @@ static String debugLockString(CompatibilitySpace compatibilitySpace,
 
 			debugAppendObject(sb, " Lockable ", ref);
 			debugAppendObject(sb, " Qualifier=", qualifier);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 			debugAppendObject(sb, " CompatibilitySpace=", compatibilitySpace);
 			debugAppendObject(sb, " Group=", group);
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Deadlock.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Deadlock.java
index a1ecf961ec..d958b3d387 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Deadlock.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Deadlock.java
@@ -572,6 +572,7 @@ private static void addInfo(StringBuffer sb, String desc, Object data) {
      */
     static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Lock.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Lock.java
index 7def6ea328..6143cc20bf 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Lock.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Lock.java
@@ -38,6 +38,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 */
 
 class Lock implements Latch, Control {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1704
 
 	/**
 		Compatibility space the object is locked in.
@@ -76,6 +77,7 @@ public final Lockable getLockable() {
 
 	/**
 		Return the compatibility space this lock is held in.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 
 		MT - Thread safe
 	*/
@@ -150,6 +152,7 @@ public final boolean equals(Object other) {
 		if (other instanceof Lock) {
 			Lock ol = (Lock) other;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 			return (space == ol.space) && ref.equals(ol.ref)
 				&& (qualifier == ol.qualifier);
 		}
@@ -166,6 +169,7 @@ public LockControl getLockControl() {
 	}
 
 	public Lock getLock(CompatibilitySpace compatibilitySpace,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 						Object qualifier) {
 		if ((space == compatibilitySpace) && (this.qualifier == qualifier)) {
 			return this;
@@ -222,6 +226,7 @@ public List getWaiting() {
 	}
 
     public boolean isGrantable(boolean noWaitersBeforeMe,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
                                CompatibilitySpace compatibilitySpace,
                                Object requestQualifier)
     {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockControl.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockControl.java
index e5814c9407..03c0d08212 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockControl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockControl.java
@@ -670,6 +670,7 @@ private void addWaiter(Lock lockItem, LockTable ls) {
 	 * @return	The removed lock request
 	 */
 	private Object popFrontWaiter(LockTable ls) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1704
 		return removeWaiter(0, ls);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockSpace.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockSpace.java
index eefd15a898..607a13c2f5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockSpace.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockSpace.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 	A LockSpace represents the complete set of locks held within
 	a single compatibility space, broken into groups of locks.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 
     A LockSpace contains a HashMap keyed by the group reference,
     the data for each key is a HashMap of Lock's.
@@ -63,6 +64,7 @@ final class LockSpace implements CompatibilitySpace {
     /** Cached HashMaps for storing lock groups. */
     private final ArrayDeque<HashMap<Lock, Lock>> spareGroups =
             new ArrayDeque<HashMap<Lock, Lock>>(MAX_CACHED_GROUPS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 	// the Limit info.
 	private Object callbackGroup;
@@ -76,7 +78,9 @@ final class LockSpace implements CompatibilitySpace {
 	 * @param owner an object representing the owner of the compatibility space
 	 */
 	LockSpace(LockOwner owner) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         groups = new HashMap<Object, HashMap<Lock, Lock>>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		this.owner = owner;
 	}
 
@@ -97,6 +101,7 @@ protected synchronized void addLock(Object group, Lock lock)
 
 		Lock lockInGroup = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<Lock, Lock> dl = groups.get(group);
 		if (dl == null)	{
 			dl = getGroupMap(group);
@@ -121,6 +126,7 @@ protected synchronized void addLock(Object group, Lock lock)
 		if (groupSize > nextLimitCall) {
 
 			inLimit = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 			callback.reached(this, group, limit,
 				new LockList(java.util.Collections.enumeration(dl.keySet())), groupSize);
 			inLimit = false;
@@ -144,11 +150,14 @@ else if (newGroupSize < (nextLimitCall / 2))
 		Unlock all the locks in a group and then remove the group.
 	*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2327
 	synchronized void unlockGroup(LockTable lset, Object group) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<Lock, Lock> dl = groups.remove(group);
 		if (dl == null)
 			return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Lock lock : dl.keySet()) {
             lset.unlock(lock, 0);
 		}
@@ -162,15 +171,18 @@ synchronized void unlockGroup(LockTable lset, Object group) {
 
     private HashMap<Lock, Lock> getGroupMap(Object group) {
         HashMap<Lock, Lock> dl = spareGroups.poll();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 		if (dl == null)
             dl = new HashMap<Lock, Lock>(5, 0.8f);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1704
 		groups.put(group, dl);
 		return dl;
 	}
 
     private void saveGroup(HashMap<Lock, Lock> dl) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         if (spareGroups.size() < MAX_CACHED_GROUPS) {
             spareGroups.offer(dl);
             dl.clear();
@@ -180,12 +192,15 @@ private void saveGroup(HashMap<Lock, Lock> dl) {
 	/**
 		Unlock all locks in the group that match the key
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2327
 	synchronized void unlockGroup(LockTable lset, Object group, Matchable key) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<Lock, Lock> dl = groups.get(group);
 		if (dl == null)
 			return; //  no group at all
 
 		boolean allUnlocked = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Iterator<Lock> e = dl.keySet().iterator(); e.hasNext(); ) {
             Lock lock = e.next();
 			if (!key.match(lock.getLockable())) {
@@ -199,6 +214,7 @@ synchronized void unlockGroup(LockTable lset, Object group, Matchable key) {
 		if (allUnlocked) {
 			groups.remove(group);
 			saveGroup(dl);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 			if ((callbackGroup != null) && group.equals(callbackGroup)) {
 				nextLimitCall = limit;
 			}
@@ -206,6 +222,7 @@ synchronized void unlockGroup(LockTable lset, Object group, Matchable key) {
 	}
 
 	synchronized void transfer(Object oldGroup, Object newGroup) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<Lock, Lock> from = groups.get(oldGroup);
 		if (from == null)
 			return;
@@ -224,6 +241,7 @@ synchronized void transfer(Object oldGroup, Object newGroup) {
 			// place the contents of to into from
 			mergeGroups(to, from);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1704
 			Object oldTo = groups.put(newGroup, from);
 			if (SanityManager.DEBUG) {
 				SanityManager.ASSERT(oldTo == to, "inconsistent state in LockSpace");
@@ -234,22 +252,27 @@ synchronized void transfer(Object oldGroup, Object newGroup) {
 		}
 		
 		clearLimit(oldGroup);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1704
 		groups.remove(oldGroup);
 	}
 
     private void mergeGroups(HashMap<Lock, Lock> from, HashMap<Lock, Lock> into) {
 
         for (Lock lock : from.keySet()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
             Lock lockI = into.get(lock);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 			if (lockI == null) {
 				// lock is only in from list
 				into.put(lock, lock);
 			} else {
 				// merge the locks
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				Lock fromL = lock;
                 Lock intoL = lockI;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 				intoL.count += fromL.getCount();
 			}
@@ -257,10 +280,12 @@ private void mergeGroups(HashMap<Lock, Lock> from, HashMap<Lock, Lock> into) {
 
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2327
 	synchronized int unlockReference(LockTable lset, Lockable ref,
 									 Object qualifier, Object group) {
 
 		// look for locks matching our reference and qualifier.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<Lock, Lock> dl = groups.get(group);
 		if (dl == null)
 			return 0;
@@ -275,6 +300,8 @@ synchronized int unlockReference(LockTable lset, Lockable ref,
 			if (dl.isEmpty()) {
 				groups.remove(group);
 				saveGroup(dl);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 				if ((callbackGroup != null) && group.equals(callbackGroup)) {
 					nextLimitCall = limit;
 				}
@@ -293,6 +320,7 @@ synchronized int unlockReference(LockTable lset, Lockable ref,
 		Return true if locks are held in a group
 	*/
 	synchronized boolean areLocksHeld(Object group) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1704
 		return groups.containsKey(group);
 	}
 
@@ -307,6 +335,7 @@ synchronized boolean areLocksHeld() {
 	synchronized boolean isLockHeld(Object group, Lockable ref, Object qualifier) {
 
 		// look for locks matching our reference and qualifier.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<Lock, Lock> dl = groups.get(group);
 		if (dl == null)
 			return false;
@@ -346,6 +375,7 @@ synchronized int deadlockCount(int bail) {
 
 		int count = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (HashMap<Lock, Lock> group: groups.values()) {
             for (Lock lock: group.keySet()) {
 					count += lock.getCount();
@@ -364,6 +394,7 @@ synchronized int deadlockCount(int bail) {
 */
 
 class LockList implements Enumeration<Lockable> {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	private Enumeration<Lock> lockGroup;
 
@@ -376,6 +407,7 @@ public boolean hasMoreElements() {
 	}
 
 	public Lockable nextElement() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		return (lockGroup.nextElement()).getLockable();
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockTable.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockTable.java
index 15544f60cb..ccf070e634 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockTable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockTable.java
@@ -154,5 +154,6 @@ boolean zeroDurationLockObject(CompatibilitySpace space, Lockable ref,
      * @param waiters the map to add the waiters to
      * @see LockControl#addWaiters
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     void addWaiters(Map<Object,Object> waiters);
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockTableVTI.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockTableVTI.java
index 4639ad0c66..4838f22d6e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockTableVTI.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/LockTableVTI.java
@@ -51,6 +51,7 @@ class LockTableVTI implements Enumeration
 	private ListIterator waitingList;
 	private Latch nextLock;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1704
 	LockTableVTI(Map clonedLockTable)
 	{
 		outerControl = clonedLockTable.values().iterator();
@@ -65,6 +66,7 @@ public boolean hasMoreElements() {
 		for (;;) {
 
 			if (control == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1704
 				if (!outerControl.hasNext())
 					return false;
 //System.out.println("new control lock ");
@@ -102,6 +104,7 @@ private Latch getNextLock(Control control) {
 		Latch lock = null;
 		if (grantedList != null) {
 			if (grantedList.hasNext()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5224
 				lock = (Latch) grantedList.next();
 			}
 			else
@@ -111,6 +114,7 @@ private Latch getNextLock(Control control) {
 		if (lock == null) {
 			if (waitingList != null) {
 				if (waitingList.hasNext()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5224
 					lock = (Latch) waitingList.next();
 				}
 				else
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/TableNameInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/TableNameInfo.java
index d2c4b63823..240e134662 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/TableNameInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/TableNameInfo.java
@@ -70,12 +70,14 @@ public String getTableName(Long conglomId) {
 			return "?";
 
 		// see if we have already seen this conglomerate
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		TableDescriptor td = tableCache.get(conglomId);
 		if (td == null)
 		{
 			// first time we see this conglomerate, get it from the
 			// ddCache 
             ConglomerateDescriptor cd = ddCache.get(conglomId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             if (cd != null)
             {
@@ -143,6 +145,7 @@ public String getTableType(Long conglomId) {
 
 		String type;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		TableDescriptor td = tableCache.get(conglomId);
 		if (td != null)
 		{
@@ -176,6 +179,7 @@ public String getTableType(Long conglomId) {
 	public String getIndexName(Long conglomId) {
 		if (conglomId == null)
 			return "?";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		return indexCache.get(conglomId);
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Timeout.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Timeout.java
index 724c0d226d..c91bca87df 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Timeout.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Timeout.java
@@ -160,6 +160,7 @@ private String buildLockTableString() throws StandardException
 
         // need language here to print out tablenames
         LanguageConnectionContext lcc = (LanguageConnectionContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             Deadlock.getContext(LanguageConnectionContext.CONTEXT_ID);
         if( lcc != null )
             tc = lcc.getTransactionExecute();
@@ -262,6 +263,7 @@ public static String buildString( Enumeration table, long time ) throws Standard
      */
     private void dumpLock() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Hashtable<String,Object> attributes = new Hashtable<String,Object>(17);
         Object lock_type = currentLock.getQualifier();
 
@@ -293,6 +295,7 @@ private void dumpLock() throws StandardException
             if( attributes.get(VirtualLockTable.CONTAINERID) != null && tc != null )
             {   
                 Long value = (Long)attributes.get(VirtualLockTable.CONTAINERID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 conglomId = tc.findConglomid( value.longValue() );
                 attributes.put( VirtualLockTable.CONGLOMID, conglomId );
             }
@@ -306,6 +309,7 @@ private void dumpLock() throws StandardException
             {
                 try
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     containerId = tc.findContainerid( conglomId.longValue() );
                     attributes.put( VirtualLockTable.CONTAINERID, containerId );
                 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/BaseMonitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
index a5f7712dd3..0bf0e5a949 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
@@ -89,6 +89,7 @@ that the its was loaded in for all class loading.
 
 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 abstract class BaseMonitor
 	implements ModuleFactory, BundleFinder {
 
@@ -98,6 +99,7 @@ abstract class BaseMonitor
 		Hash table of objects that implement PersistentService keyed by their getType() method.
 	*/
     private final HashMap<String,PersistentService> serviceProviders =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
             new HashMap<String,PersistentService>();
 	private static final String LINE = 
         "----------------------------------------------------------------";
@@ -124,6 +126,7 @@ Hash table of objects that implement PersistentService keyed by their getType()
 	private PrintWriter logging;
 
 	ThreadGroup daemonGroup;
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 	// class registry
 /* one byte  format identifiers never used
@@ -133,10 +136,13 @@ Hash table of objects that implement PersistentService keyed by their getType()
 //	private InstanceGetter[]	rc4;
 
 	/* Constructor  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	BaseMonitor() {
 		super();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		services = new Vector<TopService>(0, 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 		services.add(new TopService(this));	// first element is always the free-floating service
 	}
 
@@ -155,8 +161,10 @@ public void shutdown() {
 			inShutdown = true;
 		}
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-4601
 		Monitor.getStream().println(LINE);
 		//Make a note of Engine shutdown in the log file
+//IC see: https://issues.apache.org/jira/browse/DERBY-4755
 		Monitor.getStream().println(
                 MessageService.getTextMessage(
                     MessageId.CONN_SHUT_DOWN_ENGINE,
@@ -178,6 +186,7 @@ public void shutdown() {
 				if (position == 0)
 					break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				ts = services.get(position);
 			}
 
@@ -198,9 +207,12 @@ public void shutdown() {
 
 		}
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-4601
 		Monitor.getStream().println(LINE);
 		(services.get(0)).shutdown();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		stopContextService();
 	}
 
@@ -238,6 +250,7 @@ protected final void runWithState(Properties properties, PrintWriter log) {
 		logging = log;
 
 		// false indicates the full monitor is required, not the lite.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
         if (!initialize(false)) {
             dumpTempWriter(true);
             return;
@@ -246,8 +259,10 @@ protected final void runWithState(Properties properties, PrintWriter log) {
 		// if monitor is already set then the system is already
 		// booted or in the process of booting or shutting down.
 		if ( setMonitor( this ) ) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		MessageService.setFinder(this);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1439
 
 		if (SanityManager.DEBUG) {
 			reportOn = Boolean.valueOf(PropertyUtil.getSystemProperty("derby.monitor.verbose")).booleanValue();
@@ -276,6 +291,7 @@ protected final void runWithState(Properties properties, PrintWriter log) {
 		}
 
 		Vector<Class<?>> bootImplementations = getImplementations(bootProperties, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		Vector<Class<?>> systemImplementations = null;
 		Vector<Class<?>> applicationImplementations = null;
@@ -289,6 +305,7 @@ protected final void runWithState(Properties properties, PrintWriter log) {
 		}
 
         Vector<Class<?>> defaultImplementations = getDefaultImplementations();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 		int implementationCount = 0;
 		if (bootImplementations != null)
@@ -307,6 +324,7 @@ protected final void runWithState(Properties properties, PrintWriter log) {
 			implementationCount++;
 
         implementationSets = new ArrayList<List<Class<?>>>(implementationCount);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 		if (bootImplementations != null)
             implementationSets.add(bootImplementations);
@@ -329,12 +347,14 @@ protected final void runWithState(Properties properties, PrintWriter log) {
 				addDebugFlags(applicationProperties.getProperty(Monitor.DEBUG_TRUE), true);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-623
 			addDebugFlags(PropertyUtil.getSystemProperty(Monitor.DEBUG_FALSE), false);
 			addDebugFlags(PropertyUtil.getSystemProperty(Monitor.DEBUG_TRUE), true);
 		}
 
 		try {
 			systemStreams = (InfoStreams) Monitor.startSystemModule("org.apache.derby.shared.common.stream.InfoStreams");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 			if (SanityManager.DEBUG) {
 				SanityManager.SET_DEBUG_STREAM(systemStreams.stream().getPrintWriter());
@@ -344,9 +364,12 @@ protected final void runWithState(Properties properties, PrintWriter log) {
 
 			uuidFactory = (UUIDFactory) Monitor.startSystemModule("org.apache.derby.iapi.services.uuid.UUIDFactory");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
             timerFactory = (TimerFactory)Monitor.startSystemModule("org.apache.derby.iapi.services.timer.TimerFactory");
             
             Monitor.startSystemModule(Module.JMX);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
+//IC see: https://issues.apache.org/jira/browse/DERBY-1387
 
 		} catch (StandardException se) {
 
@@ -356,6 +379,8 @@ protected final void runWithState(Properties properties, PrintWriter log) {
 			dumpTempWriter(true);
 
 			return;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
         } catch (AccessControlException e) {
             dumpTempWriter(true);
             throw e;
@@ -375,6 +400,7 @@ protected final void runWithState(Properties properties, PrintWriter log) {
 
 		// bootup all the service providers
 		determineSupportedServiceProviders();
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 
 		// See if automatic booting of persistent services is required
 		boolean bootAll = Boolean.valueOf(PropertyUtil.getSystemProperty(Property.BOOT_ALL)).booleanValue();
@@ -415,6 +441,7 @@ public Object findService(String factoryInterface, String serviceName) {
 		TopService myts = null;
 		synchronized (this) {
 			for (int i = 1; i < services.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				TopService ts = services.get(i);
 				if (ts.isPotentialService(key)) {
 					myts = ts;
@@ -547,6 +574,7 @@ private synchronized TopService findTopService(Object serviceModule) {
 
 		if (serviceModule == null)
 			return services.get(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		for (int i = 1; i < services.size(); i++) {
 			TopService ts = services.get(i);
@@ -600,6 +628,7 @@ public InstanceGetter classFromIdentifier(int fmtId)
 			off = fmtId - StoredFormatIds.MIN_TWO_BYTE_FORMAT_ID;
 			iga = rc2;
 			if (iga == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
 				iga = rc2 = new InstanceGetter[ RegisteredFormatIds.countTwoByteIDs() ];
 			}
 
@@ -619,6 +648,7 @@ public InstanceGetter classFromIdentifier(int fmtId)
 
 			Throwable t;
 			try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				Class<?> clazz = Class.forName(className);
                 final Constructor<?> constructor = clazz.getDeclaredConstructor();
 
@@ -637,6 +667,7 @@ public InstanceGetter classFromIdentifier(int fmtId)
 				t = iae;
 			} catch (InstantiationException ie) {
 				t = ie;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			} catch (NoSuchMethodException nsme) {
 				t = nsme;
 			} catch (InvocationTargetException ite) {
@@ -691,6 +722,7 @@ public Object newInstanceFromIdentifier(int identifier)
  		catch (IllegalAccessException iae) {
 			t = iae;
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
  		catch (NoSuchMethodException iae) {
 			t = iae;
 		}
@@ -701,6 +733,7 @@ public Object newInstanceFromIdentifier(int identifier)
 			t = le;
 		}
 		throw StandardException.newException(SQLState.REGISTERED_CLASS_INSTANCE_ERROR,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			t, identifier, "XX" /*ci.getClassName()*/);
 	}
 
@@ -721,6 +754,7 @@ protected Object loadInstance(Class<?> factoryInterface, Properties properties)
 			instance = loadInstance(localImplementations, factoryInterface, properties);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (List<Class<?>> set : implementationSets) {
             instance = loadInstance(set, factoryInterface, properties);
 			if (instance != null)
@@ -731,6 +765,7 @@ protected Object loadInstance(Class<?> factoryInterface, Properties properties)
 	}
 
     private Object loadInstance(List<Class<?>> implementations,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                                 Class<?> factoryInterface,
                                 Properties properties) {
 
@@ -743,6 +778,7 @@ private Object loadInstance(List<Class<?>> implementations,
 
 			// try to create an instance
 			Object instance = newInstance((Class) implementations.get(index));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 
 			if (BaseMonitor.canSupport(instance, properties))
 				return instance;
@@ -786,10 +822,12 @@ private static int findImplementation(List<Class<?>> implementations,
     private Object newInstance(Class<?> classObject) {
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             final Constructor<?> constructor = classObject.getDeclaredConstructor();
             final Object module = constructor.newInstance();
 
             // Get and report any warnings generated during initialization
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
             try {
                 final Method getWarn = classObject.getMethod("getWarnings");
                 final String warnings = (String)getWarn.invoke(module);
@@ -815,6 +853,7 @@ private Object newInstance(Class<?> classObject) {
  		catch (IllegalAccessException e) {
 			report(classObject.getName() + " " + e.toString());
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
  		catch (NoSuchMethodException e) {
 			report(classObject.getName() + " " + e.toString());
 		}
@@ -851,6 +890,7 @@ public String[] getServiceList(String protocol) {
 
 			// count the number of services that implement the required protocol
 			for (int i = 1; i < services.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				ts = services.get(i);
 				if (ts.isActiveService()) {
 					if (ts.getKey().getFactoryInterface().getName().equals(protocol))
@@ -863,6 +903,7 @@ public String[] getServiceList(String protocol) {
 			if (count != 0) {
 				int j = 0;
 				for (int i = 1; i < services.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					ts = services.get(i);
 					if (ts.isActiveService()) {
 						if (ts.getKey().getFactoryInterface().getName().equals(protocol)) {
@@ -970,6 +1011,7 @@ public void startServices(Properties properties, boolean bootAll) {
 				try {
 					if (protocolOrType.equals(Monitor.SERVICE_TYPE_DIRECTORY)) {
 						if (bootAll)	// only if automatic booting is required
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 							findProviderAndStartService(name, properties, true);
 					} else {
 						bootService((PersistentService) null,
@@ -997,6 +1039,7 @@ public final boolean startPersistentService(String name, Properties properties)
 		throws StandardException {
 
 		return findProviderAndStartService(name, properties, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 
 	}
 
@@ -1014,6 +1057,7 @@ public Object createPersistentService(String factoryInterface, String name, Prop
 		throws StandardException {
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 		PersistentService provider = findProviderForCreate(name);
 		if (provider == null) {
 			throw StandardException.newException(SQLState.PROTOCOL_UNKNOWN, name);
@@ -1064,6 +1108,7 @@ private Vector<Class<?>> getImplementations(Properties moduleList, boolean actua
 			return null;
 
 		Vector<Class<?>> implementations = actualModuleList ? new Vector<Class<?>>(moduleList.size()) : new Vector<Class<?>>(0,1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		// Get my current JDK environment
 		int theJDKId = JVMInfo.JDK_ID;
@@ -1077,6 +1122,7 @@ private Vector<Class<?>> getImplementations(Properties moduleList, boolean actua
             
             // module tagged name in the modules.properties file.
             // used as the tag  for dependent properties.
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
             String tag;
             
             // Dynamically loaded code is defined by a property of
@@ -1138,6 +1184,7 @@ private Vector<Class<?>> getImplementations(Properties moduleList, boolean actua
 
 			try {
 				Class<?> possibleModule = Class.forName(className);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 				// Look for the monitors special modules, PersistentService ones.
 				if (getPersistentServiceImplementation(possibleModule))
@@ -1169,6 +1216,7 @@ private Vector<Class<?>> getImplementations(Properties moduleList, boolean actua
 						offset += envModuleCount[eji];
 					}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 					implementations.add(offset, possibleModule);
 					envModuleCount[envJDKId]++;
 
@@ -1246,6 +1294,7 @@ private boolean getPersistentServiceImplementation( Class<?> possibleModule)
 	private Vector<Class<?>> getDefaultImplementations() {
 
 		Properties moduleList = getDefaultModuleProperties();
+//IC see: https://issues.apache.org/jira/browse/DERBY-626
 
 		return getImplementations(moduleList, true);
 	} // end of getDefaultImplementations
@@ -1266,6 +1315,7 @@ Properties getDefaultModuleProperties()
 
         ClassLoader cl = getClass().getClassLoader();
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-798
         	Enumeration e = cl == null ?
         		ClassLoader.getSystemResources("org/apache/derby/modules.properties") :
         		cl.getResources("org/apache/derby/modules.properties");
@@ -1285,6 +1335,7 @@ Properties getDefaultModuleProperties()
                         for( Enumeration newKeys = otherList.keys(); newKeys.hasMoreElements() ;)
                         {
                             String key = (String) newKeys.nextElement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4815
                             if (moduleList.containsKey(key))
                                 // RESOLVE how do we localize messages before we have finished initialization?
                                 report( "Ignored duplicate property " + key + " in " + modulesPropertiesURL.toString());
@@ -1307,6 +1358,7 @@ Properties getDefaultModuleProperties()
             if (SanityManager.DEBUG)
                 report("Can't load implementation list: " + ioe.toString());
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-626
         if (SanityManager.DEBUG)
         {
 			if (firstList)
@@ -1343,6 +1395,7 @@ protected static Properties removeRuntimeProperties(Properties properties) {
 	/**	
 		Get InputStream for application properties file Returns nul if it does not exist.
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	abstract InputStream applicationPropertiesStream()
 	  throws IOException;
 
@@ -1420,11 +1473,13 @@ protected Properties readApplicationProperties() {
 	private void determineSupportedServiceProviders() {
 
 		for (Iterator<PersistentService> i = serviceProviders.values().iterator(); i.hasNext(); ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 			PersistentService provider = i.next();
 
 			// see if this provider can live in this environment
 			if (!BaseMonitor.canSupport(provider, (Properties) null)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 				i.remove();
 				continue;
 			}
@@ -1504,6 +1559,7 @@ private boolean findProviderAndStartService(String name,
 		int colon = name.indexOf(':');
 		if (colon != -1) {
 			actualProvider = findProviderFromName(name, colon);
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 
 			// if null is returned here then its a sub-sub protocol/provider
 			// that we don't understand. Attempt to load it as an untyped name.
@@ -1583,6 +1639,7 @@ private boolean findProviderAndStartService(String name,
 
 	protected PersistentService findProviderForCreate(String name) throws StandardException {
 		// RESOLVE - hard code creating databases in directories for now.
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 		return (PersistentService) findProviderFromName(name, name.indexOf(':'));
 	}
 
@@ -1604,6 +1661,7 @@ private PersistentService findProviderFromName(String name, int colon) throws St
 		} else {
 			serviceType = name.substring(0, colon);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 		return getServiceProvider(serviceType);
 	}
 
@@ -1617,6 +1675,7 @@ public PersistentService getServiceProvider(String subSubProtocol) throws Standa
             if( ps != null)
                 return ps;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
         return getPersistentService(subSubProtocol);
     } // end of getServiceProvider
 
@@ -1647,6 +1706,7 @@ private PersistentService getPersistentService( final String className, String s
                                                   e,
                                                   subSubProtocol, className);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
         return new StorageFactoryService( subSubProtocol, storageFactoryClass);
     } // end of getPersistentService
 
@@ -1659,14 +1719,17 @@ private PersistentService getPersistentService( final String className, String s
     private String getStorageFactoryClassName(String subSubProtocol)
     {
         String propertyName = Property.SUB_SUB_PROTOCOL_PREFIX + subSubProtocol;
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
         String className = PropertyUtil.getSystemProperty( propertyName);
         if( className != null)
             return className;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return storageFactories.get( subSubProtocol);
     } // end of getStorageFactoryClassName
 
     private static final HashMap<String,String> storageFactories = new HashMap<String,String>();
     static {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         storageFactories.put( PersistentService.DIRECTORY,
                                 "org.apache.derby.impl.io.DirStorageFactory");
         storageFactories.put( PersistentService.CLASSPATH,
@@ -1677,6 +1740,8 @@ private String getStorageFactoryClassName(String subSubProtocol)
                                 "org.apache.derby.impl.io.URLStorageFactory");
         storageFactories.put( PersistentService.HTTPS,
                                 "org.apache.derby.impl.io.URLStorageFactory");
+//IC see: https://issues.apache.org/jira/browse/DERBY-646
+//IC see: https://issues.apache.org/jira/browse/DERBY-4084
         storageFactories.put( PersistentService.INMEMORY,
                             "org.apache.derby.impl.io.VFMemoryStorageFactory");
     }
@@ -1729,6 +1794,7 @@ protected Object bootService(PersistentService provider,
 				}
 
 				for (int i = 1; i < services.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					TopService ts2 = services.get(i);
 					if (ts2.isPotentialService(serviceKey)) {
 						// if the service already exists then  just return null
@@ -1762,6 +1828,7 @@ protected Object bootService(PersistentService provider,
 				}
 
 				ts = new TopService(this, serviceKey, provider, serviceLocale);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				services.add(ts);
 			}
 
@@ -1864,6 +1931,7 @@ protected Object bootService(PersistentService provider,
 			if (ts != null) {
 				ts.shutdown();
 				synchronized (this) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 					services.remove(ts);
 				}
 
@@ -1877,6 +1945,7 @@ protected Object bootService(PersistentService provider,
 
 
 			Throwable nested = se.getCause();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 
 			// never hide ThreadDeath
 			if (nested instanceof ThreadDeath)
@@ -1912,6 +1981,7 @@ protected Object bootService(PersistentService provider,
 	/**
 	Return the UUID factory for this system.  Returns null
 	if there isn't one.
+//IC see: https://issues.apache.org/jira/browse/DERBY-862
 	See com.ibm.db2j.system.System
 	*/
 	public UUIDFactory getUUIDFactory()	{
@@ -1925,6 +1995,7 @@ public UUIDFactory getUUIDFactory()	{
      * @return the system's Timer factory.
      */
     public TimerFactory getTimerFactory() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
         return timerFactory;
     }
 
@@ -2069,6 +2140,7 @@ private static Locale setLocale(Properties properties)
 	public ResourceBundle getBundle(String messageId) {
 		ContextManager cm;
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			cm = getContextService().getCurrentContextManager();
 		} catch (ShutdownException se) {
 			cm = null;
@@ -2093,6 +2165,7 @@ public Thread getDaemonThread(Runnable task, String name, boolean setMinPriority
 
     @Override
     public final boolean isDaemonThread(Thread thread) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6631
         return thread.getThreadGroup() == daemonGroup;
     }
 
@@ -2102,6 +2175,7 @@ public final boolean isDaemonThread(Thread thread) {
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
@@ -2120,6 +2194,7 @@ public ContextService run()
      */
     private  static  void    stopContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         AccessController.doPrivileged
             (
              new PrivilegedAction<Object>()
@@ -2158,7 +2233,9 @@ public Boolean run()
 		Returns false if the monitor cannot be initialized, true otherwise.
 	*/
 	abstract boolean initialize(boolean lite);
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     class ProviderEnumeration implements Enumeration<PersistentService>
     {
         private Enumeration<String> serviceProvidersKeys = (serviceProviders == null) ? null :
@@ -2180,6 +2257,7 @@ public PersistentService nextElement() throws NoSuchElementException
             if( serviceProvidersKeys != null && serviceProvidersKeys.hasMoreElements())
                 return serviceProviders.get( serviceProvidersKeys.nextElement());
             getNextStorageFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             PersistentService ret = storageFactoryPersistentService;
             storageFactoryPersistentService = null;
             return ret;
@@ -2217,6 +2295,7 @@ private void getNextStorageFactory()
                 try
                 {
                     storageFactoryPersistentService
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
                       = getPersistentService( getStorageFactoryClassName(PersistentService.DIRECTORY),
                                               PersistentService.DIRECTORY);
                 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/FileMonitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/FileMonitor.java
index be4baa8434..ecea70ca12 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/FileMonitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/FileMonitor.java
@@ -89,6 +89,7 @@ public Object getEnvironment() {
      * a SecurityException
      */
     private ThreadGroup createDaemonGroup() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1439
         try {
             ThreadGroup group = new ThreadGroup("derby.daemons");
             group.setDaemon(true);
@@ -98,6 +99,8 @@ private ThreadGroup createDaemonGroup() {
             // let the daemon threads be created in the default thread group.
             // This can only happen if the current Derby thread is a part of
             // the root thread group "system".
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
             reportThread(se);
             return null;
         }
@@ -107,6 +110,7 @@ private ThreadGroup createDaemonGroup() {
 		SECURITY WARNING.
 
 		This method is run in a privileged block in a Java 2 environment.
+//IC see: https://issues.apache.org/jira/browse/DERBY-623
 
 		Set the system home directory.  Returns false if it couldn't for
 		some reason.
@@ -119,6 +123,7 @@ private boolean PBinitialize(boolean lite)
 		}
 
 		InputStream versionStream = getClass().getResourceAsStream("/" + ProductGenusNames.DBMS_INFO);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 		engineVersion = ProductVersionHolder.getProductVersionHolderFromMyEnv(versionStream);
 
@@ -129,6 +134,7 @@ private boolean PBinitialize(boolean lite)
 			systemHome = System.getProperty(Property.SYSTEM_HOME_PROPERTY);
 		} catch (SecurityException se) {
 			// system home will be the current directory
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
             report(se, Property.SYSTEM_HOME_PROPERTY);
 			systemHome = null;
 		}
@@ -162,10 +168,12 @@ private boolean PBinitialize(boolean lite)
                     // but avoids requiring read permission on the parent
                     // directory if it exists.
                     created = home.mkdir() || home.mkdirs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
                     if (created) {
                         FileUtil.limitAccessToOwner(home);
                     }
 				} catch (SecurityException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
                     report(se, home);
 					return false;
                 } catch (IOException ioe) {
@@ -181,6 +189,7 @@ private boolean PBinitialize(boolean lite)
 		SECURITY WARNING.
 
 		This method is run in a privileged block in a Java 2 environment.
+//IC see: https://issues.apache.org/jira/browse/DERBY-623
 
 		Return a property from the JVM's system set.
 		In a Java2 environment this will be executed as a privileged block
@@ -193,6 +202,7 @@ private String PBgetJVMProperty(String key) {
 			// SECURITY PERMISSION - OP1
 			return System.getProperty(key);
 		} catch (SecurityException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
             report(se, key);
 			return null;
 		}
@@ -228,6 +238,8 @@ private void report(SecurityException e, File file) {
     }
 
     private void reportThread(SecurityException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
         report(MessageService.getTextMessage(
                 MessageId.CANNOT_SET_DAEMON, e.toString()));
     }
@@ -242,6 +254,7 @@ private void reportThread(SecurityException e) {
 	final boolean initialize(final boolean lite)
 	{
         // SECURITY PERMISSION - OP2, OP2a, OP2b
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return (AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
             public Boolean run() {
                 return Boolean.valueOf(PBinitialize(lite));
@@ -251,6 +264,7 @@ public Boolean run() {
 
 	final Properties getDefaultModuleProperties() {
         // SECURITY PERMISSION - IP1
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return AccessController.doPrivileged(
                 new PrivilegedAction<Properties>() {
             public Properties run() {
@@ -264,6 +278,7 @@ public final String getJVMProperty(final String key) {
 			return PBgetJVMProperty(key);
 
         // SECURITY PERMISSION - OP1
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return AccessController.doPrivileged(new PrivilegedAction<String>() {
             public String run() {
                 return PBgetJVMProperty(key);
@@ -275,6 +290,7 @@ public synchronized final Thread getDaemonThread(
             final Runnable task,
             final String name,
             final boolean setMinPriority) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return AccessController.doPrivileged(new PrivilegedAction<Thread>() {
             public Thread run() {
                 try {
@@ -286,6 +302,7 @@ public Thread run() {
                     // daemon group has been automatically destroyed. If that's
                     // what happened, create a new daemon group and try again.
                     if (daemonGroup != null && daemonGroup.isDestroyed()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1439
                         daemonGroup = createDaemonGroup();
                         return FileMonitor.super.getDaemonThread(
                                 task, name, setMinPriority);
@@ -301,6 +318,7 @@ final InputStream applicationPropertiesStream()
 	  throws IOException {
 		try {
 			// SECURITY PERMISSION - OP3
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			return AccessController.doPrivileged(
                     new PrivilegedExceptionAction<InputStream>() {
                 public InputStream run() throws IOException {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/ProtocolKey.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/ProtocolKey.java
index 0077c63834..3df381c9b5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/ProtocolKey.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/ProtocolKey.java
@@ -67,6 +67,7 @@ static ProtocolKey create(String className, String identifier) throws StandardEx
 			t = cnfe;
 		} catch (IllegalArgumentException iae) {
 			t = iae;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         } catch (LinkageError le) {
             t = le;
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java
index 00b1934768..9199a17e95 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	stop cleanup on the stack at this point.
 */
 final class ServiceBootContext extends ContextImpl {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 	ServiceBootContext(ContextManager cm) {
 		super(cm, "ServiceBoot");
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java
index 6a03e917c9..8b03f8dc65 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java
@@ -70,11 +70,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * This class implements the PersistentService interface using a StorageFactory class.
  * It handles all subSubProtocols except for cache.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 final class StorageFactoryService implements PersistentService
 {
     /** Marker printed as the last line of the service properties file. */
     private static final String SERVICE_PROPERTIES_EOF_TOKEN =
             "#--- last line, don't put anything after this line ---";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5283
 
     private String home; // the path of the database home directory. Can be null
     private String canonicalHome; // will be null if home is null
@@ -83,12 +85,14 @@ final class StorageFactoryService implements PersistentService
     private StorageFactory rootStorageFactory;
     private char separatorChar;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
     StorageFactoryService( String subSubProtocol, Class storageFactoryClass)
         throws StandardException
     {
         this.subSubProtocol = subSubProtocol;
         this.storageFactoryClass = storageFactoryClass;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         Object monitorEnv = getMonitor().getEnvironment();
 		if (monitorEnv instanceof File)
         {
@@ -96,6 +100,7 @@ final class StorageFactoryService implements PersistentService
             try
             {
                 AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     new java.security.PrivilegedExceptionAction<Object>()
                     {
                         public Object run() throws IOException, StandardException
@@ -108,6 +113,7 @@ public Object run() throws IOException, StandardException
                             {
                                 StorageFile rootDir = rootStorageFactory.newStorageFile( null);
                                 boolean created = rootDir.mkdirs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
                                 if (created) {
                                     rootDir.limitAccessToOwner();
                                 }
@@ -132,6 +138,7 @@ public Object run() throws IOException, StandardException
             catch( IOException ioe){ throw Monitor.exceptionStartingModule(/*serviceName, */ ioe); }
         }
         AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             new java.security.PrivilegedAction<Object>()
             {
                 public Object run()
@@ -187,6 +194,7 @@ public StorageFactory getStorageFactoryInstance(final boolean useHome,
                 new PrivilegedExceptionAction<StorageFactory>()
                 {
                   public StorageFactory run() throws InstantiationException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                       IllegalAccessException, IOException, NoSuchMethodException, InvocationTargetException
                     {
                         return privGetStorageFactoryInstance( useHome, databaseName, tempDirName, uniqueName);
@@ -205,6 +213,7 @@ private StorageFactory privGetStorageFactoryInstance( boolean useHome,
                                                           String databaseName,
                                                           String tempDirName,
                                                           String uniqueName)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
       throws InstantiationException,
              IllegalAccessException,
              IOException,
@@ -276,6 +285,7 @@ public Properties getServiceProperties( final String serviceName, Properties def
                 {
                     public Object run()
                         throws IOException, StandardException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         InstantiationException, IllegalAccessException,
                         NoSuchMethodException, InvocationTargetException
                     {
@@ -293,6 +303,7 @@ public Object run()
                         {
                             StorageFactory storageFactory = privGetStorageFactoryInstance( true, serviceName, null, null);
                             StorageFile file = storageFactory.newStorageFile( PersistentService.PROPERTIES_NAME);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5283
                             resolveServicePropertiesFiles(storageFactory, file);
                             try {
                                 InputStream is = file.getInputStream();
@@ -349,6 +360,7 @@ public void saveServiceProperties( final String serviceName,
                 {
                     public Object run() throws StandardException
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5283
                         StorageFile backupFile = replace
                             ? storageFactory.newStorageFile(
                                 PersistentService.PROPERTIES_NAME.concat("old"))
@@ -372,6 +384,7 @@ public Object run() throws StandardException
                             // The eof token should match the ISO-8859-1 encoding 
                             // of the rest of the properties file written with store.
                             BufferedWriter bOut = new BufferedWriter(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5424
                                     new OutputStreamWriter(os,"ISO-8859-1"));
                             bOut.write(SERVICE_PROPERTIES_EOF_TOKEN);
                             bOut.newLine();
@@ -490,12 +503,16 @@ public Object run() throws StandardException
      */
 
 	public void saveServiceProperties(final String serviceName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5260
                                       final Properties properties)
 		throws StandardException {
 
         try
         {
             AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 new PrivilegedExceptionAction<Object>()
                 {
                     public Object run() throws StandardException
@@ -511,6 +528,7 @@ public Object run() throws StandardException
 
                             fos = new FileOutputStream(servicePropertiesFile);
                             FileUtil.limitAccessToOwner(servicePropertiesFile);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
                             properties.store(fos, 
                                              serviceName + 
@@ -552,6 +570,7 @@ public Object run() throws StandardException
      *      file fails
      */
     private void resolveServicePropertiesFiles(StorageFactory sf,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5283
                                                StorageFile spf)
             throws StandardException {
         StorageFile spfOld = sf.newStorageFile(PROPERTIES_NAME.concat("old"));
@@ -579,6 +598,7 @@ private void resolveServicePropertiesFiles(StorageFactory sf,
             String lastLine = null;
             try {
                 //service.properties always in ISO-8859-1 because written with Properties.store()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5424
                 bin = new BufferedReader(new InputStreamReader(
                         new FileInputStream(spf.getPath()),"ISO-8859-1"));
                 String line;
@@ -690,6 +710,7 @@ protected String recreateServiceRoot( final String serviceName,
                                 new PrivilegedExceptionAction<Object>()
                                 {
                                     public Object run()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                                         throws IOException, StandardException,
                                       InstantiationException, IllegalAccessException,
                                       NoSuchMethodException, InvocationTargetException
@@ -725,6 +746,7 @@ public Object run()
 		{
 			//First make sure backup service directory exists in the specified path
 			File backupRoot = new File(restoreFrom);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2556
 			if (fileExists(backupRoot))
 			{
 				//First make sure backup have service.properties
@@ -737,9 +759,11 @@ public Object run()
                     try
                     {
                         AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                             new PrivilegedExceptionAction<Object>()
                             {
                                 public Object run()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                                     throws IOException, StandardException,
                                     InstantiationException, IllegalAccessException,
                                     NoSuchMethodException, InvocationTargetException
@@ -795,10 +819,12 @@ public String createServiceRoot(final String name, final boolean deleteExisting)
 		Throwable t = null;
         try
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
             return getProtocolLeadIn() + (String) AccessController.doPrivileged(
                 new PrivilegedExceptionAction<Object>()
                 {
                     public Object run()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         throws StandardException, IOException,
                         InstantiationException, IllegalAccessException,
                         NoSuchMethodException, InvocationTargetException
@@ -826,6 +852,7 @@ public Object run()
 
                             if (serviceDirectory.mkdirs())
                             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
                                 serviceDirectory.limitAccessToOwner();
                                 // DERBY-5096. The storageFactory canonicalName may need to be adjusted
                                 // for casing after the directory is created. Just reset it after making the 
@@ -842,6 +869,7 @@ public Object run()
                                     throw ioe;
                                 }
                             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-336
                             throw StandardException.newException(SQLState.SERVICE_DIRECTORY_CREATE_ERROR, serviceDirectory);
                         }
                         finally { storageFactory.shutdown(); }
@@ -857,6 +885,7 @@ public Object run()
                 throw (StandardException) t;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-336
         throw StandardException.newException(SQLState.SERVICE_DIRECTORY_CREATE_ERROR, t, name);
     } // end of createServiceRoot
 
@@ -876,6 +905,7 @@ private void    vetService( StorageFactory storageFactory, String serviceName )
             StorageFile seg0 = storageFactory.newStorageFile("seg0");
             if (seg0.exists()) {
             throw StandardException.newException
+//IC see: https://issues.apache.org/jira/browse/DERBY-5283
                 ( SQLState.SERVICE_PROPERTIES_MISSING, serviceName, PersistentService.PROPERTIES_NAME );
             }
         }
@@ -903,9 +933,14 @@ public boolean removeServiceRoot(final String serviceName)
         try
         {
             return AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 new PrivilegedExceptionAction<Object>()
                 {
                     public Object run()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         throws StandardException, IOException,
                         InstantiationException, IllegalAccessException,
                         NoSuchMethodException, InvocationTargetException
@@ -919,6 +954,7 @@ public Object run()
                                 // an extra sanity check. Prepending the
                                 // protocol lead in to the canonical name from
                                 // the storage factory should be enough.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
                                 String tmpCanonical = getCanonicalServiceName(
                                         getProtocolLeadIn() +
                                         storageFactory.getCanonicalName());
@@ -945,6 +981,7 @@ public Object run()
 	} // end of removeServiceRoot
 
 	public String getCanonicalServiceName(String name)
+//IC see: https://issues.apache.org/jira/browse/DERBY-19
 		throws StandardException
     {
         int colon = name.indexOf( ':');
@@ -953,6 +990,7 @@ public String getCanonicalServiceName(String name)
         // specifications here, which contain a colon (i.e. 'C:').
         // The logic in this method may break in some cases if a colon is used
         // in the directory or database name.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4171
         if (colon < 2 && !getType().equals(PersistentService.DIRECTORY)) {
             return null;
         }
@@ -966,10 +1004,12 @@ public String getCanonicalServiceName(String name)
 
         try
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             return getProtocolLeadIn() + AccessController.doPrivileged(
                 new PrivilegedExceptionAction<String>()
                 {
                     public String run()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         throws StandardException, IOException,
                         InstantiationException, IllegalAccessException,
                         NoSuchMethodException, InvocationTargetException
@@ -986,6 +1026,7 @@ public String run()
         }
 		catch (PrivilegedActionException pae)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-19
 			throw Monitor.exceptionStartingModule(pae.getException());
 		}
 	} // end of getCanonicalServiceName
@@ -1010,6 +1051,7 @@ public boolean isSameService(String serviceName1, String serviceName2)
     {
 		if (SanityManager.DEBUG)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-19
 			try {
             SanityManager.ASSERT(serviceName1.equals(getCanonicalServiceName(serviceName1)), serviceName1);
 			SanityManager.ASSERT(serviceName2.equals(getCanonicalServiceName(serviceName2)), serviceName2);
@@ -1029,9 +1071,11 @@ public boolean isSameService(String serviceName1, String serviceName2)
      * @throws SecurityException if the required privileges are missing
      */
     private final boolean fileExists(final File file) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return (AccessController.doPrivileged(
                 new PrivilegedAction<Boolean>() {
                     public Boolean run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         return file.exists();
                     }
             })).booleanValue();
@@ -1058,6 +1102,7 @@ private String getProtocolLeadIn() {
         // We prepend the subsub protocol name to the storage factory canonical
         // name to form the service name, except in case of the default
         // subsub prototcol (which is PersistentService.DIRECTORY).
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
         if (getType().equals(PersistentService.DIRECTORY)) {
             return "";
         } else {
@@ -1071,6 +1116,7 @@ private String getProtocolLeadIn() {
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
@@ -1083,6 +1129,7 @@ public ModuleFactory run()
              );
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     final class DirectoryList implements Enumeration, PrivilegedAction<DirectoryList>
     {
         private String[] contents;
@@ -1103,6 +1150,7 @@ final class DirectoryList implements Enumeration, PrivilegedAction<DirectoryList
 
         public boolean hasMoreElements()
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
             if (contents == null)
                 return false;
             
@@ -1173,6 +1221,7 @@ public final DirectoryList run()
      *      {@code File.getPath}.
      */
     private static String getMostAccuratePath(StorageFile file) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5283
         String path = file.getPath();
         try {
             path = file.getCanonicalPath();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/TopService.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/TopService.java
index d3257e0779..7fcbb80d95 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/TopService.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/TopService.java
@@ -43,6 +43,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 
 final class TopService {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 	/*
 	** Fields.
@@ -62,6 +63,7 @@ final class TopService {
 		List of protocols.
 	*/
 	Hashtable<ProtocolKey,ModuleInstance>		protocolTable;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	/**
 	*/
@@ -88,6 +90,7 @@ final class TopService {
 	TopService(BaseMonitor monitor) {
 		super();
 		this.monitor = monitor;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		protocolTable = new Hashtable<ProtocolKey,ModuleInstance>();
 		moduleInstances = new Vector<ModuleInstance>(0, 5);
 	}
@@ -101,6 +104,7 @@ final class TopService {
 		this.serviceLocale = serviceLocale;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	void setTopModule(Object instance) {
 		synchronized (this) {
             ModuleInstance module = findModuleInstance(instance);
@@ -124,6 +128,7 @@ void setTopModule(Object instance) {
 	}
 
 	Object getService() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 		return topModule.getInstance();
 	}
@@ -136,6 +141,7 @@ boolean isPotentialService(ProtocolKey otherKey) {
 		if (serviceType == null)
 			otherCanonicalName = otherKey.getIdentifier();
 		else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-19
 			try
 			{
 				otherCanonicalName = serviceType.getCanonicalServiceName(otherKey.getIdentifier());
@@ -188,6 +194,8 @@ boolean isActiveService(ProtocolKey otherKey) {
 				try {
 					wait();
 				} catch (InterruptedException ioe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.setInterrupted();
 				}
 			}
@@ -207,8 +215,10 @@ boolean isActiveService(ProtocolKey otherKey) {
 		the protocol table.
 	*/
 	synchronized Object findModule(ProtocolKey key, boolean findOnly, Properties properties) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 		ModuleInstance module = protocolTable.get(key);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		if (module == null)
 			return null;
@@ -235,6 +245,7 @@ private ModuleInstance findModuleInstance(Object instance) {
         // ArrayIndexOutOfBoundsException.
         synchronized (moduleInstances) {
             for (int i = 0; i < moduleInstances.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 ModuleInstance module = moduleInstances.get(i);
                 if (module.getInstance() == instance) {
                     return module;
@@ -281,6 +292,7 @@ Object bootModule(boolean create, Object service, ProtocolKey key, Properties pr
                 // and result in an ArrayIndexOutOfBoundsException.
                 synchronized (moduleInstances) {
                     if (i < moduleInstances.size()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                         module = moduleInstances.get(i);
                     } else {
                         // No more instances to look at, break out of the loop.
@@ -329,6 +341,7 @@ Object bootModule(boolean create, Object service, ProtocolKey key, Properties pr
 				topModule == null ? (Object) null : topModule.getInstance());
 
 		moduleInstances.add(module);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 
 		try {
 			BaseMonitor.boot(instance, create, properties);
@@ -359,6 +372,7 @@ Object bootModule(boolean create, Object service, ProtocolKey key, Properties pr
 	
 		TopService.stop(instance);
 		moduleInstances.remove(module);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 
 		// if we reached here it's because someone else beat us adding the module, so use theirs.
 		return findModule(key, true, properties);
@@ -387,6 +401,7 @@ boolean shutdown() {
 					return true;
 
 				module = moduleInstances.get(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 			}
 			
@@ -394,6 +409,7 @@ boolean shutdown() {
 			TopService.stop(instance);
 			
 			synchronized (this) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				moduleInstances.remove(0);
 			}
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
index b401dd31b1..7ee966821e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
@@ -64,6 +64,7 @@ in which case the class is removed.  This is transparent to users.
 	@see org.apache.derby.iapi.services.loader.ClassFactory
 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-485
 abstract class DatabaseClasses
 	implements ClassFactory, ModuleControl
 {
@@ -79,6 +80,7 @@ abstract class DatabaseClasses
 	** Constructor
 	*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-485
 	DatabaseClasses() {
 	}
 
@@ -170,6 +172,7 @@ private static void WriteClassFile(String fullyQualifiedName, ByteArray bytecode
         int lastDot = fullyQualifiedName.lastIndexOf((int)'.');
         String filename = fullyQualifiedName.substring(lastDot+1,fullyQualifiedName.length()).concat(".class");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		Object env = getMonitor().getEnvironment();
 		File dir = env instanceof File ? (File) env : null;
 
@@ -181,6 +184,7 @@ private static void WriteClassFile(String fullyQualifiedName, ByteArray bytecode
 		try {
             FileOutputStream fis;
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 fis = AccessController.doPrivileged(
                         new PrivilegedExceptionAction<FileOutputStream>() {
                             public FileOutputStream run() throws IOException {
@@ -199,6 +203,7 @@ public FileOutputStream run() throws IOException {
 			fis.close();
 		} catch (IOException e) {
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4859
 				SanityManager.THROWASSERT("Unable to write .class file", e);
 		}
 	}
@@ -228,6 +233,7 @@ public final Class loadApplicationClass(String className)
             }
         }
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-485
 		Throwable loadError;
 		try {
 			try {
@@ -305,6 +311,7 @@ public int getClassLoaderVersion() {
 	** Keep track of loaded generated classes and their GeneratedClass objects.
 	*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	abstract LoadedGeneratedClass loadGeneratedClassFromData(String fullyQualifiedName, ByteArray classDump); 
     
     /**
@@ -313,6 +320,7 @@ public int getClassLoaderVersion() {
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/JarLoader.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/JarLoader.java
index 129379946a..84cad4ff84 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/JarLoader.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/JarLoader.java
@@ -175,10 +175,12 @@ protected Class loadClass(String className, boolean resolve)
         // not make assumptions about this check reducing the
         // number of classes it has to check for.
         if (className.startsWith("org.apache.derby.")
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 && !isDerbyDriver(className)
                 && !className.startsWith("org.apache.derby.jdbc.")
                 && !className.startsWith("org.apache.derby.vti.")
                 && !className.startsWith("org.apache.derby.agg.")
+//IC see: https://issues.apache.org/jira/browse/DERBY-6600
                 && !className.startsWith("org.apache.derby.optional.")
                 && !className.startsWith("org.apache.derby.impl.tools.optional.")
             )
@@ -211,9 +213,11 @@ protected Class loadClass(String className, boolean resolve)
      */
     private boolean isDerbyDriver(String className)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return
           (
            className.startsWith("org.apache.derby.iapi.jdbc.AutoloadedDriver")
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
            || className.startsWith("org.apache.derby.iapi.client.ClientAutoloadedDriver")
            );
     }
@@ -231,6 +235,7 @@ public InputStream getResourceAsStream(String name) {
      * Return the SQL name for the installed jar.
      * Used for error and informational messages.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
     final String getJarName() {
         return IdUtil.mkQualifiedName(name);
     }
@@ -243,6 +248,7 @@ Class loadClassData(String className, String jvmClassName, boolean resolve) {
 		try {
 			if (jar != null)
 				return loadClassDataFromJar(className, jvmClassName, resolve);
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
 
 			if (isStream) {
 				// have to use a new stream each time
@@ -271,6 +277,7 @@ InputStream getStream(String name) {
      
 		if (jar != null)
 			return getRawStream(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
 
 		if (isStream) {
 			try {
@@ -293,6 +300,7 @@ InputStream getStream(String name) {
      * as a java.util.jarFile.
      */
 	private Class loadClassDataFromJar(
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
             String className, String jvmClassName, boolean resolve) 
 		throws IOException {
 
@@ -346,8 +354,10 @@ private Class loadClassData(JarEntry e, InputStream in,
 		String className, boolean resolve) throws IOException {
 
 		byte[] data = readData(e, in, className);
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
 
 		Certificate[] signers = getSigners(className, e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
 
 		synchronized (updateLoader) {
 			// see if someone else loaded it while we
@@ -381,8 +391,10 @@ Class checkLoaded(String className, boolean resolve) {
      * resolve any classes or resources.
      *
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
 	void setInvalid() {
 		updateLoader = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
         if (jar != null) {
             try {
                 jar.close();
@@ -399,6 +411,7 @@ void setInvalid() {
 	*/
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
 		Get a stream for a resource directly from a JarFile.
 		In this case we can safely return the stream directly.
 		It's a new stream set up by the zip code to read just
@@ -419,6 +432,7 @@ private InputStream getRawStream(String name) {
 
 	/**
 		Get a stream from a zip file that is itself a stream.
+//IC see: https://issues.apache.org/jira/browse/DERBY-552
         We copy to the contents to a byte array and return a
         stream around that to the caller. Though a copy is
         involved it has the benefit of:
@@ -443,6 +457,7 @@ private InputStream getRawStream(InputStream in, String name) {
 
 				if (e.getName().equals(name)) {
                     int size = (int) e.getSize();
+//IC see: https://issues.apache.org/jira/browse/DERBY-552
                     if (size == -1)
                     {
                         // unknown size so just pick a good buffer size.
@@ -472,6 +487,7 @@ private InputStream getRawStream(InputStream in, String name) {
      * If this is a signed class and it has been compromised then
      * a SecurityException will be thrown.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
     byte[] readData(JarEntry ze, InputStream in, String className)
             throws IOException {
 
@@ -555,6 +571,7 @@ MessageId.CM_SECURITY_EXCEPTION, className, getJarName(), e
      */
     public String toString()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2331
         return getJarName() + ":" + super.toString();
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java
index 6f058575d5..f8d6bfada6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java
@@ -77,6 +77,7 @@ public Object newInstance(Context context) throws StandardException	{
 			t = iae;
 		} catch (java.lang.reflect.InvocationTargetException ite) {
 			t = ite;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		} catch (NoSuchMethodException le) {
 			t = le;
 		} catch (LinkageError le) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
index 65c968b057..b9fbabfea8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
@@ -25,10 +25,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.iapi.util.ByteArray;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6654
 	Reflect loader with Privileged block for Java 2 security. 
 */
 
 public class ReflectClassesJava2 extends DatabaseClasses
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	implements java.security.PrivilegedAction<Object>
 {
 
@@ -37,10 +39,12 @@ public class ReflectClassesJava2 extends DatabaseClasses
 	private int action = -1;
 
 	synchronized LoadedGeneratedClass loadGeneratedClassFromData(String fullyQualifiedName, ByteArray classDump) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 		if (classDump == null || classDump.getArray() == null) {
 
 			if (preCompiled == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				preCompiled = new java.util.HashMap<String,ReflectGeneratedClass>();
 			else
 			{
@@ -52,6 +56,7 @@ synchronized LoadedGeneratedClass loadGeneratedClassFromData(String fullyQualifi
 			// not a generated class, just load the class directly.
 			try {
 				Class jvmClass = Class.forName(fullyQualifiedName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5935
 				ReflectGeneratedClass gc = new ReflectGeneratedClass(this, jvmClass);
 				preCompiled.put(fullyQualifiedName, gc);
 				return gc;
@@ -62,6 +67,7 @@ synchronized LoadedGeneratedClass loadGeneratedClassFromData(String fullyQualifi
 
         // Generated class. Make sure that it lives in the org.apache.derby.exe package
         int     lastDot = fullyQualifiedName.lastIndexOf( "." );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6654
         String  actualPackage;
         if ( lastDot < 0 ) { actualPackage = ""; }
         else
@@ -80,6 +86,7 @@ synchronized LoadedGeneratedClass loadGeneratedClassFromData(String fullyQualifi
 
 	public final Object run() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-485
 		try {
 			// SECURITY PERMISSION - MP2
 			switch (action) {
@@ -111,6 +118,7 @@ Class loadClassNotInDatabaseJar(String name) throws ClassNotFoundException {
 	    // (the classLoader that loaded Derby). 
 	    // So we call Class.forName to ensure that we find the class.
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-485
         	ClassLoader cl;
         	synchronized(this) {
         	  action = 2;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java
index d3874e0e12..8ce7c79e3f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java
@@ -45,6 +45,7 @@ public final class ReflectGeneratedClass extends LoadedGeneratedClass {
 
 	public ReflectGeneratedClass(ClassFactory cf, Class jvmClass) {
 		super(cf, jvmClass);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		methodCache = new Hashtable<String,GeneratedMethod>();
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java
index 4d3eab5602..8baa704c88 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java
@@ -56,11 +56,13 @@ that was added in Java2 and it needs to not implement loadClass()
 		Load a generated class from the passed in class data.
 	*/
     LoadedGeneratedClass loadGeneratedClass(String name, ByteArray classData) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6621
 
 		Class jvmClass = defineClass(name, classData.getArray(), classData.getOffset(), classData.getLength());
 
 		resolveClass(jvmClass);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5935
         return new ReflectGeneratedClass(cf, jvmClass);
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectMethod.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectMethod.java
index 36b9462294..198ef0ebf6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectMethod.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectMethod.java
@@ -56,6 +56,7 @@ public Object invoke(Object ref)
 		} catch (InvocationTargetException ite) {
 
             t = ite;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6493
 
 		}
 		
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/UpdateLoader.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
index bcc2a26bb7..4b7ada1434 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
@@ -75,6 +75,7 @@ final class UpdateLoader implements LockOwner {
         // class loading mechanism, javax. ones are not. However
         // allowing database applications to override jvm classes
         // seems a bad idea.
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
         "javax.",
         
         // Allowing an application to possible override the engine's
@@ -102,8 +103,10 @@ final class UpdateLoader implements LockOwner {
 
         this.normalizeToUpper = normalizeToUpper;
 		this.parent = parent;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		lf = (LockFactory) getServiceModule(parent, Module.LockFactory);
 		compat = (lf != null) ? lf.createCompatibilitySpace(this) : null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2164
 
 		if (verbose) {
 			vs = Monitor.getStream();
@@ -118,6 +121,7 @@ final class UpdateLoader implements LockOwner {
 
 	private void initializeFromClassPath(String classpath) throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 		final String[][] elements = IdUtil.parseDbClassPath(classpath);
 		
 		final int jarCount = elements.length;
@@ -127,6 +131,7 @@ private void initializeFromClassPath(String classpath) throws StandardException
             // Creating class loaders is a restricted operation
             // so we need to use a privileged block.
             AccessController.doPrivileged
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             (new java.security.PrivilegedAction<Object>(){
                 
                 public Object run(){    
@@ -138,6 +143,7 @@ public Object run(){
             });
         }
 		if (vs != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5885
 			vs.println(MessageService.getTextMessage(MessageId.CM_CLASS_LOADER_START, classpath ));
 		}
 		
@@ -146,6 +152,7 @@ public Object run(){
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2331
 		Load the class from the class path. Called by JarLoader
         when it has a request to load a class to fulfill
         the sematics of derby.database.classpath.
@@ -189,6 +196,7 @@ Class loadClass(String className, boolean resolve)
                 // Refuse to load classes from restricted name spaces
                 // That is classes in those name spaces can be not
                 // loaded from installed jar files.
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
                 for (int i = 0; i < RESTRICTED_PACKAGES.length; i++)
                 {
                     if (className.startsWith(RESTRICTED_PACKAGES[i]))
@@ -268,6 +276,8 @@ InputStream getResourceAsStream(String name) {
 			return null;
 		} finally {
 			if (unlockLoader) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 				lf.unlock(compat, this, classLoaderLock, ShExQual.SH);
 			}
 		}
@@ -297,6 +307,7 @@ synchronized void modifyJar(boolean reload) throws StandardException {
         
         // first close the existing jar file opens
         close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
 
 		if (reload) {
 			initializeFromClassPath(thisClasspath);
@@ -310,11 +321,13 @@ private boolean lockClassLoader(ShExQual qualifier)
 			return false;
 
 		ClassFactoryContext cfc = (ClassFactoryContext) getContextOrNull(ClassFactoryContext.CONTEXT_ID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		// This method can be called from outside of the database
 		// engine, in which case tc will be null. In that case
 		// we lock the class loader only for the duration of
 		// the loadClass().
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		CompatibilitySpace lockSpace = null;
 		
 		if (cfc != null) {
@@ -344,6 +357,7 @@ Class checkLoaded(String className, boolean resolve) {
 	void close() {
 
 		for (int i = 0; i < jarList.length; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
 			jarList[i].setInvalid();
 		}
 
@@ -382,6 +396,7 @@ private String getClasspath()
 		throws StandardException {
 
 		ClassFactoryContext cfc = (ClassFactoryContext) getContextOrNull(ClassFactoryContext.CONTEXT_ID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		PersistentSet ps = cfc.getPersistentSet();
 		
@@ -401,6 +416,7 @@ JarReader getJarReader() {
 		if (jarReader == null) {
 
 			ClassFactoryContext cfc = (ClassFactoryContext) getContextOrNull(ClassFactoryContext.CONTEXT_ID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			jarReader = cfc.getJarReader(); 
 		}
@@ -419,6 +435,7 @@ public boolean noWait() {
     
     public boolean isNestedOwner()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
         return false;
     }
 
@@ -434,12 +451,14 @@ public boolean nestsUnder( LockOwner other )
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<Context>()
              {
                  public Context run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getContextOrNull( contextID );
                  }
              }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java
index 3d5ba1e18b..91619c37fa 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java
@@ -58,6 +58,7 @@ class BasicHeaderPrintWriter
 	 * @see	PrintWriterGetHeader
 	 */
 	BasicHeaderPrintWriter(OutputStream writeTo,
+//IC see: https://issues.apache.org/jira/browse/DERBY-205
 			PrintWriterGetHeader headerGetter,  boolean canClose, String streamName){
 		super(writeTo, true);
 		this.headerGetter = headerGetter;
@@ -103,6 +104,7 @@ public PrintWriter getPrintWriter(){
 	}
 
 	public String getName(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-205
 		return name;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/RollingFileStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/RollingFileStream.java
index f6099251ae..66b982ab3d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/RollingFileStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/RollingFileStream.java
@@ -461,6 +461,7 @@ private boolean fileExists(final File file) {
         Boolean value = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
 
             public Boolean run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 return file.exists();
             }
 
@@ -495,6 +496,7 @@ private boolean fileRename(final File file1, final File file2) {
         Boolean value = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
 
             public Boolean run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 return file1.renameTo(file2);
             }
         });
@@ -512,6 +514,7 @@ private long fileLength(final File file) {
         Long value = AccessController.doPrivileged(new PrivilegedAction<Long>() {
 
             public Long run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 return file.length();
             }
         });
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/SingleStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/SingleStream.java
index 844bc7ca8a..2afd47dc8f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/SingleStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/stream/SingleStream.java
@@ -74,6 +74,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 public final class SingleStream
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 implements InfoStreams, ModuleControl, java.security.PrivilegedAction<HeaderPrintWriter>
 {
 
@@ -129,6 +130,7 @@ private HeaderPrintWriter makeStream() {
 		// get the header
 		PrintWriterGetHeader header = makeHeader();
 		HeaderPrintWriter hpw = makeHPW(header);
+//IC see: https://issues.apache.org/jira/browse/DERBY-205
 
 		// If hpw == null then no properties were specified for the stream
 		// so use/create the default stream.
@@ -154,7 +156,9 @@ private HeaderPrintWriter makeHPW(PrintWriterGetHeader header) {
 		// the type of target is based on which property is used
 		// to set it. choices are file, method, field, stream
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-205
 		String target = PropertyUtil.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
 		   getSystemProperty(Property.ERRORLOG_STYLE_PROPERTY);
 		if (target != null) {
 			return makeStyleHPW(target, header);
@@ -169,6 +173,7 @@ private HeaderPrintWriter makeHPW(PrintWriterGetHeader header) {
                    getSystemProperty(Property.ERRORLOG_METHOD_PROPERTY);
 		if (target!=null) 
 			return makeMethodHPW(target, header, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
 
 		target = PropertyUtil.
                    getSystemProperty(Property.ERRORLOG_FIELD_PROPERTY);
@@ -193,6 +198,7 @@ private HeaderPrintWriter PBmakeFileHPW(String fileName,
 
 		// See if this needs to be made relative to something ...
 		if (!streamFile.isAbsolute()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			Object monitorEnv = getMonitor().getEnvironment();
 			if (monitorEnv instanceof File)
 				streamFile = new File((File) monitorEnv, fileName);
@@ -206,6 +212,7 @@ private HeaderPrintWriter PBmakeFileHPW(String fileName,
 				fos = new FileOutputStream(streamFile.getPath(), true);
 			else
 				fos = new FileOutputStream(streamFile);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             FileUtil.limitAccessToOwner(streamFile);
 		} catch (IOException ioe) {
 			return useDefaultStream(header, ioe);
@@ -213,11 +220,13 @@ private HeaderPrintWriter PBmakeFileHPW(String fileName,
 			return useDefaultStream(header, se);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-205
 		return new BasicHeaderPrintWriter(new BufferedOutputStream(fos), header,
 			true, streamFile.getPath());
 	}
 
 	private HeaderPrintWriter makeMethodHPW(String methodInvocation,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
 											PrintWriterGetHeader header,
                                             boolean canClose) {
 
@@ -228,6 +237,7 @@ private HeaderPrintWriter makeMethodHPW(String methodInvocation,
 		Throwable t;
 		try {
 			Class<?> theClass = Class.forName(className);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 			try {
 				Method theMethod = theClass.getMethod(methodName,  new Class[0]);
@@ -240,6 +250,7 @@ private HeaderPrintWriter makeMethodHPW(String methodInvocation,
 
 				try {
 					return makeValueHPW(theMethod, theMethod.invoke((Object) null, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
 						new Object[0]), header, methodInvocation, canClose);
 				} catch (IllegalAccessException iae) {
 					t = iae;
@@ -263,6 +274,7 @@ private HeaderPrintWriter makeMethodHPW(String methodInvocation,
 	}
 
 	private HeaderPrintWriter makeStyleHPW(String style,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
 											PrintWriterGetHeader header) {
 		HeaderPrintWriter res = null;
 		if ("rollingFile".equals(style)) {
@@ -304,6 +316,7 @@ private HeaderPrintWriter makeFieldHPW(String fieldAccess,
 
 				try {
 					return makeValueHPW(theField, theField.get((Object) null), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
 						header, fieldAccess, false);
 				} catch (IllegalAccessException iae) {
 					t = iae;
@@ -336,6 +349,7 @@ else if ("java.lang.System.err".equals(fieldAccess))
 
 	private HeaderPrintWriter makeValueHPW(Member whereFrom, Object value,
 		PrintWriterGetHeader header, String name, boolean canClose) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
 
 		if (value instanceof OutputStream)
 			 return new BasicHeaderPrintWriter((OutputStream) value, header, canClose, name);
@@ -365,6 +379,7 @@ private HeaderPrintWriter createDefaultStream(PrintWriterGetHeader header) {
 	*/
 	private HeaderPrintWriter useDefaultStream(PrintWriterGetHeader header) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-205
 		return new BasicHeaderPrintWriter(System.err, header, false, "System.err");
 	}
 
@@ -372,6 +387,7 @@ private HeaderPrintWriter useDefaultStream(PrintWriterGetHeader header, Throwabl
 
 		HeaderPrintWriter hpw = useDefaultStream(header);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
         while (t != null) {
             Throwable causedBy = t.getCause();
             String causedByStr =
@@ -411,6 +427,7 @@ public final HeaderPrintWriter run()
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java
index bad664b2fe..adfa018679 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java
@@ -205,6 +205,7 @@ public ClassLoader run() {
             // RuntimePermission("getClassLoader") has not been granted.
             // See the javadoc for Thread.getContextClassLoader() and
             // Class.getClassLoader() for details.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
             report(se, MessageId.CANNOT_GET_CLASSLOADER);
             return null;
         }
@@ -224,6 +225,7 @@ public Void run() {
             // the DERBY-3745 fix, did not require setContextClassLoader
             // permissions. We may leak class loaders if we are not able to
             // set this, but cannot just fail.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
             report(se, MessageId.CANNOT_SET_CLASSLOADER);
         }
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java
index 972f522b13..ed925d14ac 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java
@@ -70,6 +70,7 @@ public final class BasicUUIDFactory
 	private long timemillis;
 
 	public BasicUUIDFactory() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		Object env = getMonitor().getEnvironment();
 		if (env != null) {
 			String s = env.toString();
@@ -165,6 +166,7 @@ private void resetCounters()
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/CursorInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/CursorInfo.java
index b79f9ca769..101758707e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/CursorInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/CursorInfo.java
@@ -59,6 +59,7 @@ public class CursorInfo
 	********************************************************/
 
 	ExecCursorTableReference	targetTable; 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     List<String>          updateColumns;
 	int 						updateMode;
 
@@ -76,6 +77,7 @@ public CursorInfo()
 	(
 		int							updateMode,
 		ExecCursorTableReference	targetTable,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         List<String>             updateColumns
 	)
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericActivationHolder.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericActivationHolder.java
index 17c58a4b92..dcc7b9fa92 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericActivationHolder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericActivationHolder.java
@@ -80,6 +80,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 final public class GenericActivationHolder implements Activation
 {
 	public BaseActivation			ac;
@@ -243,12 +244,14 @@ public ResultSet execute() throws StandardException
 		{
 			/* Has the activation class changed or has the activation been
 			 * invalidated? */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5406
             final boolean needNewClass =
                     gc == null || gc != ps.getActivationClass();
 			if (needNewClass || !ac.isValid())
 			{
 
                 GeneratedClass newGC;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4279
 
 				if (needNewClass) {
                     // The statement has been re-prepared since the last time
@@ -576,6 +579,7 @@ public java.sql.ResultSet getTargetVTI()
 	}
 
 	public SQLSessionContext getSQLSessionContextForChildren() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 		return ac.getSQLSessionContextForChildren();
     }
 
@@ -601,6 +605,7 @@ public DependableFinder getDependableFinder()
 	{
 		// Vacuous implementation to make class concrete, only needed for
 		// BaseActivation
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		if (SanityManager.DEBUG) {
 			SanityManager.NOTREACHED();
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java
index 7d3d3fe3ba..cddbc1f794 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java
@@ -95,6 +95,7 @@ public GenericColumnDescriptor(ResultColumnDescriptor rcd)
 	{
 		name = rcd.getName();
 		tableName = rcd.getSourceTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
  		schemaName = rcd.getSourceSchemaName();
 		columnPos = rcd.getColumnPosition();
 		type = rcd.getType();
@@ -174,6 +175,7 @@ public boolean isAutoincrement()
 
 	public boolean updatableByCursor()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		return updatableByCursor;
 	}
 
@@ -200,6 +202,7 @@ public void writeExternal(ObjectOutput out) throws IOException
 		fh.putInt("columnPos", columnPos);
 		fh.put("type", type);
 		fh.putBoolean("isAutoincrement", isAutoincrement);
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		fh.putBoolean("updatableByCursor", updatableByCursor);
 		out.writeObject(fh);
 		return;
@@ -223,6 +226,7 @@ public void readExternal(ObjectInput in)
 		columnPos = fh.getInt("columnPos");
 		type = getStoredDataTypeDescriptor(fh.get("type"));
 		isAutoincrement = fh.getBoolean("isAutoincrement");
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		updatableByCursor = fh.getBoolean("updatableByCursor");
 	}
 	
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericLanguageFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericLanguageFactory.java
index 96badb0404..da85aa0971 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericLanguageFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericLanguageFactory.java
@@ -72,6 +72,7 @@ public GenericLanguageFactory() { }
 	 */
 	public void boot(boolean create, Properties startParams) throws StandardException 
 	{		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		LanguageConnectionFactory lcf = (LanguageConnectionFactory)  findServiceModule(this, LanguageConnectionFactory.MODULE);
 		PropertyFactory pf = lcf.getPropertyFactory();
 		if (pf != null)
@@ -114,6 +115,8 @@ public ParameterValueSet newParameterValueSet(ClassInspector ci, int numParms, b
 	 */
 	public ResultDescription getResultDescription
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		ResultDescription	inputResultDescription,
 		int[]				theCols
 	)
@@ -148,6 +151,7 @@ public ParameterValueSet newParameterValueSet(ClassInspector ci, int numParms, b
      * can't call this entry point.
      */
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericParameter.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericParameter.java
index 1525efa372..6805fc9c7f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericParameter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericParameter.java
@@ -111,6 +111,7 @@ final class GenericParameter
 	{
 		this.pvs = pvs;
 		parameterMode = (this.isReturnOutputParameter = isReturnOutputParameter)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             ? (short) (ParameterMetaData.parameterModeOut) : (short) (ParameterMetaData.parameterModeIn);
 	}
 
@@ -126,6 +127,7 @@ final class GenericParameter
 	public GenericParameter getClone(GenericParameterValueSet pvs)
 	{
 		GenericParameter gpClone = new GenericParameter(pvs, isReturnOutputParameter);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
         gpClone.initialize(this.getValue().cloneValue(false),
                            jdbcTypeId, declaredClassName);
 		gpClone.isSet = true;
@@ -191,6 +193,7 @@ void setOutParameter(int sqlType, int scale)
 		}
 
 		switch (parameterMode) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
         case (ParameterMetaData.parameterModeIn):
         case (ParameterMetaData.parameterModeUnknown):
 		default:
@@ -244,6 +247,7 @@ private StandardException throwInvalidOutParamMap(int sqlType) {
 	void validate() throws StandardException
 	{
 		switch (parameterMode) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
         case (ParameterMetaData.parameterModeUnknown):
 			break;
         case (ParameterMetaData.parameterModeIn):
@@ -312,6 +316,7 @@ public String toString()
 		{
 			try
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1693
 				return value.getTraceString();
 			}
 			catch (StandardException se)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericParameterValueSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
index 232be26e0b..39c03c1144 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
@@ -97,6 +97,7 @@ private GenericParameterValueSet(int numParms, GenericParameterValueSet pvs)
 	 */
 	public void initialize(DataTypeDescriptor[] types) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-738
 		for (int i = 0; i < parms.length; i++)
 		{
 			DataTypeDescriptor dtd = types[i];
@@ -154,6 +155,7 @@ public	DataValueDescriptor	getParameterForSet(int position) throws StandardExcep
 		try {
 
 			GenericParameter gp = parms[position];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             if (gp.parameterMode == (ParameterMetaData.parameterModeOut))
 				throw StandardException.newException(SQLState.LANG_RETURN_OUTPUT_PARAM_CANNOT_BE_SET);
 
@@ -174,6 +176,7 @@ public	DataValueDescriptor	getParameterForGet(int position) throws StandardExcep
 			GenericParameter gp = parms[position];
 
 			switch (gp.parameterMode) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             case (ParameterMetaData.parameterModeIn):
             case (ParameterMetaData.parameterModeUnknown):
 				throw StandardException.newException(SQLState.LANG_NOT_OUTPUT_PARAMETER, Integer.toString(position + 1));
@@ -189,9 +192,11 @@ public	DataValueDescriptor	getParameterForGet(int position) throws StandardExcep
 	public void setParameterAsObject(int position, Object value) throws StandardException {
 
 		UserDataValue dvd = (UserDataValue) getParameterForSet(position);
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 
 		GenericParameter gp = parms[position];
 		if (value != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 
 			{
 
@@ -226,6 +231,7 @@ public boolean allAreSet()
 			if (!gp.isSet)
 			{
 				switch (gp.parameterMode) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                 case (ParameterMetaData.parameterModeOut):
 					break;
                 case (ParameterMetaData.parameterModeInOut):
@@ -262,6 +268,7 @@ public void  transferDataValues(ParameterValueSet pvstarget) throws StandardExce
                 DataValueDescriptor dvd = oldp.getValue();
                 InputStream is = null;
                 // See if the value type can hold a stream.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
                 if (dvd.hasStream()) {
                     // DERBY-4455: Don't materialize the stream when
                     // transferring it. If the stream has been drained already,
@@ -347,6 +354,7 @@ public ParameterValueSet getClone()
 	public void registerOutParameter(int parameterIndex, int jdbcType, int scale)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
 		checkPosition( parameterIndex );
         Util.checkSupportedRaiseStandard( jdbcType );
 		parms[ parameterIndex ].setOutParameter( jdbcType, scale );
@@ -394,6 +402,7 @@ public int getParameterNumber(GenericParameter theParam)
 	/**
 		Check that there are not output parameters defined
 		by the parameter set. If there are unknown parameter
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
 		types they are forced to input types. i.e. Derby static method
 		calls with parameters that are array.
 
@@ -407,6 +416,7 @@ public boolean checkNoDeclaredOutputParameters() {
 			GenericParameter gp = parms[i];
 
 			switch (gp.parameterMode) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             case (ParameterMetaData.parameterModeIn):
 				break;
             case (ParameterMetaData.parameterModeInOut):
@@ -459,6 +469,7 @@ public DataValueDescriptor getReturnValueForSet() throws StandardException
 				
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			if (!hasReturnOutputParam)
 				SanityManager.THROWASSERT("getReturnValueForSet called on non-return parameter");
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericPreparedStatement.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
index f6cd679003..91145112b1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
@@ -183,6 +183,7 @@ public class GenericPreparedStatement
 		/* Get the UUID for this prepared statement */
 		UUIDFactory uuidFactory = 
 			getMonitor().getUUIDFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		UUIDValue = uuidFactory.createUUID();
 		UUIDString = UUIDValue.toString();
@@ -228,6 +229,7 @@ private boolean isUpToDate() {
     }
 
     /** Check if this statement is currently being compiled. */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
     final synchronized boolean isCompiling() {
         return compilingStatement;
     }
@@ -257,9 +259,11 @@ public void rePrepare(LanguageConnectionContext lcc)
 
     public void rePrepare(LanguageConnectionContext lcc, boolean forMetaData)
         throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
 		if (!upToDate()) {
             PreparedStatement ps = statement.prepare(lcc, forMetaData);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4279
 			if (SanityManager.DEBUG)
 				SanityManager.ASSERT(ps == this, "ps != this");
 		}
@@ -279,6 +283,7 @@ public Activation getActivation(LanguageConnectionContext lcc,
 			GeneratedClass gc = getActivationClass();
 
 			if (gc == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4279
 				rePrepare(lcc);
 				gc = getActivationClass();
 			}
@@ -292,6 +297,7 @@ public Activation getActivation(LanguageConnectionContext lcc,
 		// deadlock.
 		lcc.closeUnusedActivations();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 		Activation parentAct = null;
 		StatementContext stmctx = lcc.getStatementContext();
 
@@ -368,6 +374,7 @@ public ResultSet execute(Activation activation,
     private ResultSet executeStmt(Activation activation,
 								  boolean rollbackParentContext,
                                   boolean forMetaData,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 								  long timeoutMillis)
         throws
             StandardException 
@@ -430,6 +437,7 @@ private ResultSet executeStmt(Activation activation,
 
 			/* put it in try block to unlock the PS in any case
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-388
 			if (!spsAction) {
 			// only re-prepare if this isn't an SPS for a trigger-action;
 			// if it _is_ an SPS for a trigger action, then we can't just
@@ -447,8 +455,11 @@ private ResultSet executeStmt(Activation activation,
 
 			StatementContext statementContext = lccToUse.pushStatementContext(
 				isAtomic, updateMode==CursorNode.READ_ONLY, getSource(), pvs, rollbackParentContext, timeoutMillis);
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 
 			statementContext.setActivation(activation);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
 
 			if (needsSavepoint())
 			{
@@ -464,6 +475,7 @@ private ResultSet executeStmt(Activation activation,
 				lccToUse.validateStmtExecution(executionConstants);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultSet resultSet;
 			try {
 	
@@ -488,6 +500,9 @@ private ResultSet executeStmt(Activation activation,
 			}
 
             lccToUse.popStatementContext(statementContext, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
 
             if (activation.getSQLSessionContextForChildren() != null) {
                 lccToUse.popNestedSessionContext(activation);
@@ -513,12 +528,14 @@ public ResultDescription	getResultDescription()	{
 	}
 
 	public DataTypeDescriptor[]	getParameterTypes()	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return ArrayUtil.copy(paramTypeDescriptors);
 	}
 
     /** Return the type of the parameter (0-based indexing) */
     public DataTypeDescriptor  getParameterType( int idx ) throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 		if ( paramTypeDescriptors == null )
         {
 			throw StandardException.newException( SQLState.NO_INPUT_PARAMETERS );
@@ -531,6 +548,7 @@ public DataTypeDescriptor  getParameterType( int idx ) throws StandardException
 			throw StandardException.newException
                 (
                  SQLState.LANG_INVALID_PARAM_POSITION, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                  idx+1,
                  paramTypeDescriptors.length
                  );
@@ -620,6 +638,7 @@ public long getGenerateTimeInMillis()
 	 */
 	public Timestamp getBeginCompileTimestamp()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 		return DataTypeUtilities.clone( beginCompileTimestamp );
 	}
 
@@ -630,6 +649,7 @@ public Timestamp getBeginCompileTimestamp()
 	 */
 	public Timestamp getEndCompileTimestamp()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 		return DataTypeUtilities.clone( endCompileTimestamp );
 	}
 
@@ -843,7 +863,9 @@ public void makeInvalid(int action, LanguageConnectionContext lcc)
 
 		boolean alreadyInvalid;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		switch (action) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		case DependencyManager.RECHECK_PRIVILEGES:
 			return;
 		}
@@ -858,7 +880,9 @@ public void makeInvalid(int action, LanguageConnectionContext lcc)
                 // flag to indicate that an invalidation was requested. A
                 // re-compilation will be triggered if this flag is set, but
                 // not until the current compilation is done.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5406
                 invalidatedWhileCompiling = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-424
 				return;
             }
 
@@ -868,6 +892,7 @@ public void makeInvalid(int action, LanguageConnectionContext lcc)
 			isValid = false;
 
 			// block compiles while we are invalidating
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
             beginCompiling();
 		}
 
@@ -903,6 +928,7 @@ public void makeInvalid(int action, LanguageConnectionContext lcc)
 				}
 			}
 		} finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
             endCompiling();
 		}
 	}
@@ -998,6 +1024,7 @@ public boolean referencesSessionSchema()
 	 * @return	true if references SESSION schema tables/views, else false
 	 */
 	public boolean referencesSessionSchema(StatementNode qt)
+//IC see: https://issues.apache.org/jira/browse/DERBY-424
 	throws StandardException {
 		//If the query references a SESSION schema table (temporary or permanent), then
 		// mark so in this statement
@@ -1018,6 +1045,7 @@ public boolean referencesSessionSchema(StatementNode qt)
 
 		@exception StandardException thrown on failure.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 	void completeCompile(StatementNode qt)
 						throws StandardException {
 		//if (finished)
@@ -1050,6 +1078,7 @@ void completeCompile(StatementNode qt)
 		}
 		isValid = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
         rowCountStats.reset();
 	}
 
@@ -1224,6 +1253,7 @@ public ExecPreparedStatement getClone() throws StandardException
 		clone.updateMode = updateMode;	
 		clone.needsSavepoint = needsSavepoint;
         clone.rowCountStats = rowCountStats;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
 
 		return clone;
 	}
@@ -1239,6 +1269,7 @@ public void setCacheHolder(Cacheable cacheHolder) {
 			if (!isValid || (inUseCount != 0))
 				return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			ContextManager cm = getContextService().getCurrentContextManager();
 			LanguageConnectionContext lcc = 
 				(LanguageConnectionContext) 
@@ -1258,6 +1289,8 @@ public void setCacheHolder(Cacheable cacheHolder) {
 			{
 				if (SanityManager.DEBUG)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 					SanityManager.THROWASSERT("Unexpected exception", se);
 				}
 			}
@@ -1274,8 +1307,10 @@ public boolean isStorable() {
 	}
 
     public void setRequiredPermissionsList(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             List<StatementPermission> requiredPermissionsList)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		this.requiredPermissionsList = requiredPermissionsList;
 	}
 
@@ -1285,6 +1320,8 @@ public List<StatementPermission> getRequiredPermissionsList()
 	}
 
     public final long getVersionCounter() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5459
+//IC see: https://issues.apache.org/jira/browse/DERBY-2402
         return versionCounter;
     }
 
@@ -1329,6 +1366,7 @@ int incrementExecutionCount() {
         synchronized long getInitialRowCount(int rsNum, long rowCount) {
             // Allocate the list of row counts lazily.
             if (rowCounts == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 rowCounts = new ArrayList<Long>();
             }
 
@@ -1337,6 +1375,7 @@ synchronized long getInitialRowCount(int rsNum, long rowCount) {
             if (rsNum >= rowCounts.size()) {
                 int newSize = rsNum + 1;
                 rowCounts.addAll(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                                  Collections.nCopies(newSize - rowCounts.size(), (Long) null));
             }
 
@@ -1344,6 +1383,7 @@ synchronized long getInitialRowCount(int rsNum, long rowCount) {
             // set it if it is not already set.
             Long initialCount = rowCounts.get(rsNum);
             if (initialCount == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
                 rowCounts.set(rsNum, rowCount);
                 return rowCount;
             } else {
@@ -1401,6 +1441,7 @@ public long getInitialRowCount(int rsNum, long currentRowCount) {
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericResultDescription.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericResultDescription.java
index d1763c13e4..be95e3d710 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericResultDescription.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericResultDescription.java
@@ -95,6 +95,7 @@ public GenericResultDescription()
 	public GenericResultDescription(ResultColumnDescriptor[] columns, 
 					String statementType) 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.columns = ArrayUtil.copy(columns);
 		this.statementType = statementType;
 	}
@@ -107,6 +108,8 @@ public GenericResultDescription(ResultColumnDescriptor[] columns,
 	 */
 	public GenericResultDescription
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		ResultDescription	rd, 
 		int[]				theCols
 	) 
@@ -143,6 +146,7 @@ public int	getColumnCount()
 	}
 
 	public ResultColumnDescriptor[] getColumnInfo() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return ArrayUtil.copy(columns);
 	}
 
@@ -170,6 +174,8 @@ public ResultColumnDescriptor getColumnDescriptor(int position) {
 	 */
 	public ResultDescription truncateColumns(int truncateFrom)	
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		if (SanityManager.DEBUG) 
 		{
 			if (!(truncateFrom > 0 && columns != null))
@@ -281,6 +287,8 @@ public String toString()
      * Set the meta data if it has not already been set.
      */
     public synchronized void setMetaData(ResultSetMetaData rsmd) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1879
+//IC see: https://issues.apache.org/jira/browse/DERBY-1876
         if (metaData == null)
             metaData = rsmd;
     }
@@ -300,6 +308,7 @@ public synchronized ResultSetMetaData getMetaData() {
      */
     public int findColumnInsenstive(String columnName) {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         final Map<String,Integer> workMap; 
         
         synchronized (this) {
@@ -314,6 +323,7 @@ public int findColumnInsenstive(String columnName) {
                         SQLToUpperCase(
                             getColumnDescriptor(i).getName());
                     
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
                     final Integer value = i;
                     
                     map.put(key, value);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericStatement.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericStatement.java
index 36250d319f..fa5a9ba16d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericStatement.java
@@ -67,6 +67,7 @@ public GenericStatement(SchemaDescriptor compilationSchema, String statementText
 	{
 		this.compilationSchema = compilationSchema;
 		this.statementText = statementText;
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 		this.isForReadOnly = isForReadOnly;
 	}
 
@@ -82,6 +83,7 @@ public PreparedStatement prepare(LanguageConnectionContext lcc) throws StandardE
 		** Note: don't reset state since this might be
 		** a recompilation of an already prepared statement.
 		*/ 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5406
 		return prepare(lcc, false);
 	}
 	public PreparedStatement prepare(LanguageConnectionContext lcc, boolean forMetaData) throws StandardException
@@ -91,7 +93,9 @@ public PreparedStatement prepare(LanguageConnectionContext lcc, boolean forMetaD
 		** a recompilation of an already prepared statement.
 		*/ 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5406
         final int depth = lcc.getStatementDepth();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5406
         String prevErrorId = null;
         while (true) {
             boolean recompile = false;
@@ -139,6 +143,7 @@ public PreparedStatement prepare(LanguageConnectionContext lcc, boolean forMetaD
                 // invalidatedWhileCompiling and isValid are protected by
                 // synchronization on the prepared statement.
                 synchronized (preparedStmt) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5406
                     if (recompile || preparedStmt.invalidatedWhileCompiling) {
                         preparedStmt.isValid = false;
                         preparedStmt.invalidatedWhileCompiling = false;
@@ -250,6 +255,7 @@ private PreparedStatement prepMinion(LanguageConnectionContext lcc, boolean cach
 		{
 
 			for (;;) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4279
 
 				if (foundInCache) {
 					if (preparedStmt.referencesSessionSchema()) {
@@ -266,17 +272,21 @@ private PreparedStatement prepMinion(LanguageConnectionContext lcc, boolean cach
 					return preparedStmt;
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
                 if (!preparedStmt.isCompiling()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4279
 					break;
 				}
 
 				try {
 					preparedStmt.wait();
 				} catch (InterruptedException ie) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.setInterrupted();
 				}
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
             preparedStmt.beginCompiling();
 		}
 
@@ -296,6 +306,7 @@ private PreparedStatement prepMinion(LanguageConnectionContext lcc, boolean cach
 			{
 				// since this is for compilation only, set atomic
 				// param to true and timeout param to 0
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 				statementContext = lcc.pushStatementContext(true, isForReadOnly, getSource(),
                                                             null, false, 0L);
 			}
@@ -311,6 +322,7 @@ private PreparedStatement prepMinion(LanguageConnectionContext lcc, boolean cach
 			CompilerContext cc = lcc.pushCompilerContext(compilationSchema);
 			
 			if (prepareIsolationLevel != 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 				TransactionControl.UNSPECIFIED_ISOLATION_LEVEL)
 			{
 				cc.setScanIsolationLevel(prepareIsolationLevel);
@@ -355,6 +367,7 @@ private PreparedStatement prepMinion(LanguageConnectionContext lcc, boolean cach
 
 				//Only top level statements go through here, nested statement
 				//will invoke this method from other places
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 				StatementNode qt = (StatementNode)
                         p.parseStatement(statementText, paramDefaults);
 
@@ -362,11 +375,13 @@ private PreparedStatement prepMinion(LanguageConnectionContext lcc, boolean cach
 
                 // Call user-written tree-printer if it exists
                 walkAST( lcc, qt, ASTVisitor.AFTER_PARSE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4415
 
 				if (SanityManager.DEBUG) 
 				{
 					if (SanityManager.DEBUG_ON("DumpParseTree")) 
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 						SanityManager.GET_DEBUG_STREAM().print(
 							"\n\n============PARSE===========\n\n");
 						qt.treePrint();
@@ -375,6 +390,7 @@ private PreparedStatement prepMinion(LanguageConnectionContext lcc, boolean cach
 
 					if (SanityManager.DEBUG_ON("StopAfterParsing")) 
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3946
                         lcc.setLastQueryTree( qt );
                         
 						throw StandardException.newException(SQLState.LANG_STOP_AFTER_PARSING);
@@ -398,16 +414,19 @@ private PreparedStatement prepMinion(LanguageConnectionContext lcc, boolean cach
 					// transaction.
 					lcc.beginNestedTransaction(true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 					qt.bindStatement();
 					bindTime = getCurrentTimeMillis(lcc);
 
                     // Call user-written tree-printer if it exists
                     walkAST( lcc, qt, ASTVisitor.AFTER_BIND);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4415
 
 					if (SanityManager.DEBUG) 
 					{
 						if (SanityManager.DEBUG_ON("DumpBindTree")) 
 						{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 							SanityManager.GET_DEBUG_STREAM().print(
 								"\n\n============BIND===========\n\n");
 							qt.treePrint();
@@ -456,14 +475,17 @@ private PreparedStatement prepMinion(LanguageConnectionContext lcc, boolean cach
 					}
 
                     // stop adding privileges for user-defined types
+//IC see: https://issues.apache.org/jira/browse/DERBY-6491
                     cc.skipTypePrivileges( true );
                     
 					qt.optimizeStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 
 					optimizeTime = getCurrentTimeMillis(lcc);
 
                     // Call user-written tree-printer if it exists
                     walkAST( lcc, qt, ASTVisitor.AFTER_OPTIMIZE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4415
 
 					// Statement logging if lcc.getLogStatementText() is true
 					if (istream != null)
@@ -534,6 +556,7 @@ private PreparedStatement prepMinion(LanguageConnectionContext lcc, boolean cach
 					{
 						if (SanityManager.DEBUG_ON("DumpOptimizedTree")) 
 						{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 							SanityManager.GET_DEBUG_STREAM().print(
 								"\n\n============OPT===========\n\n");
 							qt.treePrint();
@@ -575,7 +598,10 @@ class in case it came from a StorablePreparedStatement
 					*/
 					preparedStmt.setConstantAction( qt.makeConstantAction() );
 					preparedStmt.setSavedObjects( cc.getSavedObjects() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 					preparedStmt.setRequiredPermissionsList(cc.getRequiredPermissionsList());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5459
+//IC see: https://issues.apache.org/jira/browse/DERBY-2402
                     preparedStmt.incrementVersionCounter();
 					preparedStmt.setActivationClass(ac);
 					preparedStmt.setNeedsSavepoint(qt.needsSavepoint());
@@ -586,11 +612,13 @@ class in case it came from a StorablePreparedStatement
 												qt.executeSchemaName()
 												);
 					preparedStmt.setSPSName(qt.getSPSName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-424
 					preparedStmt.completeCompile(qt);
 					preparedStmt.setCompileTimeWarnings(cc.getWarnings());
 
                     // Schedule updates of any stale index statistics we may
                     // have detected when creating the plan.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4938
                     TableDescriptor[] tds = qt.updateIndexStatisticsFor();
                     if (tds.length > 0) {
                         IndexStatisticsDaemon isd = lcc.getDataDictionary().
@@ -615,6 +643,7 @@ class in case it came from a StorablePreparedStatement
 						bindTime - parseTime, //bind time
 						optimizeTime - bindTime, //optimize time
 						generateTime - optimizeTime, //generate time
+//IC see: https://issues.apache.org/jira/browse/DERBY-4297
 						generateTime - beginTime, //total compile time
 						beginTimestamp,
 						endTimestamp);
@@ -626,6 +655,7 @@ class in case it came from a StorablePreparedStatement
 				lcc.popCompilerContext( cc );
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-730
 		catch (StandardException se)
 		{
 			if (foundInCache)
@@ -635,6 +665,7 @@ class in case it came from a StorablePreparedStatement
 		}
 		finally
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
             preparedStmt.endCompiling();
 		}
 
@@ -649,6 +680,7 @@ class in case it came from a StorablePreparedStatement
     /** Walk the AST, using a (user-supplied) Visitor */
     private void walkAST( LanguageConnectionContext lcc, Visitable queryTree, int phase ) throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4415
         ASTVisitor visitor = lcc.getASTVisitor();
         if ( visitor != null )
         {
@@ -727,6 +759,7 @@ public boolean equals(Object other) {
 
 			GenericStatement os = (GenericStatement) other;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 			return statementText.equals(os.statementText) && isForReadOnly==os.isForReadOnly
 				&& compilationSchema.equals(os.compilationSchema) &&
 				(prepareIsolationLevel == os.prepareIsolationLevel);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java
index b3375e1cb3..7dbd5ab465 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java
@@ -155,6 +155,7 @@ public void loadGeneratedClass()
 		throws StandardException
 	{
 		LanguageConnectionContext lcc =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			(LanguageConnectionContext) getContext
 				                                  (LanguageConnectionContext.CONTEXT_ID);
 		ClassFactory classFactory = lcc.getLanguageConnectionFactory().getClassFactory();
@@ -288,6 +289,7 @@ public String toString()
      */
     private  static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java
index bf9eb2a6e8..0d8dcc47c0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java
@@ -63,10 +63,12 @@ public void init(boolean dbOnly, Dictionary p) {
         
 		// Disallow changing sqlAuthorization from true to false or null after
 		// switching to Standard authorization
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		if (key.trim().equals(Property.SQL_AUTHORIZATION_PROPERTY))
 		{
 			LanguageConnectionContext lcc = (LanguageConnectionContext)
 					getContext(LanguageConnectionContext.CONTEXT_ID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			if (lcc.usesSqlAuthorization() && !Boolean.valueOf((String)value).booleanValue())
 				throw StandardException.newException(SQLState.PROPERTY_UNSUPPORTED_CHANGE,
@@ -112,6 +114,7 @@ public void init(boolean dbOnly, Dictionary p) {
      */
     private  static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
index c884a6e4de..e1b782d6cc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -51,9 +52,11 @@ public Object getNewInstance()
 			case StoredFormatIds.VIEW_DESCRIPTOR_FINDER_V01_ID:
 			case StoredFormatIds.TABLE_PERMISSION_FINDER_V01_ID:
 			case StoredFormatIds.ROUTINE_PERMISSION_FINDER_V01_ID:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 			case StoredFormatIds.COLUMNS_PERMISSION_FINDER_V01_ID:
 		    case StoredFormatIds.SEQUENCE_DESCRIPTOR_FINDER_V01_ID:
 		    case StoredFormatIds.PERM_DESCRIPTOR_FINDER_V01_ID:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3666
 		    case StoredFormatIds.ROLE_GRANT_FINDER_V01_ID:
 				return new DDdependableFinder(fmtId);
 			case StoredFormatIds.COLUMN_DESCRIPTOR_FINDER_V01_ID:
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java
index 7599952b93..191acf8a49 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java
@@ -91,6 +91,7 @@ public  DDColumnDependableFinder(int formatId)
 	 * @return	a dependable, a table descriptor with referencedColumnMap
 	 *			field set
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
 	Dependable findDependable(DataDictionary dd, UUID dependableObjectID)
 		throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java
index 052ad9d302..93a0d7a279 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java
@@ -128,34 +128,46 @@ private static String majorToString(int majorVersionNumber) {
 			return "10.0";
 		case DataDictionary.DD_VERSION_DERBY_10_1:
 			return "10.1";
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		case DataDictionary.DD_VERSION_DERBY_10_2:
 			return "10.2";
 		case DataDictionary.DD_VERSION_DERBY_10_3:
 			return "10.3";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3036
 		case DataDictionary.DD_VERSION_DERBY_10_4:
 			return "10.4";
 		case DataDictionary.DD_VERSION_DERBY_10_5:
 			return "10.5";
 		case DataDictionary.DD_VERSION_DERBY_10_6:
 			return "10.6";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4657
 		case DataDictionary.DD_VERSION_DERBY_10_7:
 			return "10.7";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4864
 		case DataDictionary.DD_VERSION_DERBY_10_8:
 			return "10.8";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5016
 		case DataDictionary.DD_VERSION_DERBY_10_9:
 			return "10.9";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5688
 		case DataDictionary.DD_VERSION_DERBY_10_10:
 			return "10.10";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6104
 		case DataDictionary.DD_VERSION_DERBY_10_11:
 			return "10.11";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6588
 		case DataDictionary.DD_VERSION_DERBY_10_12:
 			return "10.12";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6811
 		case DataDictionary.DD_VERSION_DERBY_10_13:
 			return "10.13";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6911
 		case DataDictionary.DD_VERSION_DERBY_10_14:
 			return "10.14";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6941
 		case DataDictionary.DD_VERSION_DERBY_10_15:
 			return "10.15";
+//IC see: https://issues.apache.org/jira/browse/DERBY-7010
 		case DataDictionary.DD_VERSION_DERBY_10_16:
 			return "10.16";
 		default:
@@ -203,6 +215,7 @@ void upgradeIfNeeded(DD_Version dictionaryVersion,
 
 		} else {
            
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			if (isFullUpgrade(startParams, dictionaryVersion.toString())) {
 				performMajorUpgrade = true;
 			} else {
@@ -215,6 +228,7 @@ void upgradeIfNeeded(DD_Version dictionaryVersion,
 
 		if (performMajorUpgrade) {
 			// real upgrade changes. Get user name of current user.
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 			String userName = IdUtil.getUserNameFromURLProps(startParams);
 			doFullUpgrade(tc, dictionaryVersion.majorVersionNumber,IdUtil.getUserAuthorizationId(userName));
             //DERBY-5996(Create readme files (cautioning users against 
@@ -226,6 +240,7 @@ void upgradeIfNeeded(DD_Version dictionaryVersion,
 			bootingDictionary.af.createReadMeFiles();
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-541
 		if (!minorOnly && !isReadOnly) {
 			// apply changes that can be made and will continue to work
 			// against previous version.
@@ -321,6 +336,7 @@ private	void	applySafeChanges(TransactionController tc, int fromMajorVersionNumb
 		Do full upgrade.  Apply changes that can NOT be safely made in soft upgrade.
 		
 		<BR>
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		<B>Upgrade items for every new release</B>
 		<UL>
 		<LI> Drop and recreate the stored versions of the JDBC database metadata queries
@@ -353,6 +369,7 @@ private	void	doFullUpgrade(TransactionController tc, int fromMajorVersionNumber,
 		//This is to make sure that we have the stored versions of JDBC database
 		//metadata queries matching with this release of the engine.
 		bootingDictionary.updateMetadataSPSes(tc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1107
 
 		/*
 		 * OLD Cloudscape 5.1 upgrade code, Derby does not support
@@ -376,8 +393,10 @@ private	void	doFullUpgrade(TransactionController tc, int fromMajorVersionNumber,
 		
 		*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         HashSet<String>  newlyCreatedRoutines = new HashSet<String>();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3191
 		if (fromMajorVersionNumber <= DataDictionary.DD_VERSION_DERBY_10_3)
 		{
 			// Add new system catalogs created for roles
@@ -385,6 +404,7 @@ private	void	doFullUpgrade(TransactionController tc, int fromMajorVersionNumber,
 				tc, DataDictionary.SYSROLES_CATALOG_NUM);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2613
         if (fromMajorVersionNumber <= DataDictionary.DD_VERSION_DERBY_10_1)
         {
             // add catalogs 1st, subsequent procedure adding may depend on
@@ -405,6 +425,7 @@ private	void	doFullUpgrade(TransactionController tc, int fromMajorVersionNumber,
             // since 10.0.  Will not work to upgrade any db previous to 10.0,
             // thus only checks for 10.0 rather than <= 10.0.
             bootingDictionary.create_10_1_system_procedures(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4127
                 tc,
                 newlyCreatedRoutines,
                 bootingDictionary.getSystemUtilSchemaDescriptor().getUUID());
@@ -425,6 +446,8 @@ private	void	doFullUpgrade(TransactionController tc, int fromMajorVersionNumber,
                     tc, DataDictionary.SYSPERMS_CATALOG_NUM);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-523
         if (fromMajorVersionNumber <= DataDictionary.DD_VERSION_DERBY_10_1)
         {
             // On upgrade from versions before 10.2, create system procedures
@@ -436,6 +459,7 @@ private	void	doFullUpgrade(TransactionController tc, int fromMajorVersionNumber,
 
 			if (SanityManager.DEBUG)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2613
 				SanityManager.ASSERT((aid != null), 
                     "Failed to get new Database Owner authorization");
             }
@@ -445,6 +469,7 @@ private	void	doFullUpgrade(TransactionController tc, int fromMajorVersionNumber,
 
             // make sure we flag that we need to add permissions to the
             // following pre-existing routines:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4127
             newlyCreatedRoutines.add( "SYSCS_INPLACE_COMPRESS_TABLE" );
             newlyCreatedRoutines.add( "SYSCS_GET_RUNTIMESTATISTICS" );
             newlyCreatedRoutines.add( "SYSCS_SET_RUNTIMESTATISTICS" );
@@ -496,6 +521,7 @@ private	void	doFullUpgrade(TransactionController tc, int fromMajorVersionNumber,
             bootingDictionary.upgradeSYSROUTINEPERMS_10_6( tc );
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5688
         if (fromMajorVersionNumber <= DataDictionary.DD_VERSION_DERBY_10_8)
         {
             // On upgrade from versions before 10.9, create system procedures
@@ -511,9 +537,11 @@ private	void	doFullUpgrade(TransactionController tc, int fromMajorVersionNumber,
             // sql (schema, schema object) parts of the file name to remove
             // path delimiters. ALso, we now use no schema subdirectories since
             // there is no chance of name collision with the UUID.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
             bootingDictionary.upgradeJarStorage(tc);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5688
         if (fromMajorVersionNumber <= DataDictionary.DD_VERSION_DERBY_10_9)
         {
             // On upgrade from versions before 10.10, create system procedures
@@ -545,10 +573,17 @@ private	void	doFullUpgrade(TransactionController tc, int fromMajorVersionNumber,
             bootingDictionary.create_10_12_system_procedures( tc, newlyCreatedRoutines );
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6892
 	if (fromMajorVersionNumber <= DataDictionary.DD_VERSION_DERBY_10_12)
         {
             // On upgrade from versions before 10.13, create system procedures
             // added in 10.13.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 	    bootingDictionary.create_10_13_system_procedures(	 tc, newlyCreatedRoutines );
         }
 
@@ -592,6 +627,7 @@ private void handleMinorRevisionChange(TransactionController tc, DD_Version from
 			// match the version we are using.  We don't want to do this for lower 
 			// database versions because on reverting to the previous version the 
 			// SPSes won't be restored.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1107
 			if (fromVersion.majorVersionNumber >= DataDictionary.DD_VERSION_DERBY_10_5)
 				bootingDictionary.updateMetadataSPSes(tc);
 
@@ -623,6 +659,7 @@ private void handleMinorRevisionChange(TransactionController tc, DD_Version from
 			// invalidate all the procedures we need to indicate that
 			// any procedure we read off disk is automatically invalid,
 			// so we do not try to load the generated class.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 			bootingDictionary.setReadOnlyUpgrade();
 		}
 
@@ -665,6 +702,7 @@ protected void dropSystemCatalog(TransactionController tc,
 		SchemaDescriptor		sd = bootingDictionary.getSystemSchemaDescriptor();
 		TableDescriptor			td = bootingDictionary.getTableDescriptor(
 											crf.getCatalogName(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 											sd, tc);
 		ConglomerateDescriptor[]	cds = td.getConglomerateDescriptors();
 		for (int index = 0; index < cds.length; index++)
@@ -739,6 +777,7 @@ public final void writeExternal( ObjectOutput out ) throws IOException
 
 		jbmsVersion.getMinorVersion()*100 +jbmsVersion.getMaintVersion() + (jbmsVersion.isBeta() ? 0 : 1) + 2
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		5.0.22 =&gt; (0*100) + 22 + 2 =  24 - (5.0 has a unique major number)
 		5.1.2  =&gt; (1*100) + 2 + 2  = 104 - (5.1 has a unique major number) 
 
@@ -756,6 +795,7 @@ public final void writeExternal( ObjectOutput out ) throws IOException
 	private int getJBMSMinorVersionNumber() 
 	{
 		ProductVersionHolder jbmsVersion = DataDictionaryImpl.getMonitor().getEngineVersion();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		return jbmsVersion.getMinorVersion()*100 +jbmsVersion.getMaintVersion() + (jbmsVersion.isBeta() ? 0 : 1) + 2;
 	}
@@ -851,6 +891,7 @@ boolean checkVersion(int requiredMajorVersion, String feature) throws StandardEx
      * can't call this entry point.
      */
     private  static  boolean isFullUpgrade( final Properties startParams, final String oldVersionInfo )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
index 2429146754..512a141d7b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.catalog.DDdependableFinder
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -166,15 +167,18 @@ public	String	getSQLObjectType()
 			case StoredFormatIds.VIEW_DESCRIPTOR_FINDER_V01_ID:
 				return Dependable.VIEW;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 			case StoredFormatIds.TABLE_PERMISSION_FINDER_V01_ID:
 				return Dependable.TABLE_PERMISSION;
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 			case StoredFormatIds.COLUMNS_PERMISSION_FINDER_V01_ID:
 				return Dependable.COLUMNS_PERMISSION;
 
 			case StoredFormatIds.ROUTINE_PERMISSION_FINDER_V01_ID:
 				return Dependable.ROUTINE_PERMISSION;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3666
 			case StoredFormatIds.ROLE_GRANT_FINDER_V01_ID:
 				return Dependable.ROLE_GRANT;
 
@@ -201,6 +205,7 @@ public	String	getSQLObjectType()
 	public final Dependable getDependable(DataDictionary dd, UUID dependableObjectID)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
         Dependable dependable = findDependable(dd, dependableObjectID);
         if (dependable == null)
             throw StandardException.newException(SQLState.LANG_OBJECT_NOT_FOUND,
@@ -255,6 +260,7 @@ Dependable findDependable(DataDictionary dd, UUID dependableObjectID)
 			case StoredFormatIds.VIEW_DESCRIPTOR_FINDER_V01_ID:
                 return dd.getViewDescriptor(dependableObjectID);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
             case StoredFormatIds.COLUMNS_PERMISSION_FINDER_V01_ID:
                 return dd.getColumnPermissions(dependableObjectID);
 
@@ -266,6 +272,7 @@ Dependable findDependable(DataDictionary dd, UUID dependableObjectID)
 
 		    case StoredFormatIds.ROLE_GRANT_FINDER_V01_ID:
 				return dd.getRoleGrantDescriptor(dependableObjectID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
 			case StoredFormatIds.SEQUENCE_DESCRIPTOR_FINDER_V01_ID:
                 return dd.getSequenceDescriptor(dependableObjectID);
@@ -279,6 +286,7 @@ Dependable findDependable(DataDictionary dd, UUID dependableObjectID)
 					SanityManager.THROWASSERT(
 						"getDependable() called with unexpeced formatId = " + formatId);
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
                 return null;
 		}
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java
index 782eed8f29..f7d23fde80 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java
@@ -140,6 +140,7 @@ private	UUIDFactory	getUUIDFactory()
 	{
 		if ( uuidFactory == null )
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			uuidFactory = DataDictionaryImpl.getMonitor().getUUIDFactory();
 		}
 		return	uuidFactory;
@@ -156,6 +157,7 @@ private BooleanDataValue	getTrueValue()
 	{
 		if ( trueValue == null )
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 			trueValue = new SQLBoolean( true );
 		}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
index 0c53ad87f3..8183abcc25 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
@@ -49,6 +49,7 @@ class IndexInfoImpl
 	 * @param indexNumber			(0-based) number of index within catalog's indexes
 	 * @param crf					CatalogRowFactory for the catalog
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	IndexInfoImpl(int indexNumber, CatalogRowFactory crf)
 	{
         this.crf = crf;
@@ -61,6 +62,7 @@ class IndexInfoImpl
 	 *
 	 * @return long	The conglomerate number for the index.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 	long getConglomerateNumber()
 	{
 		return conglomerateNumber;
@@ -71,6 +73,7 @@ long getConglomerateNumber()
 	 *
 	 * @param conglomerateNumber	The conglomerateNumber for the index.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 	void setConglomerateNumber(long conglomerateNumber)
 	{
 		this.conglomerateNumber = conglomerateNumber;
@@ -81,8 +84,10 @@ void setConglomerateNumber(long conglomerateNumber)
 	 *
 	 * @return String	The index name for the index.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 	String getIndexName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 		return crf.getIndexName(indexNumber);
 	}
 
@@ -93,6 +98,7 @@ String getIndexName()
 	 */
 	int getColumnCount()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 		return crf.getIndexColumnCount(indexNumber);
 	}
 
@@ -101,6 +107,7 @@ int getColumnCount()
 	 *
 	 * @return IndexRowGenerator	The IRG for this index.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 	IndexRowGenerator getIndexRowGenerator()
 	{
 		return irg;
@@ -111,6 +118,7 @@ IndexRowGenerator getIndexRowGenerator()
 	 *
 	 * @param irg			The IndexRowGenerator for this index.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 	void setIndexRowGenerator(IndexRowGenerator irg)
 	{
 		this.irg = irg;
@@ -126,6 +134,7 @@ void setIndexRowGenerator(IndexRowGenerator irg)
 	 */
 	int getBaseColumnPosition(int colNumber)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 		return crf.getIndexColumnPositions(indexNumber)[colNumber];
 	}
 
@@ -136,6 +145,7 @@ int getBaseColumnPosition(int colNumber)
 	 */
 	boolean isIndexUnique()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 		return crf.isIndexUnique(indexNumber);
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/PermissionsCacheable.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/PermissionsCacheable.java
index ebbf7ce75d..5fdc5fe9c4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/PermissionsCacheable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/PermissionsCacheable.java
@@ -130,6 +130,7 @@ else if( key instanceof RoutinePermsDescriptor)
 					AliasDescriptor ad = dd.getAliasDescriptor( routinePermsKey.getRoutineUUID());
 					SchemaDescriptor sd = dd.getSchemaDescriptor( ad.getSchemaUUID(),
 											  ConnectionUtil.getCurrentLCC().getTransactionExecute());
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 					if (sd.isSystemSchema() && !sd.isSchemaWithGrantableRoutines())
 						permissions = new RoutinePermsDescriptor( dd,
 																  routinePermsKey.getGrantee(),
@@ -141,6 +142,7 @@ else if( routinePermsKey.getGrantee().equals( sd.getAuthorizationId()))
 																  routinePermsKey.getGrantee(),
 																  Authorizer.SYSTEM_AUTHORIZATION_ID,
 																  routinePermsKey.getRoutineUUID(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 																  true);
 				}
 				catch( java.sql.SQLException sqle)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java
index f37dafd75f..89f6a367d8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/PermissionsCatalogRowFactory.java
@@ -37,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 abstract class PermissionsCatalogRowFactory extends CatalogRowFactory
 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     PermissionsCatalogRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
     {
         super(uuidf,ef,dvf);
@@ -60,6 +61,7 @@ DataValueDescriptor getNullAuthorizationID()
      *
      * @return The internal authorization ID
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
     String getAuthorizationID( ExecRow row, int columnPos)
         throws StandardException
     {
@@ -74,6 +76,7 @@ String getAuthorizationID( ExecRow row, int columnPos)
      *
      * @exception StandardException standard error policy
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
     abstract ExecIndexRow buildIndexKeyRow( int indexNumber,
                                                    PermissionsDescriptor perm)
         throws StandardException;
@@ -90,6 +93,7 @@ abstract ExecIndexRow buildIndexKeyRow( int indexNumber,
      *
      * @exception StandardException standard error policy
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
     abstract int orPermissions( ExecRow row, PermissionsDescriptor perm, boolean[] colsChanged)
         throws StandardException;
 
@@ -105,6 +109,7 @@ abstract int orPermissions( ExecRow row, PermissionsDescriptor perm, boolean[] c
      *
      * @exception StandardException standard error policy
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
     abstract int removePermissions( ExecRow row, PermissionsDescriptor perm, boolean[] colsChanged)
         throws StandardException;
 
@@ -118,5 +123,6 @@ abstract int removePermissions( ExecRow row, PermissionsDescriptor perm, boolean
      * @param perm Permission descriptor
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
     abstract void setUUIDOfThePassedDescriptor(ExecRow row, PermissionsDescriptor perm) throws StandardException;
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/RoleClosureIteratorImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/RoleClosureIteratorImpl.java
index ebb53b740f..ca9af87929 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/RoleClosureIteratorImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/RoleClosureIteratorImpl.java
@@ -120,6 +120,7 @@ public class RoleClosureIteratorImpl implements RoleClosureIterator
         this.root = root;
         this.dd = dd;
         this.tc = tc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         seenSoFar = new HashMap<String,Object>();
         lifo      = new ArrayList<RoleGrantDescriptor>(); // remaining work stack
 
@@ -131,6 +132,7 @@ public class RoleClosureIteratorImpl implements RoleClosureIterator
              null,
              false,
              false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         List<RoleGrantDescriptor> dummyList = new ArrayList<RoleGrantDescriptor>();
         dummyList.add(dummy);
         currNodeIter = dummyList.iterator();
@@ -150,6 +152,7 @@ public String next() throws StandardException {
         } else if (graph == null) {
             // We get here the second time next is called.
             graph = dd.getRoleGrantGraph(tc, inverse);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             List<RoleGrantDescriptor> outArcs = graph.get(root);
             if (outArcs != null) {
                 currNodeIter = outArcs.iterator();
@@ -183,6 +186,7 @@ public String next() throws StandardException {
                 while (lifo.size() > 0 && currNodeIter == null) {
 
                     newNode = lifo.remove(lifo.size() - 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
                     // In the example (see interface doc), the
                     // iterator of outgoing arcs for f (grant inverse)
@@ -204,6 +208,7 @@ public String next() throws StandardException {
         }
 
         if (result != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
             String role = inverse ? result.getRoleName(): result.getGrantee();
             seenSoFar.put(role, null);
             return role;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
index 1500bc2b85..3ed086beba 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
@@ -112,9 +112,11 @@ class SYSALIASESRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSALIASESRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 		initInfo(SYSALIASES_COLUMN_COUNT, "SYSALIASES", indexColumnPositions, uniqueness, uuids);
 	}
 
@@ -219,6 +221,7 @@ public ExecRow makeRow(TupleDescriptor	td, TupleDescriptor parent)
 		/* 7th column is SYSTEMALIAS (boolean) */
 		row.setColumn
 			(SYSALIASES_SYSTEMALIAS, new SQLBoolean(systemAlias));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		/* 8th column is ALIASINFO (org.apache.derby.catalog.AliasInfo) */
 		row.setColumn(SYSALIASES_ALIASINFO, 
@@ -325,6 +328,9 @@ public TupleDescriptor buildDescriptor(
 			{
 				case AliasInfo.ALIAS_NAME_SPACE_PROCEDURE_AS_CHAR: 
 				case AliasInfo.ALIAS_NAME_SPACE_FUNCTION_AS_CHAR: 
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 				case AliasInfo.ALIAS_TYPE_SYNONYM_AS_CHAR: 
 				case AliasInfo.ALIAS_TYPE_UDT_AS_CHAR: 
 				case AliasInfo.ALIAS_TYPE_AGGREGATE_AS_CHAR: 
@@ -369,6 +375,7 @@ public TupleDescriptor buildDescriptor(
      * @return array of SystemColumn suitable for making this catalog.
      */
     public SystemColumn[]   buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
     {
       return new SystemColumn[] {
@@ -381,6 +388,7 @@ public SystemColumn[]   buildColumnList()
         SystemColumnImpl.getIndicatorColumn("ALIASTYPE"),
         SystemColumnImpl.getIndicatorColumn("NAMESPACE"),
         SystemColumnImpl.getColumn("SYSTEMALIAS",
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
                 Types.BOOLEAN, false),
         SystemColumnImpl.getJavaColumn("ALIASINFO",
                 "org.apache.derby.catalog.AliasInfo", true),
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
index b2899b3734..dae7353989 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
@@ -82,9 +82,11 @@ class SYSCHECKSRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 	SYSCHECKSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 		initInfo(SYSCHECKS_COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, uniqueness, uuids );
 	}
 
@@ -141,6 +143,7 @@ public ExecRow makeRow(TupleDescriptor	td, TupleDescriptor parent)
 		 */
 		row.setColumn(SYSCHECKS_REFERENCEDCOLUMNS,
 			new UserType(rcd));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		return row;
 	}
@@ -215,6 +218,7 @@ public TupleDescriptor buildDescriptor(
 	 */
 
     public SystemColumn[] buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
     {
         
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
index e7740e03eb..57cae0b510 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCOLPERMSRowFactory.java
@@ -82,6 +82,7 @@ class SYSCOLPERMSRowFactory extends PermissionsCatalogRowFactory
 
     public static final int
         GRANTEE_COL_NUM_IN_GRANTEE_TABLE_TYPE_GRANTOR_INDEX = 1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
     private static final boolean[] indexUniqueness = { true, true, false};
 
@@ -91,17 +92,21 @@ class SYSCOLPERMSRowFactory extends PermissionsCatalogRowFactory
 		,"6074401f-0103-0e39-b8e7-00000010f010"	// heap UUID
 		,"787c0020-0103-0e39-b8e7-00000010f010"	// index1
 		,"c9a3808d-010c-42a2-ae15-0000000f67f8" //index2
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
 		,"80220011-010c-bc85-060d-000000109ab8" //index3
     };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSCOLPERMSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 		initInfo(COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexUniqueness, uuids);
 	}
 
 	public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         UUID						oid;
         String colPermID = null;
         DataValueDescriptor grantee = null;
@@ -118,6 +123,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent) throws Standa
         else
         {
             ColPermsDescriptor cpd = (ColPermsDescriptor) td;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
             oid = cpd.getUUID();
             if ( oid == null )
             {
@@ -137,6 +143,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent) throws Standa
         row.setColumn( GRANTOR_COL_NUM, grantor);
         row.setColumn( TABLEID_COL_NUM, new SQLChar(tableID));
         row.setColumn( TYPE_COL_NUM, new SQLChar(type));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
         row.setColumn( COLUMNS_COL_NUM, new UserType( (Object) columns));
         return row;
     } // end of makeRow
@@ -151,6 +158,7 @@ public TupleDescriptor buildDescriptor(ExecRow row,
             SanityManager.ASSERT( row.nColumns() == COLUMN_COUNT,
                                   "Wrong size row passed to SYSCOLPERMSRowFactory.buildDescriptor");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         String colPermsUUIDString = row.getColumn( COLPERMSID_COL_NUM).getString();
         UUID colPermsUUID = getUUIDFactory().recreateUUID(colPermsUUIDString);
         String tableUUIDString = row.getColumn( TABLEID_COL_NUM).getString();
@@ -163,6 +171,7 @@ public TupleDescriptor buildDescriptor(ExecRow row,
                                   "r".equals( type) || "R".equals( type),
                                   "Invalid type passed to SYSCOLPERMSRowFactory.buildDescriptor");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         ColPermsDescriptor colPermsDesc =
 	        new ColPermsDescriptor( dataDictionary, 
                     getAuthorizationID( row, GRANTEE_COL_NUM),
@@ -174,6 +183,7 @@ public TupleDescriptor buildDescriptor(ExecRow row,
 
 	/** builds a column list for the catalog */
     public SystemColumn[] buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
     {
         return new SystemColumn[] {
@@ -215,11 +225,13 @@ public ExecIndexRow buildIndexKeyRow( int indexNumber,
             row.setColumn(2, new SQLChar(tableUUIDStr));
             row.setColumn(3, new SQLChar(colPerms.getType()));
             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         case COLPERMSID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             String colPermsUUIDStr = perm.getObjectID().toString();
             row.setColumn(1, new SQLChar(colPermsUUIDStr));
             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
         case TABLEID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             colPerms = (ColPermsDescriptor) perm;
@@ -317,6 +329,7 @@ public int removePermissions( ExecRow row, PermissionsDescriptor perm, boolean[]
 	 * @see PermissionsCatalogRowFactory#setUUIDOfThePassedDescriptor
 	 */
     public void setUUIDOfThePassedDescriptor(ExecRow row, PermissionsDescriptor perm)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
     throws StandardException
     {
         DataValueDescriptor existingPermDVD = row.getColumn(COLPERMSID_COL_NUM);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
index ae5c6294fb..f4ea521b4d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
@@ -113,6 +113,11 @@ public class SYSCOLUMNSRowFactory extends CatalogRowFactory
 	private final DataDictionary dataDictionary;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
     SYSCOLUMNSRowFactory(DataDictionary dd,UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		this(dd, uuidf, ef, dvf, TABLENAME_STRING);
@@ -123,6 +128,7 @@ public class SYSCOLUMNSRowFactory extends CatalogRowFactory
 	{
 		super(uuidf,ef,dvf);
 		this.dataDictionary = dd;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 		initInfo(SYSCOLUMNS_COLUMN_COUNT, myName, indexColumnPositions, uniqueness, uuids);
 	}
 
@@ -141,6 +147,11 @@ public class SYSCOLUMNSRowFactory extends CatalogRowFactory
 	 */
   	@Override
   	public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 					throws StandardException{
 	return makeRow(td, getHeapColumnCount());
 	}
@@ -163,6 +174,7 @@ private ExecRow makeRow(TupleDescriptor td, int columnCount)
 		Object					defaultSerializable = null;
 		long					autoincStart = 0;
 		long					autoincInc = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3175
 		long					autoincValue = 0;
 		boolean					autoincCycle = false;
 		//The SYSCOLUMNS table's autoinc related columns change with different
@@ -172,6 +184,7 @@ private ExecRow makeRow(TupleDescriptor td, int columnCount)
 		//start value? Following variable is used to keep track of what happened 
 		//to the autoincrement column.
 		long autoinc_create_or_modify_Start_Increment = -1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 
 		if (td != null)
 		{
@@ -182,12 +195,20 @@ private ExecRow makeRow(TupleDescriptor td, int columnCount)
 
 			tabID = column.getReferencingUUID().toString();
 			colName = column.getColumnName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			colID = column.getPosition();
 			autoincStart = column.getAutoincStart();
 			autoincInc   = column.getAutoincInc();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3175
 			autoincValue   = column.getAutoincValue();
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 			autoinc_create_or_modify_Start_Increment = column.getAutoinc_create_or_modify_Start_Increment();
 			autoincCycle = column.getAutoincCycle();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 
 			if (column.getDefaultInfo() != null)
 			{
@@ -212,6 +233,11 @@ private ExecRow makeRow(TupleDescriptor td, int columnCount)
 
 		/* Build the row to insert  */
 		row = getExecutionFactory().getValueRow(columnCount);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 
 		/* 1st column is REFERENCEID (UUID - char(36)) */
 		row.setColumn(SYSCOLUMNS_REFERENCEID, new SQLChar(tabID));
@@ -225,6 +251,7 @@ private ExecRow makeRow(TupleDescriptor td, int columnCount)
 		/* 4th column is COLUMNDATATYPE */
 		row.setColumn(SYSCOLUMNS_COLUMNDATATYPE,
 				new UserType(typeDesc));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		/* 5th column is COLUMNDEFAULT */
 		row.setColumn(SYSCOLUMNS_COLUMNDEFAULT,
@@ -253,11 +280,17 @@ private ExecRow makeRow(TupleDescriptor td, int columnCount)
 			// In this case, the autoincValue may have a
 			// different value than the autoincStart.
 			row.setColumn(SYSCOLUMNS_AUTOINCREMENTVALUE, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3175
 						  new SQLLongint(autoincValue));
 			row.setColumn(SYSCOLUMNS_AUTOINCREMENTSTART, 
 						  new SQLLongint(autoincStart));
 			row.setColumn(SYSCOLUMNS_AUTOINCREMENTINC, 
 						  new SQLLongint(autoincInc));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 			if (row.nColumns() >= 10) {
             // This column is present only if the data dictionary version is
             // 10.14 or higher.
@@ -272,6 +305,7 @@ private ExecRow makeRow(TupleDescriptor td, int columnCount)
 
 			ColumnDescriptor  column = (ColumnDescriptor)td;
 			row.setColumn(SYSCOLUMNS_AUTOINCREMENTVALUE, new SQLLongint(autoincStart));
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 			row.setColumn(SYSCOLUMNS_AUTOINCREMENTSTART, new SQLLongint(autoincStart));
 			row.setColumn(SYSCOLUMNS_AUTOINCREMENTINC, new SQLLongint(
 					column.getTableDescriptor().getColumnDescriptor(colName).getAutoincInc()));
@@ -305,6 +339,11 @@ else if(autoinc_create_or_modify_Start_Increment == ColumnDefinitionNode.MODIFY_
 						  new SQLLongint());
 			row.setColumn(SYSCOLUMNS_AUTOINCREMENTINC,
 						  new SQLLongint());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 			if (row.nColumns() >= 10) {
             // This column is present only if the data dictionary version is
             // 10.14 or higher.
@@ -374,6 +413,11 @@ public TupleDescriptor buildDescriptor(
 		{
 			
 			int expectedCols =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
                 dd.checkVersion(DataDictionary.DD_VERSION_DERBY_10_14, null)
                     ? SYSCOLUMNS_COLUMN_COUNT
                     : (SYSCOLUMNS_COLUMN_COUNT - 1);
@@ -392,6 +436,7 @@ public TupleDescriptor buildDescriptor(
 		UUID				defaultUUID = null;
 		UUID				uuid = null;
 		UUIDFactory			uuidFactory = getUUIDFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3175
 		long autoincStart, autoincInc, autoincValue;
 		boolean autoincCycle = false;
 
@@ -468,6 +513,7 @@ else if (object instanceof DefaultInfoImpl)
 
 		/* 7th column is AUTOINCREMENTVALUE (long) */
 		autoincValue = row.getColumn(SYSCOLUMNS_AUTOINCREMENTVALUE).getLong();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3175
 
 		/* 8th column is AUTOINCREMENTSTART (long) */
 		autoincStart = row.getColumn(SYSCOLUMNS_AUTOINCREMENTSTART).getLong();
@@ -475,6 +521,11 @@ else if (object instanceof DefaultInfoImpl)
 		/* 9th column is AUTOINCREMENTINC (long) */
 		autoincInc = row.getColumn(SYSCOLUMNS_AUTOINCREMENTINC).getLong();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 		if (row.nColumns() >= 10){
 			DataValueDescriptor col = row.getColumn(SYSCOLUMNS_AUTOINCREMENTINCCYCLE);
 			autoincCycle = col.getBoolean();
@@ -514,6 +565,7 @@ public	int	getPrimaryKeyIndexNumber()
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
         
@@ -531,6 +583,11 @@ public SystemColumn[]	buildColumnList()
             SystemColumnImpl.getColumn("AUTOINCREMENTSTART", Types.BIGINT, true),
             SystemColumnImpl.getColumn("AUTOINCREMENTINC", Types.BIGINT, true),
             SystemColumnImpl.getColumn("AUTOINCREMENTCYCLE", Types.BOOLEAN, true)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 
        };
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
index e99d5feea5..733482ec3b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
@@ -106,11 +106,13 @@ public class SYSCONGLOMERATESRowFactory extends CatalogRowFactory
 		,"80000016-00d0-fd77-3ed8-000a0a0b1900"	// SYSCONGLOMERATES_INDEX3
 	};
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 	SYSCONGLOMERATESRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
 		initInfo(SYSCONGLOMERATES_COLUMN_COUNT, 
 				 TABLENAME_STRING, indexColumnPositions, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 uniqueness, uuids );
 	}
 
@@ -155,6 +157,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
 				schemaID = conglomerate.getSchemaID().toString();	
 			}
 			tabID = conglomerate.getTableID().toString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			conglomNumber = conglomerate.getConglomerateNumber();
 			conglomName = conglomerate.getConglomerateName();
 			conglomUUIDString = conglomerate.getUUID().toString();
@@ -179,6 +182,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
 
 		/* 3rd column is CONGLOMERATENUMBER (long) */
 		row.setColumn(3, new SQLLongint(conglomNumber));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		/* 4th column is CONGLOMERATENAME (varchar(128)) 
 		** If null, use the tableid so we always
@@ -189,6 +193,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
 
 		/* 5th  column is ISINDEX (boolean) */
 		row.setColumn(5, new SQLBoolean(supportsIndex));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		/* 6th column is DESCRIPTOR
 		*  (user type org.apache.derby.catalog.IndexDescriptor)
@@ -204,6 +209,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
 
 		/* 7th column is ISCONSTRAINT (boolean) */
 		row.setColumn(7, new SQLBoolean(supportsConstraint));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		/* 8th column is CONGLOMERATEID (UUID - char(36)) */
 		row.setColumn(8, new SQLChar(conglomUUIDString));
@@ -430,6 +436,7 @@ protected String getConglomerateName(ExecRow row)
 	 */
     	        
 	public SystemColumn[]	buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
             return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
index 8e70b50db0..986a780eee 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
@@ -98,10 +98,12 @@ public class SYSCONSTRAINTSRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSCONSTRAINTSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
 		initInfo(SYSCONSTRAINTS_COLUMN_COUNT, TABLENAME_STRING, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 indexColumnPositions, uniqueness, uuids );
 	}
 
@@ -132,6 +134,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
 		String					schemaID = null;
 
         boolean                 deferrable =
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             ConstraintDefinitionNode.DEFERRABLE_DEFAULT;
         boolean                 initiallyDeferred =
             ConstraintDefinitionNode.INITIALLY_DEFERRED_DEFAULT;
@@ -184,6 +187,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
 			schemaID = constraint.getSchemaDescriptor().getUUID().toString();
 
             // constraint characteristics
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             deferrable = constraint.deferrable();
             initiallyDeferred   = constraint.initiallyDeferred();
             enforced   = constraint.enforced();
@@ -216,11 +220,13 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
 		row.setColumn(SYSCONSTRAINTS_SCHEMAID, new SQLChar(schemaID));
 
 		/* 6th column is STATE (char(1)) */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         row.setColumn(SYSCONSTRAINTS_STATE,
             new SQLChar(encodeCharacteristics(deferrable, initiallyDeferred, enforced)));
 
 		/* 7th column is REFERENCED */
 		row.setColumn(SYSCONSTRAINTS_REFERENCECOUNT, new SQLInteger(referenceCount));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		return row;
 	}
@@ -243,6 +249,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
     private String encodeCharacteristics(
             boolean deferrable, boolean initiallyDeferred, boolean enforced) {
         char c;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         if (deferrable) {
             if (initiallyDeferred) {
@@ -322,6 +329,7 @@ public TupleDescriptor buildDescriptor(
 		String				constraintSType;
 		String				constraintStateStr;
         boolean             deferrable =
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 ConstraintDefinitionNode.DEFERRABLE_DEFAULT;
         boolean             initiallyDeferred =
                 ConstraintDefinitionNode.INITIALLY_DEFERRED_DEFAULT;
@@ -497,6 +505,7 @@ public TupleDescriptor buildDescriptor(
 		switch (constraintStateStr.charAt(0))
 		{
 			case 'E': 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 deferrable = false;
                 initiallyDeferred = false;
                 enforced = true;
@@ -561,6 +570,8 @@ public TupleDescriptor buildDescriptor(
 				constraintDesc = ddg.newUniqueConstraintDescriptor(
 										td, 
 										constraintName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                         deferrable,
                                         initiallyDeferred,
 										keyColumns,//genReferencedColumns(dd, td), //int referencedColumns[],
@@ -582,6 +593,7 @@ public TupleDescriptor buildDescriptor(
 				constraintDesc = ddg.newForeignKeyConstraintDescriptor(
 										td, 
 										constraintName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                         deferrable,
                                         initiallyDeferred,
 										keyColumns,//genReferencedColumns(dd, td), //int referencedColumns[],
@@ -608,6 +620,7 @@ public TupleDescriptor buildDescriptor(
 				constraintDesc = ddg.newCheckConstraintDescriptor(
 										td, 
 										constraintName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                         deferrable,
                                         initiallyDeferred,
 										constraintUUID,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
index 32de7debf2..a472d96cec 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
@@ -86,10 +86,12 @@ public class SYSDEPENDSRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSDEPENDSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
 		initInfo(SYSDEPENDS_COLUMN_COUNT,TABLENAME_STRING, indexColumnPositions,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 uniqueness, uuids );
 	}
 
@@ -153,6 +155,7 @@ public ExecRow makeRow(TupleDescriptor	td, TupleDescriptor parent)
 		/* 2nd column is DEPENDENTFINDER */
 		row.setColumn(SYSDEPENDS_DEPENDENTTYPE,
 				new UserType(dependentBloodhound));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		/* 3rd column is PROVIDERID (UUID - char(36)) */
 		row.setColumn(SYSDEPENDS_PROVIDERID, new SQLChar(providerID));
@@ -232,6 +235,7 @@ public TupleDescriptor buildDescriptor(
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
             return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
index a4850d016d..b099e14e77 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
@@ -64,11 +64,13 @@ class SYSDUMMY1RowFactory extends CatalogRowFactory
 	 */
     SYSDUMMY1RowFactory(UUIDFactory uuidf, 
 									ExecutionFactory ef, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 									DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
 		
 		initInfo(SYSDUMMY1_COLUMN_COUNT, "SYSDUMMY1", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 null, null, uuids);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
index dc50a2c5fb..f41d4a1999 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
@@ -104,10 +104,12 @@ class SYSFILESRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSFILESRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf) 
 	{
 		super(uuidf,ef,dvf);
 		initInfo(SYSFILES_COLUMN_COUNT, TABLENAME_STRING, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 indexColumnPositions, uniqueness, uuids );
 	}
 
@@ -158,6 +160,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
 
 		/* 4th column is GENERATIONID (long) */
 		row.setColumn(GENERATION_ID_COL_NUM, new SQLLongint(generationId));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		return row;
 	}
@@ -246,6 +249,7 @@ public TupleDescriptor buildDescriptor(
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
     public SystemColumn[]   buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
     {
         return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
index 3acef3af69..a9d51be129 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
@@ -90,10 +90,12 @@ public class SYSFOREIGNKEYSRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSFOREIGNKEYSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
 		initInfo(SYSFOREIGNKEYS_COLUMN_COUNT, TABLENAME_STRING, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 indexColumnPositions, uniqueness, uuids );
 	}
 
@@ -246,6 +248,7 @@ public TupleDescriptor buildDescriptor(
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
             return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
index 43010c8a5b..0a72c3b915 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
@@ -73,9 +73,11 @@ public class SYSKEYSRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSKEYSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 		initInfo(SYSKEYS_COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, uniqueness, uuids );
 	}
 
@@ -198,6 +200,7 @@ public TupleDescriptor buildDescriptor(
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
             return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSPERMSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSPERMSRowFactory.java
index 1ed00c4cb3..9f846ad884 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSPERMSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSPERMSRowFactory.java
@@ -324,6 +324,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
      * @return array of SystemColumn suitable for making this catalog.
      */
     public SystemColumn[] buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
     {
         return new SystemColumn[]{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSROLESRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSROLESRowFactory.java
index 74ec8b6641..d17048772f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSROLESRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSROLESRowFactory.java
@@ -58,6 +58,7 @@ public class SYSROLESRowFactory extends CatalogRowFactory
     private static final int[][] indexColumnPositions =
     {
         {SYSROLES_ROLEID, SYSROLES_GRANTEE, SYSROLES_GRANTOR},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         {SYSROLES_ROLEID, SYSROLES_ISDEF},
         {SYSROLES_ROLE_UUID}
     };
@@ -116,6 +117,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
         throws StandardException
     {
         ExecRow                 row;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         String                  oid_string = null;
         String                  roleid = null;
         String                  grantee = null;
@@ -126,6 +128,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
         if (td != null)
         {
             RoleGrantDescriptor rgd = (RoleGrantDescriptor)td;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
             roleid = rgd.getRoleName();
             grantee = rgd.getGrantee();
@@ -133,6 +136,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
             wao = rgd.isWithAdminOption();
             isdef = rgd.isDef();
             UUID oid = rgd.getUUID();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
             oid_string = oid.toString();
         }
 
@@ -185,7 +189,9 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
         throws StandardException {
 
         DataValueDescriptor         col;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         RoleGrantDescriptor              descriptor;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         String                      oid_string;
         String                      roleid;
         String                      grantee;
@@ -203,6 +209,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
         // first column is uuid of this role grant descriptor (char(36))
         col = row.getColumn(1);
         oid_string = col.getString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
         // second column is roleid (varchar(128))
         col = row.getColumn(2);
@@ -224,6 +231,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
         col = row.getColumn(6);
         isdef = col.getString();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         descriptor = ddg.newRoleGrantDescriptor
             (getUUIDFactory().recreateUUID(oid_string),
              roleid,
@@ -242,9 +250,11 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
      * @return array of SystemColumn suitable for making this catalog.
      */
     public SystemColumn[]   buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
     {
         return new SystemColumn[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
             SystemColumnImpl.getUUIDColumn("UUID", false),
             SystemColumnImpl.getIdentifierColumn("ROLEID", false),
             SystemColumnImpl.getIdentifierColumn("GRANTEE", false),
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
index abb7cc6d56..bd39280dab 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSROUTINEPERMSRowFactory.java
@@ -77,17 +77,21 @@ public class SYSROUTINEPERMSRowFactory extends PermissionsCatalogRowFactory
 		,"185e801c-0103-0e39-b8e7-00000010f010"	// heap UUID
 		,"c065801d-0103-0e39-b8e7-00000010f010"	// index1
 		,"40f70088-010c-4c2f-c8de-0000000f43a0" // index2
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
 		,"08264012-010c-bc85-060d-000000109ab8" // index3
     };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSROUTINEPERMSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 		initInfo( COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexUniqueness, uuids);
 	}
 
 	public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		UUID oid;
         String routinePermID = null;
         DataValueDescriptor grantee = null;
@@ -102,6 +106,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent) throws Standa
         else
         {
             RoutinePermsDescriptor rpd = (RoutinePermsDescriptor) td;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
             oid = rpd.getUUID();
             if ( oid == null )
             {
@@ -133,7 +138,9 @@ public TupleDescriptor buildDescriptor(ExecRow row,
             SanityManager.ASSERT( row.nColumns() == COLUMN_COUNT,
                                   "Wrong size row passed to SYSROUTINEPERMSRowFactory.buildDescriptor");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         String routinePermsUUIDString = row.getColumn(ROUTINEPERMSID_COL_NUM).getString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         UUID routinePermsUUID = getUUIDFactory().recreateUUID(routinePermsUUIDString);
         String aliasUUIDString = row.getColumn( ALIASID_COL_NUM).getString();
         UUID aliasUUID = getUUIDFactory().recreateUUID(aliasUUIDString);
@@ -149,6 +156,7 @@ public TupleDescriptor buildDescriptor(ExecRow row,
 
 	/** builds a column list for the catalog */
 	public SystemColumn[] buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
     {
          return new SystemColumn[] {
@@ -188,11 +196,13 @@ public ExecIndexRow buildIndexKeyRow( int indexNumber,
             String routineUUIDStr = ((RoutinePermsDescriptor) perm).getRoutineUUID().toString();
             row.setColumn(2, new SQLChar(routineUUIDStr));
             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         case ROUTINEPERMSID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             String routinePermsUUIDStr = perm.getObjectID().toString();
             row.setColumn(1, new SQLChar(routinePermsUUIDStr));
             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
         case ALIASID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             routineUUIDStr = ((RoutinePermsDescriptor) perm).getRoutineUUID().toString();
@@ -250,6 +260,7 @@ public int removePermissions( ExecRow row, PermissionsDescriptor perm, boolean[]
 	 * @see PermissionsCatalogRowFactory#setUUIDOfThePassedDescriptor
 	 */
     public void setUUIDOfThePassedDescriptor(ExecRow row, PermissionsDescriptor perm)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
     throws StandardException
     {
         DataValueDescriptor existingPermDVD = row.getColumn(ROUTINEPERMSID_COL_NUM);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
index 606750d7a6..161fe661b5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
@@ -95,10 +95,12 @@ public class SYSSCHEMASRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSSCHEMASRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
 		initInfo(SYSSCHEMAS_COLUMN_COUNT, TABLENAME_STRING, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 indexColumnPositions, uniqueness, uuids );
 	}
 
@@ -221,6 +223,7 @@ public TupleDescriptor buildDescriptor(
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
             return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSEQUENCESRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSEQUENCESRowFactory.java
index 65dae761a3..74c0f3644f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSEQUENCESRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSEQUENCESRowFactory.java
@@ -253,6 +253,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
         col = row.getColumn(SYSSEQUENCES_CURRENT_VALUE);
         if ( col.isNull() ) { currentValue = null; }
         else { currentValue = col.getLong(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         col = row.getColumn(SYSSEQUENCES_START_VALUE);
         startValue = col.getLong();
@@ -290,6 +291,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
      * @return array of SystemColumn suitable for making this catalog.
      */
     public SystemColumn[] buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
     {
         return new SystemColumn[]{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
index a0b18d4c7a..7b36f37809 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
@@ -118,10 +118,12 @@ public class SYSSTATEMENTSRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSSTATEMENTSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
 		initInfo(SYSSTATEMENTS_COLUMN_COUNT, TABLENAME_STRING, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 indexColumnPositions, uniqueness, uuids);
 	}
 
@@ -206,6 +208,7 @@ public ExecRow makeSYSSTATEMENTSrow(
 
 		/* 5th column is VALID */
 		row.setColumn(5, new SQLBoolean(valid));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		/* 6th column is TEXT */
 		row.setColumn(6, dvf.getLongvarcharDataValue(text));
@@ -225,6 +228,7 @@ public ExecRow makeSYSSTATEMENTSrow(
 		** CONSTANTSTATE is really a formatable StorablePreparedStatement.
 		*/
 		row.setColumn(10, new UserType(preparedStatement));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		/* 11th column is INITIALLY_COMPILABLE */
 		row.setColumn(11, new SQLBoolean(initiallyCompilable));
@@ -307,6 +311,7 @@ public TupleDescriptor buildDescriptor(
 
 		// In soft upgrade mode the plan may not be understand by this engine
 		// so force a recompile.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 		if (dd.isReadOnlyUpgrade()) {
 			valid = false;
 		} else {
@@ -380,6 +385,7 @@ public ExecRow makeEmptyRow()
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[] buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
             return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
index e2d55c9681..be22833d35 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
@@ -116,6 +116,7 @@ public class SYSSTATISTICSRowFactory extends CatalogRowFactory
 	/*
 	 *	CONSTRUCTORS
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSSTATISTICSRowFactory(UUIDFactory uuidf, 
 									ExecutionFactory ef, 
 									DataValueFactory dvf)
@@ -123,6 +124,7 @@ public class SYSSTATISTICSRowFactory extends CatalogRowFactory
 		super(uuidf,ef,dvf);
 		
 		initInfo(SYSSTATISTICS_COLUMN_COUNT, TABLENAME_STRING, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 indexColumnPositions, uniqueness, uuids);
 	}
 
@@ -165,6 +167,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent)
 		row.setColumn(3, new SQLChar(tableID));
 		row.setColumn(4, new SQLTimestamp(updateTime));
 		row.setColumn(5, new SQLChar(statType));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
   		row.setColumn(6, new SQLBoolean(validStat));
 		row.setColumn(7, new SQLInteger(columnCount));
 		row.setColumn(8, new UserType(statisticsObject));
@@ -238,6 +241,7 @@ public TupleDescriptor buildDescriptor(
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[] buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
             return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
index 77dab51d37..cb101d4477 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTABLEPERMSRowFactory.java
@@ -83,17 +83,21 @@ public class SYSTABLEPERMSRowFactory extends PermissionsCatalogRowFactory
 		,"004b0019-0103-0e39-b8e7-00000010f010"	// heap UUID
 		,"c851401a-0103-0e39-b8e7-00000010f010"	// index1
 		,"80220011-010c-426e-c599-0000000f1120"	// index2
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
 		,"f81e0010-010c-bc85-060d-000000109ab8"	// index3
     };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSTABLEPERMSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 		initInfo(COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, indexUniqueness, uuids);
 	}
 
 	public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		UUID						oid;
         DataValueDescriptor grantee = null;
         DataValueDescriptor grantor = null;
@@ -114,6 +118,7 @@ public ExecRow makeRow(TupleDescriptor td, TupleDescriptor parent) throws Standa
         else
         {
             TablePermsDescriptor tpd = (TablePermsDescriptor) td;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
             oid = tpd.getUUID();
             if ( oid == null )
             {
@@ -157,6 +162,7 @@ public TupleDescriptor buildDescriptor(ExecRow row,
             SanityManager.ASSERT( row.nColumns() == COLUMN_COUNT,
                                   "Wrong size row passed to SYSTABLEPERMSRowFactory.buildDescriptor");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         String tablePermsUUIDString = row.getColumn(TABLEPERMSID_COL_NUM).getString();
         UUID tablePermsUUID = getUUIDFactory().recreateUUID(tablePermsUUIDString);
         String tableUUIDString = row.getColumn( TABLEID_COL_NUM).getString();
@@ -183,6 +189,7 @@ public TupleDescriptor buildDescriptor(ExecRow row,
                                   "Invalid SYSTABLEPERMS.triggerPriv column value: " + triggerPriv);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		TablePermsDescriptor tabPermsDesc =
         new TablePermsDescriptor( dataDictionary,
                                          getAuthorizationID( row, GRANTEE_COL_NUM),
@@ -196,6 +203,7 @@ public TupleDescriptor buildDescriptor(ExecRow row,
 
 	/** builds a column list for the catalog */
 	public SystemColumn[] buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
     {
         return new SystemColumn[] {
@@ -238,11 +246,13 @@ public ExecIndexRow buildIndexKeyRow( int indexNumber,
             String tableUUIDStr = ((TablePermsDescriptor) perm).getTableUUID().toString();
             row.setColumn(2, new SQLChar(tableUUIDStr));
             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
         case TABLEPERMSID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             String tablePermsUUIDStr = perm.getObjectID().toString();
             row.setColumn(1, new SQLChar(tablePermsUUIDStr));
             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
         case TABLEID_INDEX_NUM:
             row = getExecutionFactory().getIndexableRow( 1);
             tableUUIDStr = ((TablePermsDescriptor) perm).getTableUUID().toString();
@@ -359,6 +369,7 @@ private boolean removeOnePermission( ExecRow row, boolean[] colsChanged, int col
 	 * @see PermissionsCatalogRowFactory#setUUIDOfThePassedDescriptor
 	 */
     public void setUUIDOfThePassedDescriptor(ExecRow row, PermissionsDescriptor perm)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
     throws StandardException
     {
         DataValueDescriptor existingPermDVD = row.getColumn(TABLEPERMSID_COL_NUM);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
index 163d88a22f..146e92befe 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
@@ -57,6 +57,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * @version 0.1
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 class SYSTABLESRowFactory extends CatalogRowFactory
 {
 	private static final String		TABLENAME_STRING = "SYSTABLES";
@@ -98,9 +99,11 @@ class SYSTABLESRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSTABLESRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 		initInfo(SYSTABLES_COLUMN_COUNT, TABLENAME_STRING, indexColumnPositions, (boolean[]) null, uuids);
 	}
 
@@ -179,6 +182,7 @@ public ExecRow makeRow(TupleDescriptor td,
 					tabSType = "V";
 					break;		
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 			    case TableDescriptor.SYNONYM_TYPE:
 					tabSType = "A";
 					break;		
@@ -228,6 +232,7 @@ public ExecRow makeRow(TupleDescriptor td,
 	 * @return corresponding empty index row
 	 * @exception   StandardException thrown on failure
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	ExecIndexRow	buildEmptyIndexRow( int indexNumber,
 											RowLocation rowLocation)
 			throws StandardException
@@ -269,6 +274,7 @@ ExecIndexRow	buildEmptyIndexRow( int indexNumber,
 	 *                       cases) supported for now.
 	 * @exception   StandardException thrown on failure
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3678
 	TupleDescriptor buildDescriptor(
 		ExecRow					row,
 		TupleDescriptor			parentTupleDescriptor,
@@ -307,6 +313,7 @@ public TupleDescriptor buildDescriptor(
 		DataDictionary 			dd )
 					throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3678
 		return buildDescriptorBody(
 			row,
 			parentTupleDescriptor,
@@ -366,6 +373,7 @@ public TupleDescriptor buildDescriptorBody(
 			case 'V' :
 				tableTypeEnum = TableDescriptor.VIEW_TYPE;
 				break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 			case 'A' :
 				tableTypeEnum = TableDescriptor.SYNONYM_TYPE;
 				break;
@@ -381,6 +389,7 @@ public TupleDescriptor buildDescriptorBody(
 		schemaUUID = getUUIDFactory().recreateUUID(schemaUUIDString);
 		
 		schema = dd.getSchemaDescriptor(schemaUUID, isolationLevel, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3678
 
 		/* 5th column is LOCKGRANULARITY (char(1)) */
 		col = row.getColumn(SYSTABLES_LOCKGRANULARITY);
@@ -422,6 +431,7 @@ protected String getTableName(ExecRow	row)
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
         return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
index d8c1eaf522..c7aed86504 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
@@ -132,6 +132,7 @@ public class SYSTRIGGERSRowFactory extends CatalogRowFactory
 		super(uuidf,ef,dvf);
         this.dataDictionary = dd;
 		initInfo(SYSTRIGGERS_COLUMN_COUNT, TABLENAME_STRING, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 indexColumnPositions,  uniqueness, uuids);
 	}
 
@@ -265,6 +266,7 @@ private ExecRow makeRow(TupleDescriptor td, int columnCount)
 		 *  (user type org.apache.derby.catalog.ReferencedColumns)
 		 */
 		row.setColumn(12, new UserType(rcd));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		/* 13th column is TRIGGERDEFINITION */
 		row.setColumn(13, dvf.getLongvarcharDataValue(triggerDefinition));
@@ -475,6 +477,7 @@ private Calendar getCalendarForCreationTimestamp()
             whenClauseText = col.getString();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6186
         descriptor = ddg.newTriggerDescriptor(
 									dd.getSchemaDescriptor(suuid, null),
 									uuid, 
@@ -512,6 +515,7 @@ private Calendar getCalendarForCreationTimestamp()
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[] buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
         return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
index 04139e0db1..3b21495643 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
@@ -82,10 +82,12 @@ public class SYSVIEWSRowFactory extends CatalogRowFactory
 	//
 	/////////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
     SYSVIEWSRowFactory(UUIDFactory uuidf, ExecutionFactory ef, DataValueFactory dvf)
 	{
 		super(uuidf,ef,dvf);
 		initInfo(SYSVIEWS_COLUMN_COUNT, TABLENAME_STRING, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 				 indexColumnPositions, uniqueness, uuids );
 	}
 
@@ -261,6 +263,7 @@ public TupleDescriptor buildDescriptor(
 	 * @return array of SystemColumn suitable for making this catalog.
 	 */
 	public SystemColumn[]	buildColumnList()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
             return new SystemColumn[] {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SequenceGenerator.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SequenceGenerator.java
index b7e13116ae..da0de0e956 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SequenceGenerator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SequenceGenerator.java
@@ -238,6 +238,7 @@ public synchronized SequenceGenerator clone( boolean restart )
     {
         Long    startValue;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         if ( restart ) { startValue = _RESTART_VALUE; }
         else if ( _isExhausted ) { startValue = null; }
         else { startValue = _currentValue; }
@@ -328,6 +329,7 @@ public synchronized Long peekAtCurrentValue()
     {
         Long currentValue = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         if ( !_isExhausted ) { currentValue = _currentValue; }
         
         return currentValue;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SequenceUpdater.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SequenceUpdater.java
index b4bf38a781..cde9815bad 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SequenceUpdater.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SequenceUpdater.java
@@ -135,6 +135,7 @@ public SequenceUpdater()
     /** Normal constructor */
     public SequenceUpdater( DataDictionaryImpl dd )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
         this();
         
         _dd = dd;
@@ -214,6 +215,7 @@ public void clean(boolean forRemove) throws StandardException
         //
         boolean gapClosed = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
         try {
             if ( _sequenceGenerator == null ) { gapClosed = true; }
             else
@@ -245,6 +247,7 @@ public void clean(boolean forRemove) throws StandardException
                 Monitor.getStream().println( errorMessage );
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
             _uuidString = null;
             _sequenceGenerator = null;
         }
@@ -262,6 +265,7 @@ public void clearIdentity()
         {
             //Doing check for lcc and db to be certain
             LanguageConnectionContext lcc = getLCC();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5054
             if (lcc != null)
             {
                 Database db = lcc.getDatabase();
@@ -407,6 +411,7 @@ public synchronized BulkInsertUpdater   getBulkInsertUpdater( boolean restart )
                 return;
                 
             case SequenceGenerator.RET_MARK_EXHAUSTED:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 updateCurrentValueOnDisk( currentValue, null );
                 returnValue.setValue( currentValue );
                 return;
@@ -472,6 +477,7 @@ public synchronized boolean updateCurrentValueOnDisk( Long oldValue, Long newVal
 				SanityManager.ASSERT( oldValue == null, "We should be flushing unused sequence values here." );
 			}
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             ContextService csf = getContextService();
             ContextManager cm = csf.getCurrentContextManager();
             AccessFactory af = _dd.af;
@@ -495,10 +501,12 @@ public synchronized boolean updateCurrentValueOnDisk( Long oldValue, Long newVal
             
             try
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                 retval = updateCurrentValueOnDisk( nestedTransaction, oldValue, newValue, false );
             }
             catch (StandardException se)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                 if ( !se.isLockTimeout() )
                 {
                     if ( se.isSelfDeadlock() )
@@ -523,11 +531,13 @@ public synchronized boolean updateCurrentValueOnDisk( Long oldValue, Long newVal
                 nestedTransaction.commit();
                 nestedTransaction.destroy();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                 if ( escalateToParentTransaction )
                 {
                     retval = updateCurrentValueOnDisk( executionTransaction, oldValue, newValue, false );
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                 return retval;
             }
         }
@@ -562,12 +572,14 @@ protected SequencePreallocator  makePreallocator( TransactionController tc )
                 return new SequenceRange( Integer.parseInt( className ) );
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
             Class<?> klass = Class.forName(className);
             if (!SequencePreallocator.class.isAssignableFrom(klass)) {
                 throw StandardException.newException(
                     SQLState.LANG_NOT_A_SEQUENCE_PREALLOCATOR, propertyName);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             return (SequencePreallocator) klass.getConstructor().newInstance();
         }
         catch (ClassNotFoundException e) { throw missingAllocator( propertyName, className, e ); }
@@ -597,6 +609,7 @@ private boolean isNumber( String text )
 	private static LanguageConnectionContext getLCC()
     {
 		return (LanguageConnectionContext) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 					getContextOrNull(LanguageConnectionContext.CONTEXT_ID);
 	}
 
@@ -612,6 +625,7 @@ private StandardException unimplementedFeature()
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getFactory();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
index 121120d7d1..41da8605e1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
@@ -131,10 +131,12 @@ static SystemColumn getIndicatorColumn(String name) {
      */
     static SystemColumn getJavaColumn(String name, String javaClassName,
             boolean nullability)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
     {
 
         TypeId typeId = TypeId.getUserDefinedTypeId(javaClassName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
         DataTypeDescriptor dtd = new DataTypeDescriptor(typeId, nullability);
         return new SystemColumnImpl(name, dtd);
@@ -162,6 +164,7 @@ public String	getName()
      * Return the type of this column.
      */
     public DataTypeDescriptor getType() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
         return type;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
index 0cc04b4db0..afa345457a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
@@ -51,6 +51,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 * Used to save heapId, name pairs for non core tables.
 *
 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 class TabInfoImpl
 {
     /**
@@ -72,6 +73,7 @@ class TabInfoImpl
 	 *
 	 * @param crf				the associated CatalogRowFactory
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1739
 	TabInfoImpl(CatalogRowFactory crf)
 	{
 		this.heapConglomerate = -1;
@@ -98,6 +100,7 @@ class TabInfoImpl
      *
      * @return long     The conglomerate for the heap.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	long getHeapConglomerate()
 	{
 		return heapConglomerate;
@@ -142,6 +145,7 @@ long getIndexConglomerate(int indexID)
      * @param index             Index number for index for table
      * @param indexConglomerate The conglomerate for that index
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	void setIndexConglomerate(int index, long indexConglomerate)
 	{
 		/* Index names must be set before conglomerates.
@@ -169,6 +173,7 @@ void setIndexConglomerate(int index, long indexConglomerate)
      * @param cd    The ConglomerateDescriptor for one of the index
      *              for this table.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
     void setIndexConglomerate(ConglomerateDescriptor cd)
 	{
 		int		index;
@@ -218,8 +223,10 @@ void setIndexConglomerate(ConglomerateDescriptor cd)
      *
      * @return String   The table name.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	String getTableName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 		return crf.getCatalogName();
 	}
 
@@ -294,6 +301,7 @@ int getIndexColumnCount(int indexNumber)
      *
      * @return IndexRowGenerator    The IRG for the specified index number.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	IndexRowGenerator getIndexRowGenerator(int indexNumber)
 	{
 		if (SanityManager.DEBUG)
@@ -316,6 +324,7 @@ IndexRowGenerator getIndexRowGenerator(int indexNumber)
      * @param indexNumber   The index number.
      * @param irg           The IndexRowGenerator for the specified index number.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	void setIndexRowGenerator(int indexNumber, IndexRowGenerator irg)
 	{
 		if (SanityManager.DEBUG)
@@ -417,6 +426,9 @@ int insertRow( ExecRow row, TransactionController tc)
 
 		RowLocation[] 			notUsed = new RowLocation[1]; 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
 		return insertRowListImpl(new ExecRow[] {row},tc,notUsed);
 	}
 
@@ -438,12 +450,16 @@ int insertRowList(ExecRow[] rowList, TransactionController tc )
 	{
 		RowLocation[] 			notUsed = new RowLocation[1]; 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
 		return insertRowListImpl(rowList,tc,notUsed);
 	}
 
 	/**
 	  Insert logic to insert a list of rows into a table. This logic has two
 	  odd features.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 
 	  <OL>
 	  <LI>Returns an indication if any returned row was a duplicate.
@@ -457,6 +473,9 @@ int insertRowList(ExecRow[] rowList, TransactionController tc )
 	  			ROWNOTDUPLICATE otherwise
 	 */
 	private int insertRowListImpl(ExecRow[] rowList, TransactionController tc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
                                   RowLocation[] rowLocationOut)
 		throws StandardException
 	{
@@ -522,6 +541,9 @@ private int insertRowListImpl(ExecRow[] rowList, TransactionController tc,
 													   heapLocation,
 													   row );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                 insertRetCode = indexControllers[ ictr ].insert(
                         indexableRow.getRowArray());
 
@@ -667,6 +689,7 @@ private int deleteRows(TransactionController tc,
 		** is a start key and no stop key or vice versa.
 		*/
 		int lockMode = ((startKey != null) && (stopKey != null)) ? 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6063
                 TransactionController.MODE_RECORD : 
                 TransactionController.MODE_TABLE;
 
@@ -758,6 +781,7 @@ private int deleteRows(TransactionController tc,
       * @param  indexNumber Key is appropriate for this index.
       * @exception StandardException        Thrown on failure
       */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	ExecRow getRow( TransactionController tc,
 						ExecIndexRow key,
 						int indexNumber )
@@ -791,6 +815,7 @@ ExecRow getRow( TransactionController tc,
 	 *
 	 * @exception		  StandardException thrown on failure.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	RowLocation getRowLocation(TransactionController tc,
 									  ExecIndexRow key,
 									  int indexNumber)
@@ -826,6 +851,7 @@ RowLocation getRowLocation(TransactionController tc,
       * @param  indexNumber Key is appropriate for this index.
       * @exception StandardException        Thrown on failure
       */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	ExecRow getRow( TransactionController tc,
 						   ConglomerateController heapCC,
 						   ExecIndexRow key,
@@ -919,6 +945,8 @@ private ExecRow getRowInternal( TransactionController tc,
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	void updateRow( ExecIndexRow				key, 
 						   ExecRow					newRow, 
 						   int						indexNumber,
@@ -929,6 +957,9 @@ void updateRow( ExecIndexRow				key,
 	{
 		ExecRow[] newRows = new ExecRow[1];
 		newRows[0] = newRow;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
 		updateRow(key, newRows, indexNumber, indicesToUpdate, colsToUpdate, tc);
 	}
 
@@ -949,6 +980,7 @@ void updateRow( ExecIndexRow				key,
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	void updateRow( ExecIndexRow				key,
 						   ExecRow[]				newRows,
 						   int						indexNumber,
@@ -973,11 +1005,20 @@ void updateRow( ExecIndexRow				key,
 
 		// Row level locking
 		rc.openForUpdate(indicesToUpdate, TransactionController.MODE_RECORD, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
 
 		/* Open the heap conglomerate */
 		heapCC = tc.openConglomerate(
                     getHeapConglomerate(),
                     false,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
                     TransactionController.OPENMODE_FORUPDATE,
                     TransactionController.MODE_RECORD,
                     TransactionController.ISOLATION_REPEATABLE_READ);
@@ -1031,6 +1072,7 @@ void updateRow( ExecIndexRow				key,
 	 *
 	 * @return The Properties associated with creating the heap.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	Properties getCreateHeapProperties()
 	{
 		return crf.getCreateHeapProperties();
@@ -1043,6 +1085,7 @@ Properties getCreateHeapProperties()
 	 *
 	 * @return The Properties associated with creating the specified index.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 	Properties getCreateIndexProperties(int indexNumber)
 	{
 		return crf.getCreateIndexProperties(indexNumber);
@@ -1088,6 +1131,7 @@ private	RowChanger	getRowChanger( TransactionController tc,
 			cids[ictr] = getIndexConglomerate(ictr);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 		rc = crf.getExecutionFactory().getRowChanger(getHeapConglomerate(),
 											(StaticCompiledOpenConglomInfo) null,
 											(DynamicCompiledOpenConglomInfo) null,
@@ -1164,6 +1208,7 @@ public String toString()
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1674
 			return "name: " + this.getTableName() + 
 				"\n\theapCongolomerate: "+heapConglomerate +
 				"\n\tnumIndexes: " + ((indexes != null) ? indexes.length : 0) +
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/TableKey.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/TableKey.java
index 34adf1cc37..8bae649bc3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/TableKey.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/TableKey.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.catalog.TableKey
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetDescriptor.java
index 4163bd9ac5..eda0346dad 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetDescriptor.java
@@ -116,6 +116,7 @@ public void setStatementParameters(PreparedStatement ps)
         ps.setString(1, rs_id.toString());
         ps.setString(2, op_identifier);
         ps.setString(3, op_details);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6318
         ps.setObject(4, no_opens, Types.INTEGER);
         ps.setObject(5, no_index_updates, Types.INTEGER);
         ps.setString(6, lock_mode);
@@ -155,6 +156,7 @@ public SystemColumn[] buildColumnList() {
         
         return new SystemColumn[] {
             SystemColumnImpl.getUUIDColumn("RS_ID", false),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4772
             SystemColumnImpl.getColumn("OP_IDENTIFIER", Types.VARCHAR, false,
                     TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getColumn("OP_DETAILS", Types.VARCHAR, true,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetTimingsDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetTimingsDescriptor.java
index 42fe48ecf5..89095ac220 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetTimingsDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINResultSetTimingsDescriptor.java
@@ -78,6 +78,7 @@ public void setStatementParameters(PreparedStatement ps)
         throws SQLException
     {
         ps.setString(1, timing_id.toString());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6318
         ps.setObject(2, constructor_time, Types.BIGINT);
         ps.setObject(3, open_time, Types.BIGINT);
         ps.setObject(4, next_time, Types.BIGINT);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINScanPropsDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINScanPropsDescriptor.java
index 566a9011bd..76c9850f4f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINScanPropsDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINScanPropsDescriptor.java
@@ -105,6 +105,7 @@ public void setStatementParameters(PreparedStatement ps)
         ps.setString(3, scan_object_type);
         ps.setString(4, scan_type);
         ps.setString(5, isolation_level);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6318
         ps.setObject(6, no_visited_pages, Types.INTEGER);
         ps.setObject(7, no_visited_rows, Types.INTEGER);
         ps.setObject(8, no_qualified_rows, Types.INTEGER);
@@ -181,6 +182,7 @@ public SystemColumn[] buildColumnList() {
             SystemColumnImpl.getColumn("NO_QUALIFIED_ROWS", Types.INTEGER, true),
             SystemColumnImpl.getColumn("NO_VISITED_DELETED_ROWS", Types.INTEGER, true),
             SystemColumnImpl.getColumn("NO_FETCHED_COLUMNS", Types.INTEGER, true),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4772
             SystemColumnImpl.getColumn("BITSET_OF_FETCHED_COLUMNS",
                     Types.VARCHAR, true, TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getColumn("BTREE_HEIGHT", Types.INTEGER, true),
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINSortPropsDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINSortPropsDescriptor.java
index 7e4d0be9cb..0f375de6da 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINSortPropsDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINSortPropsDescriptor.java
@@ -76,6 +76,7 @@ public void setStatementParameters(PreparedStatement ps)
     {
         ps.setString(1, sort_rs_id.toString());
         ps.setString(2, sort_type);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6318
         ps.setObject(3, no_input_rows, Types.INTEGER);
         ps.setObject(4, no_output_rows, Types.INTEGER);
         ps.setObject(5, no_merge_runs, Types.INTEGER);
@@ -126,6 +127,7 @@ public SystemColumn[] buildColumnList() {
             SystemColumnImpl.getColumn("NO_INPUT_ROWS", Types.INTEGER, true),
             SystemColumnImpl.getColumn("NO_OUTPUT_ROWS", Types.INTEGER, true),
             SystemColumnImpl.getColumn("NO_MERGE_RUNS", Types.INTEGER, true),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4772
             SystemColumnImpl.getColumn("MERGE_RUN_DETAILS", Types.VARCHAR, true,
                     TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getColumn("ELIMINATE_DUPLICATES", Types.CHAR, true, 1),
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINStatementDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINStatementDescriptor.java
index 52cb68c65d..d01275624d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINStatementDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINStatementDescriptor.java
@@ -75,6 +75,7 @@ public XPLAINStatementDescriptor (
         this.jvm_id      = jvm_id;
         this.os_id       = os_id;
         this.xplain_mode = xplain_mode;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         this.xplain_time = DataTypeUtilities.clone( xplain_time );
         this.thread_id   = thread_id;
         this.xa_id       = xa_id;
@@ -122,6 +123,7 @@ public SystemColumn[] buildColumnList() {
             SystemColumnImpl.getIdentifierColumn("STMT_NAME", true),
             SystemColumnImpl.getColumn("STMT_TYPE", Types.CHAR, false, 3),
             SystemColumnImpl.getColumn("STMT_TEXT", Types.VARCHAR, false, TypeId.VARCHAR_MAXWIDTH),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4772
             SystemColumnImpl.getColumn("JVM_ID", Types.VARCHAR, false,
                     TypeId.VARCHAR_MAXWIDTH),
             SystemColumnImpl.getColumn("OS_IDENTIFIER", Types.VARCHAR, false,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINStatementTimingsDescriptor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINStatementTimingsDescriptor.java
index 4876f4adf5..be8df8fe44 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINStatementTimingsDescriptor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/XPLAINStatementTimingsDescriptor.java
@@ -68,6 +68,7 @@ public XPLAINStatementTimingsDescriptor() {}
         this.generate_time   = generate_time;
         this.compile_time    = compile_time;
         this.execute_time    = execute_time;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         this.begin_comp_time = DataTypeUtilities.clone( begin_comp_time );
         this.end_comp_time   = DataTypeUtilities.clone( end_comp_time );
         this.begin_exe_time  = DataTypeUtilities.clone( begin_exe_time );
@@ -78,6 +79,7 @@ public void setStatementParameters(PreparedStatement ps)
         throws SQLException
     {
         ps.setString(1, timing_id.toString());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6318
         ps.setObject(2, parse_time, Types.BIGINT);
         ps.setObject(3, bind_time, Types.BIGINT);
         ps.setObject(4, optimize_time, Types.BIGINT);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java
index 753592162d..e908d8449d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.AccessPathImpl
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java
index 332ecc4af7..4e61fd4f8d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java
@@ -182,6 +182,7 @@ MethodBuilder startResetMethod() {
 	   Upon entry the only word on the stack is the result set expression
 	 */
 	void finishExecuteMethod() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
 
         if (executeMethod != null) {
             executeMethod.methodReturn();
@@ -312,6 +313,7 @@ void rememberCursor(MethodBuilder mb) {
 	/*
 		The first time a current datetime is needed, create the class
 		level support for it. The first half of the logic is in our parent
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 		class.
 	 */
     @Override
@@ -325,6 +327,7 @@ protected LocalField getCurrentSetup()
 		//    to tell cdt to restart:
 		//	  cdt.forget();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
         MethodBuilder execute = getExecuteMethod();
         execute.getField(lf);
         execute.callMethod(
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
index da9c3ca30d..e25c8543b0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.AggregateDefinition
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateNode.java
index 2bc9cc6f43..bd668fc50d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.AggregateNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -44,6 +45,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * It used for all system aggregates as well as user defined aggregates.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class AggregateNode extends UnaryOperatorNode
 {
     static final class BuiltinAggDescriptor
@@ -55,6 +58,7 @@ static final class BuiltinAggDescriptor
 
         public BuiltinAggDescriptor
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
              String aggName,
              String aggClassName,
              TypeDescriptor argType,
@@ -137,6 +141,8 @@ static final class BuiltinAggDescriptor
      * @param cm context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
      AggregateNode(
             ValueNode operand,
             UserAggregateDefinition uadClass,
@@ -183,6 +189,7 @@ static final class BuiltinAggDescriptor
      */
     AggregateNode(
             ValueNode operand,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             Class<?> uadClass,
             boolean distinct,
             String aggregateName,
@@ -225,6 +232,8 @@ private void setUserDefinedAggregate( UserAggregateDefinition userAgg )
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode replaceAggregatesWithColumnReferences(
         ResultColumnList rcl, int tableNumber) throws StandardException
 	{
@@ -239,6 +248,8 @@ ValueNode replaceAggregatesWithColumnReferences(
 			String					generatedColName;
 			CompilerContext 		cc = getCompilerContext();
 			generatedColName ="SQLCol" + cc.getNextColumnNumber();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             generatedRC =
                 new ResultColumn(generatedColName, this, getContextManager());
 			generatedRC.markGenerated();
@@ -293,6 +304,8 @@ AggregateDefinition getAggregateDefinition()
 	 *
 	 * @return the result column
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getGeneratedRC()
 	{
 		if (SanityManager.DEBUG)
@@ -313,6 +326,8 @@ ResultColumn getGeneratedRC()
 	 *
 	 * @return the column reference
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ColumnReference getGeneratedRef()
 	{
 		if (SanityManager.DEBUG)
@@ -339,6 +354,7 @@ ColumnReference getGeneratedRef()
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -352,6 +368,7 @@ ValueNode bindExpression(
         boolean noSchema = true;
         if ( userAggregateName != null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
             noSchema = (userAggregateName.getSchemaName() == null );
             userAggregateName.bind();
         }
@@ -360,6 +377,7 @@ ValueNode bindExpression(
         // bind it now.
         if (userAggregateName != null && uad == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
             String  schemaName = userAggregateName.getSchemaName();
             AliasDescriptor ad = resolveAggregate
                 (
@@ -391,6 +409,7 @@ ValueNode bindExpression(
             AliasDescriptor ad = ((UserAggregateDefinition) uad).getAliasDescriptor();
             boolean         isModernBuiltinAggregate =
                 SchemaDescriptor.STD_SYSTEM_SCHEMA_NAME.equals( ad.getSchemaName() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
 
             if ( distinct && isModernBuiltinAggregate )
             {
@@ -400,6 +419,7 @@ ValueNode bindExpression(
             // set up dependency on the user-defined aggregate and compile a check for USAGE
             // priv if needed. no need for a dependency if this is a builtin, system-supplied
             // aggregate
+//IC see: https://issues.apache.org/jira/browse/DERBY-7041
             if ( !isModernBuiltinAggregate )
             {
                 getCompilerContext().createDependency( ad );
@@ -412,8 +432,10 @@ ValueNode bindExpression(
                 // aggregates. They are tricky. They masquerade as user-defined
                 // aggregates because they implement org.apache.derby.agg.Aggregator
                 //
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
                 if ( !isModernBuiltinAggregate )
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
                     getCompilerContext().addRequiredUsagePriv( ad );
                 }
             }
@@ -421,6 +443,7 @@ ValueNode bindExpression(
 
         // Add ourselves to the list of aggregates before we do anything else.
         aggregates.add(this);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
         CompilerContext cc = getCompilerContext();
         
@@ -428,6 +451,7 @@ ValueNode bindExpression(
 		if (operand != null)
 		{
             int previousReliability = orReliability( CompilerContext.AGGREGATE_RESTRICTION );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
             bindOperand(fromList, subqueryList, aggregates);
             cc.setReliability( previousReliability );
             
@@ -450,6 +474,8 @@ ValueNode bindExpression(
 			// Also forbid any window function inside an aggregate unless in
 			// subquery, cf. SQL 2003, section 10.9, SR 7 a).
 			SelectNode.checkNoWindowFunctions(operand, aggregateName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 
 			/*
 			** Check the type of the operand.  Make sure that the user
@@ -519,9 +545,12 @@ ValueNode bindExpression(
         {
             ValueNode   castNode = ((UserAggregateDefinition) uad).castInputValue
                 ( operand, getContextManager() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
             if ( castNode != null )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                 operand = castNode.bindExpression( fromList, subqueryList, aggregates );
             }
         }
@@ -537,6 +566,7 @@ ValueNode bindExpression(
 	 * Resolve a user-defined aggregate.
 	 */
     static AliasDescriptor resolveAggregate
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
         ( DataDictionary dd, SchemaDescriptor sd, String rawName, boolean noSchema )
         throws StandardException
     {
@@ -549,6 +579,8 @@ ValueNode bindExpression(
         // been created yet. in that case, it doesn't have any aggregates in it.
         if ( sd.getUUID() == null ) { return null; }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         java.util.List<AliasDescriptor> list = dd.getRoutineList
             ( sd.getUUID().toString(), rawName, AliasInfo.ALIAS_NAME_SPACE_AGGREGATE_AS_CHAR );
 
@@ -561,6 +593,7 @@ ValueNode bindExpression(
      * Construct an AliasDescriptor for a modern builtin aggregate.
      */
     private static AliasDescriptor resolveBuiltinAggregate
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
         ( DataDictionary dd, String rawName, boolean noSchema )
         throws StandardException
     {
@@ -621,6 +654,7 @@ private void instantiateAggDef() throws StandardException
         if ( uad == null )
         {
             Class<?> theClass = aggregateDefinitionClass;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             // get the class
             if (theClass == null)
@@ -642,6 +676,7 @@ private void instantiateAggDef() throws StandardException
             Object instance = null;
             try
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 instance = theClass.getConstructor().newInstance();
             }
             catch (Throwable t)
@@ -695,6 +730,8 @@ boolean isDistinct()
 	 *
 	 * @return the class name
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String  getAggregatorClassName()
 	{
 		return aggregatorClassName.toString();
@@ -706,6 +743,8 @@ String  getAggregatorClassName()
 	 *
 	 * @return the class name
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String  getAggregateName()
 	{
 		return aggregateName;
@@ -721,11 +760,14 @@ String  getAggregateName()
 	 *
 	 * @exception StandardException on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn    getNewAggregatorResultColumn(DataDictionary dd)
 		throws StandardException
 	{
 		String	className = aggregatorClassName.toString();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2937
 		DataTypeDescriptor compType =
             DataTypeDescriptor.getSQLDataTypeDescriptor(className);
 
@@ -744,6 +786,8 @@ ResultColumn    getNewAggregatorResultColumn(DataDictionary dd)
 		** Create a result column with this new node below
 		** it.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return new ResultColumn(aggregateName, nullNode, getContextManager());
 	}
 
@@ -758,6 +802,8 @@ ResultColumn    getNewAggregatorResultColumn(DataDictionary dd)
 	 *
 	 * @exception StandardException on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn    getNewExpressionResultColumn(DataDictionary dd)
 		throws StandardException
 	{
@@ -772,6 +818,8 @@ ResultColumn    getNewExpressionResultColumn(DataDictionary dd)
 			this.getNewNullResultExpression() :
 			operand;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return new ResultColumn(
             "##aggregate expression", node, getContextManager());
 	}
@@ -784,6 +832,8 @@ ResultColumn    getNewExpressionResultColumn(DataDictionary dd)
 	 *
 	 * @exception StandardException on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode   getNewNullResultExpression()
 		throws StandardException
 	{
@@ -791,6 +841,7 @@ ValueNode   getNewNullResultExpression()
 		** Create a result column with the aggrergate operand
 		** it.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2937
 		return getNullNode(getTypeServices());
 	}
 
@@ -839,6 +890,7 @@ public String toString()
 
     boolean isConstant()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3231
 		return false;
 	}
 	
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateWindowFunctionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateWindowFunctionNode.java
index 4218c97341..08c218ee0b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateWindowFunctionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AggregateWindowFunctionNode.java
@@ -30,6 +30,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Represents aggregate function calls on a window
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 final class AggregateWindowFunctionNode extends WindowFunctionNode
 {
 
@@ -54,6 +56,7 @@ final class AggregateWindowFunctionNode extends WindowFunctionNode
      */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
             throws StandardException
     {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AllResultColumn.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
index 4cffe48c5b..e8072ea050 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.AllResultColumn
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -33,6 +34,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class AllResultColumn extends ResultColumn
 {
 	private TableName		tableName;
@@ -70,16 +73,20 @@ ResultColumn cloneMe() throws StandardException
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			SanityManager.ASSERT(getColumnDescriptor() == null,
 					"columnDescriptor is expected to be non-null");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return new AllResultColumn(tableName, getContextManager());
 	}
 
 
     @Override
     public TableName getTableNameObject() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-13
         return tableName;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AlterTableNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
index 7b68d85141..6f2d8bd986 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.AlterTableNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -44,6 +45,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class AlterTableNode extends DDLStatementNode
 {
 	// The alter table action
@@ -111,6 +114,8 @@ class AlterTableNode extends DDLStatementNode
      * @param cm Context manager
      * @exception StandardException
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     AlterTableNode(TableName tableName,
                    ContextManager cm) throws StandardException {
         super(tableName, cm);
@@ -252,6 +257,7 @@ public String toString()
 		if (SanityManager.DEBUG)
 		{
 			return super.toString() +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				"objectName: " + getObjectName() + "\n" +
 				"lockGranularity: " + lockGranularity + "\n" +
 				"compressTable: " + compressTable + "\n" +
@@ -279,8 +285,13 @@ public String toString()
 	 * @param depth		The depth to indent the sub-nodes
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 			if (tableElementList != null) {
 				printLabel(depth, "tableElementList: ");
 				tableElementList.treePrint(depth + 1);
@@ -346,6 +357,7 @@ public void bindStatement() throws StandardException
 		//If we are dealing with add column character type, then set that 
 		//column's collation type to be the collation type of the schema.
 		//The collation derivation of such a column would be "implicit".
+//IC see: https://issues.apache.org/jira/browse/DERBY-2530
 		if (changeType == ADD_TYPE) {//the action is of type add.
 			if (tableElementList != null) {//check if is is add column
 				for (int i=0; i<tableElementList.size();i++) {
@@ -359,6 +371,7 @@ public void bindStatement() throws StandardException
                         //
 
                         if ( cdn.hasGenerationClause() && ( cdn.getType() == null ) ) { continue; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3923
 
                         if ( cdn.getType() == null )
                         {
@@ -383,6 +396,7 @@ public void bindStatement() throws StandardException
 			tableElementList.validate(this, dd, baseTable);
 
 			/* Only 1012 columns allowed per table */
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			if ((tableElementList.countNumberOfColumns() + baseTable.getNumberOfColumns()) > Limits.DB2_MAX_COLUMNS_IN_TABLE)
 			{
 				throw StandardException.newException(SQLState.LANG_TOO_MANY_COLUMNS_IN_TABLE_OR_VIEW,
@@ -406,6 +420,7 @@ public void bindStatement() throws StandardException
 
 		//If the sum of backing indexes for constraints in alter table statement and total number of indexes on the table
 		//so far is more than 32767, then we need to throw an exception 
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		if ((numBackingIndexes + baseTable.getTotalNumberOfIndexes()) > Limits.DB2_MAX_INDEXES_ON_TABLE)
 		{
 			throw StandardException.newException(SQLState.LANG_TOO_MANY_INDEXES_ON_TABLE, 
@@ -432,6 +447,7 @@ public void bindStatement() throws StandardException
 			 * the check constraints and generation clauses.
 			 */
 			if  (numGenerationClauses > 0)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4145
             { tableElementList.bindAndValidateGenerationClauses( schemaDescriptor, fromList, generatedColumns, baseTable ); }
 			if  (numCheckConstraints > 0) { tableElementList.bindAndValidateCheckConstraints(fromList); }
             if ( numReferenceConstraints > 0) { tableElementList.validateForeignKeysOnGenerationClauses( fromList, generatedColumns ); }
@@ -534,9 +550,11 @@ private void	prepConstantAction() throws StandardException
 		{
 			conActions = new ConstraintConstantAction[numConstraints];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3008
 			tableElementList.genConstraintActions(false, conActions, getRelativeName(), schemaDescriptor,
 												  getDataDictionary());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4244
 			for (int conIndex = 0; conIndex < conActions.length; conIndex++)
 			{
 				ConstraintConstantAction cca = conActions[conIndex];
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AndNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AndNode.java
index 0aff80d0c4..81075d2c12 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AndNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/AndNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.AndNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -26,6 +27,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.iapi.services.context.ContextManager;
 import org.apache.derby.shared.common.sanity.SanityManager;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class AndNode extends BinaryLogicalOperatorNode
 {
     /**
@@ -49,6 +52,7 @@ class AndNode extends BinaryLogicalOperatorNode
      * @param cm context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     AndNode(ValueNode leftOperand,
             ValueNode rightOperand,
             String  methodName,
@@ -72,6 +76,7 @@ class AndNode extends BinaryLogicalOperatorNode
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -98,6 +103,8 @@ ValueNode bindExpression(
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -159,6 +166,8 @@ ValueNode eliminateNots(boolean underNotNode)
 		/* Convert the AndNode to an OrNode */
 		ValueNode	orNode;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         orNode = new OrNode(leftOperand, rightOperand, getContextManager());
 		orNode.setType(getTypeServices());
 		return orNode;
@@ -174,6 +183,8 @@ ValueNode eliminateNots(boolean underNotNode)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode putAndsOnTop()
 					throws StandardException
 	{
@@ -239,6 +250,8 @@ boolean verifyPutAndsOnTop()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode changeToCNF(boolean underTopAndNode)
 					throws StandardException
 	{
@@ -254,6 +267,8 @@ ValueNode changeToCNF(boolean underTopAndNode)
 		if (!(rightOperand instanceof AndNode) &&
 			!(rightOperand.isBooleanTrue()))
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
            BooleanConstantNode trueNode =
                     new BooleanConstantNode(true, getContextManager());
             AndNode newRightOperand = new AndNode(
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
index cf61dfadda..b1c44be7b6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BaseColumnNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -40,6 +41,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class BaseColumnNode extends ValueNode
 {
 	private String	columnName;
@@ -58,6 +61,8 @@ class BaseColumnNode extends ValueNode
      * @param cm Context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     BaseColumnNode(
             String columnName,
             TableName tableName,
@@ -81,6 +86,7 @@ public String toString()
 		if (SanityManager.DEBUG)
 		{
 			return "columnName: " + columnName + "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				"tableName: " +
 				( ( tableName != null) ?
 						tableName.toString() :
@@ -99,6 +105,8 @@ public String toString()
 	 * @return	The name of this column
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getColumnName()
 	{
 		return columnName;
@@ -114,6 +122,8 @@ String getColumnName()
 	 * 		supplied name.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getTableName()
 	{
 		return ( ( tableName != null) ? tableName.getTableName() : null );
@@ -128,8 +138,11 @@ String getTableName()
 	 * @return	The schema name for this column's table
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getSchemaName() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		return ( ( tableName != null) ? tableName.getSchemaName() : null );
 	}
 
@@ -173,8 +186,10 @@ protected int getOrderableVariantType()
      */
     boolean isEquivalent(ValueNode o)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (isSameNodeKind(o)) {
 			BaseColumnNode other = (BaseColumnNode)o;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5010
 			return other.tableName.equals(tableName)
 			&& other.columnName.equals(columnName);
 		} 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java
index c5e2b6858c..a7d394f22a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java
@@ -88,6 +88,7 @@ void fillInScanArgs1(
 		mb.push(conglomNumber);
 		mb.push(acb.addItem(scoci));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         mb.push(resultRowTemplate);
 		mb.push(innerTable.getResultSetNumber());
 
@@ -121,6 +122,7 @@ final void fillInScanArgs2(MethodBuilder mb,
 		//User may have supplied optimizer overrides in the sql
 		//Pass them onto execute phase so it can be shown in 
 		//run time statistics.
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		if (innerTable.getProperties() != null)
 			mb.push(PropertyUtil.sortProperties(innerTable.getProperties()));
 		else
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseTableNumbersVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseTableNumbersVisitor.java
index 288b0ca3aa..86a2e89c02 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseTableNumbersVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseTableNumbersVisitor.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BaseTableNumbersVisitor
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -34,6 +35,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * the bottom-most table number, which should correspond to a base
  * table.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class BaseTableNumbersVisitor implements Visitor
 {
 	// JBitSet to hold the table numbers that we find.
@@ -54,6 +57,8 @@ class BaseTableNumbersVisitor implements Visitor
 	 *
 	 * @param tableMap JBitSet into which we put the table numbers we find.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     BaseTableNumbersVisitor(JBitSet tableMap)
 	{
 		this.tableMap = tableMap;
@@ -226,6 +231,7 @@ public boolean stopTraversal()
 	 */
 	public boolean visitChildrenFirst(Visitable node)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java
index 3d88c624d0..43f1b2e0cd 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java
@@ -243,6 +243,7 @@ protected boolean userTypeStorable(TypeId thisType,
 		** If the other type is user-defined, use the java types to determine
 		** assignability.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (otherType.userType())
 		{
 			return cf.getClassInspector().assignableTo(
@@ -264,6 +265,7 @@ boolean numberConvertible(TypeId otherType,
 									 boolean forDataTypeFunction)
 	{
         if ( otherType.getBaseTypeId().isAnsiUDT() ) { return false; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
 
 		// Can't convert numbers to long types
 		if (otherType.isLongConcatableTypeId())
@@ -303,6 +305,7 @@ boolean numberStorable(TypeId thisType,
 									ClassFactory cf)
 	{
         if ( otherType.getBaseTypeId().isAnsiUDT() ) { return false; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
 
 		/*
 		** Numbers can be stored into from other number types.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
index 4c6553f6ac..5ff6ed7cb4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BetweenOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -32,6 +33,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class BetweenOperatorNode extends BinaryListOperatorNode
 {
     /**
@@ -110,6 +113,7 @@ ValueNode eliminateNots(boolean underNotNode)
 
 		/* leftO < rightOList.elementAt(0) */
         leftBCO = new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 BinaryRelationalOperatorNode.K_LESS_THAN,
                 leftOperand,
                 rightOperandList.elementAt(0),
@@ -126,6 +130,7 @@ ValueNode eliminateNots(boolean underNotNode)
 
 		/* leftO > rightOList.elementAt(1) */
         rightBCO = new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 BinaryRelationalOperatorNode.K_GREATER_THAN,
                 leftClone,
                 rightOperandList.elementAt(1),
@@ -161,6 +166,8 @@ ValueNode eliminateNots(boolean underNotNode)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -205,6 +212,7 @@ ValueNode preprocess(int numTables,
 		/* Create the AND <= */
 		BinaryComparisonOperatorNode lessEqual = 
             new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 BinaryRelationalOperatorNode.K_LESS_EQUALS,
                 leftClone1,
                 rightOperandList.elementAt(1),
@@ -221,6 +229,7 @@ ValueNode preprocess(int numTables,
 		/* Create the AND >= */
 		BinaryComparisonOperatorNode greaterEqual = 
             new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 BinaryRelationalOperatorNode.K_GREATER_EQUALS,
                 leftOperand,
                 rightOperandList.elementAt(0),
@@ -274,8 +283,12 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 
 		/* leftO >= rightOList.elementAt(0) */
         leftBCO = new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 BinaryRelationalOperatorNode.K_GREATER_EQUALS,
                 leftOperand,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 rightOperandList.elementAt(0),
                 false,
                 cm);
@@ -286,6 +299,9 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
         rightBCO = new BinaryRelationalOperatorNode(
                 BinaryRelationalOperatorNode.K_LESS_EQUALS,
                 leftOperand,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 rightOperandList.elementAt(1),
                 false,
                 cm);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java
index 6f5c905b7c..aeadf93872 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BinaryArithmeticOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -38,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public final class BinaryArithmeticOperatorNode extends BinaryOperatorNode
 {
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_DIVIDE = 0;
     final static int K_MINUS = 1;
     final static int K_PLUS = 2;
@@ -72,6 +74,7 @@ public final class BinaryArithmeticOperatorNode extends BinaryOperatorNode
               ClassName.NumberDataValue,
               cm);
         this.kind = kind;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         final String op;
         final String mNam;
@@ -109,6 +112,8 @@ public final class BinaryArithmeticOperatorNode extends BinaryOperatorNode
                 op = null;
                 mNam = null;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         setOperator(op);
         setMethodName(mNam);
 	}
@@ -126,6 +131,7 @@ public final class BinaryArithmeticOperatorNode extends BinaryOperatorNode
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -158,6 +164,8 @@ ValueNode bindExpression(
 				maxWidth = precision + 3;
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             leftOperand = new CastNode(
 						leftOperand, 
 						new DataTypeDescriptor(rightType, precision,
@@ -187,6 +195,8 @@ else if (rightType.isStringTypeId() && leftType.isNumericTypeId())
 				maxWidth = precision + 3;
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             rightOperand = new CastNode(
 						rightOperand, 
 						new DataTypeDescriptor(leftType, precision,
@@ -214,6 +224,7 @@ else if (rightType.isStringTypeId() && leftType.isNumericTypeId())
 
     @Override
     boolean isSameNodeKind(ValueNode o) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return super.isSameNodeKind(o) &&
                 ((BinaryArithmeticOperatorNode)o).kind == kind;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
index b65f1df6af..c00bab812e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BinaryComparisonOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -64,6 +65,8 @@ public abstract class BinaryComparisonOperatorNode extends BinaryOperatorNode
      * @param cm            The context manager
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     BinaryComparisonOperatorNode(
                 ValueNode   leftOperand,
                 ValueNode   rightOperand,
@@ -87,6 +90,8 @@ public abstract class BinaryComparisonOperatorNode extends BinaryOperatorNode
 	 * normal comparability checks.
 	 * @param val  true if this was for a query rewrite
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setForQueryRewrite(boolean val)
 	{
 		forQueryRewrite=val;
@@ -136,6 +141,7 @@ boolean getBetweenSelectivity()
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -158,6 +164,8 @@ ValueNode bindExpression(
 		{
 			DataTypeDescriptor rightTypeServices = rightOperand.getTypeServices();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             rightOperand = new CastNode(
 					rightOperand, 
 					new DataTypeDescriptor(
@@ -171,6 +179,8 @@ else if (! rightTypeId.isStringTypeId() && leftTypeId.isStringTypeId())
 		{
 			DataTypeDescriptor leftTypeServices = leftOperand.getTypeServices();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             leftOperand = new CastNode(
 					leftOperand, 
 					new DataTypeDescriptor(
@@ -195,6 +205,8 @@ else if (! rightTypeId.isStringTypeId() && leftTypeId.isStringTypeId())
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindComparisonOperator()
 			throws StandardException
 	{
@@ -207,6 +219,7 @@ void bindComparisonOperator()
 		boolean forEquals = operator.equals("=") || operator.equals("<>");
 
         boolean cmp = leftOperand.getTypeServices().comparable(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2569
         		rightOperand.getTypeServices(),
 				forEquals,
 				getClassFactory());
@@ -214,6 +227,7 @@ void bindComparisonOperator()
 		// optimizer.  We will assume Mr. Optimizer knows what he is doing.
           if (!cmp && !forQueryRewrite) {
 			throw StandardException.newException(SQLState.LANG_NOT_COMPARABLE, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2668
 					leftOperand.getTypeServices().getSQLTypeNameWithCollation() ,
 					rightOperand.getTypeServices().getSQLTypeNameWithCollation());
 				
@@ -250,6 +264,8 @@ void bindComparisonOperator()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -333,6 +349,7 @@ ValueNode eliminateNots(boolean underNotNode)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4412
 	abstract BinaryOperatorNode getNegation(ValueNode leftOperand,
 										  ValueNode rightOperand)
 				throws StandardException;
@@ -385,6 +402,8 @@ abstract BinaryOperatorNode getNegation(ValueNode leftOperand,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode changeToCNF(boolean underTopAndNode)
 					throws StandardException
 	{
@@ -402,6 +421,8 @@ ValueNode changeToCNF(boolean underTopAndNode)
 	
 	/** @see BinaryOperatorNode#genSQLJavaSQLTree */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode genSQLJavaSQLTree() throws StandardException
 	{
 		TypeId leftTypeId = leftOperand.getTypeId();
@@ -409,8 +430,10 @@ ValueNode genSQLJavaSQLTree() throws StandardException
 		/* If I have Java types, I need only add java->sql->java if the types
 		 * are not comparable 
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (leftTypeId.userType())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2569
 			if (leftOperand.getTypeServices().comparable(leftOperand.getTypeServices(),
 					false, getClassFactory()))
 				return this;
@@ -420,8 +443,10 @@ false, getClassFactory()))
 
 		TypeId rightTypeId = rightOperand.getTypeId();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (rightTypeId.userType())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2569
 			if (rightOperand.getTypeServices().comparable(rightOperand.getTypeServices(),
 					false, getClassFactory()))
 				return this;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java
index 69c066650e..e6014924c3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BinaryListOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -47,6 +48,8 @@ public abstract class BinaryListOperatorNode extends ValueNode
 	ValueNode		leftOperand;
 	ValueNodeList	rightOperandList;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     BinaryListOperatorNode(
             ValueNode leftOperand,
             ValueNodeList rightOperandList,
@@ -88,6 +91,8 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -122,7 +127,9 @@ void printSubNodes(int depth)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -130,6 +137,7 @@ ValueNode bindExpression(
         rightOperandList.bindExpression(fromList, subqueryList, aggregates);
 
 		/* Is there a ? parameter on the left? */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		if (leftOperand.requiresTypeFromContext())
 		{
 			/*
@@ -142,6 +150,7 @@ ValueNode bindExpression(
 			}
 
 			/* Set the left operand to the type of right parameter. */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 			leftOperand.setType(rightOperandList.getTypeServices());
 		}
 
@@ -155,6 +164,7 @@ ValueNode bindExpression(
 		/* If the left operand is not a built-in type, then generate a conversion
 		 * tree to a built-in type.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (leftOperand.getTypeId().userType())
 		{
 			leftOperand = leftOperand.genSQLJavaSQLTree();
@@ -178,6 +188,8 @@ ValueNode bindExpression(
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindComparisonOperator()
 			throws StandardException
 	{
@@ -215,6 +227,8 @@ void bindComparisonOperator()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -235,6 +249,8 @@ ValueNode preprocess(int numTables,
 	 *
 	 * @param newLeftOperand	The new leftOperand
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setLeftOperand(ValueNode newLeftOperand)
 	{
 		leftOperand = newLeftOperand;
@@ -245,6 +261,8 @@ void setLeftOperand(ValueNode newLeftOperand)
 	 *
 	 * @return The current leftOperand.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getLeftOperand()
 	{
 		return leftOperand;
@@ -256,6 +274,8 @@ ValueNode getLeftOperand()
 	 * @param newRightOperandList	The new rightOperandList
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setRightOperandList(ValueNodeList newRightOperandList)
 	{
 		rightOperandList = newRightOperandList;
@@ -266,6 +286,8 @@ void setRightOperandList(ValueNodeList newRightOperandList)
 	 *
 	 * @return The current rightOperandList.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNodeList getRightOperandList()
 	{
 		return rightOperandList;
@@ -315,6 +337,8 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	 * @exception StandardException			Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
@@ -374,11 +398,13 @@ protected int getOrderableVariantType() throws StandardException
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (leftOperand != null)
 		{
 			leftOperand = (ValueNode)leftOperand.accept(v);
@@ -395,6 +421,7 @@ void acceptChildren(Visitor v)
          */
     boolean isEquivalent(ValueNode o) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (! isSameNodeKind(o)) {
 			return false;
 		}
@@ -406,6 +433,7 @@ boolean isEquivalent(ValueNode o) throws StandardException
 			return false;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4600
         if (!rightOperandList.isEquivalent(other.rightOperandList))
         {
             return false;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
index 6f93af5d04..69c0afb8d5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BinaryLogicalOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -31,10 +32,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.sanity.SanityManager;
 import org.apache.derby.iapi.types.DataTypeDescriptor;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 abstract class BinaryLogicalOperatorNode extends BinaryOperatorNode
 {
 	boolean	shortCircuitValue;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     BinaryLogicalOperatorNode(
             ValueNode leftOperand,
             ValueNode rightOperand,
@@ -59,12 +63,14 @@ abstract class BinaryLogicalOperatorNode extends BinaryOperatorNode
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		//following is to check if we have something like "? AND 1=1" or "2>1 OR ?" 
 		if (leftOperand.isParameterNode() || rightOperand.isParameterNode())
 			throw StandardException.newException( SQLState.LANG_UNTYPED_PARAMETER_IN_WHERE_CLAUSE );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5885
 
         super.bindExpression(fromList, subqueryList, aggregates);
 
@@ -134,6 +140,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 
 		// put an extra left of the stack for potential
 		// use in the else clause.
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		mb.dup();
 		// stack - left, left
 		mb.push(shortCircuitValue);
@@ -166,6 +173,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		mb.conditionalIf();
 		
 		// stack: left
+//IC see: https://issues.apache.org/jira/browse/DERBY-742
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getImmutable",
 				ClassName.BooleanDataValue, 0);
 		
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
index e76d22c532..03994781bf 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BinaryOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -45,6 +46,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class BinaryOperatorNode extends OperatorNode
 {
 	String	operator;
@@ -54,6 +57,8 @@ class BinaryOperatorNode extends OperatorNode
 	/*
 	** These identifiers are used in the grammar.
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final static int PLUS   = 1;
     final static int MINUS  = 2;
     final static int TIMES  = 3;
@@ -85,6 +90,7 @@ class BinaryOperatorNode extends OperatorNode
 	// possible.
 
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_XMLEXISTS = 0;
     final static int K_XMLQUERY = 1;
     final static int K_BASE = 2; // when BinaryOperatorNode is used
@@ -122,8 +128,11 @@ class BinaryOperatorNode extends OperatorNode
     /** The query expression if the operator is XMLEXISTS or XMLQUERY. */
     private String xmlQuery;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     BinaryOperatorNode(ContextManager cm) {
         super(cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         kind = K_BASE;
     }
 
@@ -157,6 +166,8 @@ class BinaryOperatorNode extends OperatorNode
         this.rightOperand = rightOperand;
         this.leftInterfaceType = leftInterfaceType;
         this.rightInterfaceType = rightInterfaceType;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         this.kind = K_BASE;
 	}
 
@@ -230,6 +241,8 @@ void setMethodName(String methodName)
 	 * Used when we don't know the interface type until
 	 * later in binding.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setLeftRightInterfaceType(String iType)
 	{
 		leftInterfaceType = iType;
@@ -243,6 +256,8 @@ void setLeftRightInterfaceType(String iType)
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -277,7 +292,9 @@ void printSubNodes(int depth)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -286,12 +303,14 @@ ValueNode bindExpression(
 		rightOperand = rightOperand.bindExpression(fromList, subqueryList, 
             aggregates);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if ((kind == K_XMLEXISTS) ||
             (kind == K_XMLQUERY)) {
 			return bindXMLQuery();
         }
 
 		/* Is there a ? parameter on the left? */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		if (leftOperand.requiresTypeFromContext())
 		{
 			/*
@@ -365,6 +384,7 @@ public ValueNode bindXMLQuery()
         }
 
         // Set the result type of this operator.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind == K_XMLEXISTS) {
             // For XMLEXISTS, the result type is always SQLBoolean.
             // The "true" in the next line says that the result
@@ -378,6 +398,7 @@ public ValueNode bindXMLQuery()
             // XML data value, per SQL/XML spec 6.17: "...yielding a value
             // X1 of an XML type."
             setType(DataTypeDescriptor.getBuiltInDataTypeDescriptor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                     Types.SQLXML));
         }
 
@@ -389,10 +410,13 @@ public ValueNode bindXMLQuery()
 	 * the default behavior.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode genSQLJavaSQLTree() throws StandardException
 	{
 		TypeId leftTypeId = leftOperand.getTypeId();
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (leftTypeId.userType())
 			leftOperand = leftOperand.genSQLJavaSQLTree();
 
@@ -419,6 +443,8 @@ ValueNode genSQLJavaSQLTree() throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -490,6 +516,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		// additional work to be done.
 		boolean xmlGen =
            (kind == K_XMLQUERY) || (kind == K_XMLEXISTS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		/*
 		** The receiver is the operand with the higher type precedence.
@@ -507,6 +534,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 			** a class, they can note that in the implementation
 			** of the node that uses the method.
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             receiverType = (kind == K_BASE)
 				? getReceiverInterfaceName()
 				: leftInterfaceType;
@@ -521,6 +549,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 			mb.cast(receiverType); // cast the method instance
 			// stack: left
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 			mb.dup();
 			mb.cast(leftInterfaceType);
 			// stack: left, left
@@ -542,6 +571,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 			** a class, they can note that in the implementation
 			** of the node that uses the method.
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             receiverType = (kind == K_BASE)
 				? getReceiverInterfaceName()
 				: rightInterfaceType;
@@ -557,6 +587,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 			**  <right expression>.method(sqlXmlUtil)
 			*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 			rightOperand.generateExpression(acb, mb);			
 			mb.cast(receiverType); // cast the method instance
 			// stack: right
@@ -584,6 +615,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		}
 
 		/* Figure out the result type name */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         resultTypeName = (kind == K_BASE)
 			? getTypeCompiler().interfaceName()
 			: resultInterfaceType;
@@ -629,6 +661,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 				{
 					// to leave the DataValueDescriptor value on the stack, since setWidth is void
 					mb.dup();
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 
 					mb.push(getTypeServices().getPrecision());
 					mb.push(getTypeServices().getScale());
@@ -652,6 +685,8 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 	 *
 	 * @param newLeftOperand	The new leftOperand
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setLeftOperand(ValueNode newLeftOperand)
 	{
 		leftOperand = newLeftOperand;
@@ -662,6 +697,8 @@ void setLeftOperand(ValueNode newLeftOperand)
 	 *
 	 * @return The current leftOperand.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getLeftOperand()
 	{
 		return leftOperand;
@@ -672,6 +709,8 @@ ValueNode getLeftOperand()
 	 *
 	 * @param newRightOperand	The new rightOperand
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setRightOperand(ValueNode newRightOperand)
 	{
 		rightOperand = newRightOperand;
@@ -682,6 +721,8 @@ void setRightOperand(ValueNode newRightOperand)
 	 *
 	 * @return The current rightOperand.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getRightOperand()
 	{
 		return rightOperand;
@@ -731,6 +772,8 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	 * @exception StandardException			Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
@@ -768,6 +811,8 @@ boolean constantExpression(PredicateList whereClause)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getReceiverInterfaceName() throws StandardException {
 		if (SanityManager.DEBUG)
 		{
@@ -807,11 +852,14 @@ protected int getOrderableVariantType() throws StandardException
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (leftOperand != null)
 		{
 			leftOperand = (ValueNode)leftOperand.accept(v);
@@ -825,6 +873,7 @@ void acceptChildren(Visitor v)
 
     @Override
     boolean isSameNodeKind(ValueNode o) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return super.isSameNodeKind(o) &&
                 ((BinaryOperatorNode)o).kind == this.kind;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java
index bb3f6ca1ce..35b83cf715 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BinaryRelationalOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -42,11 +43,14 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class BinaryRelationalOperatorNode
 	extends BinaryComparisonOperatorNode
 	implements RelationalOperator
 {
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_EQUALS = 0;
     final static int K_GREATER_EQUALS = 1;
     final static int K_GREATER_THAN = 2;
@@ -148,6 +152,8 @@ class BinaryRelationalOperatorNode
     {
         super(leftOperand,
               rightOperand,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
               getOperatorName(kind),
               getMethodName(kind),
               forQueryRewrite,
@@ -192,6 +198,7 @@ private static String getMethodName(int kind) {
                 if (SanityManager.DEBUG) {
                     SanityManager.THROWASSERT(
                             "Constructor for BinaryRelationalOperatorNode" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                             " called with wrong nodeType = " + kind);
                 }
                 break;
@@ -230,6 +237,7 @@ private static String getOperatorName(int kind) {
                 if (SanityManager.DEBUG) {
                     SanityManager.THROWASSERT(
                             "Constructor for BinaryRelationalOperatorNode " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                             "called with wrong nodeType = " + kind);
 				}
 			    break;
@@ -239,6 +247,7 @@ private static String getOperatorName(int kind) {
     }
 
     private int getRelOpType(int op) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         switch (op) {
         case K_EQUALS:
                 return RelationalOperator.EQUALS_RELOP;
@@ -561,6 +570,7 @@ public ValueNode getOperand(ColumnReference cRef,
             if (SanityManager.DEBUG)
             {
                 SanityManager.THROWASSERT("Failed when trying to " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
                     "find base table number for column reference check:", se);
             }
 		}
@@ -934,6 +944,8 @@ public boolean isQualifier(Optimizable optTable, boolean forPush)
 		FromTable	ft;
 		ValueNode	otherSide = null;
 		JBitSet		tablesReferenced;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ColumnReference cr;
 		boolean	found = false;
 		boolean walkSubtree = true;
@@ -1012,10 +1024,13 @@ public int getOrderableVariantType(Optimizable optTable)
 	public boolean compareWithKnownConstant(Optimizable optTable, boolean considerParameters)
 	{
         ValueNode node = keyColumnOnLeft(optTable) ? rightOperand : leftOperand;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		if (considerParameters)
 		{
 			return (node instanceof ConstantNode) ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 						((node.requiresTypeFromContext()) &&
 						 (((ParameterNode)node).getDefaultValue() != null));
 		}
@@ -1037,11 +1052,14 @@ public DataValueDescriptor getCompareValue(Optimizable optTable)
 		** the key column.
 		*/
         ValueNode node = keyColumnOnLeft(optTable) ? rightOperand : leftOperand;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		if (node instanceof ConstantNode) 
 		{
 			return ((ConstantNode)node).getValue();
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		else if (node.requiresTypeFromContext())
 		{
 			ParameterNode pn;
@@ -1063,6 +1081,7 @@ else if (node.requiresTypeFromContext())
 	 * selectivity otherwise.
 	 */
 	protected double booleanSelectivity(Optimizable optTable)
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 	throws StandardException
 	{
 		TypeId	typeId = null;
@@ -1077,6 +1096,7 @@ else if (columnSide == RIGHT)
 			typeId = rightOperand.getTypeId();
 
 		if (typeId != null && (typeId.getJDBCTypeId() == Types.BIT ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		typeId.getJDBCTypeId() == Types.BOOLEAN))
 			retval = 0.5d;
 
@@ -1089,6 +1109,8 @@ else if (columnSide == RIGHT)
 	 * in BooleanOperatorNode for code generation purposes.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getReceiverInterfaceName() {
 	    return ClassName.DataValueDescriptor;
 	}
@@ -1101,6 +1123,7 @@ String getReceiverInterfaceName() {
      * operator is known; otherwise, this operator node
      */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4416
     ValueNode evaluateConstantExpressions() throws StandardException {
         if (leftOperand instanceof ConstantNode &&
                 rightOperand instanceof ConstantNode) {
@@ -1111,6 +1134,7 @@ ValueNode evaluateConstantExpressions() throws StandardException {
 
             if (!leftVal.isNull() && !rightVal.isNull()) {
                 int comp = leftVal.compare(rightVal);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 switch (relOpType) {
                     case EQUALS_RELOP:
                         return newBool(comp == 0);
@@ -1138,6 +1162,8 @@ ValueNode evaluateConstantExpressions() throws StandardException {
      * @return a node representing a Boolean constant
      */
     private ValueNode newBool(boolean b) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return new BooleanConstantNode(b, getContextManager());
     }
 	
@@ -1153,6 +1179,8 @@ BinaryOperatorNode getNegation(ValueNode leftOperand,
 			SanityManager.ASSERT(getTypeServices() != null,
 								 "dataTypeServices is expected to be non-null");
 		/* xxxRESOLVE: look into doing this in place instead of allocating a new node */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         negation = new BinaryRelationalOperatorNode(getNegationNode(),
 									 leftOperand, rightOperand,
                                      false,
@@ -1164,6 +1192,7 @@ BinaryOperatorNode getNegation(ValueNode leftOperand,
 	/* map current node to its negation */
     private int getNegationNode()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         switch (this.kind)
 		{
             case K_EQUALS:
@@ -1200,7 +1229,10 @@ private int getNegationNode()
      * expression.
      */
     BinaryOperatorNode getSwappedEquivalent() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         BinaryOperatorNode newNode = new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             getKindForSwap(),
             rightOperand,
             leftOperand,
@@ -1222,6 +1254,7 @@ BinaryOperatorNode getSwappedEquivalent() throws StandardException {
      * the operands are swapped
      */
     private int getKindForSwap() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         switch (this.kind) {
             case K_EQUALS:
                 return K_EQUALS;
@@ -1344,6 +1377,7 @@ public int getStopOperator(Optimizable optTable)
 	public void generateOperator(MethodBuilder mb,
 								 Optimizable optTable)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         switch (relOpType)
 		{
 			case RelationalOperator.EQUALS_RELOP:
@@ -1370,6 +1404,7 @@ public void generateOperator(MethodBuilder mb,
 	/** @see RelationalOperator#generateNegate */
 	public void generateNegate(MethodBuilder mb, Optimizable optTable)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         switch (relOpType)
 		{
 			case RelationalOperator.EQUALS_RELOP:
@@ -1392,6 +1427,7 @@ public void generateNegate(MethodBuilder mb, Optimizable optTable)
 	/** @see RelationalOperator#getOperator */
 	public int getOperator()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return relOpType;
 	}
 
@@ -1399,6 +1435,7 @@ public int getOperator()
 	 */
     @Override @SuppressWarnings("fallthrough")
 	public double selectivity(Optimizable optTable)
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 	throws StandardException
 	{
 		double retval = booleanSelectivity(optTable);
@@ -1406,6 +1443,11 @@ public double selectivity(Optimizable optTable)
 		if (retval >= 0.0d)
 			return retval;
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         switch (relOpType)
 		{
 			case RelationalOperator.EQUALS_RELOP:
@@ -1429,7 +1471,10 @@ public double selectivity(Optimizable optTable)
 	public RelationalOperator getTransitiveSearchClause(ColumnReference otherCR)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return new BinaryRelationalOperatorNode(kind,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                                                 otherCR,
                                                 rightOperand,
                                                 false,
@@ -1438,6 +1483,7 @@ public RelationalOperator getTransitiveSearchClause(ColumnReference otherCR)
 	
 	public boolean equalsComparisonWithConstantExpression(Optimizable optTable)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (relOpType != EQUALS_RELOP)
 			return false;
 
@@ -1477,6 +1523,7 @@ boolean isBinaryEqualsOperatorNode()
 		 * operator.
 		 */
 		return !isInListProbeNode() &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             (relOpType == RelationalOperator.EQUALS_RELOP);
 	}
 
@@ -1501,6 +1548,7 @@ boolean optimizableEqualityNode(Optimizable optTable,
 										   boolean isNullOkay)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (relOpType != EQUALS_RELOP)
 			return false;
 
@@ -1555,8 +1603,11 @@ private boolean implicitVarcharComparison()
 	 * @see BinaryComparisonOperatorNode#genSQLJavaSQLTree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode genSQLJavaSQLTree() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (relOpType == EQUALS_RELOP)
 			return this;
 		
@@ -1614,6 +1665,8 @@ ValueNode genSQLJavaSQLTree() throws StandardException
 	 *  instance of the column reference, they'll interfere with each other
 	 *  during optimization.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getScopedOperand(int whichSide,
 		JBitSet parentRSNsTables, ResultSetNode childRSN,
 		int [] whichRC) throws StandardException
@@ -1643,6 +1696,8 @@ ValueNode getScopedOperand(int whichSide,
 		 * is included in the list of table numbers from the parentRSN.
 		 */
 		JBitSet crTables = new JBitSet(parentRSNsTables.size());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         BaseTableNumbersVisitor btnVisitor =
 			new BaseTableNumbersVisitor(crTables);
         cr.accept(btnVisitor);
@@ -1860,6 +1915,7 @@ private boolean valNodeReferencesOptTable(ValueNode valNode,
 			if (SanityManager.DEBUG)
 			{
 				SanityManager.THROWASSERT("Failed when trying to " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 					"find base table numbers for reference check:", se);
 			}
 		}
@@ -1947,6 +2003,7 @@ private void buildTableNumList(Optimizable ft, boolean forPush)
 
     @Override
     boolean isSameNodeKind(ValueNode o) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return super.isSameNodeKind(o) &&
                 ((BinaryRelationalOperatorNode)o).kind == kind;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BitConstantNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BitConstantNode.java
index 76bdd12f41..d3f9b282bc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BitConstantNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BitConstantNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BitConstantNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -31,6 +32,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.iapi.util.StringUtil;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class BitConstantNode extends ConstantNode
 {
     /**
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java
index 98d3523938..0abfe62d32 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java
@@ -46,6 +46,7 @@ public boolean convertible(TypeId otherType,
         {
             if ( otherType.getBaseTypeId().isAnsiUDT() ) { return false; }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
 
 			return (otherType.isBitTypeId() ||
 					otherType.isBlobTypeId() ||
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java
index 7ec93f8ed2..6b7fc43827 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.BooleanConstantNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -41,6 +42,8 @@ public final class BooleanConstantNode extends ConstantNode
      * @param cm context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     BooleanConstantNode(ContextManager cm) throws StandardException {
 		/*
 		** RESOLVE: The length is fixed at 1, even for nulls.
@@ -188,6 +191,8 @@ ValueNode eliminateNots(boolean underNotNode)
 
 		booleanValue = !booleanValue;
 		super.setValue(new SQLBoolean(booleanValue));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
+//IC see: https://issues.apache.org/jira/browse/DERBY-4062
 
 		return this;
 	}
@@ -209,6 +214,8 @@ void generateConstant(ExpressionClassBuilder acb, MethodBuilder mb)
 	 * Set the value in this ConstantNode.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setValue(DataValueDescriptor value)
 	{
 		super.setValue( value);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java
index 55dc8ea736..2539c86ecb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java
@@ -58,6 +58,7 @@ public boolean compatible(TypeId otherType)
 	public boolean storable(TypeId otherType, ClassFactory cf)
 	{
 		/* Are the types the same or is other type a string */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4684
 		if ( otherType.isBooleanTypeId() || otherType.isStringTypeId() )
 		{
 			return true;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CallStatementNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
index d955458cd3..3e9e5ac62b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CallStatementNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -50,6 +51,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * A procedure is always represented by a MethodCallNode.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CallStatementNode extends DMLStatementNode
 {	
 	/**
@@ -67,6 +70,8 @@ class CallStatementNode extends DMLStatementNode
      * @param cm                The context manager
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CallStatementNode(JavaToSQLValueNode methodCall, ContextManager cm)
 	{
         super(null, cm);
@@ -87,6 +92,8 @@ String statementToString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -120,8 +127,11 @@ public void bindStatement() throws StandardException
 
 		if (SanityManager.DEBUG)
 			SanityManager.ASSERT((dd != null), "Failed to get data dictionary");
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 
         SubqueryList subqueries = new SubqueryList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		getCompilerContext().pushCurrentPrivType(getPrivType());
 		methodCall = (JavaToSQLValueNode) methodCall.bindExpression(
@@ -140,7 +150,9 @@ public void bindStatement() throws StandardException
 		// Disallow creation of BEFORE triggers which contain calls to 
 		// procedures that modify SQL data. 
   		checkReliability();
+//IC see: https://issues.apache.org/jira/browse/DERBY-551
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getCompilerContext().popCurrentPrivType();
 	}
 
@@ -168,6 +180,8 @@ public void optimizeStatement() throws StandardException
 		SanityManager.ASSERT((dd != null), "Failed to get data dictionary");
 
 		/* Preprocess the method call tree */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         methodCall =
             (JavaToSQLValueNode) methodCall.preprocess(
                 getCompilerContext().getNumTables(),
@@ -253,11 +267,13 @@ public ResultDescription makeResultDescription()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (methodCall != null)
 		{
 			methodCall = (JavaToSQLValueNode) methodCall.accept(v);
@@ -270,6 +286,7 @@ void acceptChildren(Visitor v)
     @Override
 	int getPrivType()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		return Authorizer.EXECUTE_PRIV;
 	}
 	
@@ -284,6 +301,7 @@ int getPrivType()
 	 * @throws StandardException
 	 */
 	private void checkReliability() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-551
 		if(getSQLAllowedInProcedure() == RoutineAliasInfo.MODIFIES_SQL_DATA &&
 				getCompilerContext().getReliability() == CompilerContext.MODIFIES_SQL_DATA_PROCEDURE_ILLEGAL) 
 			throw StandardException.newException(SQLState.LANG_UNSUPPORTED_TRIGGER_PROC);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CastNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CastNode.java
index 9c23350672..2adbc8c259 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CastNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CastNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CastNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -107,6 +108,8 @@ class CastNode extends ValueNode
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CastNode(ValueNode castOperand,
              DataTypeDescriptor castTarget,
              ContextManager cm) throws StandardException {
@@ -176,6 +179,8 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -208,6 +213,7 @@ protected int getOrderableVariantType() throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
     @Override @SuppressWarnings("fallthrough")
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
@@ -226,6 +232,8 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 			int length = -1;
 			TypeId srcTypeId = opndType.getTypeId();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             if (srcTypeId.isNumericTypeId())
             {
                 length = opndType.getPrecision() + 1; // 1 for the sign
@@ -239,6 +247,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
              * adding the check for Char & Varchar and calculating the
              * length based on the operand type.
              */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1132
             else if(srcTypeId.isStringTypeId())
             {
                 length = opndType.getMaximumWidth();
@@ -309,6 +318,7 @@ else if (this.targetCharType == Types.VARCHAR)
 			switch (sourceJDBCTypeId)
 			{
 				case Types.BIT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 				case Types.BOOLEAN:
 					// (BIT is boolean)
 					if (destJDBCTypeId == Types.BIT || destJDBCTypeId == Types.BOOLEAN)
@@ -319,6 +329,8 @@ else if (destJDBCTypeId == Types.CHAR)
 					{
 						BooleanConstantNode bcn = (BooleanConstantNode) castOperand;
 						String booleanString = bcn.getValueAsString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                        retNode = new CharConstantNode(
                                 booleanString,
                                 getTypeServices().getMaximumWidth(),
@@ -339,6 +351,8 @@ else if (destJDBCTypeId == Types.CHAR)
 								((UserTypeConstantNode) castOperand).
 											getObjectValue().
 												toString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                            retNode = new CharConstantNode(
                                castValue,
                                getTypeServices().getMaximumWidth(),
@@ -380,6 +394,8 @@ else if (destJDBCTypeId == Types.CHAR)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindCastNodeOnly()
 		throws StandardException
 	{
@@ -406,6 +422,7 @@ void bindCastNodeOnly()
 		*/
 		if (getTypeId().userType())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
             setType( bindUserType( getTypeServices() ) );
             
 			String className = getTypeId().getCorrespondingJavaTypeName();
@@ -422,6 +439,7 @@ void bindCastNodeOnly()
         // Obviously the type of a parameter that
         // requires its type from context (a parameter)
         // gets its type from the type of the CAST.
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		if (castOperand.requiresTypeFromContext())
 		{
             castOperand.setType(getTypeServices());
@@ -459,6 +477,7 @@ else if (!(castOperand instanceof UntypedNullConstantNode))
         { setNullability( true ); }
 		else { setNullability(castOperand.getTypeServices().isNullable()); }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
         if (targetUDT != null)
         {
             addUDTUsagePriv( this );
@@ -492,9 +511,12 @@ private ValueNode getCastFromCharConstant(int destJDBCTypeId)
 		switch (destJDBCTypeId)
 		{
 			case Types.BIT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.BOOLEAN:
 				if (cleanCharValue.equals("TRUE"))
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                    return new BooleanConstantNode(true, getContextManager());
 				}
 				else if (cleanCharValue.equals("FALSE"))
@@ -511,6 +533,8 @@ else if (cleanCharValue.equals("UNKNOWN"))
 				}
 
 			case Types.DATE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                return new UserTypeConstantNode(
 										getDataValueFactory().getDateValue(cleanCharValue, false),
 										getContextManager());
@@ -532,6 +556,7 @@ else if (cleanCharValue.equals("UNKNOWN"))
 				try 
 				{
 					// #3756 - Truncate decimal portion for casts to integer
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                   return getCastFromIntegralType((long) Double.parseDouble(cleanCharValue),
 												   destJDBCTypeId);
 				}
@@ -550,6 +575,8 @@ else if (cleanCharValue.equals("UNKNOWN"))
 				{
 					throw StandardException.newException(SQLState.LANG_FORMAT_EXCEPTION, "float");
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                return new NumericConstantNode(
                        TypeId.getBuiltInTypeId(Types.REAL),
                        floatValue,
@@ -564,6 +591,8 @@ else if (cleanCharValue.equals("UNKNOWN"))
 				{
 					throw StandardException.newException(SQLState.LANG_FORMAT_EXCEPTION, "double");
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                return new NumericConstantNode(
                        TypeId.getBuiltInTypeId(Types.DOUBLE),
                        doubleValue,
@@ -601,6 +630,8 @@ private ValueNode getCastFromIntegralType(
 		switch (destJDBCTypeId)
 		{
 			case Types.CHAR:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                return new CharConstantNode(
                         Long.toString(longValue),
                         getTypeServices().getMaximumWidth(),
@@ -613,6 +644,7 @@ private ValueNode getCastFromIntegralType(
 				}
                return new NumericConstantNode(
                        TypeId.getBuiltInTypeId(Types.TINYINT),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
                        (byte) longValue,
                        getContextManager());
 
@@ -624,6 +656,7 @@ private ValueNode getCastFromIntegralType(
 				}
                return new NumericConstantNode(
                    TypeId.getBuiltInTypeId(destJDBCTypeId),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
                    (short) longValue,
                    getContextManager());
 
@@ -635,6 +668,7 @@ private ValueNode getCastFromIntegralType(
 				}
                return new NumericConstantNode(
                    TypeId.getBuiltInTypeId(destJDBCTypeId),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
                    (int) longValue,
                    getContextManager());
 
@@ -651,6 +685,7 @@ private ValueNode getCastFromIntegralType(
 				}
                return new NumericConstantNode(
                    TypeId.getBuiltInTypeId(destJDBCTypeId),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                    (float) longValue,
                    getContextManager());
 
@@ -689,6 +724,8 @@ private ValueNode getCastFromNumericType(
 		switch (destJDBCTypeId)
 		{
 			case Types.CHAR:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                return new CharConstantNode(
                         constantValue.getString(),
                         getTypeServices().getMaximumWidth(),
@@ -752,6 +789,8 @@ private ValueNode getCastFromNumericType(
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -806,6 +845,8 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	 * @exception StandardException			Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
@@ -894,6 +935,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		 * They'll get an exception, as expected, if the
 		 * conversion cannot be performed.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		else if (castOperand.requiresTypeFromContext())
 		{
 			sourceCTI = getTypeId();
@@ -923,12 +965,14 @@ private void genDataValueConversion(ExpressionClassBuilder acb,
                 getTypeServices().getCollationType());
 		acbConstructor.setField(field);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 		/*
 			For most types generate
 
 			targetDVD.setValue(sourceDVD);
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			For source or destination java types generate
 			
 			Object o = sourceDVD.getObject();
@@ -972,6 +1016,7 @@ private void genDataValueConversion(ExpressionClassBuilder acb,
 			mb.dup();
 			mb.isInstanceOf(destinationType);
 			mb.push(destinationType);
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			mb.callMethod(VMOpcode.INVOKEINTERFACE, ClassName.DataValueDescriptor,
 					"setObjectForCast", "void", 3);
 
@@ -990,6 +1035,7 @@ private void genDataValueConversion(ExpressionClassBuilder acb,
 			
 			// to leave the DataValueDescriptor value on the stack, since setWidth is void
 			mb.dup();
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 
 			/* setWidth() is on VSDV - upcast since
 			 * decimal implements subinterface
@@ -998,6 +1044,7 @@ private void genDataValueConversion(ExpressionClassBuilder acb,
 			
 			mb.push(isNumber ? getTypeServices().getPrecision() : getTypeServices().getMaximumWidth());
 			mb.push(getTypeServices().getScale());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5749
             mb.push(!sourceCTI.variableLength() ||
                     isNumber ||
                     assignmentSemantics);
@@ -1015,11 +1062,13 @@ private void genDataValueConversion(ExpressionClassBuilder acb,
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (castOperand != null)
 		{
 			castOperand = (ValueNode)castOperand.accept(v);
@@ -1057,6 +1106,7 @@ void setForDataTypeFunction(boolean b)
      * Set assignmentSemantics to true. Used by method calls for casting actual
      * arguments
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5749
     void setAssignmentSemantics()
     {
         assignmentSemantics = true;
@@ -1069,6 +1119,7 @@ void setAssignmentSemantics()
 	 */
     boolean isEquivalent(ValueNode o) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (isSameNodeKind(o)) {
 			CastNode other = (CastNode)o;
 			return getTypeServices().equals(other.getTypeServices())
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CharConstantNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CharConstantNode.java
index ff7a62448b..1eb7d6287e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CharConstantNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CharConstantNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CharConstantNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -33,6 +34,7 @@ public final class CharConstantNode extends ConstantNode
 {
 
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_CHAR = 0;
     final static int K_VARCHAR = 1;
     final static int K_LONGVARCHAR = 2;
@@ -45,6 +47,8 @@ public final class CharConstantNode extends ConstantNode
      */
     final int kind;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CharConstantNode(String value, ContextManager cm)
             throws StandardException {
         super(TypeId.CHAR_ID,
@@ -53,6 +57,7 @@ public final class CharConstantNode extends ConstantNode
               cm);
 
         setValue(getDataValueFactory().getCharDataValue(value));
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         kind = K_CHAR;
     }
 
@@ -91,6 +96,7 @@ public final class CharConstantNode extends ConstantNode
               cm);
 
         kind = K_CHAR;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         if (newValue.length() > newLength) {
            throw StandardException.newException(
@@ -116,6 +122,8 @@ public final class CharConstantNode extends ConstantNode
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String  getString() throws StandardException
 	{
 		return value.getString();
@@ -154,6 +162,8 @@ Object getConstantValueAsObject() throws StandardException
 	
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         FromList fromList,
         SubqueryList subqueryList,
         List<AggregateNode> aggregates) throws StandardException
@@ -171,6 +181,8 @@ ValueNode bindExpression(
 	    //if at this bind time, we find that the char constant's collation
 	    //type is territory based, then we should change value from SQLxxx
 	    //to CollatorSQLxxx. That is what is getting done below.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
 	    value = ((StringDataValue)value).getValue(
 	    		getLanguageConnectionContext().getDataValueFactory().getCharacterCollator(
 	    				getTypeServices().getCollationType()));
@@ -195,5 +207,6 @@ void generateConstant(ExpressionClassBuilder acb, MethodBuilder mb) throws Stand
 
     @Override
     boolean isSameNodeKind(ValueNode o) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return super.isSameNodeKind(o) && ((CharConstantNode)o).kind == kind;
     }}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java
index adba022d6c..be3d032773 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java
@@ -44,6 +44,7 @@ public final class CharTypeCompiler extends BaseTypeCompiler
          */
         public boolean convertible(TypeId otherType, boolean forDataTypeFunction)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
             if ( otherType.getBaseTypeId().isAnsiUDT() ) { return false; }
             
 			// LONGVARCHAR can only be converted from  character types
@@ -90,6 +91,8 @@ public boolean compatible(TypeId otherType)
     public boolean storable(TypeId otherType, ClassFactory cf)
     {
         // Same rules as cast except we can't assign from numbers
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         if (convertible(otherType,false) &&
                 !otherType.isBlobTypeId() &&
                 !otherType.isNumericTypeId())
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
index d518819586..37b584fbda 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CoalesceFunctionNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -94,6 +95,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * BLOB             { "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "ERROR", "BLOB" }
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CoalesceFunctionNode extends ValueNode
 {
 	String	functionName; //Are we here because of COALESCE function or VALUE function
@@ -112,6 +115,8 @@ class CoalesceFunctionNode extends ValueNode
 	 * @param argumentsList	The list of arguments to the coalesce/value function
      * @param cm            The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CoalesceFunctionNode(
             String functionName,
             ValueNodeList argumentsList,
@@ -135,6 +140,7 @@ class CoalesceFunctionNode extends ValueNode
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 					throws StandardException
 	{
@@ -153,8 +159,10 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 		//find the first non-param argument. The generated method will generate code to call coalesce on this argument
 		for (int index = 0; index < argumentsListSize; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (!argumentsList.elementAt(index).requiresTypeFromContext())
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2016
 				firstNonParameterNodeIdx = index;
 				break;
 			}
@@ -214,6 +222,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		MethodBuilder cb = acb.getConstructor();
 		cb.pushNewArray(ClassName.DataValueDescriptor, argumentsListSize);
 		cb.setField(arrayField);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 		/* Set the array elements that are constant */
 		int numConstants = 0;
@@ -259,6 +268,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 			}
 
 			setArrayMethod.getField(arrayField); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             argumentsList.elementAt(index).generateExpression(acb, setArrayMethod);
 			setArrayMethod.upCast(receiverType);
 			setArrayMethod.setArrayElement(index);
@@ -285,6 +295,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		*/
 
 		// coalesce will be called on this non-parameter argument
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         argumentsList.elementAt(firstNonParameterNodeIdx).
 			generateExpression(acb, mb);
 
@@ -295,6 +306,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		//Following is for the second arg. This arg will be used to pass the return value.
 		//COALESCE method expects this to be initialized to NULL SQLxxx type object.
 		LocalField field = acb.newFieldDeclaration(Modifier.PRIVATE, receiverType);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 		acb.generateNull(mb, getTypeCompiler(), getTypeServices().getCollationType());
 		mb.upCast(ClassName.DataValueDescriptor);
 		mb.putField(field);
@@ -305,6 +317,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 			boolean isNumber = getTypeId().isNumericTypeId();
 			// to leave the DataValueDescriptor value on the stack, since setWidth is void
 			mb.dup();
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 
 			mb.push(isNumber ? getTypeServices().getPrecision() : getTypeServices().getMaximumWidth());
 			mb.push(getTypeServices().getScale());
@@ -321,6 +334,7 @@ public String toString()
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 			return
 				"functionName: " + functionName + "\n" +
 				"firstNonParameterNodeIdx: " + firstNonParameterNodeIdx + "\n" +
@@ -339,8 +353,11 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (SanityManager.DEBUG)
 		{
 			super.printSubNodes(depth);
@@ -356,12 +373,14 @@ void printSubNodes(int depth)
 	 */
     boolean isEquivalent(ValueNode o) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (! isSameNodeKind(o)) {
 			return false;
 		}
 		
 		CoalesceFunctionNode other = (CoalesceFunctionNode)o;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4600
         if (!argumentsList.isEquivalent(other.argumentsList))
 		{
 			return false;
@@ -377,10 +396,12 @@ boolean isEquivalent(ValueNode o) throws StandardException
 	 * @throws StandardException on error in the visitor
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v) throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4600
         argumentsList = (ValueNodeList) argumentsList.accept(v);
 	}
 
@@ -412,12 +433,15 @@ public boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
 								PredicateList outerPredicateList) 
 					throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4600
         argumentsList.preprocess(
                 numTables,
                 outerFromList,
@@ -438,6 +462,7 @@ ValueNode preprocess(int numTables,
     public ValueNode remapColumnReferencesToExpressions()
             throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4600
         argumentsList = argumentsList.remapColumnReferencesToExpressions();
         return this;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java
index bc22cc6f1e..78f914971f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CollectNodesVisitor
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -49,6 +50,7 @@ public class CollectNodesVisitor<T extends Visitable> implements Visitor
 	 */
     public CollectNodesVisitor(Class<T> nodeClass)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         this(nodeClass, null);
 	}
 
@@ -61,8 +63,10 @@ public CollectNodesVisitor(Class<T> nodeClass)
 	 * node when searching for nodeClass.
 	 */
     public CollectNodesVisitor(Class<T> nodeClass,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                                Class<? extends Visitable> skipOverClass)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         this.nodeList = new ArrayList<T>();
         this.nodeClass = nodeClass;
 		this.skipOverClass = skipOverClass;
@@ -70,6 +74,7 @@ public CollectNodesVisitor(Class<T> nodeClass,
 
 	public boolean visitChildrenFirst(Visitable node)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 
@@ -94,6 +99,7 @@ public Visitable visit(Visitable node)
 	{
 		if (nodeClass.isInstance(node))
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             nodeList.add(nodeClass.cast(node));
 		}
 		return node;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
index f13cb7b6b0..efc9b117cc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ColumnDefinitionNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -74,6 +75,7 @@ public class ColumnDefinitionNode extends TableElementNode
 	//This information is later used to make sure that the autoincrement
 	//column's increment value is not 0 at the time of create, or is not
 	//getting set to 0 at the time of increment value modification.
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 	long						autoinc_create_or_modify_Start_Increment;
 	boolean						autoincrementVerify;
 
@@ -102,6 +104,8 @@ public class ColumnDefinitionNode extends TableElementNode
      * @param cm            The context manager
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ColumnDefinitionNode(
                     String name,
                     ValueNode defaultNode,
@@ -113,6 +117,7 @@ public class ColumnDefinitionNode extends TableElementNode
         super(name, cm);
         this.type = dataTypeServices;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (defaultNode instanceof UntypedNullConstantNode)
 		{
 			/* No DTS yet for MODIFY DEFAULT */
@@ -142,15 +147,23 @@ else if (defaultNode instanceof GenerationClauseNode)
 			this.defaultNode = (DefaultNode) defaultNode;
 			if (autoIncrementInfo != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 long[] aii = autoIncrementInfo;
 				autoincrementStart = aii[QueryTreeNode.AUTOINCREMENT_START_INDEX];
 				autoincrementIncrement = aii[QueryTreeNode.AUTOINCREMENT_INC_INDEX];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 				autoincrementCycle = aii[QueryTreeNode.AUTOINCREMENT_CYCLE] == 1 ? true : false;
 				//Parser has passed the info about autoincrement column's status in the
 				//following array element. It will tell if the autoinc column is part of 
 				//a create table or if is a part of alter table. And if it is part of 
 				//alter table, is it for changing the increment value or for changing 
 				//the start value?
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 				autoinc_create_or_modify_Start_Increment = aii[QueryTreeNode.AUTOINCREMENT_CREATE_MODIFY];
 				
 				/*
@@ -207,6 +220,8 @@ public String toString()
 	 *
 	 * @return	the name of the column
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getColumnName()
 	{
 		return this.name;
@@ -217,6 +232,8 @@ String getColumnName()
 	 *
 	 * @return	the data type of the column
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final DataTypeDescriptor getType()
 	{
 		return type;
@@ -228,6 +245,8 @@ final DataTypeDescriptor getType()
     /**
      * Set the nullability of the column definition node.
       */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final void setNullability(boolean nullable)
     {
         type = getType().getNullabilityType(nullable);
@@ -250,6 +269,8 @@ void setCollationType(int collationType)
 	 * @return	The default value of the column
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DataValueDescriptor getDefaultValue()
 	{
 		return this.defaultValue;
@@ -262,6 +283,8 @@ DataValueDescriptor getDefaultValue()
 	 * @return	The default info for the column
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DefaultInfo getDefaultInfo()
 	{
 		return defaultInfo;
@@ -277,6 +300,8 @@ DefaultInfo getDefaultInfo()
 	 *
 	 * @return The DefaultNode, if any, associated with this node.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DefaultNode getDefaultNode()
 	{
 		return defaultNode;
@@ -290,6 +315,8 @@ DefaultNode getDefaultNode()
 	/**
 	 * Get the generation clause.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     GenerationClauseNode getGenerationClauseNode() {
         return generationClauseNode;
     }
@@ -306,6 +333,7 @@ boolean isAutoincrementColumn()
 			//increment value for autoincrement column can't be 0 if the autoinc column
 			//is part of create table or it is part of alter table to change the 
 			//increment value. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 			if (isAutoincrement && autoincrementIncrement == 0 && 
 					(autoinc_create_or_modify_Start_Increment == ColumnDefinitionNode.CREATE_AUTOINCREMENT ||
 							autoinc_create_or_modify_Start_Increment == ColumnDefinitionNode.MODIFY_AUTOINCREMENT_INC_VALUE))
@@ -378,6 +406,7 @@ boolean getAutoincrementCycle()
 	 *   ColumnDefinitionNode.MODIFY_AUTOINCREMENT_INC_VALUE 
 	 * 		if this definition is for alter autoincrement column to change the increment value
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 	long getAutoinc_create_or_modify_Start_Increment()
 	{
 		if (SanityManager.DEBUG)
@@ -396,6 +425,8 @@ long getAutoinc_create_or_modify_Start_Increment()
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void checkUserType(TableDescriptor td)
 		throws StandardException
 	{
@@ -404,6 +435,7 @@ void checkUserType(TableDescriptor td)
         // continue if this is a generated column and the datatype has been
         // omitted. we can't check generation clauses until later on
         if ( hasGenerationClause() && (getType() == null ) ) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3923
 
 		/* Built-in types need no checking */
 		if (!getType().getTypeId().userType())
@@ -478,6 +510,7 @@ void bindAndValidateDefault(DataDictionary dd, TableDescriptor td)
 		throws StandardException
 	{
 		/* DB2 requires non-nullable columns to have a default in ALTER TABLE */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3923
 		if (td != null && !hasGenerationClause() && !getType().isNullable() && defaultNode == null)
 		{
 			if (!isAutoincrement )
@@ -516,6 +549,8 @@ void bindAndValidateDefault(DataDictionary dd, TableDescriptor td)
 	 * 				if increment is 0 or if initial or increment values are out
 	 * 				of range for the datatype.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void validateAutoincrement(DataDictionary dd,
                                TableDescriptor td,
                                int tableType) throws StandardException
@@ -529,6 +564,7 @@ void validateAutoincrement(DataDictionary dd,
 		//increment value for autoincrement column can't be 0 if the autoinc column
 		//is part of create table or it is part of alter table to change the 
 		//increment value. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 		if (autoincrementIncrement == 0 && 
 				(autoinc_create_or_modify_Start_Increment == ColumnDefinitionNode.CREATE_AUTOINCREMENT ||
 						autoinc_create_or_modify_Start_Increment == ColumnDefinitionNode.MODIFY_AUTOINCREMENT_INC_VALUE))
@@ -553,6 +589,8 @@ void validateAutoincrement(DataDictionary dd,
 			break;
 		case Types.BIGINT:
 			autoincrementCheckRange(Long.MIN_VALUE, Long.MAX_VALUE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                                     TypeId.BIGINT_NAME);
 			break;
 		default:
@@ -597,6 +635,7 @@ void validateDefault(DataDictionary dd, TableDescriptor td)
 			return;
 
 		//Examin whether default value is autoincrement.
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 		if (isAutoincrement){
 			defaultInfo = createDefaultInfoOfAutoInc();
 			return;
@@ -634,11 +673,14 @@ void validateDefault(DataDictionary dd, TableDescriptor td)
 			// Tell the compiler context to only allow deterministic nodes
 			cc.setReliability( CompilerContext.DEFAULT_RESTRICTION );
 			defaultTree = defaultTree.bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                             new FromList(
                                 getOptimizerFactory().doJoinOrderOptimization(),
 								getContextManager()), 
 							(SubqueryList) null,
 							(List<AggregateNode>) null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 			TypeId columnTypeId = getType().getTypeId();
 			TypeId defaultTypeId = defaultTree.getTypeId();
@@ -664,6 +706,7 @@ void validateDefault(DataDictionary dd, TableDescriptor td)
 
 			// Save off the default text
 			// RESOLVEDEFAULT - Convert to constant if possible
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 			defaultInfo = new DefaultInfoImpl(false,
 							  defaultNode.getDefaultText(), 
 							  defaultValue);
@@ -689,6 +732,7 @@ void validateDefault(DataDictionary dd, TableDescriptor td)
 
 
 	protected static DefaultInfoImpl createDefaultInfoOfAutoInc(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 		return new DefaultInfoImpl(true,
 					   null, 
 					   null);
@@ -713,6 +757,7 @@ protected static DefaultInfoImpl createDefaultInfoOfAutoInc(){
     boolean defaultTypeIsValid(TypeId columnType,
 		DataTypeDescriptor columnDesc, TypeId defaultType,
 		ValueNode defaultNode, String defaultText)
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 	throws StandardException
 	{
 
@@ -749,6 +794,7 @@ boolean defaultTypeIsValid(TypeId columnType,
 				(colType == StoredFormatIds.LONGVARCHAR_TYPE_ID));
 
 			if (defaultNode instanceof SpecialFunctionNode) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 switch (((SpecialFunctionNode)defaultNode).kind) {
                     case SpecialFunctionNode.K_USER:
                     case SpecialFunctionNode.K_CURRENT_USER:
@@ -759,6 +805,7 @@ boolean defaultTypeIsValid(TypeId columnType,
                         // Note also: any size under 30 gives a warning in DB2.
                         return (charCol && (columnDesc.getMaximumWidth() >=
                                 Limits.DB2_MIN_COL_LENGTH_FOR_CURRENT_USER));
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 
                     case SpecialFunctionNode.K_CURRENT_SCHEMA:
                         // DB2 enforces min length of 128.
@@ -773,6 +820,7 @@ boolean defaultTypeIsValid(TypeId columnType,
 
 		switch (colType) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4716
 			case StoredFormatIds.BOOLEAN_TYPE_ID:
                 return ( defaultNode instanceof BooleanConstantNode );
                 
@@ -786,6 +834,8 @@ boolean defaultTypeIsValid(TypeId columnType,
 			// value if it's integer.
 				return (defType == StoredFormatIds.INT_TYPE_ID);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             case StoredFormatIds.BIGINT_TYPE_ID:
 			// This is a BIGINT column: we allow smallints, ints,
 			// and big int constants.  Smallint and int literals
@@ -811,6 +861,8 @@ boolean defaultTypeIsValid(TypeId columnType,
 						((precision - scale) <=
 						(columnDesc.getPrecision() - columnDesc.getScale())));
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 else if ((defType == StoredFormatIds.BIGINT_TYPE_ID) ||
 					(defType == StoredFormatIds.INT_TYPE_ID)) {
 				// only valid if number of digits is within limits of
@@ -835,6 +887,7 @@ else if ((defType == StoredFormatIds.BIGINT_TYPE_ID) ||
 			// to here instead of waiting until insert time.
 				return (defType == StoredFormatIds.CHAR_TYPE_ID);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-34
 			case StoredFormatIds.BIT_TYPE_ID:
 			case StoredFormatIds.VARBIT_TYPE_ID:
 			case StoredFormatIds.LONGVARBIT_TYPE_ID:
@@ -878,8 +931,11 @@ else if ((defType == StoredFormatIds.BIGINT_TYPE_ID) ||
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (SanityManager.DEBUG)
 		{
 			super.printSubNodes(depth);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java
index 8657320370..f83a8afd0f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java
@@ -80,6 +80,7 @@ boolean ordered(int direction, int tableNumber, int columnNumber) {
 	boolean contains(int tableNumber, int columnNumber)
 	{
 		for (int i = 0; i < columns.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			Integer col = columns.get(i);
 			Integer tab = tables.get(i);
 
@@ -109,6 +110,7 @@ int direction()
 	 */
 	void addColumn(int tableNumber, int columnNumber)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
         tables.add(tableNumber);
         columns.add(columnNumber);
 	}
@@ -124,6 +126,7 @@ void removeColumns(int tableNumber)
 		*/
 		for (int i = tables.size() - 1; i >= 0; i--)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			Integer tab = tables.get(i);
 			if (tab.intValue() == tableNumber)
 			{
@@ -138,6 +141,7 @@ void removeColumns(int tableNumber)
 	 */
 	boolean empty()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 		return tables.isEmpty();
 	}
 
@@ -147,6 +151,7 @@ ColumnOrdering cloneMe() {
 
 		for (int i = 0; i < columns.size(); i++) {
 			/* Integers are immutable, so just copy the pointers */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 			retval.columns.add(columns.get(i));
 			retval.tables.add(tables.get(i));
 		}
@@ -156,6 +161,7 @@ ColumnOrdering cloneMe() {
 
 	/** Is the given table number in this ColumnOrdering? */
 	boolean hasTable(int tableNumber) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
         return tables.contains(tableNumber);
 	}
 
@@ -163,6 +169,7 @@ boolean hasTable(int tableNumber) {
 	boolean hasAnyOtherTable(int tableNumber) {
 
 		for (int i = 0; i < tables.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			Integer tab = tables.get(i);
 			
 			if (tab.intValue() != tableNumber)
@@ -180,6 +187,7 @@ public String toString() {
 			retval += "Direction: " + myDirection;
 
 			for (int i = 0; i < columns.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				retval += " Table " + tables.get(i) +
 							", Column " + columns.get(i);
 			}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnReference.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnReference.java
index 7a1df94a17..0704fb9b95 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnReference.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ColumnReference.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ColumnReference
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -132,6 +133,7 @@ public class ColumnReference extends ValueNode
                     int            tokEndOffset,
                     ContextManager cm)  {
         super(cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         _columnName = columnName;
         _qualifiedTableName = tableName;
         this.setBeginOffset(tokBeginOffset);
@@ -151,6 +153,7 @@ public class ColumnReference extends ValueNode
                     TableName      tableName,
                     ContextManager cm) {
         super(cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         _columnName = columnName;
         _qualifiedTableName = tableName;
 		tableNumber = -1;
@@ -168,6 +171,7 @@ public String toString()
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			return "columnName: " + _columnName + "\n" +
 				"tableNumber: " + tableNumber + "\n" +
 				"columnNumber: " + columnNumber + "\n" +
@@ -194,6 +198,8 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -218,6 +224,7 @@ boolean getCorrelated()
 		if (SanityManager.DEBUG)
 		{
 			SanityManager.ASSERT(nestingLevel != -1,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				"nestingLevel on "+_columnName+" is not expected to be -1");
 			SanityManager.ASSERT(sourceLevel != -1,
 				"sourceLevel on "+_columnName+" is not expected to be -1");
@@ -283,6 +290,8 @@ int getSourceLevel()
 	 * column references to the matching aggregate in the 
 	 * user's SELECT.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markGeneratedToReplaceAggregate()
 	{
 		replacesAggregate = true;
@@ -292,8 +301,12 @@ void markGeneratedToReplaceAggregate()
 	/**
 	 * Mark this node as being generated to replace a window function call.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markGeneratedToReplaceWindowFunctionCall()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		replacesWindowFunctionCall = true;
 	}
 
@@ -319,6 +332,8 @@ boolean getGeneratedToReplaceAggregate()
 	 */
     boolean getGeneratedToReplaceWindowFunctionCall()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		return replacesWindowFunctionCall;
 	}
 
@@ -335,6 +350,7 @@ ValueNode getClone()
 	{
         ColumnReference newCR =
                 new ColumnReference(_columnName, _qualifiedTableName, getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		newCR.copyFields(this);
 		return newCR;
@@ -347,6 +363,8 @@ ValueNode getClone()
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void copyFields(ColumnReference oldCR)
 		throws StandardException
 	{
@@ -359,9 +377,12 @@ void copyFields(ColumnReference oldCR)
 		nestingLevel = oldCR.getNestingLevel();
 		sourceLevel = oldCR.getSourceLevel();
 		replacesAggregate = oldCR.getGeneratedToReplaceAggregate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		replacesWindowFunctionCall =
 			oldCR.getGeneratedToReplaceWindowFunctionCall();
 		scoped = oldCR.isScoped();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
         copyTagsFrom( oldCR );
         if ( oldCR._mergeTableID != MERGE_UNKNOWN )
         {
@@ -388,6 +409,8 @@ void copyFields(ColumnReference oldCR)
 	 */
     @Override
     ColumnReference bindExpression(FromList fromList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                              SubqueryList subqueryList,
                              List<AggregateNode> aggregates)
             throws StandardException
@@ -401,6 +424,7 @@ ColumnReference bindExpression(FromList fromList,
 
 		if (fromList.size() == 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			throw StandardException.newException(SQLState.LANG_ILLEGAL_COLUMN_REFERENCE, _columnName);
 		}
 
@@ -409,6 +433,7 @@ ColumnReference bindExpression(FromList fromList,
 		/* Error if no match found in fromList */
 		if (matchingRC == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-18
 			throw StandardException.newException(SQLState.LANG_COLUMN_NOT_FOUND, getSQLColumnName());
 		}
 
@@ -424,8 +449,11 @@ ColumnReference bindExpression(FromList fromList,
 	 * @return	The  column name in the form [[schema.]table.]column
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getSQLColumnName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_qualifiedTableName == null)
         {
 			return _columnName;
@@ -442,6 +470,7 @@ String getSQLColumnName()
     @Override
 	public String getColumnName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _columnName;
 	}
 
@@ -462,6 +491,8 @@ int getTableNumber()
 	 * @param tableNumber	The table number this ColumnReference will refer to
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setTableNumber(int tableNumber)
 	{
 		if (SanityManager.DEBUG)
@@ -482,8 +513,11 @@ void setTableNumber(int tableNumber)
 	 * 		supplied name.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getTableName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return ( ( _qualifiedTableName != null) ? _qualifiedTableName.getTableName() : null );
 	}
 
@@ -498,8 +532,11 @@ String getTableName()
 	 *			Null if not a ColumnReference.
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getSourceTableName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		return ((source != null) ? source.getTableName() : null);
 	}
 
@@ -513,6 +550,8 @@ String getSourceTableName()
 	 * @return	The name of the schema for Column's base table. If the column
 	 *		is not in a schema (i.e. is a derived column), it returns NULL.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getSourceSchemaName() throws StandardException
 	{
 		return ((source != null) ? source.getSchemaName() : null);
@@ -536,6 +575,7 @@ public boolean updatableByCursor()
 	 */
 	public TableName getQualifiedTableName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _qualifiedTableName;
 	}
 
@@ -562,6 +602,8 @@ int getColumnNumber()
 	 * @param colNum The new column number.
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setColumnNumber(int colNum)
 	{
 		this.columnNumber = colNum;
@@ -573,6 +615,8 @@ void setColumnNumber(int colNum)
 	 * @return	The source of this columnReference
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getSource()
 	{
 		return source;
@@ -584,6 +628,8 @@ ResultColumn getSource()
 	 * @param source	The source of this columnReference
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setSource(ResultColumn source)
 	{
 		this.source = source;
@@ -599,6 +645,8 @@ void setSource(ResultColumn source)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode putAndsOnTop()
 					throws StandardException
 	{
@@ -607,6 +655,7 @@ ValueNode putAndsOnTop()
 
         trueNode = new BooleanConstantNode(true, getContextManager());
         equalsNode = new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 BinaryRelationalOperatorNode.K_EQUALS,
                 this,
                 trueNode,
@@ -664,6 +713,8 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 		referencedTabs.set(tableNumber);
 
 		return ( ! replacesAggregate ) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 			   ( ! replacesWindowFunctionCall ) &&
 			   ( (source.getExpression() instanceof ColumnReference) ||
 			     (source.getExpression() instanceof VirtualColumnNode) ||
@@ -679,6 +730,8 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	 * RESOLVE: Once we start pushing join clauses, we will need to walk the
 	 * ResultColumn/VirtualColumnNode chain for them to remap the references.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void remapColumnReferences()
 	{
 		ValueNode expression = source.getExpression();
@@ -705,9 +758,11 @@ void remapColumnReferences()
 		 * have to keep track of the "orig" info for every remap
 		 * operation, not just for the most recent one.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (scoped && (_origSource != null))
 		{
 			if (remaps == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				remaps = new java.util.ArrayList<RemapInfo>();
 			remaps.add(new RemapInfo(
 				columnNumber, tableNumber, _columnName, source));
@@ -745,8 +800,11 @@ void remapColumnReferences()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void unRemapColumnReferences()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_origSource == null)
         {
 			return;
@@ -758,6 +816,8 @@ void unRemapColumnReferences()
 			// 	"Trying to unremap a ColumnReference that was not remapped.");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         if ((remaps == null) || (remaps.isEmpty()))
 		{
 			source = _origSource;
@@ -771,11 +831,15 @@ void unRemapColumnReferences()
 		{
 			// This CR is multiply-remapped, so undo the most
 			// recent (and only the most recent) remap operation.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			RemapInfo rI = remaps.remove(remaps.size() - 1);
 			source = rI.getSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			_columnName = rI.getColumnName();
 			tableNumber = rI.getTableNumber();
 			columnNumber = rI.getColumnNumber();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             if (remaps.isEmpty())
 				remaps = null;
 		}
@@ -789,6 +853,7 @@ void unRemapColumnReferences()
 	 */
 	protected boolean hasBeenRemapped()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return (_origSource != null);
 	}
 
@@ -797,6 +862,8 @@ protected boolean hasBeenRemapped()
 	 * getting what the source will be after this ColumnReference is remapped.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getSourceResultColumn()
 	{
         /* RESOLVE - If expression is a ColumnReference, then we are hitting
@@ -821,6 +888,8 @@ ResultColumn getSourceResultColumn()
 	 * @exception StandardException			Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
@@ -854,6 +923,7 @@ ValueNode remapColumnReferencesToExpressions()
 			{
 				SanityManager.THROWASSERT(
 					"sourceRC is expected to be non-null for " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 					_columnName);
 			}
 
@@ -892,6 +962,9 @@ ValueNode remapColumnReferencesToExpressions()
 				 */
 
                 ResultColumnList rcl = ft.getResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4679
+//IC see: https://issues.apache.org/jira/browse/DERBY-2526
+//IC see: https://issues.apache.org/jira/browse/DERBY-3023
 
                 // Need to save original (tn,cn) in case we have several
                 // flattenings so we can relocate the correct column many
@@ -906,10 +979,13 @@ ValueNode remapColumnReferencesToExpressions()
                 // inside a join tree, which can have many columns in the rcl
                 // with the same name, so looking up via column name can give
                 // the wrong column. DERBY-4679.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 ResultColumn ftRC = rcl.getResultColumn(
                     tableNumberBeforeFlattening,
                     columnNumberBeforeFlattening,
                     _columnName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
                 if (ftRC == null) {
                     // The above lookup won't work for references to a base
@@ -1061,8 +1137,11 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 	 * 		supplied name.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getSchemaName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return ( ( _qualifiedTableName != null) ? _qualifiedTableName.getSchemaName() : null );
 	}
 
@@ -1101,6 +1180,8 @@ boolean pointsToColumnReference()
      * the type that has been set on this node.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DataTypeDescriptor getTypeServices()
 	{        
         if (source == null)
@@ -1144,6 +1225,8 @@ protected ResultSetNode getSourceResultSet(int [] colNum)
 		// Walk the ResultColumn->ColumnReference chain until we
 		// find a ResultColumn whose expression is a VirtualColumnNode.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ValueNode rcExpr = rc.getExpression();
 		colNum[0] = getColumnNumber();
 
@@ -1210,12 +1293,14 @@ else if (rcExpr instanceof ColumnReference)
 	
     boolean isEquivalent(ValueNode o) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (! isSameNodeKind(o)) {
 			return false;
 		}
 
 		ColumnReference other = (ColumnReference)o;
 		return (tableNumber == other.tableNumber 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				&& _columnName.equals(other.getColumnName()));
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
index 28cdb62d5b..0bc9d900d2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
@@ -102,6 +102,7 @@ public void cleanupOnError(Throwable error) throws StandardException {
             
             int severity = se.getSeverity();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
 			if (severity < ExceptionSeverity.SYSTEM_SEVERITY) 
 			{
 				if (currentDependent != null)
@@ -115,6 +116,7 @@ public void cleanupOnError(Throwable error) throws StandardException {
 			// anything system or worse, or non-DB errors,
 			// will cause the whole system to shut down.
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
             if (severity >= ExceptionSeverity.SESSION_SEVERITY)
                 popMe();
 		}
@@ -135,16 +137,22 @@ public	void	resetContext()
 		compilationSchema = null;
 		parameterList = null;
 		parameterDescriptors = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 		scanIsolationLevel = TransactionControl.UNSPECIFIED_ISOLATION_LEVEL;
 		warnings = null;
 		savedObjects = null;
 		reliability = CompilerContext.SQL_LEGAL;
 		returnParameterFlag = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		initRequiredPriv();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3270
 		defaultSchemaStack = null;
         referencedSequences = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
         privilegeCheckFilters =  null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
         namedScopes = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6491
         skippingTypePrivileges = false;
 	}
 
@@ -167,6 +175,8 @@ public Parser getParser() {
     public  OptimizerFactory    getOptimizerFactory()
     {   return lcf.getOptimizerFactory(); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 	public int getNextColumnNumber()
 	{
@@ -322,9 +332,11 @@ private void addProviderToAuxiliaryList(Provider p)
 
 	public int addSavedObject(Object obj) {
         if (savedObjects == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             savedObjects = new ArrayList<Object>();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 		savedObjects.add(obj);
 		return savedObjects.size()-1;
 	}
@@ -332,6 +344,7 @@ public int addSavedObject(Object obj) {
 	public Object[] getSavedObjects() {
 		if (savedObjects == null) return null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 		Object[] retVal = savedObjects.toArray();
 		savedObjects = null; // erase to start over
 		return retVal;
@@ -340,6 +353,7 @@ public Object[] getSavedObjects() {
 	/** @see CompilerContext#setSavedObjects */
     public void setSavedObjects(List<Object> objs)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Iterator<Object> it = objs.iterator();
         while (it.hasNext()) {
             addSavedObject(it.next());
@@ -429,11 +443,14 @@ public StoreCostController getStoreCostController(long conglomerateNumber)
 			throws StandardException
 	{
         Long conglomNum = conglomerateNumber;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 
         // Try to find the given conglomerate number among the already
         // opened conglomerates.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         StoreCostController retval =
                 storeCostControllers.get(conglomNum);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
         if (retval == null) {
             // Not found, so get a StoreCostController from the store.
@@ -450,6 +467,7 @@ public StoreCostController getStoreCostController(long conglomerateNumber)
 	 */
 	private void closeStoreCostControllers()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Iterator<StoreCostController> it = storeCostControllers.values().iterator();
         while (it.hasNext())
 		{
@@ -480,6 +498,7 @@ public SortCostController getSortCostController() throws StandardException
 			*/
 
 			sortCostController =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 				lcc.getTransactionCompile().openSortCostController();
 		}
 
@@ -530,7 +549,9 @@ public SchemaDescriptor setCompilationSchema(SchemaDescriptor newDefault)
 	 */
 	public void pushCompilationSchema(SchemaDescriptor sd)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3270
 		if (defaultSchemaStack == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			defaultSchemaStack = new ArrayList<SchemaDescriptor>(2);
 		}
 
@@ -545,6 +566,7 @@ public void pushCompilationSchema(SchemaDescriptor sd)
 	public void popCompilationSchema()
 	{
 		SchemaDescriptor sd =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			defaultSchemaStack.remove(
 				defaultSchemaStack.size() - 1);
 		setCompilationSchema(sd);
@@ -593,6 +615,7 @@ public boolean getReturnParameterFlag()
 	/**
      * Get an array of type descriptors for all the ? parameters.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     DataTypeDescriptor[] getParameterTypes()
 	{
 		return parameterDescriptors;
@@ -673,13 +696,18 @@ private void initRequiredPriv()
 		privTypeStack.clear();
 		requiredColumnPrivileges = null;
 		requiredTablePrivileges = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		requiredSchemaPrivileges = null;
 		requiredRoutinePrivileges = null;
 		requiredUsagePrivileges = null;
 		requiredRolePrivileges = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if( lcc.usesSqlAuthorization())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			requiredColumnPrivileges = new HashMap<StatementTablePermission,StatementColumnPermission>();
 			requiredTablePrivileges = new HashMap<StatementTablePermission,StatementTablePermission>();
 			requiredSchemaPrivileges = new HashMap<StatementSchemaPermission,StatementSchemaPermission>();
@@ -699,12 +727,14 @@ private void initRequiredPriv()
 	 */
 	public void pushCurrentPrivType( int privType)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 		privTypeStack.add(currPrivType);
 		currPrivType = privType;
 	}
 
 	public void popCurrentPrivType( )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Integer top = privTypeStack.remove(privTypeStack.size() - 1);
         currPrivType = top.intValue();
 	}
@@ -745,6 +775,7 @@ public void addRequiredColumnPriv( ColumnDescriptor column)
 		if (td == null)
 			return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3266
 		if (td.getTableType() ==
 				TableDescriptor.GLOBAL_TEMPORARY_TABLE_TYPE) {
 			return; // no priv needed, it is per session anyway
@@ -762,6 +793,7 @@ public void addRequiredColumnPriv( ColumnDescriptor column)
             // the already existing SELECT privilege requirement.
 			StatementTablePermission key = new StatementTablePermission( 
 					tableUUID, Authorizer.SELECT_PRIV);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6411
             if (requiredColumnPrivileges.containsKey(key) ||
                     requiredTablePrivileges.containsKey(key)) {
 				return;
@@ -775,17 +807,21 @@ public void addRequiredColumnPriv( ColumnDescriptor column)
 			//that, remove the MIN_SELECT_PRIV privilege requirement
 			StatementTablePermission key = new StatementTablePermission( 
 					tableUUID, Authorizer.MIN_SELECT_PRIV);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6411
             requiredColumnPrivileges.remove(key);
 		}
 		
 		StatementTablePermission key = new StatementTablePermission( tableUUID, currPrivType);
 		StatementColumnPermission tableColumnPrivileges
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		  = requiredColumnPrivileges.get( key);
 		if( tableColumnPrivileges == null)
 		{
 			tableColumnPrivileges = new StatementColumnPermission( tableUUID,
 																   currPrivType,
 																   new FormatableBitSet( td.getNumberOfColumns()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 			requiredColumnPrivileges.put(key, tableColumnPrivileges);
 		}
 		tableColumnPrivileges.getColumns().set(column.getPosition() - 1);
@@ -801,6 +837,7 @@ public void addRequiredTablePriv( TableDescriptor table)
 		if( requiredTablePrivileges == null || table == null)
 			return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3266
 		if (table.getTableType() ==
 				TableDescriptor.GLOBAL_TEMPORARY_TABLE_TYPE) {
 			return; // no priv needed, it is per session anyway
@@ -814,10 +851,12 @@ public void addRequiredTablePriv( TableDescriptor table)
 			//that, remove the MIN_SELECT_PRIV privilege requirement
 			StatementTablePermission key = new StatementTablePermission( 
 					table.getUUID(), Authorizer.MIN_SELECT_PRIV);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6411
             requiredColumnPrivileges.remove(key);
 		}
 
 		StatementTablePermission key = new StatementTablePermission( table.getUUID(), currPrivType);
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		requiredTablePrivileges.put(key, key);
 	}
 
@@ -837,6 +876,7 @@ public void addRequiredRoutinePriv( AliasDescriptor routine)
 			return;
 
  		if (requiredRoutinePrivileges.get(routine.getUUID()) == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 			requiredRoutinePrivileges.put(routine.getUUID(), 1);
 	}
 
@@ -878,6 +918,7 @@ public void addRequiredSchemaPriv(String schemaName, String aid, int privType)
 	 */
 	public void addRequiredRolePriv(String roleName, int privType)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 		if( requiredRolePrivileges == null)
 			return;
 
@@ -907,6 +948,7 @@ public List<StatementPermission> getRequiredPermissionsList()
 		if( requiredRolePrivileges != null)
         { size += requiredRolePrivileges.size(); }
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		ArrayList<StatementPermission> list = new ArrayList<StatementPermission>( size);
 		if( requiredRoutinePrivileges != null)
 		{
@@ -923,6 +965,8 @@ public List<StatementPermission> getRequiredPermissionsList()
 			{
 				UUID objectID = itr.next();
 				
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 list.add(new StatementGenericPermission(
                         objectID,
                         requiredUsagePrivileges.get(objectID),
@@ -936,6 +980,7 @@ public List<StatementPermission> getRequiredPermissionsList()
 				list.add( itr.next());
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		if( requiredSchemaPrivileges != null)
 		{
 			for( Iterator<StatementSchemaPermission> itr = requiredSchemaPrivileges.values().iterator(); itr.hasNext();)
@@ -950,6 +995,7 @@ public List<StatementPermission> getRequiredPermissionsList()
 				list.add( itr.next());
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 		if( requiredRolePrivileges != null)
 		{
 			for( Iterator<StatementRolePermission> itr = requiredRolePrivileges.values().iterator();
@@ -964,6 +1010,7 @@ public List<StatementPermission> getRequiredPermissionsList()
 	public void addReferencedSequence( SequenceDescriptor sd )
     {
         if ( referencedSequences == null ) { referencedSequences = new HashMap<UUID,SequenceDescriptor>(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         referencedSequences.put( sd.getUUID(), sd );
     }
@@ -980,6 +1027,7 @@ public boolean isReferenced( SequenceDescriptor sd )
 
     public  void    addPrivilegeFilter( VisitableFilter vf )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
         if ( privilegeCheckFilters == null ) { privilegeCheckFilters = new ArrayList<VisitableFilter>(); }
         
         privilegeCheckFilters.add( vf );
@@ -1009,6 +1057,7 @@ public  boolean passesPrivilegeFilters( Visitable visitable )
     
     public  void    beginScope( String scopeName )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
         if ( namedScopes == null ) { namedScopes = new HashMap<String,int[]>(); }
         
         int[]   scopeDepth = namedScopes.get( scopeName );
@@ -1048,6 +1097,7 @@ public  boolean    skipTypePrivileges( boolean skip )
         boolean oldValue = skippingTypePrivileges;
         
         skippingTypePrivileges = skip;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6491
 
         return oldValue;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
index ed0b7d7a4f..6663447c99 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
@@ -40,6 +40,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * varying.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class ConcatenationOperatorNode extends BinaryOperatorNode {
 	/**
      * Constructor for a ConcatenationOperatorNode
@@ -83,6 +85,8 @@ ValueNode evaluateConstantExpressions() throws StandardException {
                     (StringDataValue) getTypeServices().getNull();
             resultValue.concatenate(leftValue, rightValue, resultValue);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             return new CharConstantNode(
                 resultValue.getString(), getContextManager());
         }
@@ -98,6 +102,7 @@ ValueNode evaluateConstantExpressions() throws StandardException {
 	 *                thrown on failure
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException {
 		// deal with binding operands
@@ -223,6 +228,8 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 					.getCastToCharWidth(leftOperand							.getTypeServices()));	
 
             leftOperand = new CastNode(leftOperand, dtd, getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			// DERBY-2910 - Match current schema collation for implicit cast as we do for
 			// explicit casts per SQL Spec 6.12 (10)			
@@ -238,6 +245,8 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 							.getCastToCharWidth(rightOperand
 									.getTypeServices()));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             rightOperand = new CastNode(rightOperand, dtd, getContextManager());
 			
 			// DERBY-2910 - Match current schema collation for implicit cast as we do for
@@ -301,6 +310,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 	 *                not supported on the operand types.
 	 */
 	private DataTypeDescriptor resolveConcatOperation(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
 			DataTypeDescriptor leftType, DataTypeDescriptor rightType)
 			throws StandardException {
 		TypeId leftTypeId;
@@ -389,6 +399,7 @@ private DataTypeDescriptor resolveConcatOperation(
 			switch (rightTypeId.getJDBCTypeId()) {
 			case Types.CHAR:
 			case Types.BINARY:
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 				if (resultLength > Limits.DB2_CHAR_MAXWIDTH) {
 					if (rightTypeId.getJDBCTypeId() == Types.CHAR)
 						//operands CHAR(A) CHAR(B) and A+B>254 then result is
@@ -403,6 +414,7 @@ private DataTypeDescriptor resolveConcatOperation(
 
 			case Types.VARCHAR:
 			case Types.VARBINARY:
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 				if (resultLength > Limits.DB2_CONCAT_VARCHAR_LENGTH) {
 					if (rightTypeId.getJDBCTypeId() == Types.VARCHAR)
 						//operands CHAR(A) VARCHAR(B) and A+B>4000 then result
@@ -429,6 +441,7 @@ private DataTypeDescriptor resolveConcatOperation(
 							 // result is LONG VARCHAR
 			case Types.VARCHAR: //operands VARCHAR(A) VARCHAR(B) and A+B>4000
 								// then result is LONG VARCHAR
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 				if (resultLength > Limits.DB2_CONCAT_VARCHAR_LENGTH)
 					higherType = TypeId.LONGVARCHAR_NAME;
 				break;
@@ -446,6 +459,7 @@ private DataTypeDescriptor resolveConcatOperation(
 			case Types.VARBINARY://operands VARCHAR FOR BIT DATA(A) VARCHAR FOR
 								 // BIT DATA(B) and A+B>4000 then result is LONG
 								 // VARCHAR FOR BIT DATA
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 				if (resultLength > Limits.DB2_CONCAT_VARCHAR_LENGTH)
 					higherType = TypeId.LONGVARBIT_NAME;
 				break;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConditionalNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConditionalNode.java
index 7416afb312..14542c5893 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConditionalNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConditionalNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ConditionalNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -44,6 +45,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class ConditionalNode extends ValueNode
 {
     /**
@@ -77,6 +80,7 @@ class ConditionalNode extends ValueNode
 	{
         super(cm);
         this.caseOperand = caseOperand;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         this.testConditions = testConditions;
         this.thenElseList = thenElseList;
 	}
@@ -88,12 +92,15 @@ class ConditionalNode extends ValueNode
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
 		{
 			super.printSubNodes(depth);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
             if (testConditions != null)
 			{
                 printLabel(depth, "testConditions: ");
@@ -125,7 +132,11 @@ private void recastNullNodes(
 
 		// need to have nullNodes nullable
 		castType = castType.getNullabilityType(true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2775
+//IC see: https://issues.apache.org/jira/browse/DERBY-3346
+//IC see: https://issues.apache.org/jira/browse/DERBY-3342
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         for (int i = 0; i < thenElseList.size(); i++) {
             ValueNode vn = thenElseList.elementAt(i);
             if (vn instanceof UntypedNullConstantNode) {
@@ -150,6 +161,7 @@ private void recastNullNodes(
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -163,6 +175,10 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
         testConditions.bindExpression(fromList,
 			subqueryList,
             aggregates);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
         // If we have a simple case expression in which the case operand
         // requires type from context (typically because it's an untyped
@@ -229,6 +245,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 
         // Set the type of the parameters.
         thenElseList.setParameterDescriptor(getTypeServices());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
 
 		/* The then and else expressions must be type compatible */
 		ClassInspector cu = getClassFactory().getClassInspector();
@@ -239,6 +256,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 		** since we are going to generate a cast node, but that might
 		** be confusing to users...
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         for (ValueNode expr : thenElseList) {
             DataTypeDescriptor dtd = expr.getTypeServices();
             String javaTypeName =
@@ -265,6 +283,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 		** stick it over the original expression
 		*/
 		TypeId condTypeId = getTypeId();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         for (int i = 0; i < thenElseList.size(); i++) {
             ValueNode expr = thenElseList.elementAt(i);
             if (expr.getTypeId().typePrecedence()
@@ -304,6 +323,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
      */
     private ValueNodeList bindCaseOperand(
                     CompilerContext cc, FromList fromList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     SubqueryList subqueryList, List<AggregateNode> aggregates)
             throws StandardException {
 
@@ -395,12 +415,15 @@ public boolean skipChildren(Visitable node) throws StandardException {
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
 								PredicateList outerPredicateList) 
 					throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         testConditions.preprocess(numTables,
                                   outerFromList, outerSubqueryList,
                                   outerPredicateList);
@@ -450,6 +473,7 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 
 		boolean pushable;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         pushable = testConditions.categorize(referencedTabs, simplePredsOnly);
 		pushable = (thenElseList.categorize(referencedTabs, simplePredsOnly) && pushable);
 		return pushable;
@@ -464,9 +488,12 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	 * @exception StandardException			Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         testConditions = testConditions.remapColumnReferencesToExpressions();
 		thenElseList = thenElseList.remapColumnReferencesToExpressions();
 		return this;
@@ -480,6 +507,7 @@ ValueNode remapColumnReferencesToExpressions()
     @Override
     boolean isConstantExpression()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         return (testConditions.isConstantExpression() &&
 			    thenElseList.isConstantExpression());
 	}
@@ -488,6 +516,7 @@ boolean isConstantExpression()
     @Override
     boolean constantExpression(PredicateList whereClause)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         return (testConditions.constantExpression(whereClause) &&
 			    thenElseList.constantExpression(whereClause));
 	}
@@ -516,6 +545,7 @@ ValueNode eliminateNots(boolean underNotNode)
         // CASE WHEN a THEN NOT b ELSE NOT c END, so just push the
         // NOT node down to the THEN and ELSE expressions.
         thenElseList.eliminateNots(underNotNode);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
 
         // Eliminate NOTs in the WHEN expressions too. The NOT node above us
         // should not be pushed into the WHEN expressions, though, as that
@@ -537,6 +567,7 @@ ValueNode eliminateNots(boolean underNotNode)
     void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 									throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         if (SanityManager.DEBUG) {
             // There should be at least one test condition.
             SanityManager.ASSERT(testConditions.size() > 0);
@@ -582,11 +613,13 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
         if (testConditions != null)
 		{
             testConditions = (ValueNodeList) testConditions.accept(v);
@@ -603,8 +636,10 @@ void acceptChildren(Visitor v)
 	 */
     boolean isEquivalent(ValueNode o) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (isSameNodeKind(o)) {
 			ConditionalNode other = (ConditionalNode)o;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
             return testConditions.isEquivalent(other.testConditions) &&
                     thenElseList.isEquivalent(other.thenElseList);
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConstantNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConstantNode.java
index dd2a7f4f62..5029140ca1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConstantNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConstantNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ConstantNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -60,6 +61,8 @@ abstract class ConstantNode extends ValueNode
 	** two fields holding the same constant).
 	*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ConstantNode(
             TypeId typeId,
             boolean nullable,
@@ -84,6 +87,8 @@ void setValue(DataValueDescriptor value)
 	/**
 	  * Get the value in this ConstantNode
 	  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DataValueDescriptor getValue()
 	{
 		return	value;
@@ -127,6 +132,8 @@ boolean isCloneable()
 	 *
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getClone()
 	{
 		/* All constants can simply be reused */
@@ -151,9 +158,12 @@ ValueNode getClone()
 	 * signature here needs to have throws StandardException 
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode bindExpression(FromList fromList,
                              SubqueryList subqueryList,
                              List<AggregateNode> aggregates)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2334
             throws StandardException
 	{
 		/*
@@ -202,6 +212,7 @@ boolean constantExpression(PredicateList whereClause)
 		/* Are we generating a SQL null value? */
 	    if (isNull())
 	    {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 			acb.generateNull(mb, getTypeCompiler(), 
 					getTypeServices().getCollationType());
 		}
@@ -257,6 +268,7 @@ protected int getOrderableVariantType()
         
     boolean isEquivalent(ValueNode o) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (isSameNodeKind(o)) {
 			ConstantNode other = (ConstantNode)o;
 			
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
index 78983cf8bf..9c6767dfb3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ConstraintDefinitionNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -69,6 +70,8 @@ public class ConstraintDefinitionNode extends TableElementNode
      */
     private boolean[] characteristics;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ConstraintDefinitionNode(
                     TableName constraintName,
                     int constraintType,
@@ -101,6 +104,7 @@ public class ConstraintDefinitionNode extends TableElementNode
 	}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     void setCharacteristics(boolean[] cc) {
         characteristics = cc.clone();
     }
@@ -197,6 +201,7 @@ String	getConstraintMoniker()
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         To support dropping existing constraints that may have mismatched schema names
 		we need to support ALTER TABLE S1.T DROP CONSTRAINT S2.C.
 		If a constraint name was specified this returns it, otherwise it returns null.
@@ -254,6 +259,8 @@ void setAuxiliaryProviderList(ProviderList apl)
 	 *
 	 * @return	The auxiliary provider list.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ProviderList getAuxiliaryProviderList()
 	{
 		return apl;
@@ -367,6 +374,8 @@ int getConstraintType()
 	 *
 	 * @param properties	The optional Properties for this constraint.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setProperties(Properties properties)
 	{
 		this.properties = properties;
@@ -378,6 +387,8 @@ void setProperties(Properties properties)
 	 *
 	 * @return The optional properties for the backing index to this constraint
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     Properties getProperties()
 	{
 		return properties;
@@ -419,6 +430,8 @@ boolean isEnabled()
 	 *
 	 * @return ResultColumnList The column list from this table constraint.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList getColumnList()
 	{
 		return columnList;
@@ -430,6 +443,8 @@ ResultColumnList getColumnList()
 	 *
 	 * @param columnList	The new columnList.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setColumnList(ResultColumnList columnList)
 	{
 		this.columnList = columnList;
@@ -440,6 +455,8 @@ void setColumnList(ResultColumnList columnList)
 	 *
 	 * @return The check condition from this node.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getCheckCondition()
 	{
 		return checkCondition;
@@ -450,6 +467,8 @@ ValueNode getCheckCondition()
 	 *
 	 * @param checkCondition	The check condition
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setCheckCondition(ValueNode checkCondition)
 	{
 		this.checkCondition = checkCondition;
@@ -460,6 +479,8 @@ void setCheckCondition(ValueNode checkCondition)
 	 *
 	 * @return The constraint text.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getConstraintText()
 	{
 		return constraintText;
@@ -500,6 +521,7 @@ private	UUIDFactory	getUUIDFactory()
 	{
 		if ( uuidFactory == null )
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			uuidFactory = getMonitor().getUUIDFactory();
 		}
 		return	uuidFactory;
@@ -549,6 +571,7 @@ void qualifyNames() throws StandardException {
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java
index c9b06fa919..897743d6ae 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java
@@ -25,6 +25,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.iapi.sql.compile.CostEstimate;
 import org.apache.derby.iapi.store.access.StoreCostResult;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CostEstimateImpl implements CostEstimate {
     double  cost;
     double  rowCount;
@@ -311,6 +313,8 @@ public void setEstimatedRowCount(long count) {
 		singleScanRowCount = (double) count;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimateImpl setState(double theCost,
 										double theRowCount,
 										CostEstimateImpl retval) {
@@ -326,6 +330,7 @@ CostEstimateImpl setState(double theCost,
     
 	public String toString() 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
 		return "CostEstimateImpl: at " + hashCode() + ", cost == " + cost +
 				", rowCount == " + rowCount + 
 				", singleScanRowCount == " + singleScanRowCount;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
index d085ff1c1a..adadd4ae22 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CreateAliasNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -45,6 +46,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CreateAliasNode extends DDLStatementNode
 {
     // indexes into routineElements
@@ -130,7 +133,10 @@ class CreateAliasNode extends DDLStatementNode
      * @param cm                    The context manager
      * @exception StandardException Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CreateAliasNode(    TableName aliasName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 						Object targetObject,
                         String methodName,
 						Object aliasSpecificInfo,
@@ -152,6 +158,7 @@ class CreateAliasNode extends DDLStatementNode
 
                 // XML not allowed because SQLXML support has not been implemented
                 if (
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                     (aggForType.getJDBCTypeId() == Types.SQLXML) ||
                     (aggReturnType.getJDBCTypeId() == Types.SQLXML)
                    )
@@ -175,6 +182,8 @@ class CreateAliasNode extends DDLStatementNode
 			{
 				this.javaClassName = (String) targetObject;
                 this.methodName = methodName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 				//routineElements contains the description of the procedure.
 				// 
@@ -212,6 +221,7 @@ class CreateAliasNode extends DDLStatementNode
 				
 				if (paramCount != 0) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                     names = new String[paramCount];
                     types = new TypeDescriptor[paramCount];
 					modes = new int[paramCount];
@@ -229,6 +239,7 @@ class CreateAliasNode extends DDLStatementNode
                         //
                         if ( !types[ i ].isUserDefinedType() )
                         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
                             if (TypeId.getBuiltInTypeId(types[i].getJDBCTypeId()).isXMLTypeId())
                             { throw StandardException.newException(SQLState.LANG_LONG_DATA_TYPE_NOT_ALLOWED, names[i]); }
                         }
@@ -262,6 +273,7 @@ class CreateAliasNode extends DDLStatementNode
 				Boolean hasVarargsO = (Boolean) routineElements[ VARARGS ];
                 boolean hasVarargs = (hasVarargsO == null) ? false : hasVarargsO.booleanValue();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 Boolean definersRightsO =
                     (Boolean) routineElements[ROUTINE_SECURITY_DEFINER];
                 boolean definersRights  =
@@ -286,6 +298,7 @@ class CreateAliasNode extends DDLStatementNode
                     returnType = dtd.getCatalogType();
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 aliasInfo = new RoutineAliasInfo(
                     this.methodName,
                     paramCount,
@@ -306,6 +319,7 @@ class CreateAliasNode extends DDLStatementNode
 				}
 				break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 			case AliasInfo.ALIAS_TYPE_SYNONYM_AS_CHAR:
 				String targetSchema;
 				implicitCreateSchema = true;
@@ -325,6 +339,8 @@ class CreateAliasNode extends DDLStatementNode
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		switch (this.aliasType)
@@ -335,6 +351,7 @@ String statementToString()
 			return "CREATE TYPE";
 		case AliasInfo.ALIAS_TYPE_PROCEDURE_AS_CHAR:
 			return "CREATE PROCEDURE";
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 		case AliasInfo.ALIAS_TYPE_SYNONYM_AS_CHAR:
 			return "CREATE SYNONYM";
 		default:
@@ -449,6 +466,7 @@ public void bindStatement() throws StandardException
 
 		// Don't allow creating synonyms in SESSION schema. Causes confusion if
 		// a temporary table is created later with same name.
+//IC see: https://issues.apache.org/jira/browse/DERBY-405
 		if (isSessionSchema(getSchemaDescriptor().getSchemaName()))
 			throw StandardException.newException(SQLState.LANG_OPERATION_NOT_ALLOWED_ON_SESSION_SCHEMA_TABLES);
 
@@ -474,6 +492,8 @@ private void    bindAggregate() throws StandardException
         // A user-defined aggregate cannot have the name of a builtin function which takes 1 argument.
         //
         SchemaDescriptor    sysfun = getSchemaDescriptor( "SYSFUN", true );
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         List<AliasDescriptor> systemFunctions =
             getDataDictionary().getRoutineList(
                 sysfun.getUUID().toString(),
@@ -532,6 +552,7 @@ private void bindParameterTypes( RoutineAliasInfo aliasInfo ) throws StandardExc
             parameterTypes[ i ] = bindUserCatalogType( parameterTypes[ i ] );
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
         aliasInfo.setParameterTypes( parameterTypes );
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
index 44548ce136..99f6c311f8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CreateIndexNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -44,6 +45,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CreateIndexNode extends DDLStatementNode
 {
     private boolean             unique;
@@ -71,6 +74,8 @@ class CreateIndexNode extends DDLStatementNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CreateIndexNode(boolean unique,
                     String indexType,
                     TableName indexName,
@@ -112,6 +117,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "CREATE INDEX";
@@ -133,6 +140,8 @@ public void bindStatement() throws StandardException
 		int						columnCount;
 
         getSchemaDescriptor(); // want checking side-effects only
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		td = getTableDescriptor(tableName);
 
@@ -143,6 +152,7 @@ public void bindStatement() throws StandardException
 		}
 
 		//If total number of indexes on the table so far is more than 32767, then we need to throw an exception
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		if (td.getTotalNumberOfIndexes() > Limits.DB2_MAX_INDEXES_ON_TABLE)
 		{
 			throw StandardException.newException(SQLState.LANG_TOO_MANY_INDEXES_ON_TABLE,
@@ -268,6 +278,7 @@ public ConstantAction makeConstantAction() throws StandardException
         }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 		return getGenericConstantActionFactory().getCreateIndexConstantAction(
                     false, // not for CREATE TABLE
                     unique,
@@ -275,6 +286,7 @@ public ConstantAction makeConstantAction() throws StandardException
                     false, // it's not a constraint, so its checking
                            // is not deferrable
                     false, // initiallyDeferred: N/A
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                     -1,    // constraintType: N/A
                     indexType,
                     sd.getSchemaName(),
@@ -298,6 +310,7 @@ private void verifyAndGetUniqueNames()
 				throws StandardException
 	{
 		int size = columnNameList.size();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         HashSet<String> seenNames = new HashSet<String>(size + 2, 0.999f);
 		columnNames = new String[size];
 		isAscending = new boolean[size];
@@ -307,6 +320,8 @@ private void verifyAndGetUniqueNames()
 			/* Verify that this column's name is unique within the list
 			 * Having a space at the end meaning descending on the column
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             columnNames[index] = columnNameList.get(index);
 			if (columnNames[index].endsWith(" "))
 			{
@@ -318,6 +333,7 @@ private void verifyAndGetUniqueNames()
 
             boolean alreadySeen = !seenNames.add(columnNames[index]);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 			if (alreadySeen)
 			{
 				throw StandardException.newException(SQLState.LANG_DUPLICATE_COLUMN_NAME_CREATE_INDEX, columnNames[index]);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateRoleNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateRoleNode.java
index c510778ff7..bafe4a3c7d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateRoleNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateRoleNode.java
@@ -34,6 +34,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CreateRoleNode extends DDLStatementNode
 {
     private String name;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java
index 0c14600d20..b7735f018a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CreateSchemaNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -34,6 +35,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CreateSchemaNode extends DDLStatementNode
 {
 	private String 	name;
@@ -92,11 +95,14 @@ public String toString()
 	public void bindStatement() throws StandardException
 	{
 		CompilerContext cc = getCompilerContext();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		if (isPrivilegeCollectionRequired())
 			cc.addRequiredSchemaPriv(name, aid, Authorizer.CREATE_SCHEMA_PRIV);
 
 	}
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "CREATE SCHEMA";
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateSequenceNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateSequenceNode.java
index 85460020bd..51b8ebc4b3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateSequenceNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateSequenceNode.java
@@ -37,6 +37,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * represents a CREATE SEQUENCE statement.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CreateSequenceNode extends DDLStatementNode
 {
     private TableName _sequenceName;
@@ -62,6 +64,8 @@ class CreateSequenceNode extends DDLStatementNode
      * @param cm Context manager
      * @throws org.apache.derby.shared.common.error.StandardException on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CreateSequenceNode
         (
          TableName sequenceName,
@@ -111,6 +115,8 @@ class CreateSequenceNode extends DDLStatementNode
             }
         }
         _cycle = cycle;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
         // automatically create the schema if it doesn't exist
         implicitCreateSchema = true;
@@ -246,6 +252,8 @@ public ConstantAction makeConstantAction() {
                         _stepValue.longValue(),
                         _maxValue.longValue(),
                         _minValue.longValue(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         _cycle);
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateTableNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
index 1e836cc444..895d005b55 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CreateTableNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -48,6 +49,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CreateTableNode extends DDLStatementNode
 {
 	private char				lockGranularity;
@@ -72,6 +75,8 @@ class CreateTableNode extends DDLStatementNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CreateTableNode(
             TableName        tableName,
             TableElementList tableElementList,
@@ -94,6 +99,8 @@ class CreateTableNode extends DDLStatementNode
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         this.tableElementList = tableElementList;
         this.properties = properties;
 	}
@@ -112,6 +119,8 @@ class CreateTableNode extends DDLStatementNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CreateTableNode(
             TableName tableName,
             TableElementList tableElementList,
@@ -148,6 +157,8 @@ class CreateTableNode extends DDLStatementNode
 	 * @param queryExpression	The query expression for the table.
      * @param cm                The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CreateTableNode(
             TableName tableName,
             ResultColumnList resultColumns,
@@ -197,6 +208,7 @@ public String toString()
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 			String tempString = "";
 			if (tableType == TableDescriptor.GLOBAL_TEMPORARY_TABLE_TYPE)
 			{
@@ -222,7 +234,10 @@ public String toString()
 	 * @param depth		The depth to indent the sub-nodes
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (SanityManager.DEBUG) {
 			printLabel(depth, "tableElementList: ");
 			tableElementList.treePrint(depth + 1);
@@ -230,6 +245,8 @@ void printSubNodes(int depth) {
 	}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		if (tableType == TableDescriptor.GLOBAL_TEMPORARY_TABLE_TYPE)
@@ -258,11 +275,15 @@ public void bindStatement() throws StandardException
         int numUniqueConstraints;
         int numGenerationClauses;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3923
         SchemaDescriptor sd = getSchemaDescriptor
             ( tableType != TableDescriptor.GLOBAL_TEMPORARY_TABLE_TYPE, true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-64
 		if (queryExpression != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             FromList fromList = new FromList(
                     getOptimizerFactory().doJoinOrderOptimization(),
 					getContextManager());
@@ -317,8 +338,11 @@ public void bindStatement() throws StandardException
 			int schemaCollationType = sd.getCollationType();
 	    
 			/* Create table element list from columns in query expression */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             tableElementList = new TableElementList(getContextManager());
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (ResultColumn rc : qeRCL)
 			{
 				if (rc.isGenerated()) 
@@ -358,9 +382,12 @@ public void bindStatement() throws StandardException
 					throw StandardException.newException(
 							SQLState.LANG_CAN_NOT_CREATE_TABLE,
 							dtd.getCollationName(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
 							DataTypeDescriptor.getCollationName(schemaCollationType));
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 ColumnDefinitionNode column = new ColumnDefinitionNode(
                         rc.getName(),
                         null,
@@ -386,6 +413,7 @@ public void bindStatement() throws StandardException
 			//exception for 'T%' having collation of territory based and 
 			//EMPNAME having the default collation of UCS_BASIC
 			tableElementList.setCollationTypesOnCharacterStringColumns(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3266
 				getSchemaDescriptor(
 					tableType != TableDescriptor.GLOBAL_TEMPORARY_TABLE_TYPE,
 					true));
@@ -394,6 +422,7 @@ public void bindStatement() throws StandardException
 		tableElementList.validate(this, dataDictionary, (TableDescriptor) null);
 
 		/* Only 1012 columns allowed per table */
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		if (tableElementList.countNumberOfColumns() > Limits.DB2_MAX_COLUMNS_IN_TABLE)
 		{
 			throw StandardException.newException(SQLState.LANG_TOO_MANY_COLUMNS_IN_TABLE_OR_VIEW,
@@ -430,6 +459,7 @@ public void bindStatement() throws StandardException
 
 		//each of these constraints have a backing index in the back. We need to make sure that a table never has more
 		//more than 32767 indexes on it and that is why this check.
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		if ((numPrimaryKeys + numReferenceConstraints + numUniqueConstraints) > Limits.DB2_MAX_INDEXES_ON_TABLE)
 		{
 			throw StandardException.newException(SQLState.LANG_TOO_MANY_INDEXES_ON_TABLE, 
@@ -455,6 +485,7 @@ public void bindStatement() throws StandardException
 			/* Now that we've finally goobered stuff up, bind and validate
 			 * the check constraints and generation clauses.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4145
 			if  (numGenerationClauses > 0) { tableElementList.bindAndValidateGenerationClauses( sd, fromList, generatedColumns, null ); }
 			if  (numCheckConstraints > 0) { tableElementList.bindAndValidateCheckConstraints(fromList); }
             if ( numReferenceConstraints > 0) { tableElementList.validateForeignKeysOnGenerationClauses( fromList, generatedColumns ); }
@@ -475,6 +506,7 @@ public boolean referencesSessionSchema()
 		throws StandardException
 	{
 		//If table being created/declared is in SESSION schema, then return true.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3266
 		return isSessionSchema(
 			getSchemaDescriptor(
 				tableType != TableDescriptor.GLOBAL_TEMPORARY_TABLE_TYPE,
@@ -499,6 +531,8 @@ public ConstantAction makeConstantAction() throws StandardException
 		/* If we've seen a constraint, then build a constraint list */
 		CreateConstraintConstantAction[] conActions = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3266
+//IC see: https://issues.apache.org/jira/browse/DERBY-3266
 		SchemaDescriptor sd = getSchemaDescriptor(
 			tableType != TableDescriptor.GLOBAL_TEMPORARY_TABLE_TYPE,
 			true);
@@ -509,6 +543,7 @@ public ConstantAction makeConstantAction() throws StandardException
 			conActions =
                 new CreateConstraintConstantAction[numConstraints];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3008
 			coldefs.genConstraintActions(true,
                 conActions, getRelativeName(), sd, getDataDictionary());
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
index ee4b55ba36..833a8f7c31 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CreateTriggerNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -55,6 +56,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CreateTriggerNode extends DDLStatementNode
 {
 	private	TableName			triggerName;
@@ -266,6 +269,8 @@ class CreateTriggerNode extends DDLStatementNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CreateTriggerNode
 	(
         TableName       triggerName,
@@ -314,6 +319,8 @@ String statementToString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -381,8 +388,10 @@ public void bindStatement() throws StandardException
 		{
 				throw StandardException.newException(SQLState.LANG_OPERATION_NOT_ALLOWED_ON_SESSION_SCHEMA_TABLES);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		if (isPrivilegeCollectionRequired())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 			compilerContext.pushCurrentPrivType(Authorizer.TRIGGER_PRIV);
 			compilerContext.addRequiredTablePriv(triggerTableDescriptor);
 			compilerContext.popCurrentPrivType();			
@@ -428,6 +437,7 @@ public void bindStatement() throws StandardException
 			// to procedures that modify SQL data. If the action statement 
 			// contains a procedure call, this reliability will be used during
 			// bind of the call statement node. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-551
 			if(isBefore)
 				compilerContext.setReliability(CompilerContext.MODIFIES_SQL_DATA_PROCEDURE_ILLEGAL);
 					
@@ -465,7 +475,9 @@ public void bindStatement() throws StandardException
 		if (triggerCols != null && triggerCols.size() != 0)
 		{
             HashSet<String> columnNames = new HashSet<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (ResultColumn rc : triggerCols)
 			{
 				if (!columnNames.add(rc.getName()))
@@ -524,6 +536,7 @@ public int compare(FromBaseTable o1, FromBaseTable o2) {
             // Return negative int, zero, or positive int if the offset of the
             // first table is less than, equal to, or greater than the offset
             // of the second table.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             return o1.getTableNameField().getBeginOffset() -
                     o2.getTableNameField().getBeginOffset();
         }
@@ -597,6 +610,7 @@ private boolean bindReferencesClause(DataDictionary dd) throws StandardException
 			//    FOR EACH ROW UPDATE table2 SET c24=oldt.c14;
 			
 			for (int i=0; i < triggerCols.size(); i++){
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 ResultColumn rc = triggerCols.elementAt(i);
                 ColumnDescriptor cd =
                     triggerTableDescriptor.getColumnDescriptor(rc.getName());
@@ -629,6 +643,7 @@ private boolean bindReferencesClause(DataDictionary dd) throws StandardException
 
 			int[] cols;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
 			cols = getDataDictionary().examineTriggerNodeAndCols(actionNode,
 					oldTableName,
 					newTableName,
@@ -671,6 +686,7 @@ private boolean bindReferencesClause(DataDictionary dd) throws StandardException
 					triggerEventMask,
                     true,
                     actionTransformations, cols);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
 
             // If there is a WHEN clause, we need to transform its text too.
             if (whenClause != null) {
@@ -681,6 +697,7 @@ private boolean bindReferencesClause(DataDictionary dd) throws StandardException
                             referencedColsInTriggerAction,
                             whenClause.getBeginOffset(),
                             triggerTableDescriptor, triggerEventMask, true,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
                             whenClauseTransformations, cols);
             }
 
@@ -717,6 +734,7 @@ private boolean bindReferencesClause(DataDictionary dd) throws StandardException
 		{
 			regenNode = true;
 			actionText = transformedActionText;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 			actionNode = parseStatement(actionText, true);
 		}
 
@@ -925,6 +943,8 @@ private String transformStatementTriggerText(
         final int offset = node.getBeginOffset();
         int start = 0;
         StringBuilder newText = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
         // For a statement trigger, we find all FromBaseTable nodes. If
         // the from table is NEW or OLD (or user designated alternates
@@ -1053,6 +1073,7 @@ private void    forbidActionsOnGenCols()
 
         if ( genColCount == 0 ) { return; }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         CollectNodesVisitor<ColumnReference> visitor =
             new CollectNodesVisitor<ColumnReference>(ColumnReference.class);
 
@@ -1121,6 +1142,8 @@ private void validateReferencesClause(DataDictionary dd) throws StandardExceptio
 			return;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         for (TriggerReferencingStruct trn : refClause)
 		{
 			/*
@@ -1211,6 +1234,8 @@ public ConstantAction makeConstantAction() throws StandardException
 											whenText,
 											(UUID)null,			// action SPSid 
 											actionText,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                                             compSchemaDescriptor.getUUID(),
 											referencedColInts,
 											referencedColsInTriggerAction,
@@ -1239,6 +1264,8 @@ public String toString()
 			String refString = "null";
 			if (refClause != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 StringBuilder buf = new StringBuilder();
                 for (TriggerReferencingStruct trn : refClause)
 				{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateViewNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
index 3804b9dd6b..18d078ab34 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CreateViewNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -46,6 +47,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CreateViewNode extends DDLStatementNode
 {
     private ResultColumnList resultColumns;
@@ -76,6 +79,8 @@ class CreateViewNode extends DDLStatementNode
      * @param cm                Context manager
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CreateViewNode(TableName viewName,
                    ResultColumnList resultColumns,
                    ResultSetNode queryExpression,
@@ -121,6 +126,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "CREATE VIEW";
@@ -133,6 +140,8 @@ String statementToString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -173,6 +182,8 @@ public void bindStatement() throws StandardException
 
 		providerInfos = bindViewDefinition
 			( dataDictionary, cc, getLanguageConnectionContext(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
               getOptimizerFactory(),
 			  queryExpression,
 			  getContextManager()
@@ -204,6 +215,7 @@ public void bindStatement() throws StandardException
 		}
 
 		/* Only 5000 columns allowed per view */
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 		if (queryExpression.getResultColumns().size() > Limits.DB2_MAX_COLUMNS_IN_VIEW)
 		{
 			throw StandardException.newException(SQLState.LANG_TOO_MANY_COLUMNS_IN_TABLE_OR_VIEW,
@@ -230,6 +242,8 @@ public void bindStatement() throws StandardException
 	 */
 
     private ProviderInfo[] bindViewDefinition(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         DataDictionary      dataDictionary,
         CompilerContext     compilerContext,
         LanguageConnectionContext lcc,
@@ -276,6 +290,7 @@ private ProviderInfo[] bindViewDefinition(
 		}
 
 		DependencyManager 		dm = dataDictionary.getDependencyManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         ProviderInfo[]          provInfo = dm.getPersistentProviderInfos(apl);
 		// need to clear the column info in case the same table descriptor
 		// is reused, eg., in multiple target only view definition
@@ -289,6 +304,7 @@ private ProviderInfo[] bindViewDefinition(
 				" on return from RS.bindExpressions()");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return provInfo;
 	}
 
@@ -341,6 +357,7 @@ private void genColumnInfos(ColumnInfo[] colInfos)
 
 		for (int index = 0; index < colInfos.length; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = rcl.elementAt(index);
 			// The colInfo array has been initialized to be of length 
 			// visibleSize() (DERBY-4230).  This code assumes that all the visible
@@ -348,6 +365,7 @@ private void genColumnInfos(ColumnInfo[] colInfos)
 			// if we hit a generated column in what we think is the visible
 			// range.
 			if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				if (rc.isGenerated())
 					SanityManager.THROWASSERT("Encountered generated column in expected visible range at rcl[" + index +"]");
 			}
@@ -360,6 +378,11 @@ private void genColumnInfos(ColumnInfo[] colInfos)
 											 null,
 											 null,
 											 ColumnInfo.CREATE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 											 0, 0, false, 0);
 		}
 	}
@@ -391,11 +414,13 @@ private void genColumnInfos(ColumnInfo[] colInfos)
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (queryExpression != null)
 		{
 			queryExpression = (ResultSetNode)queryExpression.accept(v);
@@ -403,6 +428,9 @@ void acceptChildren(Visitor v)
 	}
 
     public OrderByList getOrderByList() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
         return orderByList;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
index f91ef0a318..40c1ea1c30 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CurrentDatetimeOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -56,6 +57,8 @@ class CurrentDatetimeOperatorNode extends ValueNode {
 
 	private int whichType;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CurrentDatetimeOperatorNode(int whichType, ContextManager cm) {
         super(cm);
         this.whichType = whichType;
@@ -85,6 +88,8 @@ class CurrentDatetimeOperatorNode extends ValueNode {
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode bindExpression(FromList fromList,
                              SubqueryList subqueryList,
                              List<AggregateNode> aggregates)
@@ -152,6 +157,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 				break;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 		acb.generateDataValue(mb, getTypeCompiler(), 
 				getTypeServices().getCollationType(), (LocalField)null);
 	}
@@ -163,6 +169,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 	public String toString() {
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 			return "methodName: " + methodName[whichType] + "\n" +
 				super.toString();
 		}
@@ -177,6 +184,7 @@ public String toString() {
      */
     boolean isEquivalent(ValueNode o)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (isSameNodeKind(o)) {
 			CurrentDatetimeOperatorNode other = (CurrentDatetimeOperatorNode)o;
 			return other.whichType == whichType;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
index 10f2b2bc5c..656b1e7315 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CurrentOfNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -75,6 +76,8 @@ public final class CurrentOfNode extends FromTable {
 	//
 	// initializers
 	//
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CurrentOfNode(String correlationName,
                   String cursor,
                   Properties tableProperties,
@@ -131,6 +134,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 		*/
 		if (singleScanCostEstimate == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 			singleScanCostEstimate = getOptimizerFactory().getCostEstimate();
 		}
 
@@ -161,6 +165,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 						   FromList fromListParam) 
 		throws StandardException {
@@ -175,6 +181,7 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 		}
 		
         preStmt.rePrepare(getLanguageConnectionContext());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
 
 		// verify that the cursor is updatable (UPDATE is responsible
 		// for checking that the right columns are updatable)
@@ -189,6 +196,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 		exposedTableName = makeTableName(null, refTab.getExposedName());
 		baseTableName = makeTableName(schemaName,
 									  refTab.getBaseName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         SchemaDescriptor tableSchema =
                 getSchemaDescriptor(refTab.getSchemaName());
 
@@ -225,6 +234,7 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 		** the result columns from preparedStatement and
 		** turn them into an RCL that we can run with.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( new ResultColumnList(getContextManager()) );
 		ColumnDescriptorList cdl = td.getColumnDescriptorList();
 		int					 cdlSize = cdl.size();
@@ -233,6 +243,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 		{
 			/* Build a ResultColumn/BaseColumnNode pair for the column */
             ColumnDescriptor colDesc = cdl.elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
             BaseColumnNode bcn = new BaseColumnNode(
                                             colDesc.getColumnName(),
@@ -243,6 +255,7 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
                 colDesc, bcn, getContextManager());
 
 			/* Build the ResultColumnList to return */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			getResultColumns().addResultColumn(rc);
 		}
 
@@ -261,6 +274,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 	 * @param fromListParam		FromList to use/append to.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressions(FromList fromListParam)
 	{
 		/* No expressions to bind for a CurrentOfNode.
@@ -283,6 +298,8 @@ void bindExpressions(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getMatchingColumn(ColumnReference columnReference)
 						throws StandardException {
 
@@ -294,6 +311,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 		TableName		columnsTableName;
 
 		columnsTableName = columnReference.getQualifiedTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         if (columnsTableName != null
                 && columnsTableName.getSchemaName() == null
@@ -341,6 +359,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 
 			resultColumn =
 				getResultColumns().getResultColumn(columnReference.getColumnName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 			if (resultColumn != null) 
 			{
@@ -352,7 +371,9 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 				// the getMatchingColumn() methods on other FromTables)
 				// suggests that we should always set the table number
 				// if we've found the ResultColumn.  So we do that here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1329
 				columnReference.setTableNumber( tableNumber );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4695
                 columnReference.setColumnNumber(
                    resultColumn.getColumnPosition());
 
@@ -392,12 +413,15 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
 								throws StandardException
 	{
 		/* Generate an empty referenced table map */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setReferencedTableMap( new JBitSet(numTables) );
 		return this;
 	}
@@ -419,6 +443,7 @@ ResultSetNode preprocess(int numTables,
     ResultSetNode optimize(DataDictionary dataDictionary,
 					     PredicateList predicateList,
 						 double outerRows) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 						throws StandardException
     {
 		/* Assume there is no cost associated with fetching the current row */
@@ -447,6 +472,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 							throws StandardException {
 
 		if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             SanityManager.ASSERT(!isStatementResultSet(), 
 			"CurrentOfNode not expected to be statement node");
 
@@ -465,6 +491,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		  mb.push(cursorName);
 		  acb.pushThisAsActivation(mb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		  mb.push(getResultSetNumber());
 		
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getCurrentOfResultSet",
@@ -511,6 +538,8 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth) {
 		if (SanityManager.DEBUG) {
 			super.printSubNodes(depth);
@@ -539,6 +568,8 @@ public String toString() {
 	}
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String  getExposedName()
 	{
         // short-circuit for dummy CurrentOfNode cooked up to support
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java
index 3aa0131682..08e12a0c1b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CurrentRowLocationNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -39,6 +40,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * that represents the ResultSet to be deleted or updated.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class CurrentRowLocationNode extends ValueNode
 {
 
@@ -60,6 +63,8 @@ class CurrentRowLocationNode extends ValueNode
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode bindExpression(FromList fromList,
                              SubqueryList subqueryList,
                              List<AggregateNode> aggregates)
@@ -133,6 +138,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mbex)
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getRowLocation", ClassName.RowLocation, 0);
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 		acb.generateDataValue(mb, getTypeCompiler(), 
 				getTypeServices().getCollationType(), field);
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CursorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CursorNode.java
index 116c307f15..cb48aaf812 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CursorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/CursorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.CursorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -47,6 +48,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public class CursorNode extends DMLStatementNode
 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final static int UNSPECIFIED = 0;
 	public final static int READ_ONLY = 1;
     final static int UPDATE = 2;
@@ -105,6 +108,8 @@ public class CursorNode extends DMLStatementNode
      * @param forMergeStatement True if this cursor is the driving left-join of a MERGE statement
      * @param cm                 The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CursorNode(String         statementType,
                ResultSetNode  resultSet,
                String         name,
@@ -165,6 +170,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return statementType;
@@ -210,12 +217,16 @@ private static String updateModeString(int updateMode)
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
 		{
 			super.printSubNodes(depth);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
+//IC see: https://issues.apache.org/jira/browse/DERBY-6008
             if (orderByList != null) {
                 printLabel(depth, "orderByList: "  + depth);
                 orderByList.treePrint(depth + 1);
@@ -255,6 +266,7 @@ public void bindStatement() throws StandardException
 
 		dataDictionary = getDataDictionary();
         checkIndexStats = (dataDictionary.getIndexStatsRefresher(true) != null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4938
 
 		// This is how we handle queries like: SELECT A FROM T ORDER BY B.
 		// We pull up the order by columns (if they don't appear in the SELECT
@@ -271,8 +283,11 @@ public void bindStatement() throws StandardException
 			orderByList.pullUpOrderByColumns(resultSet);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getCompilerContext().pushCurrentPrivType(getPrivType());
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             FromList    fromList = new FromList(
                     getOptimizerFactory().doJoinOrderOptimization(),
 					getContextManager());
@@ -309,6 +324,7 @@ public void bindStatement() throws StandardException
 
         // Collect tables whose indexes we'll want to check for staleness.
         collectTablesWithPossiblyStaleStats();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6411
 
 		// bind the order by
 		if (orderByList != null)
@@ -318,6 +334,7 @@ public void bindStatement() throws StandardException
 
 
         bindOffsetFetch(offset, fetchFirst);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
 
 		// bind the updatability
 
@@ -352,6 +369,7 @@ public void bindStatement() throws StandardException
 		    // was declared FOR READ ONLY. This would be pretty terrible, so we are
 		    // breaking the ANSI rules.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 		    if (getLanguageConnectionContext().getStatementContext().isForReadOnly()) {
 			updateMode = READ_ONLY;
 		    } else {
@@ -373,12 +391,15 @@ public void bindStatement() throws StandardException
 
 			// If the target table is a FromBaseTable, mark the updatable
             // columns.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             if (updateTable != null)
 			{
                 updateTable.markUpdatableByCursor(updatableColumns);
 				//make sure that alongwith the FromTable, we keep other ResultSetLists
 				//in correct state too. ResultSetMetaData.isWritable looks at this to
 				//return the correct value.
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 				resultSet.getResultColumns().markColumnsInSelectListUpdatableByCursor(
 					updatableColumns);
 			}
@@ -391,11 +412,13 @@ public void bindStatement() throws StandardException
 		{
 			//If this cursor has references to session schema tables, save the names of those tables into compiler context
 			//so they can be passed to execution phase.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			ArrayList<String> sessionSchemaTableNames = getSessionSchemaTableNamesForCursor();
 			if (sessionSchemaTableNames != null)
 				indexOfSessionTableNamesInSavedObjects = getCompilerContext().addSavedObject(sessionSchemaTableNames);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6491
         getCompilerContext().skipTypePrivileges( wasSkippingTypePrivileges );
     }
 
@@ -404,6 +427,7 @@ public void bindStatement() throws StandardException
      * want to check for staleness (or to create).
      */
     private void collectTablesWithPossiblyStaleStats() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6411
         if (!checkIndexStats) {
             return;
         }
@@ -419,6 +443,7 @@ private void collectTablesWithPossiblyStaleStats() throws StandardException {
                 TableDescriptor td = fromTable.getTableDescriptor();
                 if (td.getTableType() == TableDescriptor.BASE_TABLE_TYPE) {
                     if (statsToUpdate == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                         statsToUpdate = new ArrayList<TableDescriptor>();
                     }
                     statsToUpdate.add(td);
@@ -452,6 +477,7 @@ protected ArrayList<String> getSessionSchemaTableNamesForCursor()
 		int fromListSize = fromList.size();
 		FromTable fromTable;
 		ArrayList<String> sessionSchemaTableNames = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		for( int i = 0; i < fromListSize; i++)
 		{
@@ -459,6 +485,7 @@ protected ArrayList<String> getSessionSchemaTableNamesForCursor()
 			if (fromTable instanceof FromBaseTable && isSessionSchema(fromTable.getTableDescriptor().getSchemaDescriptor()))
 			{
 				if (sessionSchemaTableNames == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					sessionSchemaTableNames = new ArrayList<String>();
 				sessionSchemaTableNames.add(fromTable.getTableName().getTableName());
 			}
@@ -572,6 +599,7 @@ private int determineUpdateMode(DataDictionary dataDictionary)
     @Override
 	public void optimizeStatement() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         resultSet.pushQueryExpressionSuffix();
 		// Push the order by list down to the ResultSet
 		if (orderByList != null)
@@ -587,11 +615,13 @@ public void optimizeStatement() throws StandardException
 			orderByList = null;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         resultSet.pushOffsetFetchFirst(offset, fetchFirst, hasJDBClimitClause);
         offset = null;
         fetchFirst = null;
 
         super.optimizeStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 
 	}
 
@@ -625,6 +655,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb) throws StandardExcep
 			MethodBuilder constructor = acb.getConstructor();
 			constructor.pushThis();
 			constructor.push(indexOfSessionTableNamesInSavedObjects);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 			constructor.putField(org.apache.derby.shared.common.reference.ClassName.BaseActivation, "indexOfSessionTableNamesInSavedObjects", "int");
 			constructor.endStatement();
     }
@@ -656,6 +687,8 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb) throws StandardExcep
 
 	// class interface
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getUpdateBaseTableName()
 	{
 		return (updateTable == null) ? null : updateTable.getBaseTableName();
@@ -734,9 +767,11 @@ private void bindUpdateColumns(FromTable targetTable)
 		TableDescriptor tableDescriptor;
 		String columnName;
         ResultColumnList rcl = resultSet.getResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		    columnName = updatableColumns.get(index);
 		    tableDescriptor = targetTable.getTableDescriptor();
 		    if ( tableDescriptor.getColumnDescriptor(columnName) == null)
@@ -756,6 +791,7 @@ private void bindUpdateColumns(FromTable targetTable)
             // columns. However, a correlation name for c13 is ok because it is
             // a read only column.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (ResultColumn rc : rcl) {
                 // Look through each column in the resultset for cursor.
                 if (rc.getSourceTableName() == null) {
@@ -771,6 +807,8 @@ private void bindUpdateColumns(FromTable targetTable)
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getXML()
 	{
 		return null;
@@ -786,6 +824,7 @@ String getXML()
      */
     @Override
     public TableDescriptor[] updateIndexStatisticsFor()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4938
             throws StandardException {
         if (!checkIndexStats || statsToUpdate == null) {
             return EMPTY_TD_LIST;
@@ -794,6 +833,7 @@ public TableDescriptor[] updateIndexStatisticsFor()
         // Iterate backwards to remove elements, chances are high the stats are
         // mostly up-to-date (minor performance optimization to avoid copy).
         for (int i=statsToUpdate.size() -1; i >= 0; i--) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             TableDescriptor td = statsToUpdate.get(i);
             if (td.getAndClearIndexStatsIsUpToDate()) {
                 statsToUpdate.remove(i);
@@ -817,6 +857,7 @@ public TableDescriptor[] updateIndexStatisticsFor()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6263
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java
index 3ee14a492a..03feb2d71b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DB2LengthOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -46,6 +47,8 @@ public final class DB2LengthOperatorNode extends UnaryOperatorNode
      * @param cm context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DB2LengthOperatorNode(ValueNode operand, ContextManager cm)
             throws StandardException {
         super(operand, "length", "getDB2Length", cm);
@@ -64,6 +67,7 @@ public final class DB2LengthOperatorNode extends UnaryOperatorNode
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -87,6 +91,8 @@ ValueNode bindExpression(
 	 * in UnaryOperatorNode for code generation purposes.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getReceiverInterfaceName() {
 	    return ClassName.ConcatableDataValue;
 	}
@@ -137,6 +143,7 @@ private int getConstantLength( ) throws StandardException
         {
         case Types.BIGINT:
             return 8;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		case Types.BOOLEAN:
         case Types.BIT:
             return 1;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
index bb14145778..8958732bf1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DDLStatementNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -81,6 +82,8 @@ abstract class DDLStatementNode extends StatementNode
 	//
 	/////////////////////////////////////////////////////////////////////////
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DDLStatementNode(TableName tableName, ContextManager cm) {
         super(cm);
         this.tableName = tableName;
@@ -101,6 +104,8 @@ protected void initAndCheck(Object objectName)
 		throws StandardException {
 
         this.tableName = (TableName) objectName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		initOk = true;
 	}
@@ -122,6 +127,8 @@ public boolean isAtomic()
 	 *
 	 * @return the relative name
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getRelativeName()
 	{
         return tableName.getTableName() ;
@@ -133,6 +140,8 @@ String getRelativeName()
 	 * 
 	 * @return the full name
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getFullName()
 	{
         return tableName.getFullTableName() ;
@@ -151,6 +160,8 @@ public String toString()
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             return ((tableName==null)?"":
                     "name: " + tableName.toString() +"\n") + super.toString();
 		}
@@ -243,17 +254,22 @@ protected final SchemaDescriptor getSchemaDescriptor() throws StandardException
 	*/
 	protected final SchemaDescriptor getSchemaDescriptor(boolean ownerCheck,
 			boolean doSystemSchemaCheck)
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		 throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         String schemaName = tableName.getSchemaName();
 		//boolean needError = !(implicitCreateSchema || (schemaName == null));
 		boolean needError = !implicitCreateSchema;
 		SchemaDescriptor sd = getSchemaDescriptor(schemaName, needError);
 		CompilerContext cc = getCompilerContext();
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 
 		if (sd == null) {
 			/* Disable creating schemas starting with SYS */
 			if (schemaName.startsWith("SYS"))
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 				throw StandardException.newException(
 					SQLState.LANG_NO_USER_DDL_IN_SYSTEM_SCHEMA,
 					statementToString(),
@@ -262,7 +278,9 @@ protected final SchemaDescriptor getSchemaDescriptor(boolean ownerCheck,
 			sd  = new SchemaDescriptor(getDataDictionary(), schemaName,
 				(String) null, (UUID)null, false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 			if (isPrivilegeCollectionRequired())
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 				cc.addRequiredSchemaPriv(schemaName, null, Authorizer.CREATE_SCHEMA_PRIV);
 		}
 
@@ -286,6 +304,8 @@ protected final SchemaDescriptor getSchemaDescriptor(boolean ownerCheck,
 	protected final TableDescriptor getTableDescriptor()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return getTableDescriptor(tableName);
 	}
 
@@ -307,6 +327,8 @@ protected final TableDescriptor getTableDescriptor()
 	protected final TableDescriptor getTableDescriptor(boolean doSystemTableCheck)
 	throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         TableDescriptor td = justGetDescriptor(tableName);
 		td = checkTableDescriptor(td,doSystemTableCheck);
 		return td;
@@ -376,6 +398,7 @@ private TableDescriptor checkTableDescriptor(TableDescriptor td,
 		String sqlState = null;
 
 		switch (td.getTableType()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-571
 		case TableDescriptor.VTI_TYPE:
 			sqlState = SQLState.LANG_INVALID_OPERATION_ON_SYSTEM_TABLE;
 			break;
@@ -438,6 +461,8 @@ FromList	makeFromList( DataDictionary dd, TableElementList tableElementList, boo
         if (tableName.getSchemaName() == null)
         { tableName.setSchemaName(getSchemaDescriptor().getSchemaName()); }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         FromList fromList = new FromList(
                 getOptimizerFactory().doJoinOrderOptimization(),
                 getContextManager());
@@ -454,6 +479,8 @@ FromList	makeFromList( DataDictionary dd, TableElementList tableElementList, boo
         {
             table.setTableNumber(0);
 			fromList.addFromTable(table);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             table.setResultColumns(new ResultColumnList(getContextManager()));
         }
         else // ALTER TABLE
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLModGeneratedColumnsStatementNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLModGeneratedColumnsStatementNode.java
index 96f27a9426..18d56c6b92 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLModGeneratedColumnsStatementNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLModGeneratedColumnsStatementNode.java
@@ -2,6 +2,9 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DMLModGeneratedColumnsStatementNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -81,4 +84,4 @@ protected String getUUIDofSequenceGenerator() throws StandardException
         }
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
index 10303eac0e..ed52acbb61 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
@@ -896,8 +896,11 @@ protected boolean hasGenerationClauses(TableDescriptor td)
     )
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<FKInfo>         fkList = new ArrayList<FKInfo>();
 		int 								type;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         UUID[]                              uuids;
         long[]                              conglomNumbers;
         String[]                            fkNames;
@@ -908,8 +911,10 @@ protected boolean hasGenerationClauses(TableDescriptor td)
 		int[]								rowMap = getRowMap(readColsBitSet, td);
         int[]                               raRules;
         boolean[]                           deferrable;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         UUID[]                              fkIds;
 		ArrayList<String>              refSchemaNames = new ArrayList<String>(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		ArrayList<String>              refTableNames = new ArrayList<String>(1);
 		ArrayList<Long>               refIndexConglomNum = new ArrayList<Long>(1);
 		ArrayList<Integer>            refActions = new ArrayList<Integer>(1);
@@ -930,6 +935,7 @@ protected boolean hasGenerationClauses(TableDescriptor td)
 				type = FKInfo.FOREIGN_KEY;
 				refcd = ((ForeignKeyConstraintDescriptor)cd).getReferencedConstraint();
 				uuids = new UUID[1];
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 deferrable = new boolean[1];
                 fkIds = new UUID[1];
 				conglomNumbers = new long[1];
@@ -965,6 +971,7 @@ else if (cd instanceof ReferencedKeyConstraintDescriptor)
 				}
 
 				uuids = new UUID[size];
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 deferrable = new boolean[size];
                 fkIds = new UUID[size];
 				fkNames = new String[size];
@@ -978,8 +985,11 @@ else if (cd instanceof ReferencedKeyConstraintDescriptor)
 				int[] colArray = remapReferencedColumns(cd, rowMap);
 				for (int inner = 0; inner < size; inner++)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     ForeignKeyConstraintDescriptor fkcd =
                         (ForeignKeyConstraintDescriptor) fkcdl.elementAt(inner);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     fkSetupArrays(
                         dd, fkcd,
                         inner, uuids, conglomNumbers, fkNames,
@@ -992,6 +1002,8 @@ else if (cd instanceof ReferencedKeyConstraintDescriptor)
 						fktd = fkcd.getTableDescriptor();
 						refSchemaNames.add(fktd.getSchemaName());
 						refTableNames.add(fktd.getName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         refActions.add(Integer.valueOf(raRules[inner]));
 						//find the referencing column name required for update null.
 						refColumns = fkcd.getReferencedColumns();
@@ -1014,6 +1026,7 @@ else if (cd instanceof ReferencedKeyConstraintDescriptor)
 				continue;
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6559
             final TableDescriptor   pktd = refcd.getTableDescriptor();
             final UUID pkIndexId = refcd.getIndexId();
             final ConglomerateDescriptor pkIndexConglom =
@@ -1024,13 +1037,17 @@ else if (cd instanceof ReferencedKeyConstraintDescriptor)
             fkList.add(
                 new FKInfo(
                     fkNames,                // foreign key names
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     cd.getSchemaDescriptor().getSchemaName(),
                     refTd.getName(),        // table being modified
                     statementType,          // INSERT|UPDATE|DELETE
                     type,                   // FOREIGN_KEY|REFERENCED_KEY
+//IC see: https://issues.apache.org/jira/browse/DERBY-6559
                     pkIndexId,              // referenced backing index uuid
                     pkIndexConglom.getConglomerateNumber(),
                                             // referenced backing index conglom
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                     refcd.getUUID(),
                     refcd.deferrable(),     // referenced constraint is
                                             // deferrable?
@@ -1051,6 +1068,8 @@ else if (cd instanceof ReferencedKeyConstraintDescriptor)
 		
         // Now convert the list into an array.
         if (!fkList.isEmpty()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             fkInfo = fkList.toArray(new FKInfo[fkList.size()]);
         }
 
@@ -1066,6 +1085,7 @@ else if (cd instanceof ReferencedKeyConstraintDescriptor)
 			fkColArrays = new int[size][];
 			for (int i = 0; i < size; i++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				fkTableNames[i] = refTableNames.get(i);
 				fkSchemaNames[i] = refSchemaNames.get(i);
 				fkRefActions[i]  = (refActions.get(i)).intValue();
@@ -1093,6 +1113,7 @@ else if (cd instanceof ReferencedKeyConstraintDescriptor)
 		boolean[]							isSelfReferencingFK,
         int[]                               raRules,
         boolean[]                           isDeferrable,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         UUID[]                              fkIds
 	)
 		throws StandardException
@@ -1129,6 +1150,8 @@ private void generateTriggerInfo(TriggerDescriptorList triggerList)
 	 *
 	 * @return the array of fkinfos
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FKInfo[] getFKInfo()
 	{
 		if (SanityManager.DEBUG)
@@ -1146,6 +1169,8 @@ FKInfo[] getFKInfo()
 	 *
 	 * @return the trigger info
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     TriggerInfo getTriggerInfo()
 	{
 		if (SanityManager.DEBUG)
@@ -1161,6 +1186,8 @@ TriggerInfo getTriggerInfo()
 	 *
 	 * @return the check constraints, may be null
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getCheckConstraints()
 	{
 		if (SanityManager.DEBUG)
@@ -1183,6 +1210,7 @@ ValueNode getCheckConstraints()
 	 */
 	private void createTriggerDependencies
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         TriggerDescriptorList       tdl,
 		Dependent					dependent
 	)
@@ -1195,6 +1223,7 @@ ValueNode getCheckConstraints()
             ** The dependent now depends on this trigger.
             ** The default dependent is the statement being compiled.
             */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5737
             if (dependent == null) {
                 compilerContext.createDependency(td);
             } else {
@@ -1229,6 +1258,7 @@ ValueNode getCheckConstraints()
 		if ( relevantTriggers !=  null ) { return relevantTriggers; }
 
         relevantTriggers =  new TriggerDescriptorList();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		if(!includeTriggers)
 			return relevantTriggers;
@@ -1422,6 +1452,8 @@ boolean requiresDeferredProcessing()
 		/* Finally, we can call the parser */
 		// Since this is always nested inside another SQL statement, so topLevel flag
 		// should be false
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 		Visitable qt = p.parseStatement(select);
 		if (SanityManager.DEBUG)
 		{
@@ -1549,6 +1581,7 @@ boolean requiresDeferredProcessing()
 	  */
 	public	void	generateGenerationClauses
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         ResultColumnList        rcl,
         int                     resultSetNumber,
         boolean                 isUpdate,
@@ -1647,9 +1680,11 @@ boolean requiresDeferredProcessing()
         for ( int i = startColumn; i < size; i++ )
         {
             ResultColumn rc = rcl.elementAt( i );
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             if ( !rc.hasGenerationClause() ) { continue; }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4142
             userExprFun.dup();       // instance (current row)
             userExprFun.push(i + 1); // arg1
 
@@ -1712,6 +1747,7 @@ public void optimizeStatement() throws StandardException
         if ( !inMatchingClause() )
         {
             /* First optimize the query */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
             super.optimizeStatement();
         }
         else if ( this instanceof UpdateNode )
@@ -1756,6 +1792,7 @@ else if ( this instanceof UpdateNode )
 					throws StandardException
 	{
         ArrayList<ConglomerateDescriptor> conglomerates = new ArrayList<ConglomerateDescriptor>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         DMLModStatementNode.getXAffectedIndexes(
                 td, updatedColumns, colBitSet, conglomerates);
@@ -1784,6 +1821,7 @@ else if ( this instanceof UpdateNode )
 		TableDescriptor		baseTable,
 		ResultColumnList	updatedColumns,
         FormatableBitSet    colBitSet,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         List<ConglomerateDescriptor>                conglomerates
 	)
 		throws StandardException
@@ -1811,6 +1849,7 @@ else if ( this instanceof UpdateNode )
 					cd.getIndexDescriptor().baseColumnPositions())))
 			{ continue; }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
             if ( conglomerates != null )
 			{
 				int i;
@@ -1822,6 +1861,7 @@ else if ( this instanceof UpdateNode )
 				if (i == distinctCount)		// first appearence
 				{
 					distinctConglomNums[distinctCount++] = cd.getConglomerateNumber();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                     conglomerates.add( cd );
 				}
 			}
@@ -1842,6 +1882,8 @@ else if ( this instanceof UpdateNode )
 
 	protected	void	markAffectedIndexes
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         List<ConglomerateDescriptor> affectedConglomerates
     )
 		throws StandardException
@@ -1857,6 +1899,8 @@ else if ( this instanceof UpdateNode )
 		for ( int ictr = 0; ictr < indexCount; ictr++ )
 		{
             cd = affectedConglomerates.get( ictr );
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			indicesToMaintain[ ictr ] = cd.getIndexDescriptor();
 			indexConglomerateNumbers[ ictr ] = cd.getConglomerateNumber();
@@ -1869,6 +1913,8 @@ else if ( this instanceof UpdateNode )
 	}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "DML MOD";
@@ -1952,7 +1998,10 @@ void setRefActionInfo(long fkIndexConglomId,
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void normalizeSynonymColumns(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
     ResultColumnList    rcl, 
     TableName           targetTableName)
 		throws StandardException
@@ -1962,6 +2011,7 @@ void normalizeSynonymColumns(
 		
 		String synTableName = synonymTableName.getTableName();
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : rcl)
 		{
             ColumnReference reference = rc.getReference();
@@ -1973,6 +2023,7 @@ void normalizeSynonymColumns(
 				{
 					if ( synTableName.equals( crTableName ) )
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 						reference.setQualifiedTableName( targetTableName );
 					}
 					else
@@ -1994,8 +2045,12 @@ void normalizeSynonymColumns(
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 		if (SanityManager.DEBUG)
 		{
 			super.printSubNodes(depth);
@@ -2022,6 +2077,7 @@ void printSubNodes(int depth)
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-791
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
index 298e28e928..16b3b1569b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DMLStatementNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -64,6 +65,8 @@ abstract class DMLStatementNode extends StatementNode
 	 */
 	ResultSetNode	resultSet;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DMLStatementNode(ResultSetNode resultSet, ContextManager cm) {
         super(cm);
         this.resultSet = resultSet;
@@ -76,6 +79,8 @@ abstract class DMLStatementNode extends StatementNode
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -95,6 +100,8 @@ void printSubNodes(int depth)
 	 *
 	 * @return ResultSetNode	The ResultSetNode from this DMLStatementNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode getResultSetNode()
 	{
 		return resultSet;
@@ -114,10 +121,12 @@ ResultSetNode getResultSetNode()
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 	QueryTreeNode bind(DataDictionary dataDictionary)
 					 throws StandardException
 	{
 		// We just need select privilege on most columns and tables
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getCompilerContext().pushCurrentPrivType(getPrivType());
 		try {
 			/*
@@ -153,6 +162,8 @@ QueryTreeNode bind(DataDictionary dataDictionary)
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     QueryTreeNode bindResultSetsWithTables(DataDictionary dataDictionary)
 					 throws StandardException
 	{
@@ -186,6 +197,8 @@ protected void bindTables(DataDictionary dataDictionary)
 		 * the same context.
 		 */
         boolean doJOO = getOptimizerFactory().doJoinOrderOptimization();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ContextManager cm = getContextManager();
         resultSet = resultSet.bindNonVTITables(dataDictionary,
                                                new FromList(doJOO, cm));
@@ -201,6 +214,8 @@ protected void bindTables(DataDictionary dataDictionary)
 	protected void bindExpressions()
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         FromList fromList =
                 new FromList(getOptimizerFactory().doJoinOrderOptimization(),
                              getContextManager());
@@ -224,6 +239,8 @@ protected void bindExpressions()
 	protected void bindExpressionsWithTables()
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         FromList fromList =
                 new FromList(getOptimizerFactory().doJoinOrderOptimization(),
                              getContextManager());
@@ -248,6 +265,8 @@ protected void bindExpressionsWithTables()
 	 */
 	int activationKind()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         List<ParameterNode> parameterList =
             getCompilerContext().getParameterList();
 		/*
@@ -294,6 +313,7 @@ public void optimizeStatement() throws StandardException
 		// be rewritten to TRUE, which is known by the optimizer to have
 		// selectivity 1.0.)
 		accept(new ConstantExpressionVisitor());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4416
 
 		resultSet = resultSet.optimize(getDataDictionary(), null, 1.0d);
 
@@ -323,6 +343,8 @@ public void optimizeStatement() throws StandardException
 			siRCList.genVirtualColumnNodes(resultSet, childRCList);
 
 			/* Finally, we create the new ScrollInsensitiveResultSetNode */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             resultSet = new ScrollInsensitiveResultSetNode(
                     resultSet, siRCList, null, getContextManager());
 
@@ -352,6 +374,7 @@ public void optimizeStatement() throws StandardException
     @Override
 	public ResultDescription makeResultDescription()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 	    ResultColumnDescriptor[] colDescs = resultSet.makeResultDescriptors();
 		String statementType = statementToString();
 
@@ -371,6 +394,8 @@ public ResultDescription makeResultDescription()
 	void generateParameterValueSet(ActivationClassBuilder acb)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         List<ParameterNode> parameterList =
             getCompilerContext().getParameterList();
 		int	numberOfParameters = (parameterList == null) ? 0 : parameterList.size();
@@ -427,11 +452,13 @@ public boolean isAtomic() throws StandardException
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (resultSet != null)
 		{
 			resultSet = (ResultSetNode)resultSet.accept(v);
@@ -446,6 +473,7 @@ void acceptChildren(Visitor v)
 	 */
 	int getPrivType()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		return Authorizer.SELECT_PRIV;
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultNode.java
index d2a21704c0..4b2eb27b33 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DefaultNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -49,6 +50,8 @@ public  class DefaultNode extends ValueNode
      *
      * @param cm            The context manager
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DefaultNode(ContextManager cm) {
         super(cm);
     }
@@ -106,6 +109,7 @@ public String toString()
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 			return "columnName: " + columnName + "\n" +
 				"defaultText: " + defaultText + "\n" +
 				super.toString();
@@ -123,8 +127,11 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (SanityManager.DEBUG)
 		{
 			super.printSubNodes(depth);
@@ -153,6 +160,7 @@ void printSubNodes(int depth)
 	 * @exception StandardException		Thrown on failure
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 		throws StandardException
 	{
@@ -188,6 +196,8 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 		DefaultInfoImpl defaultInfo = (DefaultInfoImpl) cd.getDefaultInfo();
 		if (defaultInfo != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             String      defaultTxt = defaultInfo.getDefaultText();
             ValueNode   defaultTre = parseDefault(
                 defaultTxt,
@@ -202,11 +212,14 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
             return defaultTre.bindExpression(
 									fromList, 
 									subqueryList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                                     aggregates);
 		}
 		else
 		{
 			// Default is null
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             return new UntypedNullConstantNode(getContextManager());
 		}
 	}
@@ -253,6 +266,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 		/* Finally, we can call the parser */
 		// Since this is always nested inside another SQL statement, so topLevel flag
 		// should be false
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 		Visitable qt = p.parseStatement(values);
 		if (SanityManager.DEBUG)
 		{
@@ -271,6 +285,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         defaultTree = ((CursorNode) qt).getResultSetNode().getResultColumns().
                 elementAt(0).getExpression();
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultOptTrace.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultOptTrace.java
index 63bbc7ce1a..8b0f84bca0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultOptTrace.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultOptTrace.java
@@ -64,6 +64,8 @@ public  class   DefaultOptTrace implements  OptTrace
     /** Make a DefaultOptTrace */
     public  DefaultOptTrace()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         _buffer = new StringBuilder();
     }
 
@@ -202,6 +204,7 @@ public  void    traceSortNeededForOrdering( int planType, RequiredRowOrdering re
     }
 
     public  void    traceRememberingBestJoinOrder
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         ( int joinPosition, int[] bestJoinOrder, int planType, CostEstimate planCost, JBitSet assignedTableMap )
     {
         appendTraceString
@@ -501,6 +504,8 @@ public  void    printToWriter( PrintWriter out )
          JBitSet    assignedTableMap
          )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         StringBuilder joinOrderString = new StringBuilder();
         joinOrderString.append(prefix);
 
@@ -564,6 +569,8 @@ private String reportCostIncluding( String selectivityType, CostEstimate cost, i
     /** Append a string to the optimizer trace */
     private void    appendTraceString( String traceString )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         _buffer.append( traceString );
         _buffer.append( "\n" );
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java
index 29ff280bc5..9a0134c4b1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DefaultVTIModDeferPolicy
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DeleteNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DeleteNode.java
index c6f5a596a4..1232abf165 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DeleteNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DeleteNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DeleteNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -65,6 +66,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * the named cursor.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class DeleteNode extends DMLModStatementNode
 {
 	/* Column name for the RowLocation column in the ResultSet */
@@ -126,9 +129,12 @@ String statementToString()
 	public void bindStatement() throws StandardException
 	{
 		// We just need select privilege on the where clause tables
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getCompilerContext().pushCurrentPrivType( Authorizer.SELECT_PRIV);
 		try
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             FromList fromList = new FromList(
                     getOptimizerFactory().doJoinOrderOptimization(),
                     getContextManager());
@@ -143,6 +149,7 @@ public void bindStatement() throws StandardException
             // The compiler will attempt to add these when generating the full column list during
             // binding of the tables.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
             IgnoreFilter    ignorePermissions = new IgnoreFilter();
             getCompilerContext().addPrivilegeFilter( ignorePermissions );
             
@@ -159,6 +166,8 @@ public void bindStatement() throws StandardException
 				SanityManager.ASSERT(resultSet != null && resultSet instanceof SelectNode,
 				"Delete must have a select result set");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             SelectNode sel = (SelectNode)resultSet;
 			targetTable = (FromTable) sel.fromList.elementAt(0);
 			if (targetTable instanceof CurrentOfNode)
@@ -206,10 +215,13 @@ else if (cursorTargetTableName != null)
 		
 			// descriptor must exist, tables already bound.
 			verifyTargetTable();
+//IC see: https://issues.apache.org/jira/browse/DERBY-714
+//IC see: https://issues.apache.org/jira/browse/DERBY-571
 
 			/* Generate a select list for the ResultSetNode - CurrentRowLocation(). */
 			if ( SanityManager.DEBUG )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				SanityManager.ASSERT((resultSet.getResultColumns() == null),
 							  "resultColumns is expected to be null until bind time");
             }
@@ -232,6 +244,8 @@ else if (cursorTargetTableName != null)
 				** are needed in the rcl.
 				*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 resultColumnList =
                         new ResultColumnList(getContextManager());
 
@@ -262,6 +276,8 @@ else if (cursorTargetTableName != null)
 				}
 
 				/* Generate the RowLocation column */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 rowLocationNode =
                         new CurrentRowLocationNode(getContextManager());
                 rowLocationColumn =
@@ -277,6 +293,7 @@ else if (cursorTargetTableName != null)
 				correlateAddedColumns( resultColumnList, targetTable );
 			
                 /* Add the new result columns to the driving result set */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 ResultColumnList    originalRCL = resultSet.getResultColumns();
                 if ( originalRCL != null )
                 {
@@ -306,6 +323,9 @@ else if (cursorTargetTableName != null)
 				/* Bind the new ResultColumn */
 				rowLocationColumn.bindResultColumnToExpression();
 				bindConstraints(dataDictionary,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                         getOptimizerFactory(),
                         targetTableDescriptor,
                         null,
@@ -321,6 +341,7 @@ else if (cursorTargetTableName != null)
 			 	* subquery.  Also, self-referencing foreign key deletes
 		 	 	* are deferred.  And triggers cause the delete to be deferred.
 			 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 				if (resultSet.subqueryReferencesTarget(
 									targetTableDescriptor.getName(), true) ||
 					requiresDeferredProcessing())
@@ -354,6 +375,7 @@ else if (cursorTargetTableName != null)
 
 				if(!isDependentTable){
 					//graph node
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     dependentTables = new HashSet<String>();
 				}
 
@@ -365,6 +387,7 @@ else if (cursorTargetTableName != null)
 				{
 					cascadeDelete = true;
 					int noDependents = fkTableNames.length;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 					dependentNodes = new StatementNode[noDependents];
 					for(int i =0 ; i < noDependents ; i ++)
 					{
@@ -385,11 +408,14 @@ else if (cursorTargetTableName != null)
 					String currentTargetTableName = targetTableDescriptor.getSchemaName()
 							 + "." + targetTableDescriptor.getName();
                     dependentTables.add(currentTargetTableName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
 				}
 			}
 
             // add need for DELETE privilege on the target table
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
             getCompilerContext().pushCurrentPrivType( getPrivType());
             getCompilerContext().addRequiredTablePriv( targetTableDescriptor);
             getCompilerContext().popCurrentPrivType();
@@ -451,6 +477,7 @@ public ConstantAction makeConstantAction() throws StandardException
 			*/
 			if (targetTableDescriptor.getLockGranularity() == TableDescriptor.TABLE_LOCK_GRANULARITY)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 lckMode = TransactionController.MODE_TABLE;
 			}
 
@@ -474,6 +501,7 @@ public ConstantAction makeConstantAction() throws StandardException
 				  deferred,
 				  false,
 				  targetTableDescriptor.getUUID(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                   lckMode,
 				  null, null, null, 0, null, null, 
 				  resultDescription,
@@ -530,6 +558,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		// DERBY-827 this must be done in execute() since
 		// createResultSet() will only be called once.
 		generateCodeForTemporaryTable(acb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
 
 		/* generate the parameters */
 		if(!isDependentTable)
@@ -605,6 +634,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 			LocalField arrayField =
 				acb.newFieldDeclaration(Modifier.PRIVATE, resultSetArrayType);
 			mb.pushNewArray(ClassName.ResultSet, dependentNodes.length);  // new ResultSet[size]
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 			mb.setField(arrayField);
 			for(int index=0 ; index <  dependentNodes.length ; index++)
 			{
@@ -719,9 +749,12 @@ protected final int getStatementType()
 		boolean[]	needsDeferredProcessing = new boolean[1];
 		needsDeferredProcessing[0] = requiresDeferredProcessing();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<ConglomerateDescriptor> conglomerates = new ArrayList<ConglomerateDescriptor>();
         relevantTriggers = new TriggerDescriptorList();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         FormatableBitSet columnMap = DeleteNode.getDeleteReadMap(baseTable,
                 conglomerates, relevantTriggers, needsDeferredProcessing);
 
@@ -741,6 +774,7 @@ private StatementNode getDependentTableNode(String schemaName, String tableName,
 												ColumnDescriptorList cdl) throws StandardException
 	{
         DMLModStatementNode node = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
 		if(refAction == StatementType.RA_CASCADE)
 		{
@@ -755,6 +789,7 @@ private StatementNode getDependentTableNode(String schemaName, String tableName,
         // The dependent node should be marked as such, and it should inherit
         // the set of dependent tables from the parent so that it can break
         // out of cycles in the dependency graph.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         if (node != null) {
             node.isDependentTable = true;
             node.dependentTables = dependentTables;
@@ -788,6 +823,8 @@ private DeleteNode getEmptyDeleteNode(String schemaName, String targetTableName)
 		((FromBaseTable) fromTable).setTableProperties(targetProperties);
 
         fromList.addFromTable(fromTable);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         SelectNode rs = new SelectNode(null,
                                        fromList, /* FROM list */
                                        whereClause, /* WHERE clause */
@@ -810,6 +847,10 @@ private UpdateNode getEmptyUpdateNode(String schemaName,
 
         ValueNode whereClause = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         TableName tableName =
             new TableName(schemaName , targetTableName, getContextManager());
 
@@ -818,6 +859,7 @@ private UpdateNode getEmptyUpdateNode(String schemaName,
         FromTable fromTable = new FromBaseTable(
                 tableName,
                 null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
                 FromBaseTable.DELETE,
                 null,
                 getContextManager());
@@ -831,12 +873,21 @@ private UpdateNode getEmptyUpdateNode(String schemaName,
 
         fromList.addFromTable(fromTable);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         SelectNode sn = new SelectNode(getSetClause(cdl),
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                                               fromList, /* FROM list */
                                               whereClause, /* WHERE clause */
                                               null, /* GROUP BY list */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
                                               null, /* having clause */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
                                               null, /* windows */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
                                               null, /* optimizer override plan */
                                               getContextManager());
 
@@ -881,11 +932,13 @@ public void optimizeStatement() throws StandardException
 		{
 			for(int index=0 ; index < dependentNodes.length ; index++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 				dependentNodes[index].optimizeStatement();
 			}
 		}
 
         super.optimizeStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 
         // allow more permissions to be added in case we're just one action
         // of a MERGE statement
@@ -927,7 +980,9 @@ public void optimizeStatement() throws StandardException
 	private static FormatableBitSet getDeleteReadMap
 	(
 		TableDescriptor				baseTable,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         List<ConglomerateDescriptor>  conglomerates,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         TriggerDescriptorList       relevantTriggers,
 		boolean[]					needsDeferredProcessing
 	)
@@ -951,6 +1006,7 @@ public void optimizeStatement() throws StandardException
 		** Adding indexes also takes care of the replication 
 		** requirement of having the primary key.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         DMLModStatementNode.getXAffectedIndexes(
                 baseTable, null, columnMap, conglomerates);
 
@@ -968,10 +1024,12 @@ public void optimizeStatement() throws StandardException
 
 		if (relevantTriggers.size() > 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
 			needsDeferredProcessing[0] = true;
 			
 			boolean needToIncludeAllColumns = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (TriggerDescriptor trd : relevantTriggers) {
 				//Does this trigger have REFERENCING clause defined on it.
 				//If yes, then read all the columns from the trigger table.
@@ -1008,6 +1066,7 @@ private	void	correlateAddedColumns( ResultColumnList rcl, FromTable fromTable )
 
 		TableName	correlationNameNode = makeTableName( null, correlationName );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn column : rcl)
 		{
 			ValueNode		expression = column.getExpression();
@@ -1016,6 +1075,7 @@ private	void	correlateAddedColumns( ResultColumnList rcl, FromTable fromTable )
 			{
 				ColumnReference	reference = (ColumnReference) expression;
 				
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				reference.setQualifiedTableName( correlationNameNode );
 			}
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DistinctNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DistinctNode.java
index fce68cebce..b38424246a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DistinctNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DistinctNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DistinctNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -50,6 +51,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * NOTE: A DistinctNode extends FromTable since it can exist in a FromList.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class DistinctNode extends SingleChildResultSetNode
 {
 	boolean inSortedOrder;
@@ -99,6 +102,7 @@ class DistinctNode extends SingleChildResultSetNode
 		 */
         final ResultColumnList prRCList =
                 this.childResult.getResultColumns().copyListAndObjects();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( this.childResult.getResultColumns() );
 		this.childResult.setResultColumns(prRCList);
 
@@ -131,6 +135,8 @@ public CostEstimate optimizeIt(Optimizer optimizer,
 									RowOrdering rowOrdering)
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ((Optimizable) childResult).optimizeIt(optimizer,
                 predList,
                 outerCost,
@@ -161,6 +167,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 									optimizer,
 									rowOrdering);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setCostEstimate( getCostEstimate(optimizer) );
 		getCostEstimate().setCost(childCost.getEstimatedCost(),
 							 childCost.rowCount(),
@@ -171,6 +178,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 		** No need to use estimateCost on join strategy - that has already
 		** been done on the child.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return getCostEstimate();
 	}
 
@@ -201,6 +209,8 @@ public boolean pushOptPredicate(OptimizablePredicate optimizablePredicate)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode optimize(DataDictionary dataDictionary,
 								  PredicateList predicates,
 								  double outerRows) 
@@ -216,6 +226,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 		// RESOLVE: NEED TO FACTOR IN COST OF SORTING AND FIGURE OUT HOW
 		// MANY ROWS HAVE BEEN ELIMINATED.
         setCostEstimate( getOptimizerFactory().getCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		getCostEstimate().setCost(childResult.getCostEstimate().getEstimatedCost(),
 							 childResult.getCostEstimate().rowCount(),
@@ -240,6 +251,8 @@ ResultSetNode optimize(DataDictionary dataDictionary,
     @Override
     boolean isOrderedOn(ColumnReference[] crs,
                         boolean permuteOrdering,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         List<FromBaseTable> fbtHolder)
 	{
 		/* RESOLVE - DistinctNodes are ordered on their RCLs.
@@ -266,6 +279,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		// Get the final cost estimate based on the child's cost.
 		setCostEstimate( childResult.getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/*
 			create the orderItem and stuff it in.
@@ -289,12 +303,14 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		mb.push(true);
 		mb.push(inSortedOrder);
 		mb.push(orderItem);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         mb.push(acb.addItem(getResultColumns().buildRowTemplate()));
 		mb.push(getResultColumns().getTotalColumnSize());
 		mb.push(getResultSetNumber());
 		mb.push(getCostEstimate().rowCount());
 		mb.push(getCostEstimate().getEstimatedCost());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getSortResultSet",
                 ClassName.NoPutResultSet, 9);
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropAliasNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropAliasNode.java
index 5238f2d601..c13d8128ba 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropAliasNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropAliasNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DropAliasNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -70,6 +71,7 @@ class DropAliasNode extends DDLStatementNode
 				nameSpace = AliasInfo.ALIAS_NAME_SPACE_FUNCTION_AS_CHAR;
 				break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 			case AliasInfo.ALIAS_TYPE_SYNONYM_AS_CHAR:
 				nameSpace = AliasInfo.ALIAS_NAME_SPACE_SYNONYM_AS_CHAR;
 				break;
@@ -88,6 +90,8 @@ class DropAliasNode extends DDLStatementNode
 
 	public	char	getAliasType() { return aliasType; }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "DROP ".concat(aliasTypeName(aliasType));
@@ -124,6 +128,8 @@ public void bindStatement() throws StandardException
 		}
 
 		// Statement is dependent on the AliasDescriptor
+//IC see: https://issues.apache.org/jira/browse/DERBY-2202
+//IC see: https://issues.apache.org/jira/browse/DERBY-1304
 		getCompilerContext().createDependency(ad);
 	}
 
@@ -157,6 +163,7 @@ private static String aliasTypeName( char actualType)
 			case AliasInfo.ALIAS_TYPE_FUNCTION_AS_CHAR:
 				typeName = "FUNCTION";
 				break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 			case AliasInfo.ALIAS_TYPE_SYNONYM_AS_CHAR:
 				typeName = "SYNONYM";
 				break;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropIndexNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropIndexNode.java
index 6cbe8a7d86..6e3c39b066 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropIndexNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropIndexNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DropIndexNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -38,6 +39,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class DropIndexNode extends DDLStatementNode
 {
 	private ConglomerateDescriptor	cd;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
index 593fc3c8e1..6fb3006bc5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DropSchemaNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -76,11 +77,15 @@ public void bindStatement() throws StandardException
         */
         if (isPrivilegeCollectionRequired())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5062
             LanguageConnectionContext lcc = getLanguageConnectionContext();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             StatementContext stx = lcc.getStatementContext();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-5017
             String currentUser = stx.getSQLSessionContext().getCurrentUser();
             getCompilerContext().addRequiredSchemaPriv(schemaName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 currentUser,
                 Authorizer.DROP_SCHEMA_PRIV);
         }
@@ -106,6 +111,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "DROP SCHEMA";
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropSequenceNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropSequenceNode.java
index 5bd3a1ed7b..13bb4e1aa5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropSequenceNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropSequenceNode.java
@@ -34,6 +34,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * A DropSequenceNode  represents a DROP SEQUENCE statement.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class DropSequenceNode extends DDLStatementNode {
     private TableName dropItem;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropTableNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropTableNode.java
index 74385d0dab..732c6319cf 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropTableNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropTableNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DropTableNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -35,6 +36,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class DropTableNode extends DDLStatementNode
 {
 	private long		conglomerateNumber;
@@ -78,6 +81,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "DROP TABLE";
@@ -133,6 +138,7 @@ public boolean referencesSessionSchema()
     @Override
     public ConstantAction makeConstantAction() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3266
 		return	getGenericConstantActionFactory().getDropTableConstantAction(
 			getFullName(),
 			getRelativeName(),
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
index e1f5cc861c..e8aeec3e06 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DropTriggerNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropViewNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropViewNode.java
index f6a6a005b2..c120f4062e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropViewNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/DropViewNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.DropViewNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -34,6 +35,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class DropViewNode extends DDLStatementNode
 {
 
@@ -67,6 +70,7 @@ public void bindStatement() throws StandardException
 		CompilerContext cc = getCompilerContext();
 				
 		TableDescriptor td = dd.getTableDescriptor(getRelativeName(), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 					getSchemaDescriptor(),
                     getLanguageConnectionContext().getTransactionCompile());
 	
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java
index 92dfa59011..1af48501f5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ExecSPSNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -50,6 +51,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class ExecSPSNode extends StatementNode
 {
 	private TableName			name;
@@ -101,6 +104,8 @@ public void bindStatement() throws StandardException
 			throw StandardException.newException(SQLState.LANG_OBJECT_NOT_FOUND, "STATEMENT", name);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         if (spsd.getType() == SPSDescriptor.SPS_TYPE_TRIGGER)
 		{
 			throw StandardException.newException(SQLState.LANG_TRIGGER_SPS_CANNOT_BE_EXECED, name);
@@ -308,6 +313,8 @@ int activationKind()
 	// MISC
 	//
 	/////////////////////////////////////////////////////////////////////
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "EXECUTE STATEMENT";
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java
index 4fabe6088b..2809801d3a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java
@@ -180,6 +180,7 @@ ClassBuilder getClassBuilder() {
      * reinitialize the data structures.
 	 */
 	MethodBuilder getExecuteMethod() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
         if (executeMethod == null) {
             executeMethod =
                     cb.newMethodBuilder(Modifier.PROTECTED, "void", "reinit");
@@ -546,6 +547,7 @@ FormatableArrayHolder addColumnToOrdering(
 		** We don't expect a lot of order by columns, so
 		** linear search.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6292
         ColumnOrdering[] ordering =
                 orderingHolder.getArray(ColumnOrdering[].class);
 		int length = ordering.length;
@@ -567,6 +569,7 @@ FormatableArrayHolder addColumnToOrdering(
 	}	
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     FormatableArrayHolder getColumnOrdering(OrderedColumnList<?>  oclist) {
 		int numCols = (oclist == null) ? 0 : oclist.size();
 
@@ -746,6 +749,7 @@ protected LocalField getCurrentSetup() {
 		constructor.pushNewStart(ClassName.CurrentDatetime);
 		constructor.pushNewComplete(0);
 		constructor.setField(cdtField);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 		return cdtField;
 	}
@@ -761,6 +765,7 @@ protected LocalField getCurrentSetup() {
 	 */
 	private String newFieldName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		return "e".concat(Integer.toString(nextFieldNum++));
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java
index f151f1357c..c1eb40bfa5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ExtractOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -48,6 +49,8 @@ class ExtractOperatorNode extends UnaryOperatorNode {
 
 	private int extractField;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ExtractOperatorNode(int field, ValueNode operand, ContextManager cm)
             throws StandardException {
         super(operand,
@@ -70,6 +73,7 @@ class ExtractOperatorNode extends UnaryOperatorNode {
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException 
 	{
@@ -89,8 +93,11 @@ ValueNode bindExpression(
 		*/
 		if (opTypeId.isStringTypeId())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5017
             TypeCompiler tc = operand.getTypeCompiler();
 			int castType = (extractField < 3) ? Types.DATE : Types.TIME;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             operand = new CastNode(
 					operand, 
 					DataTypeDescriptor.getBuiltInDataTypeDescriptor(castType, true, 
@@ -160,6 +167,7 @@ ValueNode bindExpression(
 	public String toString() {
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 			return "fieldName: " + fieldName[extractField] + "\n" +
 				super.toString();
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
index d463845a65..de437aca8d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.FKConstraintDefinitionNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -47,6 +48,8 @@ public final class FKConstraintDefinitionNode extends ConstraintDefinitionNode
 	int                 refActionDeleteRule;  // referential action on  delete
 	int                 refActionUpdateRule;  // referential action on update
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FKConstraintDefinitionNode(
         TableName           constraintName,
         TableName           refTableName,
@@ -93,6 +96,7 @@ void bind(DDLStatementNode ddlNode, DataDictionary dd) throws StandardException
 		}
 
 		// check the referenced table, unless this is a self-referencing constraint
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		if (refTableName.equals(ddlNode.getObjectName()))
 			return;
 
@@ -128,6 +132,7 @@ void bind(DDLStatementNode ddlNode, DataDictionary dd) throws StandardException
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (ResultColumn rc : refRcl)
 			{
 				ColumnDescriptor cd = td.getColumnDescriptor(rc.getName());
@@ -136,6 +141,8 @@ void bind(DDLStatementNode ddlNode, DataDictionary dd) throws StandardException
 					// Set tableDescriptor for this column descriptor. Needed for adding required table
 					// access permission. Column descriptors may not have this set already.
 					cd.setTableDescriptor(td);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 					if (isPrivilegeCollectionRequired())
 						getCompilerContext().addRequiredColumnPriv(cd);
 				}
@@ -144,6 +151,8 @@ void bind(DDLStatementNode ddlNode, DataDictionary dd) throws StandardException
 		getCompilerContext().popCurrentPrivType();
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ConstraintInfo getReferencedConstraintInfo()
 	{
 		if (SanityManager.DEBUG)
@@ -160,6 +169,7 @@ ConstraintInfo getReferencedConstraintInfo()
 
 	int getPrivType()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		return Authorizer.REFERENCES_PRIV;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromBaseTable.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
index 56fc407ad7..e8b5975c6b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.FromBaseTable
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -102,6 +103,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class FromBaseTable extends FromTable
 {
 	static final int UNSET = -1;
@@ -212,6 +215,8 @@ class FromBaseTable extends FromTable
      * @param tableProperties   The Properties list associated with the table.
      * @param cm                The context manager
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FromBaseTable(TableName tableName,
                   String correlationName,
                   ResultColumnList derivedRCL,
@@ -243,7 +248,10 @@ class FromBaseTable extends FromTable
         super(correlationName, null, cm);
         this.tableName = tableName;
         this.updateOrDelete = updateOrDelete;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( derivedRCL );
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
 		setOrigTableName(this.tableName);
 		templateColumns = getResultColumns();
 	}
@@ -293,6 +301,7 @@ public boolean nextAccessPath(Optimizer optimizer,
 		ConglomerateDescriptor currentConglomerateDescriptor =
 												ap.getConglomerateDescriptor();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         if ( optimizerTracingIsOn() )
         { getOptimizerTracer().traceNextAccessPath( getExposedName(), ((predList == null) ? 0 : predList.size()) ); }
 
@@ -324,6 +333,7 @@ public boolean nextAccessPath(Optimizer optimizer,
 			}
 			else
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if ( optimizerTracingIsOn() )
                 { getOptimizerTracer().traceLookingForSpecifiedIndex( userSpecifiedIndexName, tableNumber ); }
 
@@ -432,6 +442,7 @@ public boolean nextAccessPath(Optimizer optimizer,
 
 		if (currentConglomerateDescriptor == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
             if ( optimizerTracingIsOn() ) { getOptimizerTracer().traceNoMoreConglomerates( tableNumber ); }
 		}
 		else
@@ -456,6 +467,7 @@ public boolean nextAccessPath(Optimizer optimizer,
 				 */
 				if (! isOneRowResultSet(predList))
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                     if ( optimizerTracingIsOn() )
                     { getOptimizerTracer().traceAddingUnorderedOptimizable( ((predList == null) ? 0 : predList.size()) ); }
 
@@ -544,6 +556,10 @@ public CostEstimate optimizeIt(
 		// The cost that we found from the above call is now stored in the
 		// cost field of this FBT's current access path.  So that's the
 		// cost we want to return here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1007
+//IC see: https://issues.apache.org/jira/browse/DERBY-1259
+//IC see: https://issues.apache.org/jira/browse/DERBY-1260
+//IC see: https://issues.apache.org/jira/browse/DERBY-1205
 		return getCurrentAccessPath().getCostEstimate();
 	}
 
@@ -627,6 +643,7 @@ public boolean isCoveringIndex(ConglomerateDescriptor cd) throws StandardExcepti
 		baseCols = irg.baseColumnPositions();
 
 		/* First we check to see if this is a covering index */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         for (ResultColumn rc : getResultColumns())
 		{
 			/* Ignore unreferenced columns */
@@ -692,7 +709,10 @@ public void verifyProperties(DataDictionary dDictionary)
 		boolean constraintSpecified = false;
 		ConstraintDescriptor consDesc = null;
         Enumeration<?> e = tableProperties.keys();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         StringUtil.SQLEqualsIgnoreCase(tableDescriptor.getSchemaName(), "SYS");
 		while (e.hasMoreElements())
 		{
@@ -789,6 +809,7 @@ else if (key.equals("hashLoadFactor"))
 			{
 				try
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
 					loadFactor = Float.parseFloat(value);
 				}
 				catch (NumberFormatException nfe)
@@ -832,6 +853,7 @@ else if (key.equals("bulkFetch"))
 					throw StandardException.newException(SQLState.LANG_INVALID_BULK_FETCH_UPDATEABLE);
 				}
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             else if (key.equals("validateCheckConstraint")) {
                 // the property "validateCheckConstraint" is read earlier
                 // cf. isValidatingCheckConstraint
@@ -867,6 +889,7 @@ else if (key.equals("validateCheckConstraint")) {
 	}
 
     private boolean isValidatingCheckConstraint() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (tableProperties == null) {
             return false;
         }
@@ -875,6 +898,8 @@ private boolean isValidatingCheckConstraint() throws StandardException {
             String key = (String)e.nextElement();
             String value = (String) tableProperties.get(key);
             if (key.equals("validateCheckConstraint")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                 targetTableUUIDString = value;
                 validatingCheckConstraint = true;
                 return true;
@@ -913,6 +938,8 @@ public void startOptimizing(Optimizer optimizer, RowOrdering rowOrdering)
 		** costEstimate will be copied to the best access paths as
 		** necessary.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         CostEstimate costEst = getCostEstimate(optimizer);
         ap.setCostEstimate(costEst);
 
@@ -975,6 +1002,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 			*/
 			statisticsForConglomerate = tableDescriptor.statisticsExist(cd);
 			statisticsForTable = tableDescriptor.statisticsExist(null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             unknownPredicateList = new PredicateList(getContextManager());
 			predList.copyPredicatesToOtherList(unknownPredicateList);
             // If not already done, check if this table has indexes and if
@@ -986,17 +1015,21 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
                 // The case where we have a table with a single-column unique
                 // index is pretty common, so avoid engaging the istat
                 // daemon if that's the only index on the table.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
                 if (qualifiesForStatisticsUpdateCheck(tableDescriptor)) {
                     tableDescriptor.markForIndexStatsUpdate(baseRowCount());
                 }
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         AccessPath currAccessPath = getCurrentAccessPath();
 		JoinStrategy currentJoinStrategy = 
             currAccessPath.getJoinStrategy();
 
         if ( optimizerTracingIsOn() ) { getOptimizerTracer().traceEstimatingCostOfConglomerate( cd, tableNumber ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
 		/* Get the uniqueness factory for later use (see below) */
 		double tableUniquenessFactor =
@@ -1015,6 +1048,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 		StoreCostController scc = getStoreCostController(cd);
 
         CostEstimate costEst = getScratchCostEstimate(optimizer);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		/* First, get the cost for one scan */
 
@@ -1038,8 +1073,11 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 										0);
 
             if ( optimizerTracingIsOn() ) { getOptimizerTracer().traceSingleMatchedRowCost( cost, tableNumber ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
             costEst.setCost(cost, 1.0d, 1.0d);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			/*
 			** Let the join strategy decide whether the cost of the base
@@ -1054,6 +1092,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 				newCost *= outerCost.rowCount();
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             costEst.setCost(
 				newCost,
                 costEst.rowCount() * outerCost.rowCount(),
@@ -1093,6 +1133,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
                 currAccessPath.setLockMode(
 											TransactionController.MODE_RECORD);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if ( optimizerTracingIsOn() ) { getOptimizerTracer().traceConstantStartStopPositions(); }
 			}
 			else
@@ -1133,10 +1174,13 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
                 // See reference to DERBY-6011 further down in this method.
 
                 cost = singleFetchCost * costEst.rowCount();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
                 costEst.setEstimatedCost(
                                 costEst.getEstimatedCost() + cost);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if ( optimizerTracingIsOn() ) { getOptimizerTracer().traceNonCoveringIndexCost( cost, tableNumber ); }
 			}
 		}
@@ -1326,6 +1370,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 						if (firstColumn != null && leftOpnd instanceof LikeEscapeOperatorNode)
 						{
 							LikeEscapeOperatorNode likeNode = (LikeEscapeOperatorNode) leftOpnd;
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 							if (likeNode.getLeftOperand().requiresTypeFromContext())
 							{
 								ValueNode receiver = ((TernaryOperatorNode) likeNode).getReceiver();
@@ -1386,6 +1431,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
                     // when the index is being considered by the optimizer.
                     IndexRowGenerator irg = cd.getIndexDescriptor();
                     if (irg.isUnique() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                             && irg.numberOfOrderedColumns() == 1
                             && startStopPredCount == 1) {
                         statStartStopSelectivity = (1/(double)baseRowCount());
@@ -1543,6 +1589,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 					false,
 					0,
                     costEst);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			/* initialPositionCost is the first part of the index scan cost we get above.
 			 * It's the cost of initial positioning/fetch of key.  So it's unrelated to
@@ -1562,6 +1610,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 				 * on cost (affecting decision for covering index) and rc (decision for
 				 * non-covering). The purpose is favoring unique index. beetle 5006.
 				 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 if (oneRowResultSetForSomeConglom && costEst.rowCount() <= 1)
 				{
                     costEst.setCost(costEst.getEstimatedCost() * 2,
@@ -1570,12 +1620,15 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 				}
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
             if ( optimizerTracingIsOn() )
             {
                 getOptimizerTracer().traceCostOfConglomerateScan
                     (
                      tableNumber,
                      cd,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                      costEst,
                      numExtraFirstColumnPreds,
                      extraFirstColumnSelectivity,
@@ -1606,6 +1659,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 				** we only applied the FirstColumnSelectivity to the 
 				** cost.
 				*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 costEst.setCost(
                     scanCostAfterSelectivity(costEst.getEstimatedCost(),
                                              initialPositionCost,
@@ -1615,6 +1670,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
                     costEst.singleScanRowCount() *
                     statStartStopSelectivity);
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if (optimizerTracingIsOn()) {
                     getOptimizerTracer().
                         traceCostIncludingStatsForIndex(costEst, tableNumber);
@@ -1630,6 +1686,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 				*/
 				if (extraFirstColumnSelectivity != 1.0d)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     costEst.setCost(
                          scanCostAfterSelectivity(costEst.getEstimatedCost(),
 												  initialPositionCost,
@@ -1639,6 +1697,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
                          costEst.singleScanRowCount() *
                              extraFirstColumnSelectivity);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                     if (optimizerTracingIsOn()) {
                         getOptimizerTracer().
                             traceCostIncludingExtra1stColumnSelectivity(
@@ -1658,6 +1717,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
                         costEst.singleScanRowCount() *
                             extraStartStopSelectivity);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                     if (optimizerTracingIsOn()) {
                         getOptimizerTracer().traceCostIncludingExtraStartStop(
                             costEst, tableNumber);
@@ -1690,6 +1750,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 				/* If multiplication by listSize returns more rows than are
 				 * in the scan then just use the number of rows in the scan.
 				 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 costEst.setCost(
                     costEst.getEstimatedCost() * listSize,
 					rc > initialRowCount ? initialRowCount : rc,
@@ -1704,9 +1766,12 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 			*/
 			if (! startStopFound)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 currAccessPath.setLockMode(
 											TransactionController.MODE_TABLE);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if ( optimizerTracingIsOn() ) { getOptimizerTracer().traceNoStartStopPosition(); }
 			}
 			else
@@ -1816,6 +1881,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
                 costEst.setEstimatedCost(
                                 costEst.getEstimatedCost() + cost);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if (optimizerTracingIsOn()) {
                     getOptimizerTracer().traceCostOfNoncoveringIndex(
                         costEst, tableNumber);
@@ -1828,12 +1894,15 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 			 */
 			if (extraQualifierSelectivity != 1.0d)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 costEst.setCost(
                         costEst.getEstimatedCost(),
                         costEst.rowCount() * extraQualifierSelectivity,
                         costEst.singleScanRowCount() *
                             extraQualifierSelectivity);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if (optimizerTracingIsOn()) {
                     getOptimizerTracer().
                         traceCostIncludingExtraQualifierSelectivity(
@@ -1876,6 +1945,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 				newCost *= outerCost.rowCount();
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             rowCnt *= outerCost.rowCount();
 			initialRowCount *= outerCost.rowCount();
 
@@ -1889,6 +1960,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 			*/
 			if (oneRowResultSetForSomeConglom)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 if (outerCost.rowCount() < rowCnt)
 				{
                     rowCnt = outerCost.rowCount();
@@ -1924,6 +1997,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 					*/
 					double maxRows =
 							((double) baseRowCount()) / scanUniquenessFactor;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     if (rowCnt > maxRows)
 					{
 						/*
@@ -1963,6 +2038,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
                 costEst.singleScanRowCount());
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
             if (optimizerTracingIsOn()) {
                 getOptimizerTracer().traceCostOfNScans(
                     tableNumber, outerCost.rowCount(), costEst);
@@ -1980,6 +2056,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 			// beetle 4787
 			else if (extraNonQualifierSelectivity != 1.0d)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 rc = oneRowResultSetForSomeConglom ?
                     costEst.rowCount() :
                     costEst.rowCount() * extraNonQualifierSelectivity;
@@ -1991,6 +2069,7 @@ else if (extraNonQualifierSelectivity != 1.0d)
 			{
                 costEst.setCost(costEst.getEstimatedCost(), rc, src);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if (optimizerTracingIsOn()) {
                     getOptimizerTracer().
                         traceCostIncludingExtraNonQualifierSelectivity(
@@ -2009,6 +2088,7 @@ else if (extraNonQualifierSelectivity != 1.0d)
 				*/
 
 				double compositeStatRC = initialRowCount * statCompositeSelectivity;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if ( optimizerTracingIsOn() )
                 { getOptimizerTracer().traceCompositeSelectivityFromStatistics( statCompositeSelectivity ); }
 
@@ -2040,6 +2120,7 @@ else if (extraNonQualifierSelectivity != 1.0d)
 									 1 : 
 									 compositeStatRC / outerCost.rowCount());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if (optimizerTracingIsOn()) {
                     getOptimizerTracer().
                         traceCostIncludingCompositeSelectivityFromStats(
@@ -2120,6 +2201,7 @@ public boolean forUpdate()
 		 * or it is (or was) the target table of an
 		 * updatable cursor.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return (updateOrDelete != 0) || isCursorTargetTable() || getUpdateLocks;
 	}
 
@@ -2177,6 +2259,8 @@ public double uniqueJoin(OptimizablePredicateList predList)
 		JBitSet[] tableColMap = new JBitSet[1];
 		tableColMap[0] = new JBitSet(numColumns + 1);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         pl.checkTopPredicatesForEqualsConditions(tableNo,
 												null,
 												tableNumbers,
@@ -2299,6 +2383,8 @@ void setExistsBaseTable(boolean existsBaseTable, JBitSet dependencyMap, boolean
 	 *
 	 * @param locations	list of bit numbers to be cleared
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void clearDependency(List<Integer> locations)
 	{
 		if (this.dependencyMap != null)
@@ -2313,6 +2399,8 @@ void clearDependency(List<Integer> locations)
 	 *
 	 * @param tableProperties	The new table properties.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setTableProperties(Properties tableProperties)
 	{
 		this.tableProperties = tableProperties;
@@ -2331,6 +2419,8 @@ void setTableProperties(Properties tableProperties)
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 						   FromList fromListParam) 
 					throws StandardException
@@ -2340,9 +2430,11 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
         TableDescriptor tabDescr = bindTableDescriptor();
 
         if (tabDescr.getTableType() == TableDescriptor.VTI_TYPE) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 			ResultSetNode vtiNode = mapTableAsVTI(
                     tabDescr,
 					getCorrelationName(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 					getResultColumns(),
 					getProperties(),
 					getContextManager());
@@ -2352,6 +2444,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 		ResultColumnList	derivedRCL = getResultColumns();
   
 		// make sure there's a restriction list
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         restrictionList = new PredicateList(getContextManager());
         baseTableRestrictionList = new PredicateList(getContextManager());
 
@@ -2359,12 +2453,16 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 		CompilerContext compilerContext = getCompilerContext();
 
 		/* Generate the ResultColumnList */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setResultColumns( genResultColList() );
 		templateColumns = getResultColumns();
 
 		/* Resolve the view, if this is a view */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         if (tabDescr.getTableType() == TableDescriptor.VIEW_TYPE)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3270
 			FromSubquery                fsq;
 			ResultSetNode				rsn;
 			ViewDescriptor				vd;
@@ -2375,6 +2473,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 			 * the view definition text.
 			 */
             vd = dataDictionary.getViewDescriptor(tabDescr);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			/*
 			** Set the default compilation schema to be whatever
@@ -2384,6 +2484,7 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 			*/
 			compSchema = dataDictionary.getSchemaDescriptor(vd.getCompSchemaId(), null);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3270
 			compilerContext.pushCompilationSchema(compSchema);
 	
 			try
@@ -2392,6 +2493,7 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 				/* This represents a view - query is dependent on the ViewDescriptor */
 				compilerContext.createDependency(vd);
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 				cvn = (CreateViewNode)
 				          parseStatement(vd.getViewText(), false);
 
@@ -2405,6 +2507,7 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 				 */
 				if (rsn.getResultColumns().containsAllResultColumn())
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 					getResultColumns().setCountMismatchAllowed(true);
 				}
 				//Views execute with definer's privileges and if any one of 
@@ -2417,20 +2520,28 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 				//sql accessing a view, we only need to look for select privilege
 				//on the actual view and that is what the following code is
 				//checking.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 for (ResultColumn rc : getResultColumns()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
                     if (isPrivilegeCollectionRequired()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 						compilerContext.addRequiredColumnPriv( rc.getTableColumnDescriptor());
                     }
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 fsq = new FromSubquery(
 					rsn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
                     cvn.getOrderByList(),
                     cvn.getOffset(),
                     cvn.getFetchFirst(),
                     cvn.hasJDBClimitClause(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
 					(correlationName != null) ? 
                         correlationName : getOrigTableName().getTableName(), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 					getResultColumns(),
 					tableProperties,
 					getContextManager());
@@ -2442,6 +2553,7 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 				//Following call is marking the query to run with definer 
 				//privileges. This marking will make sure that we do not collect
 				//any privilege requirement for it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 CollectNodesVisitor<QueryTreeNode> cnv =
                     new CollectNodesVisitor<QueryTreeNode>(QueryTreeNode.class);
 
@@ -2452,9 +2564,11 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
                 }
 
 				fsq.setOrigTableName(this.getOrigTableName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
 
 				// since we reset the compilation schema when we return, we
 				// need to save it for use when we bind expressions:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3270
 				fsq.setOrigCompilationSchema(compSchema);
 				ResultSetNode fsqBound =
 					fsq.bindNonVTITables(dataDictionary, fromListParam);
@@ -2479,6 +2593,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 		{
 			/* This represents a table - query is dependent on the TableDescriptor */
             compilerContext.createDependency(tabDescr);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			/* Get the base conglomerate descriptor */
 			baseConglomerateDescriptor =
@@ -2491,11 +2607,14 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
             if (baseConglomerateDescriptor == null) {
                 throw StandardException.newException(
                         SQLState.STORE_CONGLOMERATE_DOES_NOT_EXIST,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         Long.valueOf(tabDescr.getHeapConglomerateId()));
             }
 
 			/* Build the 0-based array of base column names. */
 			columnNames = getResultColumns().getColumnNames();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 			/* Do error checking on derived column list and update "exposed"
 			 * column names if valid.
@@ -2503,6 +2622,7 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 			if (derivedRCL != null)
 			{
                 getResultColumns().propagateDCLInfo(derivedRCL, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1894
 											    origTableName.getFullTableName());
 			}
 
@@ -2516,6 +2636,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
         //
         authorizeSYSUSERS =
             dataDictionary.usesSqlAuthorization() &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             tabDescr.getUUID().toString().equals(
                 SYSUSERSRowFactory.SYSUSERS_UUID );
 
@@ -2546,6 +2668,7 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
      * resultColumns) are passed into the FROM_VTI node.
      */
     private ResultSetNode mapTableAsVTI(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
             TableDescriptor td,
             String correlationName,
             ResultColumnList resultColumns,
@@ -2558,6 +2681,8 @@ private ResultSetNode mapTableAsVTI(
         // call is an indication that we are mapping to a no-argument VTI. Since
         // we have the table descriptor we do not need to pass in a TableName.
         // See NewInvocationNode for more.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         final List<ValueNode> emptyList = Collections.emptyList();
         MethodCallNode newNode = new NewInvocationNode(
                 null, // TableName
@@ -2579,6 +2704,8 @@ private ResultSetNode mapTableAsVTI(
             TableName exposedName = newNode.makeTableName(td.getSchemaName(),
                     td.getDescriptorName());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             vtiNode = new FromVTI(
                     newNode,
                     null, /* correlationName */
@@ -2609,6 +2736,7 @@ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
 		throws StandardException
 	{
 		// ourSchemaName can be null if correlation name is specified.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1894
 		String ourSchemaName = getOrigTableName().getSchemaName();
 		String fullName = (schemaName != null) ? (schemaName + '.' + name) : name;
 
@@ -2662,6 +2790,7 @@ else if ((schemaName != null && ourSchemaName != null) ||
 			// Compare column's schema name with table descriptor's if it is
 			// not a synonym since a synonym can be declared in a different
 			// schema.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1894
 			if (tableName.equals(origTableName) && 
 					! schemaName.equals(tableDescriptor.getSchemaDescriptor().getSchemaName()))
 			{
@@ -2675,6 +2804,7 @@ else if ((schemaName != null && ourSchemaName != null) ||
 			}
 
 			// Make sure exposed name is not a correlation name
+//IC see: https://issues.apache.org/jira/browse/DERBY-1894
 			if (! getExposedName().equals(getOrigTableName().getTableName()))
 			{
 				return null;
@@ -2686,6 +2816,7 @@ else if ((schemaName != null && ourSchemaName != null) ||
 		/* Schema name only specified on table. Compare full exposed name
 		 * against table's schema name || "." || column's table name.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1894
 		if (! getExposedName().equals(getOrigTableName().getSchemaName() + "." + name))
 		{
 			return null;
@@ -2710,9 +2841,11 @@ private	TableDescriptor	bindTableDescriptor()
 		SchemaDescriptor sd = getSchemaDescriptor(schemaName);
 
 		tableDescriptor = getTableDescriptor(tableName.getTableName(), sd);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1894
 		if (tableDescriptor == null)
 		{
 			// Check if the reference is for a synonym.
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 			TableName synonymTab = resolveTableToSynonym(tableName);
 			if (synonymTab == null)
 				throw StandardException.newException(SQLState.LANG_TABLE_NOT_FOUND, tableName);
@@ -2739,6 +2872,8 @@ private	TableDescriptor	bindTableDescriptor()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressions(FromList fromListParam)
 					throws StandardException
 	{
@@ -2760,6 +2895,8 @@ void bindExpressions(FromList fromListParam)
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumns(FromList fromListParam)
 				throws StandardException
 	{
@@ -2781,6 +2918,8 @@ void bindResultColumns(FromList fromListParam)
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getMatchingColumn(ColumnReference columnReference)
             throws StandardException
 	{
@@ -2789,6 +2928,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 		TableName		exposedTableName;
 
 		columnsTableName = columnReference.getQualifiedTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         if(columnsTableName != null) {
             if(columnsTableName.getSchemaName() == null && correlationName == null)
@@ -2801,6 +2941,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 		** table name.
 		*/
         exposedTableName = getExposedTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
 
         if (exposedTableName.getSchemaName() == null
                 && correlationName == null) {
@@ -2826,6 +2967,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
             //         sys.systables systabs
             //     where systabs.tabletype = 'T' and systabs.tableid = tt.tableid;
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             if ( getResultColumns() == null )
             {
                 throw StandardException.newException
@@ -2837,6 +2979,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 			if (resultColumn != null)
 			{
 				columnReference.setTableNumber(tableNumber);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4695
                 columnReference.setColumnNumber(
                     resultColumn.getColumnPosition());
 
@@ -2850,6 +2993,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
                     // Add a privilege for this column if the bind() phase of an UPDATE
                     // statement marked it as a selected column. see DERBY-6429.
                     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
                     if ( columnReference.isPrivilegeCollectionRequired() )
                     {
                         if ( columnReference.taggedWith( TagFilter.NEED_PRIVS_FOR_UPDATE_STMT ) )
@@ -2892,6 +3036,8 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
@@ -2908,11 +3054,13 @@ ResultSetNode preprocess(int numTables,
         // At preprocess() time, the result column list should be the columns in the base
         // table.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6221
         if ( authorizeSYSUSERS )
         {
             int passwordColNum = SYSUSERSRowFactory.PASSWORD_COL_NUM;
 
             FormatableBitSet    refCols = getResultColumns().getReferencedFormatableBitSet( false, true, false );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
             if (
                 (refCols.getLength() >= passwordColNum ) && refCols.isSet( passwordColNum - 1 )
@@ -2924,6 +3072,7 @@ ResultSetNode preprocess(int numTables,
         }
         
         /* Generate the referenced table map */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setReferencedTableMap( new JBitSet(numTables) );
 		getReferencedTableMap().set(tableNumber);
 
@@ -2960,6 +3109,7 @@ protected ResultSetNode genProjectRestrict(int numTables)
 		/* We get a shallow copy of the ResultColumnList and its 
 		 * ResultColumns.  (Copy maintains ResultColumn.expression for now.)
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		ResultColumnList prRCList = getResultColumns();
 		setResultColumns( getResultColumns().copyListAndObjects() );
 		getResultColumns().setIndexRow( baseConglomerateDescriptor.getConglomerateNumber(), forUpdate() );
@@ -2971,6 +3121,7 @@ protected ResultSetNode genProjectRestrict(int numTables)
 		 * we won't be able to project out any of them.
 		 */
 		prRCList.genVirtualColumnNodes(this, getResultColumns(), false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Project out any unreferenced columns.  If there are no referenced 
 		 * columns, generate and bind a single ResultColumn whose expression is 1.
@@ -2978,6 +3129,7 @@ protected ResultSetNode genProjectRestrict(int numTables)
 		prRCList.doProjection();
 
 		/* Finally, we create the new ProjectRestrictNode */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         ProjectRestrictNode result =
                 new ProjectRestrictNode(
 								this,
@@ -2989,6 +3141,7 @@ protected ResultSetNode genProjectRestrict(int numTables)
 								null,
                                 getContextManager());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (isValidatingCheckConstraint()) {
             CompilerContext cc = getCompilerContext();
 
@@ -3000,6 +3153,8 @@ protected ResultSetNode genProjectRestrict(int numTables)
                         SQLState.LANG_SYNTAX_ERROR, "validateCheckConstraint");
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             result.setValidatingCheckConstraints(targetTableUUIDString);
         }
         return result;
@@ -3020,6 +3175,7 @@ ResultSetNode changeAccessPath() throws StandardException
 		JoinStrategy trulyTheBestJoinStrategy = ap.getJoinStrategy();
         Optimizer opt = ap.getOptimizer();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         if (optimizerTracingIsOn()) {
             getOptimizerTracer().traceChangingAccessPathForTable(tableNumber);
         }
@@ -3070,6 +3226,8 @@ else if (isOneRowResultSet())
 		** Divide up the predicates for different processing phases of the
 		** best join strategy.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         storeRestrictionList = new PredicateList(getContextManager());
         nonStoreRestrictionList = new PredicateList(getContextManager());
         requalificationRestrictionList = new PredicateList(getContextManager());
@@ -3092,6 +3250,7 @@ else if (isOneRowResultSet())
 		 * really need to completely disable bulk fetching here,
 		 * or can we do something else?
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate pred : restrictionList)
 		{
 			if (pred.isInListProbePredicate() && pred.isStartKey())
@@ -3123,6 +3282,7 @@ else if (isOneRowResultSet())
 			(bulkFetch == UNSET) && 
 			!forUpdate() && 
 			!isOneRowResultSet() &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             getLevel() == 0 &&
             !validatingCheckConstraint)
 		{
@@ -3149,6 +3309,7 @@ else if (isOneRowResultSet())
 			/* Template must reflect full row.
 			 * Compact RCL down to partial row.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			templateColumns = getResultColumns();
 			referencedCols = getResultColumns().getReferencedFormatableBitSet(isCursorTargetTable(), isSysstatements, false);
 			setResultColumns( getResultColumns().compactColumns(isCursorTargetTable(), isSysstatements) );
@@ -3184,6 +3345,7 @@ else if (isOneRowResultSet())
 			// If this is for update then we need to get the RID in the result row
 			if (forUpdate())
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				getResultColumns().addRCForRID();
 			}
 			
@@ -3192,6 +3354,7 @@ else if (isOneRowResultSet())
 			 * because we don't want the RID in the partial row returned
 			 * by the store.)
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			referencedCols = getResultColumns().getReferencedFormatableBitSet(isCursorTargetTable(),true, false);
 			setResultColumns( getResultColumns().compactColumns(isCursorTargetTable(),true) );
 
@@ -3226,6 +3389,7 @@ else if (isOneRowResultSet())
 		** a cursor can fetch the current row).
 		*/
 		ResultColumnList newResultColumns =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			newResultColumns(getResultColumns(),
 							trulyTheBestConglomerateDescriptor,
 							baseConglomerateDescriptor,
@@ -3243,6 +3407,8 @@ else if (isOneRowResultSet())
 		// Get the BitSet for all of the referenced columns
 		FormatableBitSet indexReferencedCols = null;
         FormatableBitSet heapReferencedCols;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		if ((bulkFetch == UNSET) && 
 			(requalificationRestrictionList == null || 
@@ -3251,6 +3417,7 @@ else if (isOneRowResultSet())
 			/* No BULK FETCH or requalification, XOR off the columns coming from the heap 
 			 * to get the columns coming from the index.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			indexReferencedCols = getResultColumns().getReferencedFormatableBitSet(isCursorTargetTable(), true, false);
 			heapReferencedCols = getResultColumns().getReferencedFormatableBitSet(isCursorTargetTable(), true, true);
 			if (heapReferencedCols != null)
@@ -3261,6 +3428,7 @@ else if (isOneRowResultSet())
 		else
 		{
 			// BULK FETCH or requalification - re-get all referenced columns from the heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			heapReferencedCols = getResultColumns().getReferencedFormatableBitSet(isCursorTargetTable(), true, false) ;
 		}
 		ResultColumnList heapRCL = getResultColumns().compactColumns(isCursorTargetTable(), false);
@@ -3285,6 +3453,7 @@ else if (isOneRowResultSet())
 		** result set is the compacted column list.
 		*/
 		setResultColumns( newResultColumns );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		templateColumns = newResultColumns(getResultColumns(),
 			 							   trulyTheBestConglomerateDescriptor,
@@ -3301,6 +3470,7 @@ else if (isOneRowResultSet())
 		 */
 		if (bulkFetch != UNSET)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			getResultColumns().markAllUnreferenced();
 			storeRestrictionList.markReferencedColumns();
 			if (nonStoreRestrictionList != null)
@@ -3355,6 +3525,8 @@ private ResultColumnList newResultColumns(
 		IndexRowGenerator	irg = idxCD.getIndexDescriptor();
 		int[]				baseCols = irg.baseColumnPositions();
         ResultColumnList newCols = new ResultColumnList((getContextManager()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		for (int i = 0; i < baseCols.length; i++)
 		{
@@ -3378,6 +3550,8 @@ private ResultColumnList newResultColumns(
 			if (cloneRCs)
 			{
 				newCol = oldCol.cloneMe();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 oldCol.setExpression(new VirtualColumnNode(
 						this,
 						newCol,
@@ -3419,6 +3593,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 	{
         if ( rowLocationColumnName != null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             getResultColumns().conglomerateId = tableDescriptor.getHeapConglomerateId();
         }
 
@@ -3428,6 +3603,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		** Remember if this base table is the cursor target table, so we can
 		** know which table to use when doing positioned update and delete
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (isCursorTargetTable())
 		{
 			acb.rememberCursorTarget(mb);
@@ -3499,6 +3675,7 @@ void generateResultSet(ExpressionClassBuilder acb, MethodBuilder mb)
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null,
 			trulyTheBestJoinStrategy.resultSetMethodName(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 (bulkFetch != UNSET), multiProbing, validatingCheckConstraint),
 			ClassName.NoPutResultSet, nargs);
 
@@ -3528,6 +3705,8 @@ void generateResultSet(ExpressionClassBuilder acb, MethodBuilder mb)
 	 * @return	The final CostEstimate for this ResultSetNode.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getFinalCostEstimate()
 	{
 		return getTrulyTheBestAccessPath().getCostEstimate();
@@ -3541,8 +3720,12 @@ CostEstimate getFinalCostEstimate()
          * @throws StandardException
          */
     private void pushIndexName(ConglomerateDescriptor cd, MethodBuilder mb)
+//IC see: https://issues.apache.org/jira/browse/DERBY-578
+//IC see: https://issues.apache.org/jira/browse/DERBY-1464
           throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         if (cd.isConstraint()) {
             DataDictionary dd = getDataDictionary();
             ConstraintDescriptor constraintDesc =
@@ -3594,6 +3777,7 @@ private void generateMaxSpecialResultSet(
 		acb.pushThisAsActivation(mb);
 		mb.push(getResultSetNumber());
         mb.push(acb.addItem(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                             getResultColumns().buildRowTemplate(referencedCols, false)));
 		mb.push(cd.getConglomerateNumber());
 		mb.push(tableDescriptor.getName());
@@ -3609,12 +3793,15 @@ private void generateMaxSpecialResultSet(
 		mb.push(getTrulyTheBestAccessPath().getLockMode());
 		mb.push(tableLockGranularity);
 		mb.push(getCompilerContext().getScanIsolationLevel());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         mb.push(costEst.singleScanRowCount());
         mb.push(costEst.getEstimatedCost());
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getLastIndexKeyResultSet",
 					ClassName.NoPutResultSet, 13);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 
 	}
 
@@ -3625,6 +3812,8 @@ private void generateMaxSpecialResultSet(
 	) throws StandardException
 	{
 		ConglomerateDescriptor cd = getTrulyTheBestAccessPath().getConglomerateDescriptor();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         CostEstimate costEst = getFinalCostEstimate();
 		int colRefItem = (referencedCols == null) ?
 						-1 :
@@ -3654,6 +3843,7 @@ private void generateMaxSpecialResultSet(
 		/* Get the hash key columns and wrap them in a formattable */
         int[] hashKeyCols;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         hashKeyCols = new int[getResultColumns().size()];
 		if (referencedCols == null)
 		{
@@ -3669,6 +3859,8 @@ private void generateMaxSpecialResultSet(
 					colNum != -1;
 					colNum = referencedCols.anySetBit(colNum))
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 hashKeyCols[index++] = colNum;
 			}
 		}
@@ -3688,6 +3880,7 @@ private void generateMaxSpecialResultSet(
 		mb.push(conglomNumber);
 		mb.push(acb.addItem(scoci));
         mb.push(acb.addItem(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                             getResultColumns().buildRowTemplate(referencedCols, false)));
 		mb.push(getResultSetNumber());
 		mb.push(hashKeyItem);
@@ -3695,20 +3888,29 @@ private void generateMaxSpecialResultSet(
 		//User may have supplied optimizer overrides in the sql
 		//Pass them onto execute phase so it can be shown in 
 		//run time statistics.
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		if (tableProperties != null)
 			mb.push(org.apache.derby.iapi.util.PropertyUtil.sortProperties(tableProperties));
 		else
 			mb.pushNull("java.lang.String");
+//IC see: https://issues.apache.org/jira/browse/DERBY-578
+//IC see: https://issues.apache.org/jira/browse/DERBY-1464
+//IC see: https://issues.apache.org/jira/browse/DERBY-578
+//IC see: https://issues.apache.org/jira/browse/DERBY-1464
 		pushIndexName(cd, mb);
 		mb.push(cd.isConstraint());
 		mb.push(colRefItem);
 		mb.push(getTrulyTheBestAccessPath().getLockMode());
 		mb.push(tableLockGranularity);
 		mb.push(getCompilerContext().getScanIsolationLevel());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         mb.push(costEst.singleScanRowCount());
         mb.push(costEst.getEstimatedCost());
 		
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getDistinctScanResultSet",
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 							ClassName.NoPutResultSet, 16);
 	}
 
@@ -3763,6 +3965,7 @@ private int getScanArguments(ExpressionClassBuilder acb,
         // Put the result row template in the saved objects.
         int resultRowTemplate =
             acb.addItem(getResultColumns().buildRowTemplate(referencedCols, false));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// pass in the referenced columns on the saved objects
 		// chain
@@ -3774,6 +3977,7 @@ private int getScanArguments(ExpressionClassBuilder acb,
 
 		// beetle entry 3865: updateable cursor using index
 		int indexColItem = -1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (isCursorTargetTable() || getUpdateLocks)
 		{
 			ConglomerateDescriptor cd = getTrulyTheBestAccessPath().getConglomerateDescriptor();
@@ -3788,6 +3992,7 @@ private int getScanArguments(ExpressionClassBuilder acb,
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
         AccessPath ap = getTrulyTheBestAccessPath();
 		JoinStrategy trulyTheBestJoinStrategy =	ap.getJoinStrategy();
 
@@ -3813,6 +4018,7 @@ private int getScanArguments(ExpressionClassBuilder acb,
 											nonStoreRestrictionList,
 											acb,
 											bulkFetch,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 											resultRowTemplate,
 											colRefItem,
 											indexColItem,
@@ -3868,11 +4074,14 @@ private int mapAbsoluteToRelativeColumnPosition(int absolutePosition)
 	 *
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getExposedName()
 	{
 		if (correlationName != null)
 			return correlationName;
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
 			return getOrigTableName().getFullTableName();
 	}
 	
@@ -3898,6 +4107,8 @@ TableName getExposedTableName() throws StandardException
 	 * @return	The table name for this table.
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     TableName getTableNameField()
 	{
 		return tableName;
@@ -3916,9 +4127,12 @@ TableName getTableNameField()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList getAllResultColumns(TableName allTableName)
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return getResultColumnsForList(allTableName, getResultColumns(), 
 				getOrigTableName());
 	}
@@ -3932,6 +4146,8 @@ ResultColumnList getAllResultColumns(TableName allTableName)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList genResultColList()
 			throws StandardException
 	{
@@ -3959,7 +4175,10 @@ ResultColumnList genResultColList()
 			//setTableDescriptor method. ColumnDescriptor's table descriptor is used
 			//to get ResultSetMetaData.getTableName & ResultSetMetaData.getSchemaName
 			colDesc.setTableDescriptor(tableDescriptor);
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             valueNode = new BaseColumnNode(colDesc.getColumnName(),
 									  		exposedName,
 											colDesc.getType(),
@@ -3999,6 +4218,8 @@ ResultColumnList genResultColList()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList addColsToList
 	(
 		ResultColumnList	inputRcl,
@@ -4014,8 +4235,12 @@ ResultColumnList genResultColList()
 		 * in the expanded list.
 		 */
 		exposedName = getExposedTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
 
 		/* Add all of the columns in the table */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ResultColumnList newRcl = new ResultColumnList((getContextManager()));
 		ColumnDescriptorList cdl = tableDescriptor.getColumnDescriptorList();
 		int					 cdlSize = cdl.size();
@@ -4035,6 +4260,8 @@ ResultColumnList genResultColList()
 			{	
                 ColumnReference cr = new ColumnReference(cd.getColumnName(),
 												exposedName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 												getContextManager());
                 if ( (getMergeTableID() != ColumnReference.MERGE_UNKNOWN ) )
                 {
@@ -4058,6 +4285,8 @@ ResultColumnList genResultColList()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     TableName getTableName()
 			throws StandardException
 	{
@@ -4078,6 +4307,7 @@ TableName getTableName()
     @Override
     boolean markAsCursorTargetTable()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setCursorTargetTable( true );
 		return true;
 	}
@@ -4091,6 +4321,7 @@ boolean markAsCursorTargetTable()
     @Override
 	protected boolean cursorTargetTable()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return isCursorTargetTable();
 	}
 
@@ -4103,6 +4334,7 @@ protected boolean cursorTargetTable()
 	 */
 	void markUpdated(ResultColumnList updateColumns)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		getResultColumns().markUpdated(updateColumns);
 	}
 
@@ -4173,6 +4405,8 @@ boolean isOneRowResultSet() throws StandardException
 		if (trulyTheBestJoinStrategy.isHashJoin())
 		{
             pl = new PredicateList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			if (storeRestrictionList != null)
 			{
@@ -4283,6 +4517,8 @@ protected boolean supersetOfUniqueIndex(boolean[] eqCols)
 	 * 	one table are a superset
 	 */
 	protected boolean supersetOfUniqueIndex(JBitSet[] tableColMap)
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 		throws StandardException
 	{
 		ConglomerateDescriptor[] cds = tableDescriptor.getConglomerateDescriptors();
@@ -4381,6 +4617,7 @@ int updateTargetLockMode()
             getLanguageConnectionContext().getCurrentIsolationLevel();
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 		if ((isolationLevel != TransactionControl.SERIALIZABLE_ISOLATION_LEVEL) &&
 			(tableDescriptor.getLockGranularity() != 
 					TableDescriptor.TABLE_LOCK_GRANULARITY))
@@ -4452,6 +4689,7 @@ boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List<FromBas
 			isOrdered = isStrictlyOrdered(crs, cd);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         if (fbtHolder != null)
 		{
             fbtHolder.add(this);
@@ -4501,7 +4739,9 @@ boolean isPossibleDistinctScan(Set<BaseColumnNode> distinctColumns)
 		}
 
 		HashSet<ValueNode> columns = new HashSet<ValueNode>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         for (ResultColumn rc : getResultColumns()) {
 			columns.add(rc.getExpression());
 		}
@@ -4754,6 +4994,8 @@ private boolean isOneRowResultSet(ConglomerateDescriptor cd,
 		}
 
         PredicateList restrictList = (PredicateList) predList;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		if (! cd.isIndex())
 		{
@@ -4780,6 +5022,8 @@ private boolean isOneRowResultSet(ConglomerateDescriptor cd,
 			/* Is there a pushable equality predicate on this key column?
 			 * (IS NULL is also acceptable)
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             if (! restrictList.hasOptimizableEqualityPredicate(
                         this, curCol, true))
 			{
@@ -4949,12 +5193,14 @@ void setRefActionInfo(long fkIndexConglomId,
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 	
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (nonStoreRestrictionList != null) {
 			nonStoreRestrictionList.accept(v);
 		}
@@ -4984,6 +5230,7 @@ void acceptChildren(Visitor v)
      * @return {@code true} if qualified, {@code false} if not
      */
     private boolean qualifiesForStatisticsUpdateCheck(TableDescriptor td)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
             throws StandardException {
         int qualifiedIndexes = 0;
         // Only base tables qualifies.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromList.java
index 8dcaefc4fb..40353ed706 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromList.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.FromList
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -44,6 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 class FromList extends    QueryTreeNodeVector<ResultSetNode>
                implements OptimizableList
 {
@@ -79,6 +81,8 @@ class FromList extends    QueryTreeNodeVector<ResultSetNode>
      * {@code false}.
      * @param cm context manager
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FromList(ContextManager cm) {
         super(ResultSetNode.class, cm);
         this.isTransparent = false;
@@ -111,6 +115,9 @@ class FromList extends    QueryTreeNodeVector<ResultSetNode>
              FromTable fromTable,
              ContextManager cm) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         super(ResultSetNode.class, cm);
         constructorMinion(optimizeJoinOrder);
         addFromTable(fromTable);
@@ -162,6 +169,8 @@ public void verifyProperties(DataDictionary dDictionary) throws StandardExceptio
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final void addFromTable(FromTable fromTable) throws StandardException
 	{
 		/* Don't worry about checking TableOperatorNodes since
@@ -173,6 +182,8 @@ final void addFromTable(FromTable fromTable) throws StandardException
 		 * user is executing a really dumb query and we won't throw
 		 * and exception - consider it an ANSI extension.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         TableName leftTable;
         TableName rightTable;
 
@@ -183,6 +194,7 @@ final void addFromTable(FromTable fromTable) throws StandardException
 			for (int index = 0; index < size; index++)
 			{
                 leftTable = fromTable.getTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-13
 
                 if(((FromTable) elementAt(index)) instanceof TableOperatorNode) {
                     continue;
@@ -198,6 +210,7 @@ final void addFromTable(FromTable fromTable) throws StandardException
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         addElement(fromTable);
 	}
 
@@ -254,6 +267,7 @@ public boolean referencesSessionSchema()
 		// definition. Hence, we need to intercept in the middle on the bindTables
 		// method and save that information in referencesSeesionSchema field.
 		if (referencesSessionSchema) return true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-424
 
 		/* Check for table or VTI name in FROM list */
 		int size = size();
@@ -311,6 +325,8 @@ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
 	 * @see HalfOuterJoinNode#isJoinColumnForRightOuterJoin
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void isJoinColumnForRightOuterJoin(ResultColumn rc)
 	{
 		FromTable	fromTable;
@@ -321,6 +337,8 @@ void isJoinColumnForRightOuterJoin(ResultColumn rc)
 			fromTable.isJoinColumnForRightOuterJoin(rc);
 		}
 	}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindTables(DataDictionary dataDictionary,
 							FromList fromListParam) 
 			throws StandardException
@@ -350,6 +368,7 @@ void bindTables(DataDictionary dataDictionary,
 			// in referencesSessionSchema element. The reason for this is that the view will get
 			// replaced by it's view definition and we will loose the information that the statement
 			// was referencing a SESSION schema object. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-424
 			if (fromTable.referencesSessionSchema())
             {
 				referencesSessionSchema = true;
@@ -383,6 +402,7 @@ void bindTables(DataDictionary dataDictionary,
         //    the constructor for column privilege requires us to pass
         //    a column descriptor, we just choose the first column for
         //    MIN_SELECT_PRIV requirement.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6411
         final CompilerContext cc = getCompilerContext();
         cc.pushCurrentPrivType(Authorizer.MIN_SELECT_PRIV);
         for (int index = 0; index < size; index++) {
@@ -396,6 +416,7 @@ void bindTables(DataDictionary dataDictionary,
             }
         }
         cc.popCurrentPrivType();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6491
         getCompilerContext().skipTypePrivileges( wasSkippingTypePrivileges );
 	}
 
@@ -407,6 +428,8 @@ void bindTables(DataDictionary dataDictionary,
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressions( FromList fromListParam )
 					throws StandardException
 	{
@@ -436,6 +459,8 @@ void bindExpressions( FromList fromListParam )
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumns(FromList fromListParam)
 				throws StandardException
 	{
@@ -491,6 +516,8 @@ void bindResultColumns(FromList fromListParam)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList expandAll(TableName allTableName)
 			throws StandardException
 	{
@@ -627,6 +654,8 @@ ResultColumnList expandAll(TableName allTableName)
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn bindColumnReference(ColumnReference columnReference)
 				throws StandardException
 	{
@@ -703,6 +732,7 @@ ResultColumn bindColumnReference(ColumnReference columnReference)
 					columnReference.setSourceLevel(currentLevel);
 					columnNameMatch = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 					if (fromTable.isPrivilegeCollectionRequired())
                     {
 						getCompilerContext().addRequiredColumnPriv( resultColumn.getTableColumnDescriptor());
@@ -713,6 +743,7 @@ ResultColumn bindColumnReference(ColumnReference columnReference)
 				else
 				{
 					throw StandardException.newException(SQLState.LANG_AMBIGUOUS_COLUMN_NAME, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-18
 							 columnReference.getSQLColumnName());
 				}
 			}
@@ -737,6 +768,7 @@ ResultColumn bindColumnReference(ColumnReference columnReference)
                     crtn = fbt.getExposedTableName();
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             columnReference.setQualifiedTableName( crtn );
         }
         
@@ -751,6 +783,8 @@ ResultColumn bindColumnReference(ColumnReference columnReference)
 	 *									directly under a ResultColumn
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void rejectParameters() throws StandardException
 	{
 		FromTable	fromTable;
@@ -796,6 +830,8 @@ boolean LOJ_reorderable(int numTables) throws StandardException
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void preprocess(int numTables,
 						   GroupByList gbl,
 						   ValueNode predicateTree)
@@ -828,15 +864,20 @@ void preprocess(int numTables,
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void flattenFromTables(ResultColumnList rcl,
 								  PredicateList predicateList,
 								  SubqueryList sql,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4698
+//IC see: https://issues.apache.org/jira/browse/DERBY-3880
                                   GroupByList gbl,
                                   ValueNode havingClause)
 									throws StandardException
 	{
 		boolean			flattened = true;
 		ArrayList<Integer>		flattenedTableNumbers = new ArrayList<Integer>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		if (SanityManager.DEBUG)
 		{
@@ -867,6 +908,7 @@ void flattenFromTables(ResultColumnList rcl,
 				{
 					//save the table number of the node to be flattened
                     flattenedTableNumbers.add(ft.getTableNumber());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 
 					/* Remove the node from the list and insert its
 					 * FromList here.
@@ -875,6 +917,8 @@ void flattenFromTables(ResultColumnList rcl,
 														rcl,
 														predicateList,
 														sql,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4698
+//IC see: https://issues.apache.org/jira/browse/DERBY-3880
                                                         gbl,
                                                         havingClause);
 					if (SanityManager.DEBUG)
@@ -910,6 +954,7 @@ void flattenFromTables(ResultColumnList rcl,
 		/* fix up dependency maps for exists base tables since they might have a
 		 * dependency on this join node
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 		if (!flattenedTableNumbers.isEmpty())
 		{
 			for (int i = 0; i < size(); i++)
@@ -965,6 +1010,8 @@ void pushPredicates(PredicateList predicateList)
 	 *
 	 * @param level		The query block level for this table.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setLevel(int level)
 	{
 		int size = size();
@@ -1011,6 +1058,8 @@ FromTable getFromTableByResultColumn(ResultColumn rc)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setProperties(Properties props) throws StandardException
 	{
 		properties = props;
@@ -1020,6 +1069,7 @@ void setProperties(Properties props) throws StandardException
 		** there is nothing in this properties list that relies on binding
 		** or optimization to validate.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Enumeration<?> e = properties.keys();
 		while (e.hasMoreElements())
 		{
@@ -1101,6 +1151,7 @@ public void reOrder(int[] joinOrder)
 			*/
 			if (sum != ( ( joinOrder.length * (joinOrder.length - 1) ) / 2) )
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 StringBuilder arrayVals = new StringBuilder();
                 for (int i : joinOrder) {
                     arrayVals.append(i);
@@ -1176,6 +1227,8 @@ public void initAccessPaths(Optimizer optimizer)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindUntypedNullsToResultColumns(ResultColumnList bindingRCL)
 				throws StandardException
 	{
@@ -1308,7 +1361,10 @@ boolean returnsAtMostSingleRow(ResultColumnList rcl,
 
 		PredicateList predicatesTemp;
         predicatesTemp = new PredicateList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate p : wherePredicates) {
             predicatesTemp.addPredicate(p);
         }
@@ -1321,6 +1377,7 @@ boolean returnsAtMostSingleRow(ResultColumnList rcl,
 		 */
 		if (rcl != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = rcl.elementAt(0);
 			if (rc.getExpression() instanceof ColumnReference)
 			{
@@ -1387,8 +1444,11 @@ boolean returnsAtMostSingleRow(ResultColumnList rcl,
 			{
 				int existsTableNumber = fbt.getTableNumber();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 for (int i = predicatesTemp.size() - 1; i >= 0; i--)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     AndNode topAndNode =
                             predicatesTemp.elementAt(i).getAndNode();
 
@@ -1410,6 +1470,7 @@ boolean returnsAtMostSingleRow(ResultColumnList rcl,
 						JBitSet referencedTables = and.getLeftOperand().getTablesReferenced();
 						if (referencedTables.get(existsTableNumber))
 						{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                             predicatesTemp.removeElementAt(i);
 							break;
 						}
@@ -1684,6 +1745,7 @@ int updateTargetLockMode()
                     ( "size() is " + size() + " but should be 1");
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return elementAt(0).updateTargetLockMode();
 	}
 
@@ -1727,7 +1789,11 @@ void markAsTransparent()
 	 * Set windows field to the supplied value.
 	 * @param windows list of window definitions associated with a SELECT.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setWindows(WindowList windows) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		this.windows = windows;
 	}
 
@@ -1735,6 +1801,8 @@ void setWindows(WindowList windows) {
 	/**
 	 * @return list of window definitions associated with a SELECT.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     WindowList getWindows() {
 		return windows;
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromSubquery.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromSubquery.java
index 7cacaa684b..d7c81441f6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromSubquery.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromSubquery.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.FromSubquery
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -41,6 +42,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * of the insert target table.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class FromSubquery extends FromTable
 {
 	ResultSetNode	subquery;
@@ -69,6 +72,8 @@ class FromSubquery extends FromTable
 	 * @param tableProperties	Properties list associated with the table
      * @param cm            The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FromSubquery(ResultSetNode subquery,
                  OrderByList orderByList,
                  ValueNode offset,
@@ -85,6 +90,7 @@ class FromSubquery extends FromTable
         this.offset = offset;
         this.fetchFirst = fetchFirst;
         this.hasJDBClimitClause = hasJDBClimitClause;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( derivedRCL );
 	}
 
@@ -95,6 +101,8 @@ class FromSubquery extends FromTable
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG) {
@@ -106,6 +114,9 @@ void printSubNodes(int depth)
 				subquery.treePrint(depth + 1);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
             if (orderByList != null)
             {
                 printLabel(depth, "orderByList: ");
@@ -131,6 +142,8 @@ void printSubNodes(int depth)
 	 *
 	 * @return ResultSetNode	The "subquery" from this node.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode getSubquery()
 	{
 		return subquery;
@@ -153,6 +166,7 @@ ResultSetNode getSubquery()
     FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5005
         if (schemaName != null && origTableName != null) {
             // View can have schema
             if (!schemaName.equals(origTableName.schemaName)) {
@@ -179,6 +193,8 @@ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 						  FromList fromListParam) 
 							throws StandardException
@@ -202,6 +218,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindVTITables(FromList fromListParam)
 							throws StandardException
 	{
@@ -219,6 +237,8 @@ ResultSetNode bindVTITables(FromList fromListParam)
 	 *									directly under a ResultColumn
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void rejectParameters() throws StandardException
 	{
 		subquery.rejectParameters();
@@ -232,12 +252,15 @@ void rejectParameters() throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressions(FromList fromListParam)
 					throws StandardException
 	{
         FromList            emptyFromList = new FromList(
                 getOptimizerFactory().doJoinOrderOptimization(),
                 getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		ResultColumnList	derivedRCL = getResultColumns();
 		ResultColumnList	subqueryRCL;
 		FromList			nestedFromList;
@@ -245,13 +268,17 @@ void bindExpressions(FromList fromListParam)
 		/* From subqueries cannot be correlated, so we pass an empty FromList
 		 * to subquery.bindExpressions() and .bindResultColumns()
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 		if (orderByList != null) {
 			orderByList.pullUpOrderByColumns(subquery);
 		}
 
 		nestedFromList = emptyFromList;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2442
 
 		CompilerContext compilerContext = getCompilerContext();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3270
 
 		if (origCompilationSchema != null) {
 			// View expansion needs the definition time schema
@@ -261,6 +288,7 @@ void bindExpressions(FromList fromListParam)
         // Nested VTI/tableFunctions will want to know whether their arguments
         // reference tables in the FROM list which contains this subquery. Those
         // references are illegal. See DERBY-5554 and DERBY-5779.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         CollectNodesVisitor<FromVTI> nestedVTIs =
                 new CollectNodesVisitor<FromVTI>(FromVTI.class);
 		subquery.accept( nestedVTIs );
@@ -278,11 +306,14 @@ void bindExpressions(FromList fromListParam)
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 		if (orderByList != null) {
 			orderByList.bindOrderByColumns(subquery);
 		}
 
         bindOffsetFetch(offset, fetchFirst);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
 
         /* NOTE: If the size of the derived column list is less than
 		 * the size of the subquery's RCL and the derived column list is marked
@@ -292,6 +323,7 @@ void bindExpressions(FromList fromListParam)
 		 * the table since the view was created.
 		 */
 		subqueryRCL = subquery.getResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getResultColumns() != null && getResultColumns().getCountMismatchAllowed() &&
 			getResultColumns().size() < subqueryRCL.size())
 		{
@@ -306,9 +338,11 @@ void bindExpressions(FromList fromListParam)
         /*
          * Create RCL based on subquery, adding a level of VCNs.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
          ResultColumnList newRcl = subqueryRCL.copyListAndObjects();
          newRcl.genVirtualColumnNodes(subquery, subquery.getResultColumns());
          setResultColumns( newRcl );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Propagate the name info from the derived column list */
 		if (derivedRCL != null)
@@ -331,6 +365,8 @@ void bindExpressions(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getMatchingColumn(ColumnReference columnReference)
             throws StandardException
 	{
@@ -349,6 +385,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 		// now but what happens if the condition is false? Investigate.
 		if (columnReference.getGeneratedToReplaceAggregate()) // 1
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			resultColumn = getResultColumns().getResultColumn(columnReference.getColumnName());
 		}
 		else if (columnsTableName == null || columnsTableName.equals(correlationName)) // 5?
@@ -360,6 +397,7 @@ else if (columnsTableName == null || columnsTableName.equals(correlationName)) /
 		if (resultColumn != null)
 		{
 			columnReference.setTableNumber(tableNumber);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4695
             columnReference.setColumnNumber(resultColumn.getColumnPosition());
 		}
 
@@ -385,13 +423,18 @@ else if (columnsTableName == null || columnsTableName.equals(correlationName)) /
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
 								throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         subquery.pushQueryExpressionSuffix();
 		// Push the order by list down to the ResultSet
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 		if (orderByList != null)
 		{
 			// If we have more than 1 ORDERBY columns, we may be able to
@@ -465,6 +508,8 @@ ResultSetNode preprocess(int numTables,
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode extractSubquery(int numTables)
 		throws StandardException
 	{
@@ -473,6 +518,7 @@ ResultSetNode extractSubquery(int numTables)
 
         newPRN = new ProjectRestrictNode(
 								subquery,		/* Child ResultSet */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 								getResultColumns(),	/* Projection */
 								null,			/* Restriction */
 								null,			/* Restriction as PredicateList */
@@ -518,9 +564,13 @@ ResultSetNode extractSubquery(int numTables)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FromList flatten(ResultColumnList rcl,
 							PredicateList outerPList,
 							SubqueryList sql,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4698
+//IC see: https://issues.apache.org/jira/browse/DERBY-3880
                             GroupByList gbl,
                             ValueNode havingClause)
 
@@ -530,6 +580,7 @@ FromList flatten(ResultColumnList rcl,
 		SelectNode	selectNode;
 
 		getResultColumns().setRedundant();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		subquery.getResultColumns().setRedundant();
 
@@ -572,6 +623,8 @@ else if ( ! (subquery instanceof RowResultSetNode))
 			gbl.remapColumnReferencesToExpressions();
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4698
+//IC see: https://issues.apache.org/jira/browse/DERBY-3880
         if (havingClause != null) {
             havingClause.remapColumnReferencesToExpressions();
         }
@@ -586,6 +639,8 @@ else if ( ! (subquery instanceof RowResultSetNode))
 	 * @return	The exposed name for this table.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getExposedName()
 	{
 		return correlationName;
@@ -597,12 +652,15 @@ String getExposedName()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList getAllResultColumns(TableName allTableName)
 			throws StandardException
 	{
 		TableName		 exposedName;
         TableName        toCompare;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-13
 
 		if(allTableName != null)
              toCompare = makeTableName(allTableName.getSchemaName(),correlationName);
@@ -622,6 +680,8 @@ ResultColumnList getAllResultColumns(TableName allTableName)
 		exposedName = makeTableName(null, correlationName);
 
         ResultColumnList rcList = new ResultColumnList((getContextManager()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		/* Build a new result column list based off of resultColumns.
 		 * NOTE: This method will capture any column renaming due to 
@@ -634,6 +694,7 @@ ResultColumnList getAllResultColumns(TableName allTableName)
 
 		for (int index = 0; index < rclSize; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			ResultColumn resultColumn = getResultColumns().elementAt(index);
 			ValueNode		 valueNode;
 			String			 columnName;
@@ -653,10 +714,14 @@ ResultColumnList getAllResultColumns(TableName allTableName)
 			TableName tableName;
 
 			tableName = exposedName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2442
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             valueNode = new ColumnReference(columnName,
 											tableName,
 											getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             resultColumn = new ResultColumn(columnName,
 											valueNode,
 											getContextManager());
@@ -707,6 +772,8 @@ public boolean referencesSessionSchema()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindUntypedNullsToResultColumns(ResultColumnList bindingRCL)
 				throws StandardException
 	{
@@ -732,7 +799,10 @@ void decrementLevel(int decrement)
 	 * @param sd schema descriptor of the original compilation schema of the
 	 * view.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setOrigCompilationSchema(SchemaDescriptor sd) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3270
 		origCompilationSchema = sd;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromTable.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromTable.java
index 1ae1705c3b..559f6c9715 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromTable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromTable.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.FromTable
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -90,6 +91,7 @@ abstract class FromTable extends ResultSetNode implements Optimizable
 	private boolean considerSortAvoidancePath;
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	 Set of object-&gt;trulyTheBestAccessPath mappings used to keep track
 	 of which of this Optimizable's "trulyTheBestAccessPath" was the best
 	 with respect to a specific outer query or ancestor node.  In the case
@@ -119,6 +121,8 @@ abstract class FromTable extends ResultSetNode implements Optimizable
      * @param tableProperties   Properties list associated with the table
      * @param cm                The context manager
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FromTable(String correlationName,
               Properties tableProperties,
               ContextManager cm)
@@ -174,6 +178,7 @@ public CostEstimate optimizeIt(
 		getCostEstimate(optimizer);
 
 		setCostEstimateCost(singleScanCost);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Optimize any subqueries that need to get optimized and
 		 * are not optimized any where else.  (Like those
@@ -253,6 +258,7 @@ else if (joinStrategyNumber < numStrat)
 
 			found = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
             if ( optimizerTracingIsOn() ) { getOptimizerTracer().traceConsideringJoinStrategy( ap.getJoinStrategy(), tableNumber ); }
 		}
 
@@ -314,6 +320,7 @@ public void rememberJoinStrategyAsBest(AccessPath ap)
 
 		ap.setJoinStrategy(getCurrentAccessPath().getJoinStrategy());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         if (optimizerTracingIsOn()) {
             getOptimizerTracer().traceRememberingJoinStrategy(
                 getCurrentAccessPath().getJoinStrategy(), tableNumber);
@@ -345,6 +352,7 @@ else if (ap == bestSortAvoidancePath)
 					"unknown access path type");
 			}
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
             if (optimizerTracingIsOn()) {
                 getOptimizerTracer().traceRememberingBestUnknownAccessPathSubstring(
                     ap, tableNumber);
@@ -439,6 +447,7 @@ public void verifyProperties(DataDictionary dDictionary)
 		 *		invalid value for hashMaxCapacity
 		 */
         Enumeration<?> e = tableProperties.keys();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		while (e.hasMoreElements())
 		{
@@ -464,6 +473,7 @@ else if (key.equals("hashLoadFactor"))
 			{
 				try
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
 					loadFactor = Float.parseFloat(value);
 				}
 				catch (NumberFormatException nfe)
@@ -528,6 +538,8 @@ public void updateBestPlanMap(short action,
 			if (bestPlanMap != null)
 			{
 				bestPlanMap.remove(planKey);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 if (bestPlanMap.isEmpty()) {
 					bestPlanMap = null;
                 }
@@ -548,6 +560,7 @@ public void updateBestPlanMap(short action,
 			// If the bestPlanMap already exists, search for an
 			// AccessPath for the received key and use that if we can.
 			if (bestPlanMap == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				bestPlanMap = new HashMap<Object,AccessPathImpl>();
 			else
 				ap = bestPlanMap.get(planKey);
@@ -579,6 +592,7 @@ public void updateBestPlanMap(short action,
 			return;
 
 		ap = bestPlanMap.get(planKey);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		// It might be the case that there is no plan stored for
 		// the key, in which case there's nothing to load.
@@ -650,7 +664,9 @@ public void rememberAsBest(int planType, Optimizer optimizer)
 		}
 
 		setCostEstimateCost(bestPath.getCostEstimate());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         if ( optimizerTracingIsOn() )
         { getOptimizerTracer().traceRememberingBestAccessPath( bestPath, tableNumber, planType ); }
 	}
@@ -724,10 +740,13 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 	 *  we just return the value stored in costEstimate as a default.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getFinalCostEstimate()
 		throws StandardException
 	{
 		// If we already found it, just return it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getCandidateFinalCostEstimate() != null)
         {
 			return getCandidateFinalCostEstimate();
@@ -759,6 +778,7 @@ public boolean isBaseTable()
      * {@code false} otherwise
      */
     public boolean hasLargeObjectColumns() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         for (ResultColumn rc : getResultColumns()) {
             if (rc.isReferenced()) {
                 DataTypeDescriptor type = rc.getType();
@@ -835,6 +855,7 @@ public float loadFactor()
 	/** @see Optimizable#maxCapacity */
 	public int maxCapacity( JoinStrategy joinStrategy, int maxMemoryPerTable) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
         return joinStrategy.maxCapacity( maxCapacity, maxMemoryPerTable, getPerRowUsage());
 	}
 
@@ -843,6 +864,7 @@ private double getPerRowUsage() throws StandardException
         if( perRowUsage < 0)
         {
             // Do not use getRefCols() because the cached refCols may no longer be valid.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             FormatableBitSet refCols = getResultColumns().getReferencedFormatableBitSet(cursorTargetTable(), true, false);
             perRowUsage = 0.0;
 
@@ -851,6 +873,7 @@ private double getPerRowUsage() throws StandardException
             {
                 if (refCols.isSet(i))
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                     ResultColumn rc = getResultColumns().elementAt(i);
                     DataTypeDescriptor expressionType = rc.getExpression().getTypeServices();
                     if( expressionType != null)
@@ -871,6 +894,7 @@ private double getPerRowUsage() throws StandardException
             {
                 if (cd.isIndex() && ( ! isCoveringIndex(cd) ) )
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1673
                     perRowUsage +=  12.0 ;
                 }
             }
@@ -911,6 +935,7 @@ public boolean feasibleJoinStrategy(OptimizablePredicateList predList,
 
     /** @see Optimizable#memoryUsageOK */
     public boolean memoryUsageOK( double rowCount, int maxMemoryPerTable)
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
 			throws StandardException
     {
 		/*
@@ -929,6 +954,8 @@ public boolean memoryUsageOK( double rowCount, int maxMemoryPerTable)
 	 * 
 	 * @see HalfOuterJoinNode#isJoinColumnForRightOuterJoin
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void isJoinColumnForRightOuterJoin(ResultColumn rc)
 	{
 	}
@@ -947,6 +974,7 @@ public boolean legalJoinOrder(JBitSet assignedTableMap)
 	 */
 	public int getNumColumnsReturned()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return getResultColumns().size();
 	}
 
@@ -1037,6 +1065,7 @@ protected boolean cursorTargetTable()
 
 	protected CostEstimate getCostEstimate(Optimizer optimizer)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getCostEstimate() == null)
 		{
 			setCostEstimate( getOptimizerFactory().getCostEstimate() );
@@ -1053,6 +1082,7 @@ protected CostEstimate getCostEstimate(Optimizer optimizer)
 	*/
 	protected CostEstimate getScratchCostEstimate(Optimizer optimizer)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if ( getScratchCostEstimate() == null )
 		{
 			setScratchCostEstimate( getOptimizerFactory().getCostEstimate() );
@@ -1074,6 +1104,7 @@ protected void setCostEstimateCost(CostEstimate newCostEstimate)
 	 */
 	protected void assignCostEstimate(CostEstimate newCostEstimate)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setCostEstimate( newCostEstimate );
 	}
 
@@ -1113,12 +1144,15 @@ public String toString()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList getResultColumnsForList(TableName allTableName,
 												ResultColumnList inputRcl,
 												TableName tableName)
 			throws StandardException
 	{
 		TableName		 exposedName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-13
         TableName        toCompare;
 		/* If allTableName is non-null, then we must check to see if it matches
 		 * our exposed name.
@@ -1152,6 +1186,7 @@ ResultColumnList getResultColumnsForList(TableName allTableName,
 			exposedName = makeTableName(null, correlationName);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         final ContextManager cm = getContextManager();
         ResultColumnList rcList = new ResultColumnList(cm);
 
@@ -1217,6 +1252,8 @@ void pushExpressions(PredicateList predicateList)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getExposedName() throws StandardException
 	{
 		if (SanityManager.DEBUG)
@@ -1230,6 +1267,8 @@ String getExposedName() throws StandardException
 	 *
 	 * @param tableNumber	The table # for this table.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setTableNumber(int tableNumber)
 	{
 		/* This should only be called if the tableNumber has not been set yet */
@@ -1247,6 +1286,8 @@ void setTableNumber(int tableNumber)
 	 * @return a TableName node representing this FromTable.
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     TableName getTableName()
 		throws StandardException
 	{
@@ -1265,6 +1306,8 @@ TableName getTableName()
 	 *
 	 * @param level		The query block level for this FromTable.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setLevel(int level)
 	{
 		this.level = level;
@@ -1319,6 +1362,8 @@ void decrementLevel(int decrement)
 	* @exception	StandardException	throws on schema name
 	*						that doesn't exist	
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     SchemaDescriptor getSchemaDescriptor() throws StandardException
 	{
 		return getSchemaDescriptor(corrTableName);
@@ -1334,6 +1379,8 @@ SchemaDescriptor getSchemaDescriptor() throws StandardException
 	* @exception	StandardException	throws on schema name
 	*						that doesn't exist	
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     SchemaDescriptor getSchemaDescriptor(TableName tableName)
             throws StandardException
 	{
@@ -1417,6 +1464,8 @@ FromTable transformOuterJoins(ValueNode predicateTree, int numTables)
 	 * @param passedMap	The table map to fill in.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void fillInReferencedTableMap(JBitSet passedMap)
 	{
 		if (tableNumber != -1)
@@ -1435,6 +1484,7 @@ void fillInReferencedTableMap(JBitSet passedMap)
 	 */
     protected void markUpdatableByCursor(List<String> updateColumns)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		getResultColumns().markUpdatableByCursor(updateColumns);
 	}
 
@@ -1469,9 +1519,13 @@ boolean columnsAreUpdatable()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FromList flatten(ResultColumnList rcl,
 							PredicateList outerPList,
 							SubqueryList sql,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4698
+//IC see: https://issues.apache.org/jira/browse/DERBY-3880
                             GroupByList gbl,
                             ValueNode havingClause)
 
@@ -1543,8 +1597,11 @@ boolean needsSpecialRCLBinding()
 	 * @param tableName the unbound table name
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setOrigTableName(TableName tableName)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
 		this.origTableName = tableName;
 	}
 	
@@ -1556,6 +1613,8 @@ void setOrigTableName(TableName tableName)
 	 * @return TableName the original or unbound tablename
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     TableName getOrigTableName()
 	{
 		return this.origTableName;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromVTI.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromVTI.java
index be58210a4f..f49105c07b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromVTI.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/FromVTI.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.FromVTI
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -76,6 +77,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * A FromVTI represents a VTI in the FROM list of a DML statement.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class FromVTI extends FromTable implements VTIEnvironment
 {
 
@@ -146,6 +149,8 @@ class FromVTI extends FromTable implements VTIEnvironment
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FromVTI(MethodCallNode invocation,
             String correlationName,
             ResultColumnList derivedRCL,
@@ -182,6 +187,7 @@ private void constructorMinion(
             TableName exposedTableName) {
 
         this.methodCall = invocation;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( derivedRCL );
         this.subqueryList = new SubqueryList(getContextManager());
 
@@ -208,6 +214,7 @@ public CostEstimate estimateCost(
 			throws StandardException
 	{
 		setCostEstimate( getCostEstimate(optimizer) );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Cost the VTI if it implements VTICosting.
 		 * Otherwise we use the defaults.
@@ -239,6 +246,7 @@ public CostEstimate estimateCost(
 		}
 
 		getCostEstimate().setCost(estimatedCost, estimatedRowCount, estimatedRowCount);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/*
 		** Let the join strategy decide whether the cost of the base
@@ -256,6 +264,7 @@ public CostEstimate estimateCost(
 				getJoinStrategy().
 					multiplyBaseCostByOuterRows())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			getCostEstimate().multiply(outerCost.rowCount(), getCostEstimate());
 		}
 
@@ -282,6 +291,8 @@ public boolean legalJoinOrder(JBitSet assignedTableMap)
 		 * outer tables that we are correlated with, contains
 		 * our dependency map.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         JBitSet tempBitSet = assignedTableMap;
 		tempBitSet.or(correlationMap);
 
@@ -316,6 +327,8 @@ public boolean isDerbyStyleTableFunction()
 	 * @see ResultSetNode#adjustForSortElimination()
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void adjustForSortElimination()
 	{
 		/* It's possible that we have an ORDER BY on the columns for this
@@ -381,6 +394,8 @@ public boolean pushOptPredicate(OptimizablePredicate optimizablePredicate)
             return false;
         
 		if (restrictionList == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             restrictionList = new PredicateList(getContextManager());
 		}
 
@@ -418,6 +433,8 @@ public String toString()
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG) {
@@ -467,6 +484,8 @@ final MethodCallNode getMethodCall()
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getExposedName()
 	{
 		return correlationName;
@@ -504,6 +523,8 @@ void setTarget()
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 							FromList fromListParam) 
 					throws StandardException
@@ -534,10 +555,13 @@ String getVTIName()
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindVTITables(FromList fromListParam)
 							throws StandardException
 	{
 		ResultColumnList	derivedRCL = getResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		LanguageConnectionContext lcc = getLanguageConnectionContext();
 
@@ -550,6 +574,7 @@ ResultSetNode bindVTITables(FromList fromListParam)
 		 * Correlated subqueries are not allowed as parameters to
 		 * a VTI, so pass an empty FromList.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<AggregateNode> aggregates = new ArrayList<AggregateNode>();
         methodCall.bindExpression(fromListParam, subqueryList, aggregates);
 
@@ -631,6 +656,7 @@ else if (! constructor.assignableTo("java.sql.ResultSet"))
 		{
 			TableDescriptor td = getDataDictionary().getTableDescriptor(triggerTableId);
 			setResultColumns( genResultColList(td) );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 			// costing info
 			vtiCosted = true;
@@ -641,6 +667,7 @@ else if (! constructor.assignableTo("java.sql.ResultSet"))
 		else
 		{	
             setResultColumns( new ResultColumnList((getContextManager())) );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 			// if this is a Derby-style Table Function, then build the result
 			// column list from the RowMultiSetImpl return datatype
@@ -672,6 +699,7 @@ else if (! constructor.assignableTo("java.sql.ResultSet"))
 				numVTICols = 0;
 			    }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			    getResultColumns().createListFromResultSetMetaData(rsmd, exposedName, 
 														  getVTIName() );
 			}
@@ -697,6 +725,8 @@ else if (! constructor.assignableTo("java.sql.ResultSet"))
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetMetaData getResultSetMetaData()
 		throws StandardException
 	{
@@ -709,6 +739,7 @@ ResultSetMetaData getResultSetMetaData()
 			{
 				ps = (PreparedStatement) getNewInstance();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 				if (ps.getResultSetConcurrency() != ResultSet.CONCUR_UPDATABLE)
 				{
 					throw StandardException.newException(SQLState.LANG_UPDATABLE_VTI_NON_UPDATABLE_RS, 
@@ -763,8 +794,11 @@ private Object getNewInstance()
         throws StandardException
     {
 		NewInvocationNode   constructor = (NewInvocationNode) methodCall;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Class<?>[]  paramTypeClasses = constructor.getMethodParameterClasses();
         Object[] paramObjects;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		if (paramTypeClasses != null)
 		{
@@ -773,6 +807,7 @@ private Object getNewInstance()
 			for (int index = 0; index < paramTypeClasses.length; index++)
 			{
                 Class<?> paramClass = paramTypeClasses[index];
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 				paramObjects[index] = methodParms[index].getConstantValueAsObject();
 
@@ -784,6 +819,8 @@ private Object getNewInstance()
 
 					if (paramClass.equals(Short.TYPE)) {
 						paramObjects[index] =
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                             Short.valueOf(
                                 ((Integer) paramObjects[index]).shortValue());
 					} else if (paramClass.equals(Byte.TYPE)) {
@@ -799,6 +836,7 @@ private Object getNewInstance()
 				{
 					if (paramClass.equals(Integer.TYPE))
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                         paramObjects[index] = Integer.valueOf(0);
 					}
 					else if (paramClass.equals(Short.TYPE))
@@ -811,10 +849,13 @@ else if (paramClass.equals(Byte.TYPE))
 					}
 					else if (paramClass.equals(Long.TYPE))
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         paramObjects[index] = Long.valueOf((long) 0);
 					}
 					else if (paramClass.equals(Float.TYPE))
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 						paramObjects[index] = (float) 0;
 					}
 					else if (paramClass.equals(Double.TYPE))
@@ -827,6 +868,8 @@ else if (paramClass.equals(Boolean.TYPE))
 					}
 					else if (paramClass.equals(Character.TYPE))
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         paramObjects[index] =
                                 Character.valueOf(Character.MIN_VALUE);
 					}
@@ -835,6 +878,7 @@ else if (paramClass.equals(Character.TYPE))
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             paramTypeClasses = new Class<?>[0];
 			paramObjects = new Object[0];
 		}
@@ -844,6 +888,7 @@ else if (paramClass.equals(Character.TYPE))
             ClassInspector classInspector = getClassFactory().getClassInspector();
             String javaClassName = methodCall.getJavaClassName();
             Constructor<?> constr = classInspector.getClass(javaClassName).getConstructor(paramTypeClasses);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             return constr.newInstance(paramObjects);
         }
@@ -892,6 +937,8 @@ public int getResultSetType()
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressions(FromList fromListParam)
 					throws StandardException
 	{
@@ -905,7 +952,9 @@ void bindExpressions(FromList fromListParam)
 		 * from other VTIs that appear after this one in the FROM list.
 		 * These CRs will have uninitialized column and table numbers.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<AggregateNode> aggregates = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (ColumnReference ref : getNodesFromParameters(ColumnReference.class))
 		{
             //
@@ -931,6 +980,7 @@ void bindExpressions(FromList fromListParam)
                 for ( int i = 0; i < outerFromLists.size(); i++ )
                 {
                     FromTable   fromTable = columnInFromList( outerFromLists.get( i ), ref );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
                     if ( fromTable != null )
                     {
@@ -965,6 +1015,7 @@ void bindExpressions(FromList fromListParam)
 				// we need a fake agg list
                 if (aggregates == null)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     aggregates = new ArrayList<AggregateNode>();
 				}
 				ref.bindExpression(fromListParam,
@@ -991,6 +1042,8 @@ private FromTable columnInFromList( FromList fromList, ColumnReference ref )
             {
                 // remember this FromTable so that we can code generate the arg
                 // from actual result columns later on.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 argSources.put(Integer.valueOf(fromTable.getTableNumber()),
                                fromTable );
 
@@ -1011,6 +1064,7 @@ private FromTable columnInFromList( FromList fromList, ColumnReference ref )
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     <T extends Visitable> List<T> getNodesFromParameters(Class<T> nodeClass)
 		throws StandardException
 	{
@@ -1025,10 +1079,13 @@ <T extends Visitable> List<T> getNodesFromParameters(Class<T> nodeClass)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList getAllResultColumns(TableName allTableName)
 			throws StandardException
 	{
         TableName        toCompare;
+//IC see: https://issues.apache.org/jira/browse/DERBY-13
 
 		if(allTableName != null)
              toCompare = makeTableName(allTableName.getSchemaName(),correlationName);
@@ -1041,6 +1098,7 @@ ResultColumnList getAllResultColumns(TableName allTableName)
             return null;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         final ContextManager cm = getContextManager();
         final ResultColumnList rcList = new ResultColumnList(cm);
 
@@ -1048,6 +1106,7 @@ ResultColumnList getAllResultColumns(TableName allTableName)
 		 * NOTE: This method will capture any column renaming due to 
 		 * a derived column list.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         for (ResultColumn rc : getResultColumns())
 		{
             if (!rc.isGenerated()) {
@@ -1079,12 +1138,15 @@ ResultColumnList getAllResultColumns(TableName allTableName)
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getMatchingColumn(ColumnReference columnReference)
             throws StandardException
 	{
 		/* We could get called before our RCL is built.  That's okay, we'll
 		 * just say that we don't match. 
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getResultColumns() == null)
 		{
 			return null;
@@ -1094,6 +1156,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 		TableName		columnsTableName;
 
 		columnsTableName = columnReference.getQualifiedTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/*
 		** If the column did not specify a name, or the specified name
@@ -1102,11 +1165,13 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 		*/
 		if (columnsTableName == null || columnsTableName.equals(exposedName))
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			resultColumn = getResultColumns().getResultColumn(columnReference.getColumnName());
 			/* Did we find a match? */
 			if (resultColumn != null)
 			{
 				columnReference.setTableNumber(tableNumber);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4695
                 columnReference.setColumnNumber(
                     resultColumn.getColumnPosition());
 			}
@@ -1135,6 +1200,8 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
@@ -1149,6 +1216,7 @@ ResultSetNode preprocess(int numTables,
             new PredicateList(getContextManager()));
 
 		/* Generate the referenced table map */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setReferencedTableMap( new JBitSet(numTables) );
 		getReferencedTableMap().set(tableNumber);
 
@@ -1210,6 +1278,7 @@ protected ResultSetNode genProjectRestrict(int numTables)
 		/* We get a shallow copy of the ResultColumnList and its 
 		 * ResultColumns.  (Copy maintains ResultColumn.expression for now.)
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		prRCList = getResultColumns();
 		setResultColumns( getResultColumns().copyListAndObjects() );
 
@@ -1220,6 +1289,7 @@ protected ResultSetNode genProjectRestrict(int numTables)
 		 * we won't be able to project out any of them.
 		 */
 		prRCList.genVirtualColumnNodes(this, getResultColumns(), false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Project out any unreferenced columns.  If there are no referenced 
 		 * columns, generate and bind a single ResultColumn whose expression is 1.
@@ -1227,6 +1297,8 @@ protected ResultSetNode genProjectRestrict(int numTables)
 		prRCList.doProjection();
 
 		/* Finally, we create the new ProjectRestrictNode */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return new ProjectRestrictNode(
 								this,
 								prRCList,
@@ -1292,6 +1364,7 @@ void computeProjectionAndRestriction( PredicateList parentPredicates )
     private HashMap<String,String> computeProjection( ) throws StandardException
     {
         HashMap<String,String>  nameMap = new HashMap<String,String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         ResultColumnList allVTIColumns = getResultColumns();
         int              totalColumnCount = allVTIColumns.size();
@@ -1302,6 +1375,8 @@ private HashMap<String,String> computeProjection( ) throws StandardException
         {
             ResultColumn column = allVTIColumns.getResultColumn( i + 1 );
             String       exposedNam = column.getName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
             if ( column.isReferenced() )
             {
@@ -1309,6 +1384,8 @@ private HashMap<String,String> computeProjection( ) throws StandardException
                 
                 projectedColumnNames[ i ] = baseName;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 nameMap.put( exposedNam, baseName );
             }
         }
@@ -1328,6 +1405,7 @@ private void computeRestriction( PredicateList parentPredicates, HashMap<String,
 
         // walk the list, looking for qualifiers, that is, WHERE clause
         // fragments (conjuncts)  which can be pushed into the table function
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate pp : parentPredicates)
         {
             if ( canBePushedDown( pp ) )
@@ -1374,6 +1452,7 @@ private boolean canBePushedDown( Predicate predicate ) throws StandardException
      * @param columnNameMap Mapping between the exposed column names used in the predicates and the actual column names declared for the table function at CREATE FUNCTION time.
      */
     private Restriction makeRestriction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ValueNode clause,
             HashMap<String, String> columnNameMap )
         throws StandardException
@@ -1422,6 +1501,7 @@ else if ( clause instanceof IsNullNode )
      * @param columnNameMap Mapping between the exposed column names used in the predicates and the actual column names declared for the table function at CREATE FUNCTION time.
      */
     private Restriction makeLeafRestriction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             BinaryRelationalOperatorNode clause,
             HashMap<String, String> columnNameMap) throws StandardException
     {
@@ -1445,6 +1525,7 @@ else if ( clause.getRightOperand() instanceof ColumnReference )
         int comparisonOperator = mapOperator( rawOperator );
         if ( comparisonOperator < 0 ) { return iAmConfused( clause ); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         String columnName = columnNameMap.get( rawColumn.getColumnName() );
         Object constantOperand = squeezeConstantValue( rawValue );
         if ( (columnName == null) || (constantOperand == null) ) { return iAmConfused( clause ); }
@@ -1459,6 +1540,7 @@ else if ( clause.getRightOperand() instanceof ColumnReference )
      * @param columnNameMap Mapping between the exposed column names used in the predicates and the actual column names declared for the table function at CREATE FUNCTION time.
      */
     private Restriction makeIsNullRestriction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             IsNullNode clause,
             HashMap<String, String> columnNameMap) throws StandardException
     {
@@ -1471,6 +1553,7 @@ private Restriction makeIsNullRestriction(
             (comparisonOperator != Restriction.ColumnQualifier.ORDER_OP_ISNOTNULL)
             ) { return iAmConfused( clause ); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         String columnName = columnNameMap.get( rawColumn.getColumnName() );
         if ( columnName == null ) { return iAmConfused( clause ); }
 
@@ -1582,6 +1665,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		acb.pushGetResultSetFactoryExpression(mb);
 		int nargs = getScanArguments(acb, mb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getVTIResultSet",ClassName.NoPutResultSet, nargs);
 	}
 
@@ -1595,8 +1679,11 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
      */
     private void remapBaseTableColumns() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (ColumnReference ref : getNodesFromParameters(ColumnReference.class))
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             FromTable fromTable = argSources.get(
                 Integer.valueOf(ref.getTableNumber()));
 
@@ -1625,6 +1712,7 @@ private int getScanArguments(ActivationClassBuilder acb,
 
 		// Get our final cost estimate.
 		setCostEstimate( getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		for (int index = 0; index < rclSize; index++)
 		{
@@ -1655,6 +1743,7 @@ private int getScanArguments(ActivationClassBuilder acb,
 
         // Get a row builder to allocate scan rows of the right shape and size.
         mb.push(acb.addItem(getResultColumns().buildRowTemplate())); // arg 2
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// For a Version 2 VTI we never maintain the java.sql.PreparedStatement
 		// from compile time to execute time. This would rquire the PreparedStatement
@@ -1668,12 +1757,14 @@ private int getScanArguments(ActivationClassBuilder acb,
 		// o  No ? or ColumnReferences in parameters
 
 		boolean reuseablePs = version2 &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 			(getNodesFromParameters(ParameterNode.class).isEmpty()) &&
 			(getNodesFromParameters(ColumnReference.class).isEmpty());
 
 
 
 		mb.push(getResultSetNumber()); // arg 3
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// The generated method for the constructor
 		generateConstructor(acb, mb, reuseablePs); // arg 4
@@ -1705,6 +1796,7 @@ private int getScanArguments(ActivationClassBuilder acb,
 
 		// estimated row count
 		mb.push(getCostEstimate().rowCount());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// estimated cost
 		mb.push(getCostEstimate().getEstimatedCost());
@@ -1716,6 +1808,7 @@ private int getScanArguments(ActivationClassBuilder acb,
         int rtNum = -1;
         if ( isDerbyStyleTableFunction  )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3616
             rtNum = acb.addItem(methodCall.getRoutineInfo().getReturnType());
         }
         mb.push(rtNum);
@@ -1725,6 +1818,7 @@ private int getScanArguments(ActivationClassBuilder acb,
         mb.push( storeObjectInPS( acb, vtiRestriction ) );        
 
         // push the schema name and unqualified name of the table function
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
         TableName   fullName = methodCall.getFullName();
 		mb.push( (fullName == null) ? "" : fullName.getSchemaName() );
 		mb.push( (fullName == null) ? "" : fullName.getTableName() );
@@ -1845,11 +1939,13 @@ boolean referencesTarget(String name, boolean baseTable)
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (methodCall != null)
 		{
 			methodCall = (MethodCallNode) methodCall.accept(v);
@@ -1896,6 +1992,8 @@ private ResultColumnList genResultColList(TableDescriptor td)
 			throws StandardException
 	{
 		/* Add all of the columns in the table */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ResultColumnList rcList = new ResultColumnList((getContextManager()));
 		ColumnDescriptorList cdl = td.getColumnDescriptorList();
 		int					 cdlSize = cdl.size();
@@ -1931,6 +2029,8 @@ boolean isUpdatableCursor() throws StandardException {
 	/*
 	** VTIEnvironment
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final public boolean isCompileTime() {
 		return true;
 	}
@@ -1939,7 +2039,10 @@ public String getOriginalSQL() {
 		return getCompilerContext().getParser().getSQLtext();
 	}
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final public int getStatementIsolationLevel() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 		return TransactionControl.jdbcIsolationLevel( getCompilerContext().getScanIsolationLevel() );
 	}
 
@@ -1972,6 +2075,7 @@ public Object getSharedState(String key) {
         {
             String          columnName = columnNames[ i ];
             DataTypeDescriptor  dtd = DataTypeDescriptor.getType(types[i]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             ResultColumn    rc = getResultColumns().addColumn
                 ( exposedName, columnName, dtd );
 
@@ -1987,6 +2091,11 @@ public Object getSharedState(String key) {
                 (
                  columnName, i+1, dtd,
                  (DataValueDescriptor) null, (DefaultInfo) null, (UUID) null, (UUID) null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
                  0L, 0L, 0L, false
                  );
             rc.setColumnDescriptor( null, coldesc );
@@ -2005,7 +2114,9 @@ public Object getSharedState(String key) {
     private boolean implementsDerbyStyleVTICosting( String className )
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Constructor<?>     constructor = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Class<?>           vtiClass = lookupClass( className );
         Class<?>           vtiCostingClass = lookupClass( VTICosting.class.getName() );
 
@@ -2018,6 +2129,7 @@ private boolean implementsDerbyStyleVTICosting( String className )
         }
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             constructor = vtiClass.getConstructor( new Class<?>[] {} );
         }
         catch (Throwable t)
@@ -2043,11 +2155,15 @@ private VTICosting  getVTICosting()
         if ( !isDerbyStyleTableFunction ) { return (version2) ? (VTICosting) ps : (VTICosting) rs; }
         
         String              className = methodCall.getJavaClassName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Class<?>               vtiClass = lookupClass( className );
         
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             Constructor<?> constructor =
                     vtiClass.getConstructor( new Class<?>[] {} );
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             VTICosting          result =
                     (VTICosting) constructor.newInstance( (Object[])null );
 
@@ -2063,6 +2179,7 @@ private VTICosting  getVTICosting()
      * Lookup the class that holds the VTI.
      */
     private Class<?> lookupClass( String className )
+//IC see: https://issues.apache.org/jira/browse/DERBY-4126
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java
index 93ef240ab6..69b7fc9899 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java
@@ -61,6 +61,8 @@ class GenerationClauseNode extends ValueNode
     ///////////////////////////////////////////////////////////////////////////////////
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     GenerationClauseNode( ValueNode generationExpression,
                           String expressionText,
                           ContextManager cm)
@@ -84,6 +86,8 @@ class GenerationClauseNode extends ValueNode
 
 	/** Return the auxiliary provider list. */
     ProviderList getAuxiliaryProviderList() { return _apl; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
     ///////////////////////////////////////////////////////////////////////////////////
     //
@@ -96,6 +100,7 @@ class GenerationClauseNode extends ValueNode
 	 */
     @Override
     ValueNode bindExpression
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ( FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
         throws StandardException
 	{
@@ -122,6 +127,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
     boolean isEquivalent(ValueNode other)
 		throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (! isSameNodeKind(other)) {
             return false;
         }
@@ -139,6 +145,7 @@ boolean isEquivalent(ValueNode other)
     public List<ColumnReference> findReferencedColumns()
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         CollectNodesVisitor<ColumnReference> visitor =
             new CollectNodesVisitor<ColumnReference>(ColumnReference.class);
 
@@ -156,6 +163,7 @@ public List<ColumnReference> findReferencedColumns()
      */
     @Override
     void acceptChildren(Visitor v) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6690
 
         super.acceptChildren(v);
 
@@ -174,6 +182,7 @@ void acceptChildren(Visitor v) throws StandardException {
     @Override
 	public String toString()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
         return
             "expressionText: GENERATED ALWAYS AS ( " +
             _expressionText + " )\n" +
@@ -188,6 +197,8 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
index 9482c600dd..7aa83bc553 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.GetCurrentConnectionNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -65,6 +66,8 @@ public final class GetCurrentConnectionNode extends JavaValueNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     JavaValueNode bindExpression(FromList fromList,
                                  SubqueryList subqueryList,
                                  List<AggregateNode> aggregates)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GrantNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GrantNode.java
index 92c6b92a4b..c01606b504 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GrantNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GrantNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.GrantNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -33,6 +34,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * This class represents a GRANT statement.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class GrantNode extends DDLStatementNode
 {
 	private PrivilegeNode privileges;
@@ -66,6 +69,8 @@ public String toString()
 		if (SanityManager.DEBUG)
 		{
             StringBuilder sb = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
             for (String grantee : grantees)
 			{
@@ -83,6 +88,8 @@ public String toString()
 		}
 	} // end of toString
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "GRANT";
@@ -98,6 +105,7 @@ String statementToString()
     @Override
 	public void bindStatement() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		privileges = (PrivilegeNode) privileges.bind( new HashMap<Provider,Provider>(), grantees, true);
 	} // end of bind
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GrantRoleNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GrantRoleNode.java
index 593d3c4e97..6313cc6ca9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GrantRoleNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GrantRoleNode.java
@@ -74,6 +74,8 @@ public ConstantAction makeConstantAction() throws StandardException
     public String toString()
     {
         if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 StringBuilder sb1 = new StringBuilder();
                 for(String role : roles) {
 					if( sb1.length() > 0) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByColumn.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByColumn.java
index a21b2d52a6..34321ccc7d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByColumn.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByColumn.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.GroupByColumn
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -58,6 +59,8 @@ class GroupByColumn extends OrderedColumn
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -66,6 +69,7 @@ void printSubNodes(int depth)
 
 			if (columnExpression != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				printLabel(depth, "columnExpression: ");
 				columnExpression.treePrint(depth + 1);
 			}
@@ -77,6 +81,8 @@ void printSubNodes(int depth)
 	 *
 	 * @return	The name of this column
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getColumnName()
 	{
 		return columnExpression.getColumnName();
@@ -96,11 +102,14 @@ String getColumnName()
     void bindExpression(
 			FromList fromList, 
 			SubqueryList subqueryList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             List<AggregateNode> aggregates)
 				throws StandardException
 	{
 		/* Bind the ColumnReference to the FromList */
         int previousReliability = orReliability( CompilerContext.GROUP_BY_RESTRICTION );
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         columnExpression = columnExpression.bindExpression(fromList,
 							  subqueryList,
                               aggregates);
@@ -127,6 +136,8 @@ void bindExpression(
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getColumnExpression()
 	{
 		return columnExpression;
@@ -146,6 +157,7 @@ void setColumnExpression(ValueNode cexpr)
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException {
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByList.java
index 74e5da47d9..87c3d55ca4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByList.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.GroupByList
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -34,6 +35,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 class GroupByList extends OrderedColumnList<GroupByColumn>
 {
 	int		numGroupingColsAdded = 0;
@@ -59,6 +61,8 @@ void addGroupByColumn(GroupByColumn column)
 
 		@param position	The column to get from the list
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     GroupByColumn getGroupByColumn(int position)
 	{
 		if (SanityManager.DEBUG)
@@ -67,10 +71,13 @@ GroupByColumn getGroupByColumn(int position)
 					"position (" + position +
 					") expected to be between 0 and " + size());
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return elementAt(position);
 	}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setRollup()
 	{
 		rollup = true;
@@ -105,15 +112,19 @@ int getNumNeedToAddGroupingCols()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     void bindGroupByColumns(SelectNode select, List<AggregateNode> aggregates)
 					throws StandardException
 	{
 		FromList		 fromList = select.getFromList();
 		ResultColumnList selectRCL = select.getResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         SubqueryList dummySubqueryList = new SubqueryList(getContextManager());
 		int				 numColsAddedHere = 0;
 
 		/* Only 32677 columns allowed in GROUP BY clause */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (size() > Limits.DB2_MAX_ELEMENTS_IN_GROUP_BY)
 		{
 			throw StandardException.newException(SQLState.LANG_TOO_MANY_ELEMENTS);
@@ -123,6 +134,7 @@ void bindGroupByColumns(SelectNode select, List<AggregateNode> aggregates)
         for (GroupByColumn groupByCol : this)
 		{
 			groupByCol.bindExpression(fromList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                                       dummySubqueryList, aggregates);
 		}
 
@@ -170,6 +182,8 @@ void bindGroupByColumns(SelectNode select, List<AggregateNode> aggregates)
 				ResultColumn newRC;
 
 				/* Get a new ResultColumn */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 newRC = new ResultColumn(
                         groupingCol.getColumnName(),
                         groupingCol.getColumnExpression().getClone(),
@@ -233,9 +247,12 @@ void bindGroupByColumns(SelectNode select, List<AggregateNode> aggregates)
 	 * 
 	 * @throws StandardException
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     GroupByColumn findGroupingColumn(ValueNode node)
 	        throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (GroupByColumn gbc : this)
 		{
 			if (gbc.getColumnExpression().isEquivalent(node))
@@ -252,6 +269,8 @@ GroupByColumn findGroupingColumn(ValueNode node)
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void remapColumnReferencesToExpressions() throws StandardException
 	{
         /* This method is called when flattening a FromTable. */
@@ -272,6 +291,7 @@ void remapColumnReferencesToExpressions() throws StandardException
     @Override
 	public String toString()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (SanityManager.DEBUG) {
 			return "numGroupingColsAdded: " + numGroupingColsAdded + "\n" +
 				super.toString();
@@ -281,6 +301,7 @@ public String toString()
 	}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     void preprocess(int numTables,
                     FromList fromList,
                     SubqueryList whereSubquerys,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByNode.java
index 16f352ad41..ed14a4b4cb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/GroupByNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.GroupByNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -70,6 +71,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class GroupByNode extends SingleChildResultSetNode
 {
 	/**
@@ -103,6 +106,7 @@ class GroupByNode extends SingleChildResultSetNode
 
 	// Is the source in sorted order
     final private boolean isInSortedOrder;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 	private ValueNode havingClause;
 	
@@ -124,6 +128,8 @@ class GroupByNode extends SingleChildResultSetNode
      * @param cm            The context manager
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     GroupByNode(ResultSetNode  bottomPR,
                 GroupByList    groupingList,
                 List<AggregateNode> aggregates,
@@ -157,6 +163,8 @@ class GroupByNode extends SingleChildResultSetNode
 		}
 
 		ResultColumnList newBottomRCL;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         this.groupingList = groupingList;
         this.aggregates = aggregates;
 		this.parent = this;
@@ -169,6 +177,7 @@ class GroupByNode extends SingleChildResultSetNode
 		** RCL to its columns.
 		*/
 		newBottomRCL = childResult.getResultColumns().copyListAndObjects();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setResultColumns( childResult.getResultColumns() );
 		childResult.setResultColumns(newBottomRCL);
 
@@ -181,6 +190,7 @@ class GroupByNode extends SingleChildResultSetNode
 
 		if (this.groupingList != null && this.groupingList.isRollup())
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                     getResultColumns().setNullability(true);
 			parent.getResultColumns().setNullability(true);
                 }
@@ -199,6 +209,7 @@ class GroupByNode extends SingleChildResultSetNode
 			int index;
 			for (index = 0; index < glSize; index++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 GroupByColumn gc = this.groupingList.elementAt(index);
 				if (gc.getColumnExpression() instanceof ColumnReference) 
 				{
@@ -261,6 +272,8 @@ private void addDistinctAggregatesToOrderBy()
 			int count = aggInfo.size();
 			for (int i = 0; i < count; i++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 agg = aggInfo.elementAt(i);
 				if (agg.isDistinct())
 				{
@@ -291,7 +304,10 @@ private void addNewPRNode()
 		** Get the new PR, put above the GroupBy.  
 		*/
         ResultColumnList rclNew = new ResultColumnList((getContextManager()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         for (ResultColumn rc : getResultColumns())
 		{
 			if (!rc.isGenerated()) {
@@ -302,8 +318,11 @@ private void addNewPRNode()
 		// if any columns in the source RCL were generated for an order by
 		// remember it in the new RCL as well. After the sort is done it will
 		// have to be projected out upstream.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		rclNew.copyOrderBySelect(getResultColumns());
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         parent = new ProjectRestrictNode(
 										this, 	// child
 										rclNew,
@@ -324,6 +343,7 @@ private void addNewPRNode()
 		** Set the group by RCL to be empty
 		*/
         setResultColumns( new ResultColumnList((getContextManager())) );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 	}
 
@@ -342,14 +362,19 @@ private ArrayList<SubstituteExpressionVisitor> addUnAggColumns() throws Standard
 	{
 		ResultColumnList bottomRCL  = childResult.getResultColumns();
 		ResultColumnList groupByRCL = getResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		ArrayList<SubstituteExpressionVisitor> referencesToSubstitute = new ArrayList<SubstituteExpressionVisitor>();
 		ArrayList<SubstituteExpressionVisitor> havingRefsToSubstitute = null;
 		if (havingClause != null)
 			havingRefsToSubstitute = new ArrayList<SubstituteExpressionVisitor>();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (GroupByColumn gbc : groupingList)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ResultColumn newRC = new ResultColumn(
                     "##UnaggColumn",
 					gbc.getColumnExpression(),
@@ -362,6 +387,8 @@ private ArrayList<SubstituteExpressionVisitor> addUnAggColumns() throws Standard
 			newRC.setVirtualColumnId(bottomRCL.size());
 			
 			// now add this column to the groupbylist
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ResultColumn gbRC = new ResultColumn(
                     "##UnaggColumn",
 					gbc.getColumnExpression(),
@@ -376,6 +403,8 @@ private ArrayList<SubstituteExpressionVisitor> addUnAggColumns() throws Standard
 			 ** Reset the original node to point to the
 			 ** Group By result set.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             VirtualColumnNode vc = new VirtualColumnNode(
 					this, // source result set.
 					gbRC,
@@ -438,6 +467,7 @@ private ArrayList<SubstituteExpressionVisitor> addUnAggColumns() throws Standard
 			}
 			gbc.setColumnPosition(bottomRCL.size());
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		ExpressionSorter sorter = new ExpressionSorter();
 		Collections.sort(referencesToSubstitute,sorter);
 		for (int r = 0; r < referencesToSubstitute.size(); r++)
@@ -500,6 +530,7 @@ select c1, sum(c2), max(c3)
 	  </pre>
 	 * the query tree ends up looking like this:
 	   <pre>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	    ProjectRestrictNode RCL -&gt; (ptr to GBN(column[0]), ptr to GBN(column[1]), ptr to GBN(column[4]))
 	              |
 	    GroupByNode RCL-&gt;(C1, SUM(C2), &lt;agg-input&gt;, <aggregator>, MAX(C3), &lt;agg-input&gt;, &lt;aggregator&gt;)
@@ -532,9 +563,11 @@ private void addNewColumnsForAggregation()
 	{
 		aggInfo = new AggregatorInfoList();
 		ArrayList<SubstituteExpressionVisitor> havingRefsToSubstitute = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		if (groupingList != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4071
 			havingRefsToSubstitute = addUnAggColumns();
 		}
 
@@ -546,6 +579,8 @@ private void addNewColumnsForAggregation()
 			// having clause.
 			if (havingRefsToSubstitute != null) {
 				for (int r = 0; r < havingRefsToSubstitute.size(); r++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     havingClause.accept(havingRefsToSubstitute.get(r));
 				}
 			}
@@ -559,6 +594,7 @@ private void addNewColumnsForAggregation()
 			// it is allright to have columns from parent or child subqueries;
 			//   select * from p where p.p1 in 
 			//      (select c.c1 from c group by c.c1 having count(*) = p.p2
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             CollectNodesVisitor<ColumnReference> collectNodesVisitor =
                 new CollectNodesVisitor<ColumnReference>(
                     ColumnReference.class, AggregateNode.class);
@@ -566,6 +602,8 @@ private void addNewColumnsForAggregation()
 
             for (ColumnReference cr: collectNodesVisitor.getList())
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 				if ( ! (cr.getGeneratedToReplaceAggregate() ||
 						cr.getGeneratedToReplaceWindowFunctionCall()) &&
 					 cr.getSourceLevel() == level) {
@@ -592,6 +630,7 @@ private void addAggregateColumns() throws StandardException
 		ResultColumn	tmpRC;
 		ResultColumn	aggResultRC;
 		ResultColumnList bottomRCL  = childResult.getResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		ResultColumnList groupByRCL = getResultColumns();
 		ResultColumnList aggRCL;
 		int				aggregatorVColId;
@@ -608,6 +647,8 @@ private void addAggregateColumns() throws StandardException
 		
 		ReplaceAggregatesWithCRVisitor replaceAggsVisitor = 
 			new ReplaceAggregatesWithCRVisitor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     new ResultColumnList((getContextManager())),
 				((FromTable) childResult).getTableNumber(),
 				ResultSetNode.class);
@@ -618,6 +659,8 @@ private void addAggregateColumns() throws StandardException
 		{
 			// replace aggregates in the having clause with column references.
 			replaceAggsVisitor = new ReplaceAggregatesWithCRVisitor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     new ResultColumnList((getContextManager())),
 					((FromTable)childResult).getTableNumber());
 			havingClause.accept(replaceAggsVisitor);
@@ -635,6 +678,8 @@ private void addAggregateColumns() throws StandardException
 		for (int index = 0; index < alSize; index++)
 		{
             AggregateNode aggregate = aggregates.get(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			/*
 			** AGG RESULT: Set the aggregate result to null in the
@@ -656,6 +701,8 @@ private void addAggregateColumns() throws StandardException
 			** was created when we called
 			** ReplaceAggregatesWithCRVisitor()
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             newColumnRef = new ColumnReference(newRC.getName(),
                                                null,
                                                getContextManager());
@@ -689,6 +736,8 @@ private void addAggregateColumns() throws StandardException
 			bottomRCL.addElement(newRC);
 			newRC.setVirtualColumnId(bottomRCL.size());
 			aggInputVColId = newRC.getVirtualColumnId();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
            aggResultRC = new ResultColumn(
                     "##aggregate expression",
                     aggregate.getNewNullResultExpression(),
@@ -726,6 +775,8 @@ private void addAggregateColumns() throws StandardException
 			** to generate a proper result description for input
 			** to this agg if it is a user agg.
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             aggRCL = new ResultColumnList((getContextManager()));
 			aggRCL.addElement(aggResultRC);
 
@@ -776,6 +827,7 @@ public CostEstimate optimizeIt(
 			throws StandardException
 	{
 		// RESOLVE: NEED TO FACTOR IN THE COST OF GROUPING (SORTING) HERE
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         ((Optimizable) childResult).optimizeIt( optimizer,
                                                 predList,
                                                 outerCost,
@@ -813,6 +865,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 													optimizer,
 													rowOrdering);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         CostEstimate costEst = getCostEstimate(optimizer);
         costEst.setCost(childCost.getEstimatedCost(),
 							childCost.rowCount(),
@@ -846,6 +900,7 @@ public String toString()
 		if (SanityManager.DEBUG)
 		{
 			return "singleInputRowOptimization: " + singleInputRowOptimization + "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				super.toString();
 		}
 		else
@@ -861,14 +916,20 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (SanityManager.DEBUG)
 		{
 			super.printSubNodes(depth);
 
             printLabel(depth, "aggregates:\n");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
             for (int i = 0; i < aggregates.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 AggregateNode agg = aggregates.get(i);
                 debugPrint(formatNodeString("[" + i + "]:", depth + 1));
                 agg.treePrint(depth + 1);
@@ -925,6 +986,8 @@ boolean flattenableInFromSubquery(FromList fromList)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode optimize(DataDictionary dataDictionary,
 								  PredicateList predicates,
 								  double outerRows)
@@ -940,6 +1003,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 		// RESOLVE: NEED TO FACTOR IN COST OF SORTING AND FIGURE OUT HOW
 		// MANY ROWS HAVE BEEN ELIMINATED.
         setCostEstimate( getOptimizerFactory().getCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		getCostEstimate().setCost(childResult.getCostEstimate().getEstimatedCost(),
 							childResult.getCostEstimate().rowCount(),
@@ -949,6 +1013,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 	}
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 	ResultColumnDescriptor[] makeResultDescriptors()
 	{
 	    return childResult.makeResultDescriptors();
@@ -990,6 +1055,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		// Get the final cost estimate from the child.
 		setCostEstimate( childResult.getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/*
 		** Get the column ordering for the sort.  Note that
@@ -1012,9 +1078,12 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		{
 			if (SanityManager.DEBUG_ON("AggregateTrace"))
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 StringBuilder s = new StringBuilder();
 					
 				s.append("Group by column ordering is (");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6292
                 ColumnOrdering[] ordering =
                         orderingHolder.getArray(ColumnOrdering[].class);
 
@@ -1050,6 +1119,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		mb.push(orderingItem);
 
         mb.push(acb.addItem(getResultColumns().buildRowTemplate()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		mb.push(getResultColumns().getTotalColumnSize());
 		mb.push(getResultSetNumber());
@@ -1117,10 +1187,13 @@ private	void genGroupedAggregateResultSet(ActivationClassBuilder acb,
 		 */
 		String resultSet = (addDistinctAggregate) ? "getDistinctGroupedAggregateResultSet" : "getGroupedAggregateResultSet";
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		mb.push(getCostEstimate().rowCount());
 		mb.push(getCostEstimate().getEstimatedCost());
 		mb.push(groupingList.isRollup());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, resultSet,
                 ClassName.NoPutResultSet, 10);
 
@@ -1149,6 +1222,8 @@ private ResultColumn getColumnReference(ResultColumn targetRC,
 		ColumnReference	tmpColumnRef;
 		ResultColumn	newRC;
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         tmpColumnRef = new ColumnReference(targetRC.getName(),
                                            null,
                                            getContextManager());
@@ -1194,6 +1269,8 @@ void considerPostOptimizeOptimizations(boolean selectHasPredicates)
 		{
             if (aggregates.size() == 1)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 AggregateNode an = aggregates.get(0);
 				AggregateDefinition ad = an.getAggregateDefinition();
 				if (ad instanceof MaxMinAggregateDefinition)
@@ -1203,6 +1280,7 @@ void considerPostOptimizeOptimizations(boolean selectHasPredicates)
 						/* See if the underlying ResultSet tree
 						 * is ordered on the ColumnReference.
 						 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                         ColumnReference[] crs = {
                             (ColumnReference) an.getOperand()
                         };
@@ -1210,10 +1288,12 @@ void considerPostOptimizeOptimizations(boolean selectHasPredicates)
                         // Holder list for the FromBaseTable. We expect no more
                         // than one table, hence initial capacity is 1.
                         ArrayList<FromBaseTable> fbtHolder = new ArrayList<FromBaseTable>(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
                         boolean minMaxOptimizationPossible = isOrderedOn(crs, false, fbtHolder);
 						if (SanityManager.DEBUG)
 						{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                             SanityManager.ASSERT(fbtHolder.size() <= 1,
                                 "bad number of FromBaseTables returned by isOrderedOn() -- " +
                                 fbtHolder.size());
@@ -1254,6 +1334,8 @@ void considerPostOptimizeOptimizations(boolean selectHasPredicates)
 								}
 							}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                             FromBaseTable fbt = fbtHolder.get(0);
 							MaxMinAggregateDefinition temp = (MaxMinAggregateDefinition)ad;
 
@@ -1316,6 +1398,8 @@ else if (an.getOperand() instanceof ConstantNode)
 	 * a+b+c, a+b, then a.
 	 */
     private static class ExpressionSorter
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         implements Comparator<SubstituteExpressionVisitor>
 	{
 		public int compare(SubstituteExpressionVisitor o1, SubstituteExpressionVisitor o2)
@@ -1324,6 +1408,7 @@ public int compare(SubstituteExpressionVisitor o1, SubstituteExpressionVisitor o
 				ValueNode v1 = o1.getSource();
 				ValueNode v2 = o2.getSource();
 				int refCount1, refCount2;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 CollectNodesVisitor<ColumnReference> vis =
                     new CollectNodesVisitor<ColumnReference>(
                         ColumnReference.class);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
index 38f52e2123..da3eb7eafc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.HalfOuterJoinNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -38,6 +39,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class HalfOuterJoinNode extends JoinNode
 {
 	private boolean rightOuterJoin;
@@ -57,6 +60,8 @@ class HalfOuterJoinNode extends JoinNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     HalfOuterJoinNode(ResultSetNode leftResult,
                       ResultSetNode rightResult,
                       ValueNode onClause,
@@ -155,6 +160,8 @@ public String toString()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
@@ -198,6 +205,8 @@ ResultSetNode preprocess(int numTables,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void pushExpressions(PredicateList outerPredicateList)
 					throws StandardException
 	{
@@ -220,6 +229,7 @@ void pushExpressions(PredicateList outerPredicateList)
 		{
 			Predicate predicate;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             predicate = joinPredicates.elementAt(index);
 			if (! predicate.getPushable())
 			{
@@ -233,6 +243,8 @@ void pushExpressions(PredicateList outerPredicateList)
 		}
 
 		/* Recurse down both sides of tree */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         PredicateList noPredicates = new PredicateList(getContextManager());
 		leftFromTable.pushExpressions(getLeftPredicateList());
 		rightFromTable.pushExpressions(noPredicates);
@@ -318,6 +330,7 @@ boolean LOJ_reorderable(int numTables)
 			anyChange =	((HalfOuterJoinNode)logicalLeftResultSet).LOJ_reorderable(numTables) || anyChange;
 		}
 		else if (!(logicalLeftResultSet instanceof FromBaseTable))
+//IC see: https://issues.apache.org/jira/browse/DERBY-4471
         {// left operand must be either a base table or another OJ
 			// In principle, we don't care about the left operand.  However, we
 			// need to re-bind the resultColumns.  If the left operand is a
@@ -333,6 +346,7 @@ else if (!(logicalLeftResultSet instanceof FromBaseTable))
 			anyChange = ((HalfOuterJoinNode)logicalRightResultSet).LOJ_reorderable(numTables) || anyChange;
 		}
 		else if (!(logicalRightResultSet instanceof FromBaseTable))
+//IC see: https://issues.apache.org/jira/browse/DERBY-4471
         {// right operand must be either a base table or another OJ
 			return anyChange;
 		}
@@ -351,6 +365,7 @@ else if (!(logicalRightResultSet instanceof FromBaseTable))
         // the table references on row-preserving and null-producing sides.  It
         // may be possible that either operand is a complex view.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4471
         JBitSet RPReferencedTableMap; // Row-preserving
         JBitSet NPReferencedTableMap; // Null-producing
 
@@ -366,6 +381,7 @@ else if (!(logicalRightResultSet instanceof FromBaseTable))
 
         // Check if logical right operand is another OJ... so we may be able
         // to push the join.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4471
         if (logicalRightResultSet instanceof HalfOuterJoinNode)
 		{
             // Get the row-preserving map of the  child OJ
@@ -460,6 +476,8 @@ else if (!(logicalRightResultSet instanceof FromBaseTable))
                 // ((HalfOuterJoinNode)logicalRightResultSet).transformed =
                 //     local_transformed;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 FromList localFromList = new FromList(
                         getOptimizerFactory().doJoinOrderOptimization(),
                         getContextManager());
@@ -469,6 +487,7 @@ else if (!(logicalRightResultSet instanceof FromBaseTable))
                 rightResultSet = RChild;
 
                 // rebuild the result columns and re-bind column references
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 ((HalfOuterJoinNode)leftResultSet).setResultColumns( null );
                  // localFromList is empty:
                 ((JoinNode)leftResultSet).bindResultColumns(localFromList);
@@ -619,7 +638,10 @@ boolean LOJ_bindResultColumns(boolean anyChange)
 	{
 		if (anyChange)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			setResultColumns( null );
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             FromList localFromList = new FromList(
                     getOptimizerFactory().doJoinOrderOptimization(),
                     getContextManager());
@@ -677,6 +699,7 @@ FromTable transformOuterJoins(ValueNode predicateTree, int numTables)
         // (inner or outer), that is, the inner operand is itself a join,
         // recursively.
         JBitSet innerMap = innerRS.LOJgetReferencedTables(numTables);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4405
 
 		/* Walk predicates looking for 
 		 * a null intolerant predicate on the inner table.
@@ -688,6 +711,7 @@ FromTable transformOuterJoins(ValueNode predicateTree, int numTables)
 			ValueNode left = and.getLeftOperand();
 
 			/* Skip IS NULL predicates as they are not null intolerant */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (left.getClass().equals(IsNullNode.class) &&
                 ((IsNullNode)left).isNullNode())
 			{
@@ -717,17 +741,22 @@ FromTable transformOuterJoins(ValueNode predicateTree, int numTables)
 					if (refMap.get(bit) && innerMap.get(bit))
 					{
 						// OJ -> IJ
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         JoinNode ij =  new JoinNode(
 												leftResultSet,
 												rightResultSet,
 												joinClause,
 												null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 												getResultColumns(),
 												null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 												null,
 												getContextManager());
 						ij.setTableNumber(tableNumber);
 						ij.setSubqueryList(subqueryList);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                         ij.setAggregates(aggregates);
 						return ij;
 					}
@@ -884,6 +913,8 @@ boolean isRightOuterJoin()
 	 *  ResultColumn should be marked such. DERBY-4631
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void isJoinColumnForRightOuterJoin(ResultColumn rc)
 	{
 		if (isRightOuterJoin() && usingClause != null &&  
@@ -894,6 +925,8 @@ void isJoinColumnForRightOuterJoin(ResultColumn rc)
 	}
 
 	// return the Null-producing table references
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     JBitSet LOJgetNPReferencedTables(int numTables)
 				throws StandardException
 	{
@@ -905,9 +938,12 @@ JBitSet LOJgetNPReferencedTables(int numTables)
 
     // return the row-preserving table references
     public JBitSet LOJgetRPReferencedTables(int numTables)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4471
                 throws StandardException
     {
         if (rightOuterJoin && !transformed)
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             return rightResultSet.LOJgetReferencedTables(numTables);
         else
             return leftResultSet.LOJgetReferencedTables(numTables);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java
index 3f6bdd6b22..2554e00ec6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.HasCorrelatedCRsVisitor
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -29,6 +30,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * anywhere below us.  Stop traversal as soon as we find one.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class HasCorrelatedCRsVisitor implements Visitor
 {
 	private boolean hasCorrelatedCRs;
@@ -103,6 +106,7 @@ public boolean skipChildren(Visitable v)
 
 	public boolean visitChildrenFirst(Visitable v)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 
@@ -127,6 +131,8 @@ boolean hasCorrelatedCRs()
 	 *
 	 *	@param	value	true/false
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setHasCorrelatedCRs(boolean value)
 	{
 		hasCorrelatedCRs = value;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java
index 52b688a4cb..3dcb3a07f3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.HasNodeVisitor
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -33,6 +34,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * parameter.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class HasNodeVisitor implements Visitor
 {
 	protected boolean hasNode;
@@ -44,6 +47,7 @@ class HasNodeVisitor implements Visitor
 	 * @param nodeClass the class of the node that 
 	 * 	we are looking for.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     HasNodeVisitor(Class<?> nodeClass)
 	{
 		this.nodeClass = nodeClass;
@@ -57,6 +61,7 @@ class HasNodeVisitor implements Visitor
 	 * @param skipOverClass do not go below this
 	 * node when searching for nodeClass.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     HasNodeVisitor(Class<?> nodeClass, Class<?> skipOverClass)
 	{
 		this.nodeClass = nodeClass;
@@ -113,6 +118,7 @@ public boolean skipChildren(Visitable node)
 	 */
 	public boolean visitChildrenFirst(Visitable node)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 
@@ -136,6 +142,8 @@ boolean hasNode()
 	 * Reset the status so it can be run again.
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void reset()
 	{
 		hasNode = false;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasTableFunctionVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasTableFunctionVisitor.java
index 2722fbd2af..1dc67fac49 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasTableFunctionVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasTableFunctionVisitor.java
@@ -27,6 +27,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Find out if we have a user-defined table function anywhere in the
  * tree.  Stop traversal as soon as we find one.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class HasTableFunctionVisitor extends HasNodeVisitor
 {
     ///////////////////////////////////////////////////////////////////////////////////
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java
index 5e58f9734e..55f89f739d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.HasVariantValueNodeVisitor
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -45,6 +46,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * @see org.apache.derby.iapi.store.access.Qualifier 
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class HasVariantValueNodeVisitor implements Visitor
 {
 	private boolean hasVariant;
@@ -55,6 +58,8 @@ class HasVariantValueNodeVisitor implements Visitor
 	/**
 	 * Construct a visitor
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     HasVariantValueNodeVisitor()
 	{
 		this.variantType = Qualifier.VARIANT;
@@ -80,6 +85,8 @@ class HasVariantValueNodeVisitor implements Visitor
 	 *		variant
 	 * @param ignoreParameters should I ignore parameter nodes?
  	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     HasVariantValueNodeVisitor(int variantType, boolean ignoreParameters)
 	{
 		this.variantType = variantType;
@@ -113,6 +120,7 @@ public Visitable visit(Visitable node) throws StandardException
 	{
 		if (node instanceof ValueNode)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 			if (ignoreParameters && ((ValueNode)node).requiresTypeFromContext())
 				return node;
 				
@@ -131,6 +139,7 @@ public boolean skipChildren(Visitable node)
 
 	public boolean visitChildrenFirst(Visitable node)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
index 4546002daf..652264f9cf 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
@@ -67,6 +67,7 @@ public boolean feasible(Optimizable innerTable,
 		 */
 		if (! innerTable.isMaterializable())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
             if ( innerTable.optimizerTracingIsOn() ) { innerTable.getOptimizerTracer().traceSkipUnmaterializableHashJoin(); }
 			return false;
 		}
@@ -118,6 +119,8 @@ public boolean feasible(Optimizable innerTable,
 			// join predicates that we'll be searching.
 			JBitSet pNums = new JBitSet(tNums.size());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             for (int i = 0; i < predList.size(); i++)
 			{
                 Predicate pred = (Predicate)predList.getOptPredicate(i);
@@ -143,12 +146,15 @@ public boolean feasible(Optimizable innerTable,
 		
 		/* Look for equijoins in the predicate list */
         int[] hashKeyColumns = findHashKeyColumns(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 innerTable,
                 cd,
                 predList);
 
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
             if ( innerTable.optimizerTracingIsOn() )
             {
                 if (hashKeyColumns == null)
@@ -216,6 +222,7 @@ public OptimizablePredicateList getBasePredicates(
 	/** @see JoinStrategy#nonBasePredicateSelectivity */
 	public double nonBasePredicateSelectivity(
 										Optimizable innerTable,
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 										OptimizablePredicateList predList) 
 	throws StandardException {
 		double retval = 1.0;
@@ -268,6 +275,7 @@ public void estimateCost(Optimizable innerTable,
 	public int maxCapacity( int userSpecifiedCapacity,
                             int maxMemoryPerTable,
                             double perRowUsage) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
         if( userSpecifiedCapacity >= 0)
             return userSpecifiedCapacity;
         perRowUsage += ClassSize.estimateHashEntrySize();
@@ -350,6 +358,8 @@ public int getScanArgs(
 		{
 			for (int i = storeRestrictionList.size() - 1; i >= 0; i--)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 Predicate pred =
                         (Predicate)storeRestrictionList.getOptPredicate(i);
 				if (pred.isInListProbePredicate())
@@ -370,10 +380,12 @@ public int getScanArgs(
 										storeRestrictionList,
 										acb,
 										resultRowTemplate);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
 		nonStoreRestrictionList.generateQualifiers(acb,	mb, innerTable, true);
 		mb.push(innerTable.initialCapacity());
 		mb.push(innerTable.loadFactor());
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
 		mb.push(innerTable.maxCapacity( (JoinStrategy) this, maxMemoryPerTable));
 		/* Get the hash key columns and wrap them in a formattable */
 		int[] hashKeyColumns = innerTable.hashKeyColumns();
@@ -392,6 +404,7 @@ public int getScanArgs(
 						tableLocked,
 						isolationLevel);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 		return 28;
 	}
 
@@ -639,12 +652,15 @@ else if (cd.isIndex())
 		}
 
         // Build a list of all the hash key columns
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<Integer> hashKeys = new ArrayList<Integer>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         for (int colCtr = 0; colCtr < columns.length; colCtr++)
 		{
 			// Is there an equijoin condition on this column?
 			if (predList.hasOptimizableEquijoin(innerTable, columns[colCtr]))
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
                 hashKeys.add(colCtr);
 			}
 		}
@@ -658,6 +674,8 @@ else if (cd.isIndex())
         int[] keyCols = new int[hashKeys.size()];
         for (int index = 0; index < keyCols.length; index++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             keyCols[index] = hashKeys.get(index).intValue();
         }
         return keyCols;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HashTableNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HashTableNode.java
index 08d941b407..dfc6a5c54a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HashTableNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/HashTableNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.HashTableNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -65,6 +66,8 @@ class HashTableNode extends SingleChildResultSetNode
 	 * @param hashKeyColumns		Hash key columns
      * @param cm                    The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     HashTableNode(ResultSetNode  childResult,
                   Properties     tableProperties,
                   ResultColumnList resultColumns,
@@ -78,6 +81,7 @@ class HashTableNode extends SingleChildResultSetNode
                   ContextManager cm)
 	{
         super(childResult, tableProperties, cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( resultColumns );
         this.searchPredicateList = searchPredicateList;
         this.joinPredicateList = joinPredicateList;
@@ -110,6 +114,8 @@ public Optimizable modifyAccessPath(JBitSet outerTables, Optimizer optimizer)
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -148,6 +154,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 	{
 		if (SanityManager.DEBUG)
             SanityManager.ASSERT(getResultColumns() != null, "Tree structure bad");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         //
         // If we are projecting and restricting the stream from a table
@@ -238,8 +245,13 @@ private void generateMinion(ExpressionClassBuilder acb,
 
 
 		// Map the result columns to the source columns
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
         ResultColumnList.ColumnMapping  mappingArrays =
             getResultColumns().mapSourceColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         int[] mapArray = mappingArrays.mapArray;
 
@@ -288,6 +300,7 @@ private void generateMinion(ExpressionClassBuilder acb,
 		 */
 		if (pSubqueryList != null && pSubqueryList.size() > 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			pSubqueryList.setPointOfAttachment(getResultSetNumber());
 			if (SanityManager.DEBUG)
 			{
@@ -297,6 +310,7 @@ private void generateMinion(ExpressionClassBuilder acb,
 		}
 		if (rSubqueryList != null && rSubqueryList.size() > 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			rSubqueryList.setPointOfAttachment(getResultSetNumber());
 			if (SanityManager.DEBUG)
 			{
@@ -307,6 +321,7 @@ private void generateMinion(ExpressionClassBuilder acb,
 
 		// Get the final cost estimate based on child's cost.
 		setCostEstimate( childResult.getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// if there is no searchClause, we just want to pass null.
 		if (searchClause == null)
@@ -372,6 +387,7 @@ private void generateMinion(ExpressionClassBuilder acb,
 			// as-is, with the performance trade-off as discussed above.)
 
 			/* Generate the Row function for the projection */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			getResultColumns().generateCore(acb, mb, false);
 		}
 		else
@@ -390,6 +406,7 @@ private void generateMinion(ExpressionClassBuilder acb,
 		mb.push(getCostEstimate().singleScanRowCount());
 		mb.push(getCostEstimate().getEstimatedCost());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getHashTableResultSet",
                 ClassName.NoPutResultSet, 14);
 	}
@@ -402,11 +419,13 @@ private void generateMinion(ExpressionClassBuilder acb,
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (searchPredicateList != null)
 		{
 			searchPredicateList = (PredicateList)searchPredicateList.accept(v);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
index 0f0bb474ca..2ba86ff318 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.InListOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -51,6 +52,8 @@ public final class InListOperatorNode extends BinaryListOperatorNode
      * @param cm Context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     InListOperatorNode(
             ValueNode leftOperand,
             ValueNodeList rightOperandList,
@@ -85,6 +88,8 @@ public String toString()
 	 */
 	protected InListOperatorNode shallowCopy() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         InListOperatorNode ilon = new InListOperatorNode(
 				leftOperand,
 				rightOperandList,
@@ -116,6 +121,8 @@ protected InListOperatorNode shallowCopy() throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -133,6 +140,7 @@ ValueNode preprocess(int numTables,
 		{
 			BinaryComparisonOperatorNode equal = 
                 new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     BinaryRelationalOperatorNode.K_EQUALS,
                     leftOperand,
                     rightOperandList.elementAt(0),
@@ -155,6 +163,8 @@ ValueNode preprocess(int numTables,
         if ((leftOperand.getTypeServices().getTypeId().typePrecedence() !=
                     targetTypePrecedence) &&
                 !rightOperandList.allSamePrecendence(targetTypePrecedence)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             CastNode cn =
                     new CastNode(leftOperand, targetType, getContextManager());
             cn.bindCastNodeOnly();
@@ -255,6 +265,7 @@ ValueNode preprocess(int numTables,
 				rightOperandList.sortInAscendingOrder(judgeODV);
 				isOrdered = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 ValueNode minValue = rightOperandList.elementAt(0);
                 ValueNode maxValue = rightOperandList.elementAt(
 						rightOperandList.size() - 1);
@@ -271,7 +282,10 @@ ValueNode preprocess(int numTables,
 				if (judgeODV.equals(minODV, maxODV).equals(true))
 				{
 					BinaryComparisonOperatorNode equal = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                             BinaryRelationalOperatorNode.K_EQUALS,
 							leftOperand, 
 							minValue,
@@ -302,7 +316,10 @@ ValueNode preprocess(int numTables,
 			 * the list.  This is arbitrary and should not matter in the
 			 * big picture.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ValueNode srcVal = rightOperandList.elementAt(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ParameterNode pNode = new ParameterNode(
                     0,
 					null, // default value
@@ -338,7 +355,12 @@ ValueNode preprocess(int numTables,
 			 * to "this").
 			 */
 			BinaryComparisonOperatorNode equal = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     BinaryRelationalOperatorNode.K_EQUALS,
 					leftOperand, 
 					pNode,
@@ -371,6 +393,7 @@ private DataTypeDescriptor getDominantType() {
             // what the dominant type is.
             ClassFactory cf = getClassFactory();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (ValueNode vn : rightOperandList) {
                 targetType = targetType.getDominantType(
                         vn.getTypeServices(), cf);
@@ -433,8 +456,11 @@ ValueNode eliminateNots(boolean underNotNode)
 		 */
 		ValueNode leftClone = (leftOperand instanceof ColumnReference) ? leftOperand.getClone() : leftOperand;
         leftBCO = new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 BinaryRelationalOperatorNode.K_NOT_EQUALS,
                 leftClone,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 rightOperandList.elementAt(0),
                 false,
                 getContextManager());
@@ -448,9 +474,13 @@ ValueNode eliminateNots(boolean underNotNode)
 
 			/* leftO <> rightOList.elementAt(elemsDone) */
 			leftClone = (leftOperand instanceof ColumnReference) ? leftOperand.getClone() : leftOperand;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             rightBCO = new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     BinaryRelationalOperatorNode.K_NOT_EQUALS,
                     leftClone,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     rightOperandList.elementAt(elemsDone),
                     false,
                     getContextManager());
@@ -480,6 +510,7 @@ ValueNode eliminateNots(boolean underNotNode)
     boolean selfReference(ColumnReference cr)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ValueNode vn : rightOperandList)
 		{
             if (vn.getTablesReferenced().get(cr.getTableNumber())) {
@@ -592,6 +623,7 @@ protected LocalField generateListAsArray(ExpressionClassBuilder acb,
 		MethodBuilder cb = acb.getConstructor();
 		cb.pushNewArray(ClassName.DataValueDescriptor, listSize);
 		cb.setField(arrayField);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 		/* Set the array elements that are constant */
 		int numConstants = 0;
@@ -637,6 +669,7 @@ protected LocalField generateListAsArray(ExpressionClassBuilder acb,
 			}
 
 			setArrayMethod.getField(arrayField); // first arg
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             rightOperandList.elementAt(index).generateExpression(acb, setArrayMethod);
 			setArrayMethod.upCast(ClassName.DataValueDescriptor); // second arg
 			setArrayMethod.setArrayElement(index);
@@ -723,6 +756,7 @@ void generateStartStopKey(boolean isAsc, boolean isStartKey,
 							  ((i == 0) ? 4 : 3);
 			for (int j = 0; j < numVals; j++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 ValueNode vn = rightOperandList.elementAt(currentOpnd++);
 				vn.generateExpression(acb, mb);
 				mb.upCast(ClassName.DataValueDescriptor);
@@ -749,6 +783,8 @@ void generateStartStopKey(boolean isAsc, boolean isStartKey,
 
 			/* decide to get min or max value
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             String methodNam;
 			if ((isAsc && isStartKey) || (! isAsc && ! isStartKey))
                 methodNam = "minValue";
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
index a1501a93f5..9050cb51b0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.IndexToBaseRowNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -56,6 +57,8 @@ class IndexToBaseRowNode extends FromTable
 	private FormatableBitSet	allReferencedCols;
 	private FormatableBitSet	heapOnlyReferencedCols;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     IndexToBaseRowNode(
             FromBaseTable    source,
             ConglomerateDescriptor  baseCD,
@@ -71,6 +74,7 @@ class IndexToBaseRowNode extends FromTable
         super(null, tableProperties, cm);
         this.source = source;
         this.baseCD = baseCD;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( resultColumns );
         this.cursorTargetTable = cursorTargetTable;
         this.restrictionList = restrictionList;
@@ -78,6 +82,7 @@ class IndexToBaseRowNode extends FromTable
         this.heapReferencedCols = heapReferencedCols;
         this.indexReferencedCols = indexReferencedCols;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2226
 		if (this.indexReferencedCols == null) {
 			this.allReferencedCols = this.heapReferencedCols;
 			heapOnlyReferencedCols = this.heapReferencedCols;
@@ -108,6 +113,8 @@ public AccessPath getTrulyTheBestAccessPath()
 	}
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getCostEstimate()
 	{
 		return source.getTrulyTheBestAccessPath().getCostEstimate();
@@ -165,6 +172,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		// Get the CostEstimate info for the underlying scan
 		setCostEstimate( getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Put the predicates back into the tree */
 		if (restrictionList != null)
@@ -198,6 +206,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 			heapColRefItem = acb.addItem(heapReferencedCols);
 		}
 		int allColRefItem = -1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2226
 		if (allReferencedCols != null)
 		{
 			allColRefItem = acb.addItem(allReferencedCols);
@@ -233,8 +242,10 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
         // not null, but no bits are set. This can happen when we need to get
         // all of the columns from the heap due to a check constraint.
         boolean skipPropagatedCols =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
                 indexReferencedCols != null &&
                 indexReferencedCols.getNumBitsSet() != 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         mb.push(acb.addItem(getResultColumns()
                 .buildRowTemplate(heapReferencedCols, skipPropagatedCols)));
 
@@ -242,6 +253,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		mb.push(source.getBaseTableName());
 		mb.push(heapColRefItem);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2226
 		mb.push(allColRefItem);
 		mb.push(heapOnlyColRefItem);
 
@@ -285,6 +297,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		}
 
 		mb.push(forUpdate);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		mb.push(getCostEstimate().rowCount());
 		mb.push(getCostEstimate().getEstimatedCost());
         mb.push( source.getTableDescriptor().getNumberOfColumns() );
@@ -401,6 +414,7 @@ private int[] getIndexColMapping()
 		for (int index = 0; index < rclSize; index++)
 		{
             ResultColumn rc = getResultColumns().elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 			if (indexReferencedCols != null && rc.getExpression() instanceof VirtualColumnNode)
 			{
@@ -427,11 +441,13 @@ private int[] getIndexColMapping()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (source != null)
 		{
 			source = (FromBaseTable)source.accept(v);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/InsertNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/InsertNode.java
index c1b53d8c63..6065d358af 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/InsertNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/InsertNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.InsertNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -109,6 +110,8 @@ public final class InsertNode extends DMLModGeneratedColumnsStatementNode
      *                           from JDBC limit/offset escape syntax
      * @param cm                 The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     InsertNode(
             QueryTreeNode    targetName,
             ResultColumnList insertColumns,
@@ -153,6 +156,7 @@ public String toString()
                 return ( (targetTableName!=null) ? targetTableName : targetVTI.getTableName() ).toString() + "\n"
                     + targetProperties + "\n"
                     + super.toString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             } catch (org.apache.derby.shared.common.error.StandardException e) {
                 return "tableName: <not_known>\n"
                     + targetProperties + "\n"
@@ -166,6 +170,8 @@ public String toString()
 	}
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "INSERT";
@@ -196,11 +202,14 @@ void printSubNodes(int depth)
 				targetColumnList.treePrint(depth + 1);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 			if (orderByList != null) {
 				printLabel(depth, "orderByList: ");
 				orderByList.treePrint(depth + 1);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6008
             if (offset != null) {
                 printLabel(depth, "offset:");
                 offset.treePrint(depth + 1);
@@ -233,7 +242,10 @@ public void bindStatement() throws StandardException
 	{
 		// We just need select privilege on the expressions
 		getCompilerContext().pushCurrentPrivType( Authorizer.SELECT_PRIV);
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         FromList fromList = new FromList(
                 getOptimizerFactory().doJoinOrderOptimization(),
                 getContextManager());
@@ -261,6 +273,7 @@ public void bindStatement() throws StandardException
 		** table or VTI. We don't bother adding any permission checks here
         ** because they are assumed by INSERT permission on the table.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
         IgnoreFilter    ignorePermissions = new IgnoreFilter();
         getCompilerContext().addPrivilegeFilter( ignorePermissions );
 		getResultColumnList();
@@ -273,16 +286,19 @@ public void bindStatement() throws StandardException
 			/*
 			 * Normalize synonym qualifers for column references.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
 			if (synonymTableName != null)
 			{
 				normalizeSynonymColumns ( targetColumnList, targetTableName );
 			}
 			
 			/* Bind the target column list */
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 			getCompilerContext().pushCurrentPrivType( getPrivType());
 			if (targetTableDescriptor != null)
 			{
 				targetColumnList.bindResultColumnsByName(targetTableDescriptor,
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 														(DMLStatementNode) this);
 			}
 			else
@@ -290,10 +306,13 @@ public void bindStatement() throws StandardException
 				targetColumnList.bindResultColumnsByName(targetVTI.getResultColumns(), targetVTI,
 														this);
 			}	
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 			getCompilerContext().popCurrentPrivType();
         }
 
         getCompilerContext().removePrivilegeFilter( ignorePermissions );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
+//IC see: https://issues.apache.org/jira/browse/DERBY-6433
 
 		/* Verify that all underlying ResultSets reclaimed their FromList */
 		if (SanityManager.DEBUG)
@@ -309,6 +328,7 @@ public void bindStatement() throws StandardException
          * checked for illegal DEFAULTs elsewhere.
          */
         boolean isTableConstructor =
+//IC see: https://issues.apache.org/jira/browse/DERBY-4426
             (resultSet instanceof UnionNode &&
              ((UnionNode)resultSet).tableConstructor()) ||
             resultSet instanceof RowResultSetNode;
@@ -341,6 +361,7 @@ public void bindStatement() throws StandardException
         // At this point, we have added permissions checks for the driving query.
         // Now add a check for INSERT privilege on the target table.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
         if (isPrivilegeCollectionRequired())
         {
             getCompilerContext().pushCurrentPrivType( getPrivType());
@@ -430,6 +451,7 @@ public void bindStatement() throws StandardException
 			{
                 int position = targetColumnList.elementAt(index).
                     getColumnDescriptor().getPosition();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 				if (index != position-1)
 				{
@@ -456,6 +478,8 @@ public void bindStatement() throws StandardException
 		}
 
 		// Bind the ORDER BY columns
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 		if (orderByList != null)
 		{
 			orderByList.pullUpOrderByColumns(resultSet);
@@ -468,6 +492,7 @@ public void bindStatement() throws StandardException
 		}
 
         bindOffsetFetch(offset, fetchFirst);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
 
 		resultSet = enhanceAndCheckForAutoincrement( resultSet, inOrder, colMap, defaultsWereReplaced );
 
@@ -479,6 +504,8 @@ public void bindStatement() throws StandardException
 												resultSet.getResultColumns()))
 		{
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             resultSet = new NormalizeResultSetNode(
                 resultSet, resultColumnList, null, false, getContextManager());
 		}
@@ -495,8 +522,11 @@ public void bindStatement() throws StandardException
 			/* Get and bind all constraints on the table */
             boolean[] hasDCC = new boolean[]{false /* a priori*/ };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             checkConstraints = bindConstraints(
                     dataDictionary,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     getOptimizerFactory(),
                     targetTableDescriptor,
                     null,
@@ -549,9 +579,13 @@ public void bindStatement() throws StandardException
                                                   resultSet);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
         identitySequenceUUIDString = getUUIDofSequenceGenerator();
         
         getCompilerContext().removePrivilegeFilter( ignorePermissions );
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getCompilerContext().popCurrentPrivType();
 	}
 
@@ -618,6 +652,10 @@ public void bindStatement() throws StandardException
 		 */
 
 		resultSet = resultSet.enhanceRCLForInsert(this, inOrder, colMap);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4442
+//IC see: https://issues.apache.org/jira/browse/DERBY-3
+//IC see: https://issues.apache.org/jira/browse/DERBY-4433
+//IC see: https://issues.apache.org/jira/browse/DERBY-1644
 
 		// Forbid overrides for generated columns and identity columns that
 		// are defined as GENERATED ALWAYS.
@@ -797,6 +835,7 @@ public ConstantAction makeConstantAction() throws StandardException
 				  indexNames,
 				  deferred,
 				  false,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                   hasDeferrableCheckConstraints,
 				  targetTableDescriptor.getUUID(),
 				  lockMode,
@@ -861,8 +900,11 @@ boolean[] getIndexedCols() throws StandardException
     @Override
 	public void optimizeStatement() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         resultSet.pushQueryExpressionSuffix();
 		// Push the order by list down to the ResultSet
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 		if (orderByList != null)
 		{
 			// If we have more than 1 ORDERBY columns, we may be able to
@@ -891,6 +933,7 @@ public void optimizeStatement() throws StandardException
         this.accept( tableFunctionVisitor );
         // DERBY-5614: See if the target is a global temporary table (GTT),
         // in which case we don't support bulk insert.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5614
         if ( tableFunctionVisitor.hasNode() &&
                 !isSessionSchema(targetTableDescriptor.getSchemaDescriptor())) {
             requestBulkInsert();
@@ -912,6 +955,7 @@ private void requestBulkInsert()
         if ( targetProperties.getProperty( key ) == null )
         { targetProperties.put( key, value ); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         bulkInsert = true;
     }
 
@@ -934,6 +978,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		// DERBY-827 this must be done in execute() since
 		// createResultSet() will only be called once.
 		generateCodeForTemporaryTable(acb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
 
 		/* generate the parameters */
 		generateParameterValueSet(acb);
@@ -965,12 +1010,15 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 			generateCheckConstraints( checkConstraints, acb, mb );
 
             // arg 4 row template used by bulk insert
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
             if (bulkInsert) {
                 ColumnDescriptorList cdl =
                         targetTableDescriptor.getColumnDescriptorList();
                 ExecRowBuilder builder =
                         new ExecRowBuilder(cdl.size(), false);
                 for (int i = 0; i < cdl.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     ColumnDescriptor cd = cdl.get(i);
                     builder.setColumn(i + 1, cd.getType());
                 }
@@ -980,6 +1028,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
             }
 
             // arg 5, 6 table name
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             if (targetTableName.getSchemaName() == null) {
                 mb.pushNull("java.lang.String");
             } else {
@@ -1093,6 +1142,7 @@ static int getStatementType(Properties targetProperties)
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-791
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java
index d81774c177..f9421b9b08 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java
@@ -1,7 +1,9 @@
 /*
 
    Derby - Class org.apache.derby.impl.sql.compile.IntersectNode
+//IC see: https://issues.apache.org/jira/browse/DERBY-330
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -87,6 +89,8 @@ public class IntersectOrExceptNode extends SetOperatorNode
      * @param cm                The context manager
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     IntersectOrExceptNode(int            opType,
                           ResultSetNode  leftResult,
                           ResultSetNode  rightResult,
@@ -117,6 +121,8 @@ private int getOpType()
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
@@ -144,6 +150,7 @@ ResultSetNode preprocess(int numTables,
          * expressions to see if a sort can be avoided.
          */
         final OrderByList obl = qec.getOrderByList(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
 
         if( obl != null)
         {
@@ -173,6 +180,7 @@ ResultSetNode preprocess(int numTables,
                     intermediateOrderByIdx++;
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
             qec.setOrderByList(0, null); // It will be pushed down.
         }
         else // The output of the intersect/except does not have to be ordered
@@ -197,6 +205,8 @@ private void pushOrderingDown( ResultSetNode rsn)
     {
         ContextManager cm = getContextManager();
         OrderByList orderByList = new OrderByList(null, cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
         for( int i = 0; i < intermediateOrderByColumns.length; i++)
         {
@@ -219,6 +229,7 @@ private void pushOrderingDown( ResultSetNode rsn)
             orderByList.addOrderByColumn( orderByColumn);
         }
         orderByList.bindOrderByColumns( rsn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         rsn.pushQueryExpressionSuffix();
         rsn.pushOrderByList( orderByList);
     } // end of pushOrderingDown
@@ -234,6 +245,7 @@ public CostEstimate estimateCost( OptimizablePredicateList predList,
                                       RowOrdering rowOrdering)
                           throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-219
 		leftResultSet = optimizeSource(
 							optimizer,
 							leftResultSet,
@@ -246,6 +258,8 @@ public CostEstimate estimateCost( OptimizablePredicateList predList,
 							(PredicateList) null,
 							outerCost);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         CostEstimate costEst = getCostEstimate(optimizer);
         CostEstimate leftCostEstimate = leftResultSet.getCostEstimate();
         CostEstimate rightCostEstimate = rightResultSet.getCostEstimate();
@@ -290,6 +304,8 @@ public Optimizable modifyAccessPath(JBitSet outerTables) throws StandardExceptio
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode modifyAccessPaths() throws StandardException
 	{
 		ResultSetNode retRSN;
@@ -325,11 +341,14 @@ private ResultSetNode addNewNodes()
 
         ResultSetNode treeTop = this;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i = 0; i < qec.size(); i++) {
             final OrderByList obl = qec.getOrderByList(i);
 
             if(obl != null) {
                 // Generate an order by node on top of the intersect/except
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 treeTop = new OrderByNode(
                         treeTop,
                         obl,
@@ -377,6 +396,7 @@ void generate( ActivationClassBuilder acb, MethodBuilder mb)
 
 		// Get our final cost estimate based on the child estimates.
 		setCostEstimate( getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// build up the tree.
 
@@ -400,6 +420,7 @@ void generate( ActivationClassBuilder acb, MethodBuilder mb)
 		getRightResultSet().generate( acb, mb);
 
 		acb.pushThisAsActivation(mb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		mb.push(getResultSetNumber());
         mb.push( getCostEstimate().getEstimatedRowCount());
         mb.push( getCostEstimate().getEstimatedCost());
@@ -408,6 +429,7 @@ void generate( ActivationClassBuilder acb, MethodBuilder mb)
         mb.push( getCompilerContext().addSavedObject( intermediateOrderByColumns));
         mb.push( getCompilerContext().addSavedObject( intermediateOrderByDirection));
         mb.push( getCompilerContext().addSavedObject( intermediateOrderByNullsLow));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE,
                       (String) null,
@@ -426,9 +448,12 @@ void generate( ActivationClassBuilder acb, MethodBuilder mb)
 	 *  getRowCountEstimate() in this class for more).
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getFinalCostEstimate()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getCandidateFinalCostEstimate() != null)
         {
 			return getCandidateFinalCostEstimate();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IsNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IsNode.java
index d8156cfcc2..40f8854891 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IsNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IsNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.IsNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -28,6 +29,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
 import org.apache.derby.iapi.services.context.ContextManager;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class IsNode extends BinaryLogicalOperatorNode
 {
 	private boolean		notMe;	// set to true if we're to negate the sense of this node
@@ -66,6 +69,7 @@ class IsNode extends BinaryLogicalOperatorNode
 	 */
 
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IsNullNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IsNullNode.java
index 1259b573f2..0a1c8dabd1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IsNullNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/IsNullNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.IsNullNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -51,6 +52,7 @@ public final class IsNullNode extends UnaryComparisonOperatorNode
      */
     private boolean notNull;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     IsNullNode(ValueNode operand, boolean notNull, ContextManager cm)
             throws StandardException {
         super(operand, cm);
@@ -82,6 +84,7 @@ UnaryOperatorNode getNegation(ValueNode operand)
 						"dataTypeServices is expected to be non-null");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         notNull = !notNull;
         updateOperatorDetails();
 		return this;
@@ -105,6 +108,7 @@ void bindParameter()
 		** is required) and hence we will not worry about the collation setting
 		*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		operand.setType(new DataTypeDescriptor(TypeId.getBuiltInTypeId(Types.VARCHAR), true));
 	}
 
@@ -128,6 +132,7 @@ public boolean usefulStopKey(Optimizable optTable)
     @Override
 	public int getStartOperator(Optimizable optTable)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (SanityManager.DEBUG) {
             if (notNull) {
                 SanityManager.THROWASSERT("NOT NULL not expected here");
@@ -161,6 +166,7 @@ public void generateOperator(MethodBuilder mb,
 	public void generateNegate(MethodBuilder mb,
 										Optimizable optTable)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         mb.push(notNull);
 	}
 
@@ -196,6 +202,7 @@ public DataValueDescriptor getCompareValue(Optimizable optTable)
 	public boolean equalsComparisonWithConstantExpression(Optimizable optTable)
 	{
 		// Always return false for NOT NULL
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (notNull)
 		{
 			return false;
@@ -227,6 +234,7 @@ public boolean equalsComparisonWithConstantExpression(Optimizable optTable)
 	public RelationalOperator getTransitiveSearchClause(ColumnReference otherCR)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return new IsNullNode(otherCR, notNull, getContextManager());
 	}
 
@@ -242,6 +250,7 @@ String getReceiverInterfaceName() {
     @Override
 	public double selectivity(Optimizable optTable) 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (notNull) {
             /* IS NOT NULL is like <>, so should have same selectivity */
 			return 0.9d;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
index 77cef64dc6..e61a93814d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.JavaToSQLValueNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -73,6 +74,8 @@ class JavaToSQLValueNode extends ValueNode
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -136,6 +139,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 
 			mb.conditionalIfNull();
 			mb.getField(nullValueField);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 			acb.generateNullWithExpress(mb, getTypeCompiler(), 
 					getTypeServices().getCollationType());
 
@@ -160,6 +164,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		javaNode.generateExpression(acb, mb);
 
 		/* Generate the SQL value, which is always nullable */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 		acb.generateDataValue(mb, tc, 
 				getTypeServices().getCollationType(), field);
 
@@ -180,6 +185,8 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -218,6 +225,7 @@ JavaValueNode getJavaValueNode()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -227,6 +235,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 
 		/* Bind the expression under us */
         javaNode = javaNode.bindExpression(fromList, subqueryList, aggregates);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
         if ( javaNode instanceof StaticMethodCallNode )
         {
@@ -234,10 +243,12 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 
             if ( agg != null )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                 return agg.bindExpression( fromList, subqueryList, aggregates );
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
 		DataTypeDescriptor dts = javaNode.getDataType();
 		if (dts == null)
 		{
@@ -246,7 +257,9 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 		}
 
         TypeDescriptor catalogType = dts.getCatalogType();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4092
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
         if ( catalogType.isRowMultiSet() || (catalogType.getTypeName().equals( "java.sql.ResultSet" )) )
         {
 			throw StandardException.newException(SQLState.LANG_TABLE_FUNCTION_NOT_ALLOWED);
@@ -274,6 +287,8 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 	 * @exception StandardException			Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
@@ -340,11 +355,13 @@ protected int getOrderableVariantType() throws StandardException
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (javaNode != null)
 		{
 			javaNode = (JavaValueNode)javaNode.accept(v);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JavaValueNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
index 2394f5cef9..882066c4b8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.JavaValueNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -57,6 +58,8 @@ abstract class JavaValueNode extends QueryTreeNode
         // * Collation type of schema where method is defined. 
 	private int collationType;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     JavaValueNode(ContextManager cm) {
         super(cm);
     }
@@ -66,6 +69,7 @@ abstract class JavaValueNode extends QueryTreeNode
      */
     DataTypeDescriptor getDataType() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
         return DataTypeDescriptor.getSQLDataTypeDescriptor( getJavaTypeName()) ;
     }
 
@@ -113,6 +117,8 @@ String getPrimitiveTypeName()
 		switch( myType.getCategory() )
 		{
 		    case JSQLType.JAVA_PRIMITIVE: return JSQLType.getPrimitiveName( myType.getPrimitiveKind() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4293
+//IC see: https://issues.apache.org/jira/browse/DERBY-4293
 
 		    default:
 
@@ -165,6 +171,7 @@ JSQLType getJSQLType() throws StandardException {
 	  *
 	  */
     static TypeId mapToTypeID(JSQLType jsqlType)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         throws StandardException
 	{
 		DataTypeDescriptor	dts = jsqlType.getSQLType();
@@ -206,6 +213,7 @@ abstract boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     abstract JavaValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 							throws StandardException;
 	/**
@@ -350,6 +358,7 @@ final boolean generateReceiver(ExpressionClassBuilder acb,
 		** type to the Java domain.
 		*/
 		if ( (! valueReturnedToSQLDomain()) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-5055
 				ClassInspector.primitiveType(getJavaTypeName()))
 		{
 			return false;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JoinNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JoinNode.java
index 15c2d7aa64..a113efe0ba 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JoinNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/JoinNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.JoinNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -57,6 +58,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class JoinNode extends TableOperatorNode
 {
 	/* Join semantics */
@@ -76,6 +79,7 @@ class JoinNode extends TableOperatorNode
 	private PredicateList rightPredicateList;
 
 	protected boolean flattenableJoin = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     List<AggregateNode>                aggregates;
 	SubqueryList		subqueryList;
 	ValueNode			joinClause;
@@ -85,6 +89,7 @@ class JoinNode extends TableOperatorNode
 	//User provided optimizer overrides
 	Properties joinOrderStrategyProperties;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 
 	/**
      * Constructor for a JoinNode.
@@ -100,6 +105,8 @@ class JoinNode extends TableOperatorNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     JoinNode(ResultSetNode    leftResult,
              ResultSetNode    rightResult,
              ValueNode        onClause,
@@ -110,6 +117,7 @@ class JoinNode extends TableOperatorNode
              ContextManager   cm) throws StandardException {
 
         super(leftResult, rightResult, tableProperties, cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( selectList );
         this.joinClause = onClause;
         this.joinClauseNormalized = false;
@@ -119,6 +127,7 @@ class JoinNode extends TableOperatorNode
 		/* JoinNodes can be generated in the parser or at the end of optimization.
 		 * Those generated in the parser do not have resultColumns yet.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         if (getResultColumns() != null)
 		{
 			/* A longer term assertion */
@@ -134,6 +143,7 @@ class JoinNode extends TableOperatorNode
 			/* Build the referenced table map (left || right) */
 			if (leftResultSet.getReferencedTableMap() != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 setReferencedTableMap
                     ( (JBitSet) leftResultSet.getReferencedTableMap().clone() );
                 getReferencedTableMap().or
@@ -162,6 +172,7 @@ public CostEstimate optimizeIt(
 			throws StandardException
 	{
         if ( optimizerTracingIsOn() ) { getOptimizerTracer().traceOptimizingJoinNode(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
 		// It's possible that a call to optimize the left/right will cause
 		// a new "truly the best" plan to be stored in the underlying base
@@ -207,6 +218,7 @@ public CostEstimate optimizeIt(
 		 * implement full outer join.
 		 */
 		// Walk joinPredicates backwards due to possible deletes
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (int i = joinPredicates.size() - 1; i >= 0; i --)
 		{
             Predicate p = joinPredicates.elementAt(i);
@@ -225,6 +237,7 @@ public CostEstimate optimizeIt(
 							leftResultSet.getCostEstimate());
 
 		setCostEstimate( getCostEstimate(optimizer) );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/*
 		** We add the costs for the inner and outer table, but the number
@@ -243,6 +256,7 @@ public CostEstimate optimizeIt(
 		** join types.
 		*/
 		adjustNumberOfRowsReturned(getCostEstimate());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/*
 		** Get the cost of this result set in the context of the whole plan.
@@ -255,6 +269,7 @@ public CostEstimate optimizeIt(
 							(ConglomerateDescriptor) null,
 							outerCost,
 							optimizer,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 							getCostEstimate()
 							);
 
@@ -267,6 +282,7 @@ public CostEstimate optimizeIt(
 		 	* Also need to figure out the pushing of the joinClause.
 		 	*/
 			subqueryList.optimize(optimizer.getDataDictionary(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                                   getCostEstimate().rowCount());
 			subqueryList.modifyAccessPaths();
 		}
@@ -363,6 +379,8 @@ protected void adjustNumberOfRowsReturned(CostEstimate costEstimate)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList getAllResultColumns(TableName allTableName)
 			throws StandardException
 	{
@@ -498,6 +516,8 @@ else if (rightRCL == null)
 			}
 
 			// Return a spliced copy of the 2 lists
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ResultColumnList
                     tempList = new ResultColumnList((getContextManager()));
 			tempList.nondestructiveAppend(leftRCL);
@@ -520,6 +540,8 @@ else if (rightRCL == null)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getMatchingColumn(ColumnReference columnReference)
             throws StandardException
 	{
@@ -534,6 +556,8 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 		ResultColumn	usingRC = null;
 
         ResultColumn leftRC = logicalLeftRS.getMatchingColumn(columnReference);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		if (leftRC != null)
 		{
@@ -577,6 +601,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 			if (leftRC != null)
 			{
 				throw StandardException.newException(SQLState.LANG_AMBIGUOUS_COLUMN_NAME, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-18
 						 columnReference.getSQLColumnName());
 			}
 
@@ -600,6 +625,7 @@ ResultColumn getMatchingColumn(ColumnReference columnReference)
 		 * for the ColumnReference will be from the wrong ResultSet
 		 * at generate().)
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getResultColumns() != null)
 		{
             for (ResultColumn rc : getResultColumns())
@@ -644,6 +670,8 @@ public void bindExpressions(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumns(FromList fromListParam)
 					throws StandardException
 	{
@@ -729,6 +757,7 @@ private void buildRCL() throws StandardException
 		 * exist.  This can happen in the degenerate case of an insert
 		 * select with a join expression in a derived table within the select.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getResultColumns() != null)
 		{
 			return;
@@ -741,6 +770,7 @@ private void buildRCL() throws StandardException
 		/* We get a shallow copy of the left's ResultColumnList and its 
 		 * ResultColumns.  (Copy maintains ResultColumn.expression for now.)
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setResultColumns( leftResultSet.getResultColumns() );
 		leftRCL = getResultColumns().copyListAndObjects();
 		leftResultSet.setResultColumns(leftRCL);
@@ -757,6 +787,7 @@ private void buildRCL() throws StandardException
 		*/
 		if (this instanceof HalfOuterJoinNode && ((HalfOuterJoinNode)this).isRightOuterJoin())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			getResultColumns().setNullability(true);
 		}
 
@@ -771,6 +802,7 @@ private void buildRCL() throws StandardException
 		 */
 		tmpRCL.genVirtualColumnNodes(rightResultSet, rightRCL, false);
 		tmpRCL.adjustVirtualColumnIds(getResultColumns().size());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/*
 		** If this is a left outer join, we can get nulls on the right side,
@@ -784,18 +816,22 @@ private void buildRCL() throws StandardException
 		/* Now we append the propagated RCL from the right to the one from
 		 * the left and call it our own.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		getResultColumns().nondestructiveAppend(tmpRCL);
 	}
 
 	private void deferredBindExpressions(FromList fromListParam)
 				throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ContextManager cm = getContextManager();
         CompilerContext cc = getCompilerContext();
 
 		/* Bind the expressions in the join clause */
         subqueryList = new SubqueryList(cm);
         aggregates = new ArrayList<AggregateNode>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         
 		/* ON clause */
@@ -817,6 +853,9 @@ else if (usingClause != null)
 			 * we don't find an bogus ambiguous column reference. (Bug 377)
 			 */
             joinClause = new BooleanConstantNode(true, cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             for (ResultColumn rc : usingClause)
 			{
@@ -826,28 +865,35 @@ else if (usingClause != null)
 
 				/* Create and bind the left CR */
 				fromListParam.insertElementAt(leftResultSet, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 leftCR = new ColumnReference(
                         rc.getName(),
                         ((FromTable) leftResultSet).getTableName(),
                         cm);
 				leftCR = (ColumnReference) leftCR.bindExpression(
 									  fromListParam, subqueryList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                                       aggregates);
 				fromListParam.removeElementAt(0);
 
 				/* Create and bind the right CR */
 				fromListParam.insertElementAt(rightResultSet, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 rightCR = new ColumnReference(
                         rc.getName(),
                         ((FromTable) rightResultSet).getTableName(),
                         cm);
 				rightCR = (ColumnReference) rightCR.bindExpression(
 									  fromListParam, subqueryList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                                       aggregates);
 				fromListParam.removeElementAt(0);
 
 				/* Create and insert the new = condition */
                 equalsNode = new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                         BinaryRelationalOperatorNode.K_EQUALS,
                         leftCR,
                         rightCR,
@@ -870,6 +916,7 @@ else if (usingClause != null)
 			/* If joinClause is a parameter, (where ?), then we assume
 			 * it will be a nullable boolean.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 			if (joinClause.requiresTypeFromContext())
 			{
 				joinClause.setType(new DataTypeDescriptor(TypeId.BOOLEAN_ID, true));
@@ -889,6 +936,7 @@ else if (usingClause != null)
 			/* If the where clause is not a built-in type, then generate a bound 
 			 * conversion tree to a built-in type.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			if (joinTypeId.userType())
 			{
 				joinClause = joinClause.genSQLJavaSQLTree();
@@ -982,9 +1030,12 @@ private ResultColumnList getCommonColumnsForNaturalJoin()
         ResultColumnList rightRCL =
                 getRightResultSet().getAllResultColumns(null);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         List<String> columnNames = extractColumnNames(leftRCL);
         columnNames.retainAll(extractColumnNames(rightRCL));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ResultColumnList
                 commonColumns = new ResultColumnList((getContextManager()));
 
@@ -1007,7 +1058,9 @@ private ResultColumnList getCommonColumnsForNaturalJoin()
      */
     private static List<String> extractColumnNames(ResultColumnList rcl) {
         ArrayList<String> names = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : rcl) {
             names.add(rc.getName());
         }
@@ -1040,6 +1093,8 @@ private static List<String> extractColumnNames(ResultColumnList rcl) {
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
@@ -1074,6 +1129,8 @@ ResultSetNode preprocess(int numTables,
 				 * flattening will take place. (Bug #1206)
 				 */
                 joinClause = joinClause.preprocess(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     numTables,
                     new FromList(
                         getOptimizerFactory().doJoinOrderOptimization(),
@@ -1100,6 +1157,7 @@ void projectResultColumns() throws StandardException
     {
         leftResultSet.projectResultColumns();
         rightResultSet.projectResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         getResultColumns().pullVirtualIsReferenced();
         super.projectResultColumns();
     }
@@ -1108,6 +1166,8 @@ void projectResultColumns() throws StandardException
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void normExpressions()
 				throws StandardException
 	{
@@ -1171,6 +1231,8 @@ void normExpressions()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void pushExpressions(PredicateList outerPredicateList)
 					throws StandardException
 	{
@@ -1246,6 +1308,7 @@ protected void pushExpressionsToLeft(PredicateList outerPredicateList)
 		for (int index = outerPredicateList.size() - 1; index >= 0; index --)
 		{
             Predicate predicate = outerPredicateList.elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			if (! predicate.getPushable())
 			{
@@ -1301,6 +1364,7 @@ private void pushExpressionsToRight(PredicateList outerPredicateList)
 		for (int index = outerPredicateList.size() - 1; index >= 0; index --)
 		{
             Predicate predicate = outerPredicateList.elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             if (! predicate.getPushable())
 			{
@@ -1356,6 +1420,7 @@ private void grabJoinPredicates(PredicateList outerPredicateList)
 		for (int index = outerPredicateList.size() - 1; index >= 0; index --)
 		{
             Predicate predicate = outerPredicateList.elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			if (! predicate.getPushable())
 			{
@@ -1419,9 +1484,13 @@ private void grabJoinPredicates(PredicateList outerPredicateList)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FromList flatten(ResultColumnList rcl,
 							PredicateList outerPList,
 							SubqueryList sql,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4698
+//IC see: https://issues.apache.org/jira/browse/DERBY-3880
                             GroupByList gbl,
                             ValueNode havingClause)
 
@@ -1446,6 +1515,8 @@ FromList flatten(ResultColumnList rcl,
 		 * since there is no exposed name. (And even if there was,
 		 * we could care less about unique exposed name checking here.)
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         FromList fromList = new FromList(
                 getOptimizerFactory().doJoinOrderOptimization(),
                 getContextManager());
@@ -1454,6 +1525,7 @@ FromList flatten(ResultColumnList rcl,
 
 		/* Mark our RCL as redundant */
 		getResultColumns().setRedundant();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Remap all ColumnReferences from the outer query to this node.
 		 * (We replace those ColumnReferences with clones of the matching
@@ -1466,6 +1538,8 @@ FromList flatten(ResultColumnList rcl,
 			gbl.remapColumnReferencesToExpressions();
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4698
+//IC see: https://issues.apache.org/jira/browse/DERBY-3880
         if (havingClause != null) {
             havingClause.remapColumnReferencesToExpressions();
         }
@@ -1596,6 +1670,7 @@ void generateCore(ActivationClassBuilder acb,
 		 */
 		if (subquerys != null && subquerys.size() > 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			subquerys.setPointOfAttachment(getResultSetNumber());
 		}
 
@@ -1644,6 +1719,7 @@ private int getJoinArguments(ActivationClassBuilder acb,
 		int numArgs = getNumJoinArguments();
 
 		leftResultSet.generate(acb, mb); // arg 1
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		mb.push(leftResultSet.getResultColumns().size()); // arg 2
 		rightResultSet.generate(acb, mb); // arg 3
 		mb.push(rightResultSet.getResultColumns().size()); // arg 4
@@ -1701,6 +1777,7 @@ private int getJoinArguments(ActivationClassBuilder acb,
 		}
 
 		mb.push(getResultSetNumber()); // arg 6
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		addOuterJoinArguments(acb, mb);
 
@@ -1709,6 +1786,7 @@ private int getJoinArguments(ActivationClassBuilder acb,
 
 		// estimated row count
 		mb.push(getCostEstimate().rowCount());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// estimated cost
 		mb.push(getCostEstimate().getEstimatedCost());
@@ -1716,6 +1794,7 @@ private int getJoinArguments(ActivationClassBuilder acb,
 		//User may have supplied optimizer overrides in the sql
 		//Pass them onto execute phase so it can be shown in 
 		//run time statistics.
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		if (joinOrderStrategyProperties != null)
 			mb.push(PropertyUtil.sortProperties(joinOrderStrategyProperties));
 		else
@@ -1735,10 +1814,13 @@ private int getJoinArguments(ActivationClassBuilder acb,
 	 *  though, is that for the inner table only.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getFinalCostEstimate()
 		throws StandardException
 	{
 		// If we already found it, just return it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getCandidateFinalCostEstimate() != null)
         {
 			return getCandidateFinalCostEstimate();
@@ -1769,6 +1851,7 @@ void oneRowRightSide(ActivationClassBuilder acb, MethodBuilder mb)
 	 */
 	protected int getNumJoinArguments()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 		return 11;
 	}
 
@@ -1831,6 +1914,8 @@ protected PredicateList getLeftPredicateList() throws StandardException
 	{
 		if (leftPredicateList == null)
             leftPredicateList = new PredicateList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		return leftPredicateList;
 	}
@@ -1839,6 +1924,8 @@ protected PredicateList getRightPredicateList() throws StandardException
 	{
 		if (rightPredicateList == null)
             rightPredicateList = new PredicateList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		return rightPredicateList;
 	}
@@ -1914,6 +2001,8 @@ boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List<FromBas
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -1951,6 +2040,7 @@ void setSubqueryList(SubqueryList subqueryList)
 		this.subqueryList = subqueryList;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     void setAggregates(List<AggregateNode> aggregates)
 	{
         this.aggregates = aggregates;
@@ -1994,11 +2084,13 @@ ResultSetNode getLogicalRightResultSet()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getResultColumns() != null)
 		{
 			setResultColumns( (ResultColumnList)getResultColumns().accept(v) );
@@ -2014,6 +2106,7 @@ void acceptChildren(Visitor v)
 			usingClause = (ResultColumnList)usingClause.accept(v);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4416
 		if (joinPredicates != null)
 		{
 			joinPredicates = (PredicateList) joinPredicates.accept(v);
@@ -2026,6 +2119,8 @@ void acceptChildren(Visitor v)
     // The top most LOJ may be a join betw T and X and thus we can reorder the
 	// LOJs.  However, as of 10/2002, we don't reorder LOJ mixed with join.
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     JBitSet LOJgetReferencedTables(int numTables)
 				throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java
index a27905b074..cec429846a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java
@@ -45,6 +45,8 @@ public boolean convertible(TypeId otherType,
             boolean forDataTypeFunction)
     {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return  (otherType.isBlobTypeId());
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java
index 498b7ad90d..5c8377ff14 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.LengthOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -45,6 +46,7 @@ public final class LengthOperatorNode extends UnaryOperatorNode
             throws StandardException {
         super(operator, cm);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         String op = "char_length";
         String methodNam = "charLength";
         parameterType = Types.VARCHAR;
@@ -67,6 +69,7 @@ public final class LengthOperatorNode extends UnaryOperatorNode
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -87,6 +90,7 @@ ValueNode bindExpression(
 				case Types.VARBINARY:
 				case Types.LONGVARBINARY:
 				case Types.LONGVARCHAR:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
                 case Types.BLOB:
                 case Types.CLOB:
 					break;
@@ -126,6 +130,7 @@ void bindParameter()
 		** is required) and hence we will not worry about the collation setting
 		*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		operand.setType(DataTypeDescriptor.getBuiltInDataTypeDescriptor(parameterType, true, 
 												parameterWidth));
 	}
@@ -135,6 +140,8 @@ void bindParameter()
 	 * in UnaryOperatorNode for code generation purposes.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getReceiverInterfaceName() {
 	    return ClassName.ConcatableDataValue;
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
index dfa72524e6..ba06dd3bae 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
     This node represents a like comparison operator (no escape)
 
     If the like pattern is a constant or a parameter then if possible
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     the like is modified to include a &gt;= and &lt; operator. In some cases
     the like can be eliminated.  By adding =, &gt;= or &lt; operators it may
     allow indexes to be used to greatly narrow the search range of the
@@ -49,6 +50,7 @@ This node represents a like comparison operator (no escape)
     card e.g. Derby%
 
     CHAR(n), VARCHAR(n) where n &lt; 255
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         &gt;=   prefix padded with '\u0000' to length n -- e.g. Derby\u0000\u0000
         &lt;=   prefix appended with '\uffff' -- e.g. Derby\uffff
@@ -83,6 +85,7 @@ This node represents a like comparison operator (no escape)
     Note that the Unicode value '\uffff' is defined as not a character value
     and can be used by a program for any purpose. We use it to set an upper
     bound on a character range with a less than predicate. We only need a single
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
     '\uffff' appended because the string 'Derby\uffff\uffff' is not a valid
     String because '\uffff' is not a valid character.
 
@@ -118,6 +121,7 @@ public final class LikeEscapeOperatorNode extends TernaryOperatorNode
         super(receiver,
               leftOperand,
               rightOperand,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
               TernaryOperatorNode.K_LIKE,
               cm);
     }
@@ -134,6 +138,7 @@ public final class LikeEscapeOperatorNode extends TernaryOperatorNode
      */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
         throws StandardException
     {
@@ -152,6 +157,7 @@ ValueNode bindExpression(
 
         // escape must be a string or a parameter
         if ((rightOperand != null) && 
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
             !(rightOperand.requiresTypeFromContext()) && 
             !(rightOperand.getTypeId().isStringTypeId()))
         {
@@ -168,6 +174,7 @@ ValueNode bindExpression(
         *  a parameter on the right copies its length from
         *  the left, since it won't match if it is any longer than it.
         */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
         if (receiver.requiresTypeFromContext())
         {
             receiver.setType(
@@ -201,6 +208,7 @@ ValueNode bindExpression(
             */
             if (receiver.getTypeId().isStringTypeId())
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
                 leftOperand.setType(receiver.getTypeServices());
             }
             else
@@ -222,6 +230,7 @@ ValueNode bindExpression(
          *  both will be max length.  nullability is set to true.
          */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
         if (rightOperand != null && rightOperand.requiresTypeFromContext())
         {
             /*
@@ -230,6 +239,7 @@ ValueNode bindExpression(
              */
             if (receiver.getTypeId().isStringTypeId())
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
                 rightOperand.setType(receiver.getTypeServices());
             }
             else
@@ -307,6 +317,7 @@ else if (rightOperand == null)
 
         // The left and the pattern of the LIKE must be same collation type
         // and derivation.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2793
         if (!receiver.getTypeServices().compareCollationInfo(
         		leftOperand.getTypeServices()))
         {
@@ -378,7 +389,10 @@ else if (pattern.indexOf('_') == -1 &&
                     //     /   \
                     //  column  'Derby'
                     BinaryComparisonOperatorNode equals = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                             BinaryRelationalOperatorNode.K_EQUALS,
                             leftClone, 
                             new CharConstantNode(newPattern,
@@ -392,6 +406,7 @@ else if (pattern.indexOf('_') == -1 &&
                     equals = (BinaryComparisonOperatorNode) 
                         equals.bindExpression(
                             fromList, subqueryList, aggregates);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
                     // create new and node and hook in "equals" the new "=' node
                     //
@@ -401,6 +416,8 @@ else if (pattern.indexOf('_') == -1 &&
                     //           / \
                     //       column 'Derby'
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     AndNode newAnd =
                             new AndNode(this, equals, getContextManager());
 
@@ -494,6 +511,7 @@ public void bindComparisonOperator()
     * @exception StandardException  Thrown on error
     */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     ValueNode preprocess(
     int             numTables,
     FromList        outerFromList,
@@ -531,6 +549,7 @@ ValueNode preprocess(
          * then can't optimize, eg. column LIKE column
          */
         if (!(leftOperand instanceof CharConstantNode) && 
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
                 !(leftOperand.requiresTypeFromContext()))
         {
             return this;
@@ -602,6 +621,8 @@ ValueNode preprocess(
             greaterEqualString = 
                 Like.greaterEqualString(pattern, escape, maxWidth);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
             lessThanString          = 
                 Like.lessThanString(pattern, escape, maxWidth);
             eliminateLikeComparison = 
@@ -632,13 +653,19 @@ ValueNode preprocess(
 
         AndNode   newAnd   = null;
         ValueNode trueNode = new BooleanConstantNode(true, getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
         /* Create the AND <, if lessThanString is non-null or 
          * leftOperand is a parameter.
          */
         if (lessThanString != null || 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
             leftOperand.requiresTypeFromContext())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ValueNode likeLTopt;
             if (leftOperand.requiresTypeFromContext())
             {
@@ -655,11 +682,14 @@ ValueNode preprocess(
             {
                 // pattern string is a constant
                 likeLTopt = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     new CharConstantNode(lessThanString, getContextManager());
             }
 
             BinaryComparisonOperatorNode lessThan = 
                 new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     BinaryRelationalOperatorNode.K_LESS_THAN,
                     receiver.getClone(), 
                     likeLTopt,
@@ -676,6 +706,8 @@ ValueNode preprocess(
 
             /* Create the AND */
             newAnd = new AndNode(lessThan, trueNode, getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
             newAnd.postBindFixup();
         }
@@ -685,6 +717,7 @@ ValueNode preprocess(
          */
 
         ValueNode likeGEopt;
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
         if (leftOperand.requiresTypeFromContext()) 
         {
             // the pattern is a ?, eg. c1 LIKE ?
@@ -704,6 +737,8 @@ ValueNode preprocess(
             // the pattern is a constant, eg. c1 LIKE 'Derby'
 
             likeGEopt = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 new CharConstantNode(greaterEqualString, getContextManager());
         }
 
@@ -712,7 +747,10 @@ ValueNode preprocess(
         //      /   \
         //  reciever pattern
         BinaryComparisonOperatorNode greaterEqual = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 BinaryRelationalOperatorNode.K_GREATER_EQUALS,
                 receiver.getClone(), 
                 likeGEopt,
@@ -731,6 +769,8 @@ ValueNode preprocess(
         /* Create the AND */
         if (newAnd == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             newAnd = new AndNode(greaterEqual, trueNode, getContextManager());
         }
         else
@@ -744,6 +784,8 @@ ValueNode preprocess(
          */
         if (!eliminateLikeComparison)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             newAnd = new AndNode(this, newAnd, getContextManager());
             newAnd.postBindFixup();
         }
@@ -839,6 +881,8 @@ private ValueNode setupOptimizeStringFromParameter(
             methodName += "WithEsc";
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         StaticMethodCallNode methodCall = new StaticMethodCallNode(
                 methodName,
                 "org.apache.derby.iapi.types.Like",
@@ -847,6 +891,8 @@ private ValueNode setupOptimizeStringFromParameter(
         // using a method call directly, thus need internal sql capability
         methodCall.internalCall = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         NumericConstantNode maxWidthNode = new NumericConstantNode(
             TypeId.getBuiltInTypeId(Types.INTEGER),
             Integer.valueOf(maxWidth),
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LockTableNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LockTableNode.java
index d3d82edc17..60e040edd7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LockTableNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/LockTableNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.LockTableNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -39,6 +40,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class LockTableNode extends MiscellaneousStatementNode
 {
 	private TableName	tableName;
@@ -82,6 +85,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "LOCK TABLE";
@@ -116,6 +121,7 @@ public void bindStatement() throws StandardException
 		if (lockTableDescriptor == null)
 		{
 			// Check if the reference is for a synonym.
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 			TableName synonymTab = resolveTableToSynonym(tableName);
 			if (synonymTab == null)
 				throw StandardException.newException(SQLState.LANG_TABLE_NOT_FOUND, tableName);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MatchingClauseNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MatchingClauseNode.java
index 16cf686228..37eae9da2e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MatchingClauseNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MatchingClauseNode.java
@@ -261,6 +261,7 @@ void    bindRefinement( MergeNode mergeNode, FromList fullFromList ) throws Stan
             {
                 mergeNode.getColumnsInExpression( drivingColumnMap, rc.getExpression(), ColumnReference.MERGE_UNKNOWN );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 ColumnReference leftCR = new ColumnReference( rc.getName(), targetTableName, getContextManager() );
                 mergeNode.addColumn( drivingColumnMap, leftCR, ColumnReference.MERGE_TARGET );
             }
@@ -327,6 +328,7 @@ else if ( isDeleteClause() )
         //
         ResultColumnList    beforeColumns = new ResultColumnList( getContextManager() );
         ResultColumnList    afterColumns = new ResultColumnList( getContextManager() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         ResultColumnList    fullUpdateRow = getBoundSelectUnderUpdate().getResultColumns();
         
         // the full row is the before image, the after image, and a row location
@@ -558,6 +560,7 @@ else if ( candidate instanceof SingleChildResultSetNode )
                     origRC.setExpression( cr );
 
                     // remove the column descriptor in order to turn off hasGenerationClause()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                     origRC.setColumnDescriptor( null, null );
                 }
                 
@@ -758,6 +761,7 @@ private HashSet<String> getChangedColumnNames()
     private void    buildThenColumnsForDelete()
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         ResultColumnList    dmlSignature = _dml.resultSet.getResultColumns();
         for ( int i = 0; i < dmlSignature.size(); i++ )
         {
@@ -838,6 +842,7 @@ private void    buildThenColumnsForDelete()
 
         _dml.bindStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         buildThenColumnsForInsert( fullFromList, targetTable, _dml.resultSet.getResultColumns(), _insertColumns, _insertValues );
     }
 
@@ -863,6 +868,7 @@ private void    buildThenColumnsForDelete()
         for ( int i = 0; i <_insertValues.size(); i++ )
         {
             ResultColumn    rc = _insertValues.elementAt( i );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             String          columnName = _insertColumns.elementAt( i ).getName();
             ValueNode       expr = rc.getExpression();
             ColumnDescriptor    cd = td.getColumnDescriptor( columnName );
@@ -1390,6 +1396,7 @@ void    generateResultSetField( ActivationClassBuilder acb, MethodBuilder mb )
         {
             ResultColumn    lastLeftJoinRC = leftJoinResult.elementAt( leftJoinResult.size() - 1 );
             ValueNode       value = lastLeftJoinRC.getExpression();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             String              columnName = lastLeftJoinRC.getName();
             ColumnReference rowLocationCR = new ColumnReference
                 ( columnName, hojn.getTableName(), getContextManager() );
@@ -1417,6 +1424,7 @@ void    generateResultSetField( ActivationClassBuilder acb, MethodBuilder mb )
         throws StandardException
     {
         ResultColumnList    leftJoinResult = generatedScan.getResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         for ( ColumnReference cr : getColumnReferences( node ) )
         {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
index a9deef21d3..ca53d22381 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.MaterializeResultSetNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -35,6 +36,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class MaterializeResultSetNode extends SingleChildResultSetNode
 {
 	/**
@@ -51,6 +54,7 @@ class MaterializeResultSetNode extends SingleChildResultSetNode
                              Properties tableProperties,
                              ContextManager cm) {
         super(childResult, tableProperties, cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( rcl );
 	}
 
@@ -61,6 +65,8 @@ class MaterializeResultSetNode extends SingleChildResultSetNode
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -80,6 +86,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 	{
 		if (SanityManager.DEBUG)
             SanityManager.ASSERT(getResultColumns() != null, "Tree structure bad");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Get the next ResultSet #, so that we can number this ResultSetNode, its
 		 * ResultColumnList and ResultSet.
@@ -88,6 +95,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		// Get the cost estimate from the child if we don't have one yet
 		setCostEstimate( childResult.getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// build up the tree.
 
@@ -95,11 +103,13 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		acb.pushGetResultSetFactoryExpression(mb);
 
 		childResult.generate(acb, mb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		mb.push(getResultSetNumber());
 		mb.push(getCostEstimate().rowCount());
 		mb.push(getCostEstimate().getEstimatedCost());
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getMaterializedResultSet",
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 						ClassName.NoPutResultSet, 4);
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java
index f9d99de1ab..9dfcd47fb4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.MaterializeSubqueryNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java
index 96e167a0c9..6cce99061a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java
@@ -32,6 +32,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Defintion for the MAX()/MIN() aggregates.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class MaxMinAggregateDefinition
 		implements AggregateDefinition 
 {
@@ -61,6 +63,7 @@ public final DataTypeDescriptor	getAggregator(DataTypeDescriptor inputType,
 	{
 		LanguageConnectionContext lcc = (LanguageConnectionContext)
 			QueryTreeNode.getContext(LanguageConnectionContext.CONTEXT_ID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			/*
 			** MIN and MAX may return null
@@ -86,6 +89,8 @@ public final DataTypeDescriptor	getAggregator(DataTypeDescriptor inputType,
 	/**
 	 * This is set by the parser.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final void setMaxOrMin(boolean isMax)
 	{
 		this.isMax = isMax;
@@ -96,6 +101,8 @@ final void setMaxOrMin(boolean isMax)
 	 *
 	 * @return boolean true/false
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final boolean isMax()
 	{
 		return(isMax);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MergeNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MergeNode.java
index 41f55b558e..bae1c744f1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MergeNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MergeNode.java
@@ -346,6 +346,7 @@ public void bindStatement() throws StandardException
             !(_sourceTable instanceof FromBaseTable)
             )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
             throw StandardException.newException( SQLState.LANG_SOURCE_NOT_BASE_OR_VTI );
         }
 
@@ -388,8 +389,10 @@ public void bindStatement() throws StandardException
 
             // window function not allowed
             SelectNode.checkNoWindowFunctions(mcn, "matching clause");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6689
 
             // aggregates not allowed
+//IC see: https://issues.apache.org/jira/browse/DERBY-6693
             checkNoAggregates(mcn);
         }
         
@@ -450,6 +453,7 @@ public boolean referencesSessionSchema() throws StandardException {
      */
     private void    forbidDerivedColumnLists() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         if ( (_sourceTable.getResultColumns() != null) || (_targetTable.getResultColumns() != null) )
         {
             throw StandardException.newException( SQLState.LANG_NO_DCL_IN_MERGE );
@@ -562,6 +566,7 @@ private void    bindLeftJoin( DataDictionary dd )   throws StandardException
             _leftJoinFromList = _hojn.makeFromList( true, true );
             _leftJoinFromList.bindTables( dd, new FromList( getOptimizerFactory().doJoinOrderOptimization(), getContextManager() ) );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
             if ( !sourceIsBase_or_VTI() )
             {
                 throw StandardException.newException( SQLState.LANG_SOURCE_NOT_BASE_OR_VTI );
@@ -691,6 +696,7 @@ private FromTable   cloneFromTable( FromTable fromTable ) throws StandardExcepti
                 (
                  source.methodCall,
                  source.correlationName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                  source.getResultColumns(),
                  null,
                  source.exposedName,
@@ -711,6 +717,7 @@ else if ( fromTable instanceof FromBaseTable )
         }
         else
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
             throw StandardException.newException( SQLState.LANG_SOURCE_NOT_BASE_OR_VTI );
         }
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MethodCallNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
index a65b70a601..1571a09f10 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.MethodCallNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -103,6 +104,8 @@ abstract class MethodCallNode extends JavaValueNode
 	*/
 	String[] methodParameterTypes;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     MethodCallNode(String methodName, ContextManager cm) {
         super(cm);
         this.methodName = methodName;
@@ -119,6 +122,7 @@ String getMethodName()
      * StaticMethodCallNodes.
      * </p>
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
     TableName getFullName()
 	{
 		return  null;
@@ -156,6 +160,8 @@ public RoutineAliasInfo getRoutineInfo()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void addParms(List<ValueNode> parameterList) throws StandardException
 	{
 		methodParms = new JavaValueNode[parameterList.size()];
@@ -181,6 +187,7 @@ void addParms(List<ValueNode> parameterList) throws StandardException
 	  *
 	  *	@return	the Classes of our parameters
 	  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6621
     Class<?>[]  getMethodParameterClasses()
 	{ 
 		ClassInspector ci = getClassFactory().getClassInspector();
@@ -219,6 +226,7 @@ Class<?>[]  getMethodParameterClasses()
 	void getCorrelationTables(JBitSet correlationMap)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         CollectNodesVisitor<ColumnReference> getCRs =
             new CollectNodesVisitor<ColumnReference>(ColumnReference.class);
 		accept(getCRs);
@@ -238,6 +246,8 @@ void getCorrelationTables(JBitSet correlationMap)
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -292,6 +302,7 @@ public String toString()
 	 * @exception StandardException		Thrown on error
 	 */
 	final void bindParameters(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -313,10 +324,12 @@ final void bindParameters(
 					methodParms[parm] =
 						methodParms[parm].bindExpression(
                             fromList, subqueryList, aggregates);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
 					if (routineInfo == null)
 						signature[ parm ] = methodParms[ parm ].getJSQLType();
                     
+//IC see: https://issues.apache.org/jira/browse/DERBY-6691
                     SelectNode.checkNoWindowFunctions(methodParms[parm], "method argument");
 				}
 			}
@@ -352,6 +365,8 @@ void throwNoMethodFound(String receiverTypeName,
 		throws StandardException
 	{
 		/* Put the parameter type names into a single string */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         StringBuilder   parmTypes = new StringBuilder();
         int     paramCount = signature.length;
 		for (int i = 0; i < paramCount; i++)
@@ -587,6 +602,7 @@ public	int generateParameters(ExpressionClassBuilder acb,
             // the argument into a wrapper object. So, for instance, this converts a primitive "int"
             // into a "java.lang.Integer".
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6511
             if (
                 ClassInspector.primitiveType( argumentType ) &&
                 parameterType.equals( JSQLType.getWrapperClassName( JSQLType.getPrimitiveID( argumentType ) ) )
@@ -659,6 +675,7 @@ else if (ClassInspector.primitiveType(parameterType))
         // must strip another array level off of out and in/out parameters
         if ( routineInfo != null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             if ( routineInfo.getParameterModes()[ firstVarargIdx ] != (ParameterMetaData.parameterModeIn) )
             {
                 varargType = stripOneArrayLevel( varargType );
@@ -755,6 +772,8 @@ void generateOneParameter(ExpressionClassBuilder acb,
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void    setNullParameterInfo(String[] parmTypeNames)
 			throws StandardException
 	{
@@ -766,6 +785,7 @@ void    setNullParameterInfo(String[] parmTypeNames)
 				/* Set the type information in the null constant node */
 				DataTypeDescriptor dts = DataTypeDescriptor.getSQLDataTypeDescriptor(parmTypeNames[i]);
 				((SQLToJavaValueNode)methodParms[i]).value.setType(dts);
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 
 				/* Set the correct java type name */
 				methodParms[i].setJavaTypeName(parmTypeNames[i]);
@@ -926,6 +946,7 @@ else if ( returnType.getTypeId().userType() )
 				else
 				{
 			 		requiredType = returnTypeId.getCorrespondingJavaTypeName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3119
 
 					if (!requiredType.equals(typeName)) {
 						switch (returnType.getJDBCTypeId()) {
@@ -953,6 +974,7 @@ else if ( returnType.getTypeId().userType() )
                 // allow subtypes of ResultSet too
                 try {
                     Class<?> actualType = classInspector.getClass( typeName );
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
                     foundCorrectType = ResultSet.class.isAssignableFrom( actualType );
                 }
@@ -989,6 +1011,7 @@ else if ( returnType.getTypeId().userType() )
 					int parameterMode = routineInfo.getParameterModes()[ getRoutineArgIdx( i ) ];
 
 					switch (parameterMode) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                     case (ParameterMetaData.parameterModeIn):
 						break;
                     case (ParameterMetaData.parameterModeInOut):
@@ -1260,6 +1283,7 @@ protected boolean[] getIsParam()
 			if (methodParms[index] instanceof SQLToJavaValueNode)
 			{
 				SQLToJavaValueNode stjvn = (SQLToJavaValueNode) methodParms[index];
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 				if (stjvn.value.requiresTypeFromContext())
 				{
 					isParam[index] = true;
@@ -1290,6 +1314,8 @@ static  String	getObjectTypeName( JSQLType jsqlType, TypeCompilerFactory tcf )
 						// as it (incorrectly but historically always has) maps a DECIMAL to a double. 
 
 						switch (ctid.getJDBCTypeId()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4657
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
 						case java.sql.Types.BOOLEAN:
 						case java.sql.Types.SMALLINT:
 						case java.sql.Types.INTEGER:
@@ -1308,6 +1334,7 @@ static  String	getObjectTypeName( JSQLType jsqlType, TypeCompilerFactory tcf )
 		        case JSQLType.JAVA_CLASS: return jsqlType.getJavaClassName();
 
 		        case JSQLType.JAVA_PRIMITIVE: return JSQLType.getPrimitiveName( jsqlType.getPrimitiveKind() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4293
 
 		        default:
 
@@ -1326,6 +1353,8 @@ String[]	getPrimitiveSignature( boolean castToPrimitiveAsNecessary )
 		int					count = signature.length;
 		String[] 			primParmTypeNames = new String[ count ];
         JSQLType            jsqlTyp;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		for (int i = 0; i < count; i++)
 		{
@@ -1348,6 +1377,8 @@ String[]	getPrimitiveSignature( boolean castToPrimitiveAsNecessary )
 
 
                             TypeId  ctid = mapToTypeID( jsqlTyp );
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 							if ((ctid.isNumericTypeId() && !ctid.isDecimalTypeId()) || ctid.isBooleanTypeId())
 							{
@@ -1362,6 +1393,8 @@ String[]	getPrimitiveSignature( boolean castToPrimitiveAsNecessary )
 
 		            case JSQLType.JAVA_CLASS:
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         primParmTypeNames[i] = jsqlTyp.getJavaClassName();
 						break;
 
@@ -1445,6 +1478,7 @@ private int getVariantTypeOfParams() throws StandardException
     @Override
     DataTypeDescriptor getDataType() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
         if ( routineInfo != null )
         {
             TypeDescriptor td = routineInfo.getReturnType();
@@ -1466,6 +1500,8 @@ DataTypeDescriptor getDataType() throws StandardException
 	 * 
 	 * @return	The method parameters
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     JavaValueNode[] getMethodParms()
 	{
 		return methodParms;
@@ -1479,6 +1515,7 @@ JavaValueNode[] getMethodParms()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
index ebd7bfc653..412990bd61 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.MiscellaneousStatementNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -37,6 +38,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 abstract class MiscellaneousStatementNode extends StatementNode
 {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     MiscellaneousStatementNode(ContextManager cm) {
         super(cm);
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
index 701b31c9a8..77c3525764 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ModifyColumnNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -49,6 +50,7 @@ class ModifyColumnNode extends ColumnDefinitionNode
 	UUID	oldDefaultUUID;
 
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_MODIFY_COLUMN_TYPE = 0;
     final static int K_MODIFY_COLUMN_DEFAULT = 1;
     final static int K_MODIFY_COLUMN_CONSTRAINT = 2;
@@ -70,6 +72,11 @@ class ModifyColumnNode extends ColumnDefinitionNode
             DataTypeDescriptor dataTypeServices,
             long[] autoIncrementInfo,
             ContextManager cm) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
     		super(name, defaultNode, dataTypeServices, autoIncrementInfo, cm);
         	this.kind = kind;
 	}
@@ -108,9 +115,12 @@ int getColumnPosition()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void checkUserType(TableDescriptor td)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind != K_MODIFY_COLUMN_TYPE) {
             return; // nothing to do if user not changing length
         }
@@ -134,7 +144,10 @@ void checkUserType(TableDescriptor td)
 		
 		// can only alter the length of varchar, bitvarying columns
 		String typeName = getType().getTypeName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
 		if (!(typeName.equals(TypeId.VARCHAR_NAME)) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-4256
 			!(typeName.equals(TypeId.VARBIT_NAME))&&
 			!(typeName.equals(TypeId.BLOB_NAME))&&
 			!(typeName.equals(TypeId.CLOB_NAME)))
@@ -170,14 +183,18 @@ void checkUserType(TableDescriptor td)
 	 * @exception StandardException		Thrown on Error.
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void checkExistingConstraints(TableDescriptor td)
 	             throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if ((kind != K_MODIFY_COLUMN_TYPE) &&
             (kind != K_MODIFY_COLUMN_CONSTRAINT) &&
             (kind != K_MODIFY_COLUMN_CONSTRAINT_NOT_NULL))
 			return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3456
 		DataDictionary           dd          = getDataDictionary();
 		ConstraintDescriptorList cdl         = dd.getConstraintDescriptors(td);
 		int                      intArray[]  = new int[1];
@@ -201,6 +218,7 @@ void checkExistingConstraints(TableDescriptor td)
 			// and fkey columns.
 			if ((constraintType == DataDictionary.FOREIGNKEY_CONSTRAINT) 
 				&&
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 (kind == K_MODIFY_COLUMN_TYPE))
 			{
 				throw StandardException.newException(
@@ -214,6 +232,7 @@ void checkExistingConstraints(TableDescriptor td)
 				{
                     // If a column is part of unique constraint it can't be
                     // made nullable in soft upgrade mode from a pre-10.4 db.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     if (kind == K_MODIFY_COLUMN_CONSTRAINT &&
 						(existingConstraint.getConstraintType() == 
 							DataDictionary.UNIQUE_CONSTRAINT)) 
@@ -226,10 +245,12 @@ void checkExistingConstraints(TableDescriptor td)
 
                 // A column that is part of a primary key
                 // is being made nullable; can't be done.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 if ((kind == K_MODIFY_COLUMN_CONSTRAINT) &&
 					((existingConstraint.getConstraintType() == 
 					 DataDictionary.PRIMARYKEY_CONSTRAINT)))
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3523
 					String errorState = 
 						(getLanguageConnectionContext().getDataDictionary()
 								.checkVersion(DataDictionary.DD_VERSION_DERBY_10_4, 
@@ -245,6 +266,7 @@ void checkExistingConstraints(TableDescriptor td)
 				if (refcdl.size() > 0)
 				{
 					throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3456
 						 SQLState.LANG_MODIFY_COLUMN_REFERENCED, 
                          name, refcdl.elementAt(0).getConstraintName());
 				}
@@ -265,6 +287,8 @@ void checkExistingConstraints(TableDescriptor td)
 	 * @param td Table Descriptor that holds the column which is being altered
 	 * @throws StandardException
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void useExistingCollation(TableDescriptor td)
     throws StandardException
     {
@@ -293,6 +317,7 @@ void useExistingCollation(TableDescriptor td)
     @Override
 	int getAction()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         switch (kind) {
             case K_MODIFY_COLUMN_DEFAULT:
                 if (autoinc_create_or_modify_Start_Increment ==
@@ -303,6 +328,11 @@ int getAction()
                         ColumnDefinitionNode.MODIFY_AUTOINCREMENT_INC_VALUE) {
                     return ColumnInfo.MODIFY_COLUMN_DEFAULT_INCREMENT;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
                 } else if (autoinc_create_or_modify_Start_Increment ==
                         ColumnDefinitionNode.MODIFY_AUTOINCREMENT_CYCLE_VALUE) {
                     return ColumnInfo.MODIFY_COLUMN_DEFAULT_CYCLE;
@@ -366,6 +396,7 @@ void bindAndValidateDefault(DataDictionary dd, TableDescriptor td)
 		columnPosition = cd.getPosition();
 
 		// No other work to do if no user specified default
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind != K_MODIFY_COLUMN_DEFAULT) {
 			return;
 		}
@@ -382,12 +413,18 @@ void bindAndValidateDefault(DataDictionary dd, TableDescriptor td)
         { defaultInfo = (DefaultInfoImpl)cd.getDefaultInfo(); }
         else
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6545
             if ( cd.hasGenerationClause() || cd.isAutoincrement() )
             {
 				throw StandardException.newException( SQLState.LANG_GEN_COL_DEFAULT, cd.getColumnName() );
             }
         }
 		if (autoinc_create_or_modify_Start_Increment ==
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 				ColumnDefinitionNode.MODIFY_AUTOINCREMENT_RESTART_VALUE){
 			autoincrementIncrement = cd.getAutoincInc();
 			autoincrementCycle = cd.getAutoincCycle();
@@ -431,6 +468,8 @@ private ColumnDescriptor getLocalColumnDescriptor(String name, TableDescriptor t
 	 * when making a column nullable)
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void validateAutoincrement(DataDictionary dd,
                                TableDescriptor td,
                                int tableType) throws StandardException
@@ -460,6 +499,7 @@ void validateAutoincrement(DataDictionary dd,
 		}
 
 		// a column that has an autoincrement default can't be made nullable
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind == K_MODIFY_COLUMN_CONSTRAINT)
 		{
 			cd = getLocalColumnDescriptor(name, td);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java
index 2e35945efa..f0b1b79eea 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.NOPStatementNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -32,6 +33,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * executed in the parser, so the statements don't do anything at execution
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class NOPStatementNode extends StatementNode
 {
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
index 531c9dea85..a0f5e917fb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
@@ -143,6 +143,7 @@ public void estimateCost(Optimizable innerTable,
 							 CostEstimate costEstimate) {
 		costEstimate.multiply(outerCost.rowCount(), costEstimate);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         if ( innerTable.optimizerTracingIsOn() )
         { innerTable.getOptimizerTracer().traceCostOfNScans( innerTable.getTableNumber(), outerCost.rowCount(), costEstimate ); }
 	}
@@ -151,6 +152,7 @@ public void estimateCost(Optimizable innerTable,
 	public int maxCapacity( int userSpecifiedCapacity,
                             int maxMemoryPerTable,
                             double perRowUsage) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
 		return Integer.MAX_VALUE;
 	}
 
@@ -173,6 +175,7 @@ public String resultSetMethodName(
             boolean multiprobe,
             boolean validatingCheckConstraint) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (validatingCheckConstraint) {
             return "getValidateCheckConstraintResultSet";
         } else if (bulkFetch) {
@@ -258,6 +261,7 @@ else if (bulkFetch > 1)
 										storeRestrictionList,
 										acb,
 										resultRowTemplate);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
 		if (genInListVals)
 			((PredicateList)storeRestrictionList).generateInListValues(acb, mb);
@@ -272,6 +276,8 @@ else if (bulkFetch > 1)
 			{
 				for (int i = storeRestrictionList.size() - 1; i >= 0; i--)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     Predicate pred =
                             (Predicate)storeRestrictionList.getOptPredicate(i);
 					if (pred.isInListProbePredicate())
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
index 360df7cfec..6fa8f31794 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.NewInvocationNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -60,6 +61,8 @@ class NewInvocationNode extends MethodCallNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     NewInvocationNode(
             String javaClassName,
             List<ValueNode> params,
@@ -107,6 +110,8 @@ class NewInvocationNode extends MethodCallNode
 	 *  is a delimited identifier.
      * @param cm context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     NewInvocationNode(
                     TableName vtiTableFuncName,
                     TableDescriptor tableDescriptor,
@@ -129,6 +134,8 @@ class NewInvocationNode extends MethodCallNode
 				"be null, but neither or both of them were null.");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         TableName vtiName = vtiTableFuncName;
         TableDescriptor td = tableDescriptor;
 		boolean isTableFunctionVTI = (vtiTableFuncName != null);
@@ -209,7 +216,9 @@ void setSingleInstantiation()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
     JavaValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -277,6 +286,7 @@ JavaValueNode bindExpression(
 
 		for (int i = 0; i < methodParameterTypes.length; i++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5055
 			if (ClassInspector.primitiveType(methodParameterTypes[i]))
 				methodParms[i].castToPrimitive(true);
 		}
@@ -428,6 +438,7 @@ primParmTypeNames, isParam, staticMethod, false, hasVarargs()
 			 */
 			if (SanityManager.DEBUG)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unexpected exception", e);
 			}
 			return null;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
index 07328bd4fb..3c3da6dbf3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
@@ -66,6 +66,8 @@ class NextSequenceNode extends ValueNode {
      * @throws StandardException Thrown on error
      */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode bindExpression(FromList fromList,
                              SubqueryList subqueryList,
                              List<AggregateNode> aggregates,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
index 276654192b..4311cd1814 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.NonStaticMethodCallNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -57,6 +58,8 @@ class NonStaticMethodCallNode extends MethodCallNode
      * @param cm            The context manager
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     NonStaticMethodCallNode(String methodName,
                             ValueNode receiver,
                             ContextManager cm)
@@ -76,6 +79,8 @@ class NonStaticMethodCallNode extends MethodCallNode
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             this.receiver =
                 new SQLToJavaValueNode(receiver, getContextManager());
 //            System.out.println("NonStaticMethodCallNode.init() receiver = "+receiver);
@@ -99,7 +104,9 @@ class NonStaticMethodCallNode extends MethodCallNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
     JavaValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -123,6 +130,7 @@ JavaValueNode bindExpression(
 			//	then we have a type for it. Binding can continue.
 			//
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 			if (SQLValue.requiresTypeFromContext())
 			{
 				if ( SQLValue.getTypeServices() == null )
@@ -131,6 +139,7 @@ JavaValueNode bindExpression(
 		}
 
         bindParameters(fromList, subqueryList, aggregates);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
 		/* Now we don't allow an alias static method call here (that has to
 		 * use :: sign for any static call).  If it gets here, it can't be
@@ -271,6 +280,8 @@ JavaValueNode remapColumnReferencesToExpressions()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -371,6 +382,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		** Refer to the field holding the receiver, if there is any.
 		*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Class<?> declaringClass = method.getDeclaringClass();
 		
 		/*
@@ -446,11 +458,13 @@ boolean generateReceiver(ExpressionClassBuilder acb,
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (receiver != null)
 		{
 			receiver = (JavaValueNode)receiver.accept(v);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
index 8516f81a66..d8a0e42ebb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.NormalizeResultSetNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -519,6 +520,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class NormalizeResultSetNode extends SingleChildResultSetNode
 {
 	/**
@@ -558,6 +561,8 @@ class NormalizeResultSetNode extends SingleChildResultSetNode
 	 * @throws StandardException 
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     NormalizeResultSetNode(ResultSetNode chldRes,
                            ResultColumnList targetResultColumnList,
                            Properties tableProperties,
@@ -580,6 +585,8 @@ class NormalizeResultSetNode extends SingleChildResultSetNode
 		 * detailed explanation of how this works.
 		 */
 		ResultColumnList prRCList = rcl;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         chldRes.setResultColumns(rcl.copyListAndObjects());
 		// Remove any columns that were generated.
 		prRCList.removeGeneratedGroupingColumns();
@@ -590,8 +597,11 @@ class NormalizeResultSetNode extends SingleChildResultSetNode
 		 * in the NormalizeResultSetNode's ResultColumnList.  (VirtualColumnNodes include
 		 * pointers to source ResultSetNode, rsn, and source ResultColumn.)
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         prRCList.genVirtualColumnNodes(chldRes, chldRes.getResultColumns());
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setResultColumns( prRCList );
 		// Propagate the referenced table map if it's already been created
         if (chldRes.getReferencedTableMap() != null)
@@ -603,7 +613,9 @@ class NormalizeResultSetNode extends SingleChildResultSetNode
 		if (targetResultColumnList != null) {
 		    int size = Math.min(targetRCL.size(), getResultColumns().size());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (int index = 0; index < size; index++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 ResultColumn sourceRC = getResultColumns().elementAt(index);
                 ResultColumn resultColumn = targetRCL.elementAt(index);
                 sourceRC.setType(resultColumn.getTypeServices());
@@ -625,6 +637,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		if (SanityManager.DEBUG)
             SanityManager.ASSERT(getResultColumns() != null, "Tree structure bad");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Get the next ResultSet #, so that we can number this ResultSetNode, its
 		 * ResultColumnList and ResultSet.
@@ -637,6 +650,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		// Get the cost estimate for the child
 		setCostEstimate( childResult.getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		erdNumber = acb.addItem(makeResultDescription());
 
@@ -649,6 +663,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		mb.push(forUpdate);
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getNormalizeResultSet",
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 					ClassName.NoPutResultSet, 6);
 	}
 
@@ -670,6 +685,7 @@ void setRefActionInfo(long fkIndexConglomId,
 
     @Override
     public void pushQueryExpressionSuffix() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         childResult.pushQueryExpressionSuffix();
     }
 
@@ -682,6 +698,8 @@ public void pushQueryExpressionSuffix() {
 	 * @param orderByList	The order by list
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 	void pushOrderByList(OrderByList orderByList)
 	{
 		childResult.pushOrderByList(orderByList);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NotNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NotNode.java
index c1ccd58bb5..1526b9463b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NotNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NotNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.NotNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -43,6 +44,8 @@ public final class NotNode extends UnaryLogicalOperatorNode
      * @param cm context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     NotNode(ValueNode operand, ContextManager cm)
             throws StandardException {
         super(operand, "not", cm);
@@ -106,6 +109,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 
 		// arg 2
 		mb.push(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 		acb.generateDataValue(mb, getTypeCompiler(), 
 				getTypeServices().getCollationType(), field);
 		mb.upCast(ClassName.DataValueDescriptor);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
index 7f91dc73ed..66f5d6248c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.NumericConstantNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -42,6 +43,7 @@ public final class NumericConstantNode extends ConstantNode
 {
 
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_TINYINT = 0;
     final static int K_SMALLINT = 1;
     final static int K_INT = 2;
@@ -63,6 +65,8 @@ public final class NumericConstantNode extends ConstantNode
      * @param cm context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     NumericConstantNode(TypeId t, ContextManager cm)
             throws StandardException {
         super(cm);
@@ -79,9 +83,12 @@ public final class NumericConstantNode extends ConstantNode
      * @param cm context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     NumericConstantNode(TypeId t, Number value, ContextManager cm)
             throws StandardException {
         super(cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         kind = getKind(t);
         setType(t,
                 getPrecision(t, value),
@@ -94,6 +101,7 @@ public final class NumericConstantNode extends ConstantNode
     private int getPrecision(TypeId t, Number val) throws StandardException {
 
         switch (t.getJDBCTypeId()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         case Types.TINYINT:
             return TypeId.SMALLINT_PRECISION; // FIXME
@@ -105,6 +113,7 @@ private int getPrecision(TypeId t, Number val) throws StandardException {
             return TypeId.LONGINT_PRECISION;
         case Types.DECIMAL:
             if (val != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 SQLDecimal constantDecimal = new SQLDecimal((BigDecimal) val);
                 return constantDecimal.getDecimalValuePrecision();
             } else {
@@ -134,6 +143,7 @@ private int getScale(TypeId t, Object val) throws StandardException {
             return TypeId.LONGINT_SCALE;
         case Types.DECIMAL:
             if (val != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 SQLDecimal constantDecimal = new SQLDecimal((BigDecimal) val);
                 return constantDecimal.getDecimalValueScale();
             } else {
@@ -163,6 +173,7 @@ private int getMaxWidth(TypeId t, Object val) throws StandardException {
            return val != null ? TypeId.LONGINT_MAXWIDTH: 0;
        case Types.DECIMAL:
             if (val != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                SQLDecimal constantDecimal = new SQLDecimal((BigDecimal) val);
                int precision = constantDecimal.getDecimalValuePrecision();
                int scal = constantDecimal.getDecimalValueScale();
@@ -188,6 +199,7 @@ private int getMaxWidth(TypeId t, Object val) throws StandardException {
     private int getKind(TypeId t) {
        switch (t.getJDBCTypeId()) {
        case Types.TINYINT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
            return K_TINYINT;
        case Types.INTEGER:
            return K_INT;
@@ -224,6 +236,7 @@ private void setValue(TypeId t, Number value ) throws StandardException {
            setValue(new SQLLongint((Long)value));
             break;
        case Types.DECIMAL:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
            setValue(new SQLDecimal((BigDecimal)value));
             break;
        case Types.DOUBLE:
@@ -270,6 +283,7 @@ Object getConstantValueAsObject()
 	void generateConstant(ExpressionClassBuilder acb, MethodBuilder mb)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         switch (kind)
 		{
         case K_INT:
@@ -282,7 +296,9 @@ void generateConstant(ExpressionClassBuilder acb, MethodBuilder mb)
 			mb.push(value.getShort());
 			break;
         case K_DECIMAL:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             mb.pushNewStart("java.math.BigDecimal");
+//IC see: https://issues.apache.org/jira/browse/DERBY-225
 			mb.push(value.getString());
             mb.pushNewComplete(1);
 			break;
@@ -301,6 +317,7 @@ void generateConstant(ExpressionClassBuilder acb, MethodBuilder mb)
 				// we should never really come here-- when the class is created
 				// it should have the correct nodeType set.
 				SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                           "Unexpected numeric type = " + kind);
 			}
 		}	
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
index 92c7041282..1325f08cae 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
@@ -64,6 +64,8 @@ public String getCorrespondingPrimitiveTypeName()
 			case StoredFormatIds.INT_TYPE_ID:
 				return "int";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             case StoredFormatIds.BIGINT_TYPE_ID:
 				return "long";
 
@@ -106,6 +108,8 @@ public String getPrimitiveMethodName()
 			case StoredFormatIds.INT_TYPE_ID:
 				return "getInt";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             case StoredFormatIds.BIGINT_TYPE_ID:
 				return "getLong";
 
@@ -147,6 +151,8 @@ public int getCastToCharWidth(DataTypeDescriptor dts)
 			case StoredFormatIds.INT_TYPE_ID:
 				return TypeCompiler.INT_MAXWIDTH_AS_CHAR;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             case StoredFormatIds.BIGINT_TYPE_ID:
 				return TypeCompiler.LONGINT_MAXWIDTH_AS_CHAR;
 
@@ -176,6 +182,8 @@ public int getCastToCharWidth(DataTypeDescriptor dts)
 	 */
     @Override
     public DataTypeDescriptor resolveArithmeticOperation(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             DataTypeDescriptor leftType,
             DataTypeDescriptor rightType,
             String operator) throws StandardException
@@ -347,6 +355,8 @@ String nullMethodName()
 			case StoredFormatIds.INT_TYPE_ID:
 				return "getNullInteger";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             case StoredFormatIds.BIGINT_TYPE_ID:
 				return "getNullLong";
 
@@ -432,6 +442,7 @@ else if (operator.equals(TypeCompiler.DIVIDE_OP))
 			val = this.getScale(operator, leftType, rightType) +
 					Math.max(lprec - lscale, rprec - rscale) + 1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			if (val > Limits.DB2_MAX_DECIMAL_PRECISION_SCALE)
 			// then, like DB2, just set it to the max possible.
 				val = Limits.DB2_MAX_DECIMAL_PRECISION_SCALE;
@@ -489,6 +500,8 @@ else if (TypeCompiler.DIVIDE_OP.equals(operator))
 			** or 4, whichever is biggest 
 			*/
 			// Scale: 31 - left precision + left scale - right scale
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             val = Math.max(NumberDataValue.MAX_DECIMAL_PRECISION_SCALE
                                - lprec + lscale - rscale,
                            0);
@@ -519,6 +532,7 @@ else if (TypeCompiler.AVG_OP.equals(operator))
 	public void generateDataValue(MethodBuilder mb, int collationType,
 			LocalField field)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         if (getTypeId().isDecimalTypeId())
 		{
             // Cast the value to a Number for method resolution. It is most
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OperatorNode.java
index 1cf363cbca..41b23f3edc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OperatorNode.java
@@ -34,6 +34,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 abstract class OperatorNode extends ValueNode {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     OperatorNode(ContextManager cm) {
         super(cm);
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java
index e7e1517604..f05edaa566 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java
@@ -72,6 +72,8 @@ public void boot(boolean create, Properties startParams)
         ** by default.  It is used mainly for testing - there are many tests
         ** that assume the join order is fixed.
         */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         String opt =
             PropertyUtil.getSystemProperty(Optimizer.JOIN_ORDER_OPTIMIZATION);
         if (opt != null)
@@ -185,6 +187,7 @@ public CostEstimate getCostEstimate()
 	 */
 	public boolean supportsOptimizerTrace()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
 		return true;
 	}
 
@@ -199,6 +202,8 @@ protected Optimizer getOptimizerImpl(OptimizableList optimizableList,
 								  DataDictionary dDictionary,
 								  RequiredRowOrdering requiredRowOrdering,
 								  int numTablesInQuery,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
 								  OptimizerPlan overridingPlan,
 								  LanguageConnectionContext lcc)
 				throws StandardException
@@ -215,7 +220,10 @@ protected Optimizer getOptimizerImpl(OptimizableList optimizableList,
 							joinStrategySet,
 							lcc.getLockEscalationThreshold(),
 							requiredRowOrdering,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
 							numTablesInQuery,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
 							overridingPlan,
                             lcc);
 	}
@@ -231,6 +239,8 @@ public int getMaxMemoryPerTable()
     @Override
     public boolean doJoinOrderOptimization()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return joinOrderOptimization;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
index e8e2c59087..8fceffb72b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
@@ -189,6 +189,7 @@ class OptimizerImpl implements Optimizer
 	private boolean usingPredsPushedFromAbove;
 	private boolean bestJoinOrderUsedPredsFromAbove;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
 	OptimizerImpl(OptimizableList optimizableList, 
 				  OptimizablePredicateList predicateList,
 				  DataDictionary dDictionary,
@@ -200,7 +201,9 @@ class OptimizerImpl implements Optimizer
 				  int tableLockThreshold,
 				  RequiredRowOrdering requiredRowOrdering,
                   int numTablesInQuery,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
                   OptimizerPlan overridingPlan,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
                   LanguageConnectionContext lcc )
 		throws StandardException
 	{
@@ -225,6 +228,7 @@ class OptimizerImpl implements Optimizer
 		this.numTablesInQuery = numTablesInQuery;
 		numOptimizables = optimizableList.size();
 		proposedJoinOrder = new int[numOptimizables];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2130
         if (initJumpState() == READY_TO_JUMP)
             firstLookOrder = new int[numOptimizables];
 
@@ -281,6 +285,7 @@ class OptimizerImpl implements Optimizer
         }
 
         // make sure that optimizer overrides are bound and left-deep
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         if ( overridingPlan != null )
         {
             if ( !overridingPlan.isBound() )
@@ -359,6 +364,7 @@ public void prepForNextRound()
 		 * can take advantage of the pushed predicates.
 		 */
 		usingPredsPushedFromAbove = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1073
 		if ((predicateList != null) && (predicateList.size() > 0))
 		{
 			for (int i = predicateList.size() - 1; i >= 0; i--)
@@ -400,6 +406,7 @@ public void prepForNextRound()
          * (most notably, an uninitialized bestCost, which we should never see).
          * DERBY-1905.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2130
         initJumpState();
     }
     
@@ -416,6 +423,7 @@ private int initJumpState() {
 
     public int getMaxMemoryPerTable()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
         return maxMemoryPerTable;
     }
     
@@ -516,6 +524,8 @@ public boolean getNextPermutation()
 				// proceed with normal timeout logic.
 				if (firstLookOrder == null)
 					firstLookOrder = new int[numOptimizables];
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 System.arraycopy(
                         bestJoinOrder, 0, firstLookOrder, 0, numOptimizables);
 				permuteState = JUMPING;
@@ -576,6 +586,7 @@ public boolean getNextPermutation()
 		 * (if the latter is applicable) are greater than bestCost.
 		 */
 		boolean alreadyCostsMore =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1357
 			!bestCost.isUninitialized() &&
 			(currentCost.compare(bestCost) > 0) &&
 			((requiredRowOrdering == null) ||
@@ -638,6 +649,7 @@ public boolean getNextPermutation()
 			// as we rewind since they may have been clobbered
 			// (as part of the current join order) before we gave
 			// up on jumping.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1365
 			reloadBestPlan = true;
 			rewindJoinOrder();  //fall
 			permuteState = NO_JUMP;  //give up
@@ -774,6 +786,7 @@ else if (permuteState == JUMPING)  //still jumping
 					// here.
 						if (joinPosition > 0) {
 							joinPosition--;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1365
 							reloadBestPlan = true;
 							rewindJoinOrder();
 						}
@@ -993,6 +1006,7 @@ else if (proposedJoinOrder[i] > firstLookOrder[i])  //done
 					joinPosition--;
 					if (joinPosition >= 0)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1365
 						reloadBestPlan = true;
 						rewindJoinOrder();
 						joinPosition = -1;
@@ -1108,11 +1122,13 @@ private void endOfRoundCleanup()
 	 * subtracting 3.14E40.
 	 */
 	private double recoverCostFromProposedJoinOrder(boolean sortAvoidance)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3214
 		throws StandardException
 	{
 		double recoveredCost = 0.0d;
 		for (int i = 0; i < joinPosition; i++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3214
 			if (sortAvoidance)
 			{
 				recoveredCost +=
@@ -1216,11 +1232,13 @@ private void pullOptimizableFromJoinOrder()
 			** here,try to make some sense of things by adding up costs
 			** as they existed prior to pullMe...
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-3214
 			if (newCost <= 0.0)
 			{
 				if (joinPosition == 0)
 					newCost = 0.0;
 				else
+//IC see: https://issues.apache.org/jira/browse/DERBY-3214
 					newCost = recoverCostFromProposedJoinOrder(false);
 			}
 		}
@@ -1301,6 +1319,7 @@ private void pullOptimizableFromJoinOrder()
 				}
 
 				// See discussion above for "newCost"; same applies here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3214
 				if (prevEstimatedCost <= 0.0)
 				{
 					if (joinPosition == 0)
@@ -1308,6 +1327,7 @@ private void pullOptimizableFromJoinOrder()
 					else
 					{
 						prevEstimatedCost =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3214
 							recoverCostFromProposedJoinOrder(true);
 					}
 				}
@@ -1592,6 +1612,7 @@ public boolean getNextDecoratedPermutation()
 		
 		// RESOLVE: Should we step through the different join strategies here?
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         while ( true )
         {
             /* Returns true until all access paths are exhausted */
@@ -1827,6 +1848,10 @@ else if (bestCost.rowCount() < currentCost.rowCount())
 				** of better alternative we look at the row counts.  See
 				** CostEstimateImpl.compare() for more.
 				*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-1007
+//IC see: https://issues.apache.org/jira/browse/DERBY-1259
+//IC see: https://issues.apache.org/jira/browse/DERBY-1260
+//IC see: https://issues.apache.org/jira/browse/DERBY-1205
 				if ((! foundABestPlan) ||
 					(currentCost.compare(bestCost) < 0) ||
 					bestCost.isUninitialized())
@@ -1867,6 +1892,7 @@ else if (bestCost.rowCount() < currentCost.rowCount())
 					curOpt.considerSortAvoidancePath())
 				{
 					if (requiredRowOrdering.sortRequired(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6148
                             bestRowOrdering,
                             optimizableList,
                             proposedJoinOrder) ==
@@ -1874,6 +1900,10 @@ else if (bestCost.rowCount() < currentCost.rowCount())
 					{
 						if (tracingIsOn()) { tracer().traceCurrentPlanAvoidsSort( bestCost, currentSortAvoidanceCost ); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1007
+//IC see: https://issues.apache.org/jira/browse/DERBY-1259
+//IC see: https://issues.apache.org/jira/browse/DERBY-1260
+//IC see: https://issues.apache.org/jira/browse/DERBY-1205
 						if ((currentSortAvoidanceCost.compare(bestCost) <= 0)
 							|| bestCost.isUninitialized())
 						{
@@ -1892,6 +1922,7 @@ else if (bestCost.rowCount() < currentCost.rowCount())
      * Get the unique tuple descriptor of the current access path for an Optimizable.
      */
     private UniqueTupleDescriptor   getTupleDescriptor( Optimizable optimizable )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         throws StandardException
     {
         if ( isTableFunction( optimizable ) )
@@ -1953,6 +1984,8 @@ private void rememberBestCost(CostEstimate currentCost, int planType)
 		*/
 		bestJoinOrderUsedPredsFromAbove = usingPredsPushedFromAbove;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         System.arraycopy(
                 proposedJoinOrder, 0, bestJoinOrder, 0, numOptimizables);
 
@@ -1974,6 +2007,7 @@ private void rememberBestCost(CostEstimate currentCost, int planType)
 		if (tracingIsOn())
 		{
 			if (requiredRowOrdering != null)    { tracer().traceSortNeededForOrdering( planType, requiredRowOrdering ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
             tracer().traceRememberingBestJoinOrder
                 ( joinPosition, ArrayUtil.copy( bestJoinOrder ), planType, currentCost, (JBitSet) assignedTableMap.clone() );
 		}
@@ -2222,6 +2256,8 @@ private void ruleBasedCostOptimizable(Optimizable optimizable,
 		** If all else fails, and no conglomerate has been picked yet,
 		** pick this one.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ConglomerateDescriptor bestConglomerateDescriptor =
             bestAp.getConglomerateDescriptor();
 
@@ -2337,6 +2373,7 @@ private void costBasedCostOptimizable(Optimizable optimizable,
 				** path avoid a sort?
 				*/
 				if (requiredRowOrdering.sortRequired(currentRowOrdering,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6148
                                                      assignedTableMap,
                                                      optimizableList,
                                                      proposedJoinOrder)
@@ -2347,6 +2384,14 @@ private void costBasedCostOptimizable(Optimizable optimizable,
 
 					/* Is this the cheapest sort-avoidance path? */
 					if ((bestCostEstimate == null) ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-1007
+//IC see: https://issues.apache.org/jira/browse/DERBY-1259
+//IC see: https://issues.apache.org/jira/browse/DERBY-1260
+//IC see: https://issues.apache.org/jira/browse/DERBY-1205
+//IC see: https://issues.apache.org/jira/browse/DERBY-1007
+//IC see: https://issues.apache.org/jira/browse/DERBY-1259
+//IC see: https://issues.apache.org/jira/browse/DERBY-1260
+//IC see: https://issues.apache.org/jira/browse/DERBY-1205
 						bestCostEstimate.isUninitialized() ||
 						(estimatedCost.compare(bestCostEstimate) < 0))
 					{
@@ -2408,6 +2453,10 @@ public void	considerCost(Optimizable optimizable,
 		// That check is performed in getNextDecoratedPermutation() of
 		// this class.
 		optimizable.getCurrentAccessPath().setCostEstimate(estimatedCost);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1007
+//IC see: https://issues.apache.org/jira/browse/DERBY-1259
+//IC see: https://issues.apache.org/jira/browse/DERBY-1260
+//IC see: https://issues.apache.org/jira/browse/DERBY-1205
 
 		/*
 		** Skip this access path if it takes too much memory.
@@ -2440,6 +2489,10 @@ public void	considerCost(Optimizable optimizable,
 		CostEstimate bestCostEstimate = ap.getCostEstimate();
 
 		if ((bestCostEstimate == null) ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-1007
+//IC see: https://issues.apache.org/jira/browse/DERBY-1259
+//IC see: https://issues.apache.org/jira/browse/DERBY-1260
+//IC see: https://issues.apache.org/jira/browse/DERBY-1205
 			bestCostEstimate.isUninitialized() ||
 			(estimatedCost.compare(bestCostEstimate) <= 0))
 		{
@@ -2467,6 +2520,7 @@ public void	considerCost(Optimizable optimizable,
 				** path avoid a sort?
 				*/
 				if (requiredRowOrdering.sortRequired(currentRowOrdering,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6148
                                                     assignedTableMap,
                                                      optimizableList,
                                                      proposedJoinOrder)
@@ -2477,6 +2531,10 @@ public void	considerCost(Optimizable optimizable,
 
 					/* Is this the cheapest sort-avoidance path? */
 					if ((bestCostEstimate == null) ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-1007
+//IC see: https://issues.apache.org/jira/browse/DERBY-1259
+//IC see: https://issues.apache.org/jira/browse/DERBY-1260
+//IC see: https://issues.apache.org/jira/browse/DERBY-1205
 						bestCostEstimate.isUninitialized() ||
 						(estimatedCost.compare(bestCostEstimate) < 0))
 					{
@@ -2575,6 +2633,8 @@ public CostEstimate getFinalCost()
 		// optimizable.
 		finalCostEstimate = getNewCostEstimate(0.0d, 0.0d, 0.0d);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         for (int i = 0; i < bestJoinOrder.length; i++)
 		{
             CostEstimate ce = optimizableList.getOptimizable(bestJoinOrder[i])
@@ -2718,9 +2778,12 @@ private CostEstimate estimateTotalCost(OptimizablePredicateList predList,
 	/** @see Optimizer#getLevel */
 	public int getLevel()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
 		return 2;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimateImpl getNewCostEstimate(double theCost,
 							double theRowCount,
 							double theSingleScanRowCount)
@@ -2760,6 +2823,8 @@ public void updateBestPlanMaps(short action,
 				if (savedJoinOrders != null)
 				{
 					savedJoinOrders.remove(planKey);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     if (savedJoinOrders.isEmpty()) {
 						savedJoinOrders = null;
                     }
@@ -2770,6 +2835,7 @@ else if (action == FromTable.ADD_PLAN)
 				// If the savedJoinOrder map already exists, search for the
 				// join order for the target optimizer and reuse that.
 				if (savedJoinOrders == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					savedJoinOrders = new HashMap<Object,int[]>();
 				else
 					joinOrder = savedJoinOrders.get(planKey);
@@ -2779,6 +2845,8 @@ else if (action == FromTable.ADD_PLAN)
 				if (joinOrder == null)
 					joinOrder = new int[numOptimizables];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 System.arraycopy(
                         bestJoinOrder, 0, joinOrder, 0, bestJoinOrder.length);
 
@@ -2794,9 +2862,12 @@ else if (action == FromTable.ADD_PLAN)
 				// for which there was no valid plan.
 				if (savedJoinOrders != null)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					joinOrder = savedJoinOrders.get(planKey);
 					if (joinOrder != null)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         System.arraycopy(
                             joinOrder, 0, bestJoinOrder, 0, joinOrder.length);
 					}
@@ -2834,6 +2905,8 @@ else if (action == FromTable.ADD_PLAN)
 	 * @param pList List of predicates to add to this OptimizerImpl's
 	 *  own list for pushing.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void addScopedPredicatesToList(PredicateList pList, ContextManager cm)
 		throws StandardException
 	{
@@ -2845,6 +2918,8 @@ void addScopedPredicatesToList(PredicateList pList, ContextManager cm)
 		// in this case, there is no 'original' predicateList, so we
 		// can just create one.
             predicateList = new PredicateList(cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		// First, we need to go through and remove any predicates in this
 		// optimizer's list that may have been pushed here from outer queries
@@ -2852,6 +2927,8 @@ void addScopedPredicatesToList(PredicateList pList, ContextManager cm)
 		// predicate was pushed from an outer query because it will have
 		// been scoped to the node for which this OptimizerImpl was
 		// created.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         Predicate pred;
 		for (int i = predicateList.size() - 1; i >= 0; i--) {
 			pred = (Predicate)predicateList.getOptPredicate(i);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerTracer.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerTracer.java
index 83383753a4..3cb4e0811d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerTracer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OptimizerTracer.java
@@ -97,6 +97,7 @@ public  void    loadTool( String... configurationParameters )
         {
             tracer = new DefaultOptTrace();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         else if ( "xml".equals( configurationParameters[ 0 ] ) )
         {
             try {
@@ -112,9 +113,11 @@ else if ( "custom".equals( configurationParameters[ 0 ] ) )
             String  customOptTraceName = configurationParameters[ 1 ];
 
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 ClassFactoryContext cfc = (ClassFactoryContext) getContext( ClassFactoryContext.CONTEXT_ID );
                 ClassFactory    classFactory = cfc.getClassFactory();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Class<?> clazz = classFactory.loadApplicationClass( customOptTraceName );
                 tracer = (OptTrace) clazz.getConstructor().newInstance();
             }
@@ -150,6 +153,7 @@ public  void    unloadTool( final String... configurationParameters )
             final   OptTrace    tracer = OptimizerTrace.getOptimizerTracer();
 
             boolean     needsClosing = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6256
             PrintWriter pw;
             
             if (
@@ -159,6 +163,7 @@ public  void    unloadTool( final String... configurationParameters )
             {
                 pw = AccessController.doPrivileged
                     (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6635
                      new PrivilegedExceptionAction<PrintWriter>()
                      {
                          public PrintWriter run() throws SQLException
@@ -193,6 +198,7 @@ public PrintWriter run() throws SQLException
             if ( needsClosing ) { pw.close(); }
             
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6635
         catch (Exception e)
         {
             if ( e.getMessage() == null )
@@ -234,6 +240,7 @@ private SQLException    wrap( String errorMessage )
      */
     private  static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrNode.java
index 18c64dd219..e239ddc4ab 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.OrNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -71,6 +72,7 @@ void setFirstOr()
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -95,6 +97,8 @@ ValueNode bindExpression(
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -170,6 +174,8 @@ ValueNode preprocess(int numTables,
 					 	 */
 						if (left instanceof BinaryRelationalOperatorNode)
 						{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                             BinaryRelationalOperatorNode bron =
                                     (BinaryRelationalOperatorNode)left;
 							if (!bron.isInListProbeNode())
@@ -240,6 +246,8 @@ else if (tableNumber != cr.getTableNumber() ||
 			/* So, can we convert the OR chain? */
 			if (convert)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 ValueNodeList vnl = new ValueNodeList(getContextManager());
 				// Build the IN list 
                 for (vn = this;
@@ -274,6 +282,8 @@ else if (bron.getLeftOperand() instanceof ColumnReference)
 					}
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 InListOperatorNode ilon =
                         new InListOperatorNode(cr, vnl, getContextManager());
 
@@ -321,6 +331,8 @@ ValueNode eliminateNots(boolean underNotNode)
 		}
 
 		/* Convert the OrNode to an AndNode */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
        AndNode andNode =
                 new AndNode(leftOperand, rightOperand, getContextManager());
 		andNode.setType(getTypeServices());
@@ -356,6 +368,8 @@ ValueNode eliminateNots(boolean underNotNode)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode changeToCNF(boolean underTopAndNode)
 					throws StandardException
 	{
@@ -366,6 +380,8 @@ ValueNode changeToCNF(boolean underTopAndNode)
 		 */
 		if (rightOperand instanceof AndNode)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
            BooleanConstantNode falseNode =
                     new BooleanConstantNode(false, getContextManager());
             rightOperand =
@@ -384,6 +400,8 @@ ValueNode changeToCNF(boolean underTopAndNode)
 		/* Add the false BooleanConstantNode if not there yet */
 		if (!(curOr.getRightOperand().isBooleanFalse()))
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
            BooleanConstantNode falseNode =
                     new BooleanConstantNode(false, getContextManager());
             curOr.setRightOperand(new OrNode(
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByColumn.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
index 7382c4c8f6..5b95d7136d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.OrderByColumn
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -36,6 +37,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 class OrderByColumn extends OrderedColumn {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 	private ResultColumn	resultCol;
 	private boolean			ascending = true;
@@ -56,6 +59,8 @@ class OrderByColumn extends OrderedColumn {
 	 * @param expression            Expression of this column
      * @param cm                    The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     OrderByColumn(ValueNode expression, ContextManager cm)
 	{
         super(cm);
@@ -71,6 +76,7 @@ class OrderByColumn extends OrderedColumn {
     @Override
 	public String toString() {
 		if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 			return
 				"nullsOrderedLow: " + nullsOrderedLow + "\n" +
 				"ascending; " + ascending + "\n" +
@@ -88,6 +94,8 @@ public String toString() {
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -109,6 +117,8 @@ void printSubNodes(int depth)
 	/**
 	 * Mark the column as descending order
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setDescending() {
 		ascending = false;
 	}
@@ -127,7 +137,10 @@ boolean isAscending() {
 	/**
 	 * Mark the column as ordered NULL values lower than non-NULL values.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setNullsOrderedLow() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
 		nullsOrderedLow = true;
 	}
 
@@ -201,10 +214,13 @@ ValueNode getNonRedundantExpression()
 	 * @exception StandardException		Thrown on error
 	 * @exception StandardException		Thrown when column not found
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindOrderByColumn(ResultSetNode target, OrderByList oblist)
 				throws StandardException 
 	{
 		this.list = oblist;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1861
 
 		if(expression instanceof ColumnReference){
 		
@@ -218,6 +234,7 @@ void bindOrderByColumn(ResultSetNode target, OrderByList oblist)
 			if (addedColumnOffset >= 0 &&
 					target instanceof SelectNode &&
 					( (SelectNode)target ).hasDistinct())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				throw StandardException.newException(SQLState.LANG_DISTINCT_ORDER_BY, cr.getColumnName());
 		}else if(isReferedColByNum(expression)){
 			
@@ -237,6 +254,7 @@ void bindOrderByColumn(ResultSetNode target, OrderByList oblist)
 			}
 
 		}else{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6009
             if (list.isTableValueCtorOrdering()) {
                 // For VALUES, we only allow ordering by column number,
                 // SQL-92 style. This is a more general expression, so throw.
@@ -250,6 +268,7 @@ void bindOrderByColumn(ResultSetNode target, OrderByList oblist)
 					((SelectNode)target).hasDistinct() &&
 					!expressionMatch(target))
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 CollectNodesVisitor<ColumnReference> collectNodesVisitor =
                     new CollectNodesVisitor<ColumnReference>(
                         ColumnReference.class);
@@ -257,6 +276,8 @@ void bindOrderByColumn(ResultSetNode target, OrderByList oblist)
 
                 for (ColumnReference cr1 : collectNodesVisitor.getList())
 				{//visits through the columns in this OrderByColumn
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     String col=cr1.getColumnName();
                     boolean match = columnMatchFound(target,cr1);
 					/* breaks if a match not found, this is needed
@@ -270,10 +291,12 @@ void bindOrderByColumn(ResultSetNode target, OrderByList oblist)
 				}
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-127
 			if( SanityManager.DEBUG)
 				SanityManager.ASSERT( addedColumnOffset >= 0,
 				"Order by expression was not pulled into the result column list");
 			resolveAddedColumn(target);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2459
 			if (resultCol == null)
 				throw StandardException.newException(SQLState.LANG_UNION_ORDER_BY);
 		}
@@ -380,6 +403,8 @@ private void resolveAddedColumn(ResultSetNode target)
 	 * @param target	The result set being selected from
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void pullUpOrderByColumn(ResultSetNode target)
 				throws StandardException 
 	{
@@ -391,11 +416,15 @@ void pullUpOrderByColumn(ResultSetNode target)
 
 			resultCol = targetCols.findResultColumnForOrderBy(
                     cr.getColumnName(), cr.getQualifiedTableName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 			if(resultCol == null){
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                resultCol = new ResultColumn(
                         cr.getColumnName(), cr, getContextManager());
 				targetCols.addResultColumn(resultCol);
+//IC see: https://issues.apache.org/jira/browse/DERBY-127
                 addedColumnOffset = targetCols.getOrderBySelect();
 				targetCols.incOrderBySelect();
 			}
@@ -457,6 +486,7 @@ void remapColumnReferencesToExpressions() throws StandardException
 	private static boolean isReferedColByNum(ValueNode expression) 
 	throws StandardException{
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6027
        return expression instanceof NumericConstantNode &&
                expression.getConstantValueAsObject() instanceof Integer;
 	}
@@ -464,6 +494,8 @@ private static boolean isReferedColByNum(ValueNode expression)
 	
 	private ResultColumn resolveColumnReference(ResultSetNode target,
 							   ColumnReference cr)
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             throws StandardException {
 		int					sourceTableNumber = -1;
 		
@@ -474,6 +506,7 @@ private ResultColumn resolveColumnReference(ResultSetNode target,
 			throw StandardException.newException(SQLState.LANG_QUALIFIED_COLUMN_NAME_NOT_ALLOWED, fullName);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if(cr.getQualifiedTableName() != null){
 			TableName tableNameNode = cr.getQualifiedTableName();
 
@@ -487,6 +520,7 @@ private ResultColumn resolveColumnReference(ResultSetNode target,
 								       tableNameNode.getSchemaName():null),
 								      false);
 				if(fromTable == null){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 					String fullName = cr.getQualifiedTableName().toString();
 					throw StandardException.newException(SQLState.LANG_EXPOSED_NAME_NOT_FOUND, fullName);
 				}
@@ -510,8 +544,11 @@ private ResultColumn resolveColumnReference(ResultSetNode target,
 
 		ResultColumnList	targetCols = target.getResultColumns();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ResultColumn resCol = targetCols.getOrderByColumnToBind(
                             cr.getColumnName(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 							cr.getQualifiedTableName(),
 							sourceTableNumber,
 							this);
@@ -520,10 +557,13 @@ private ResultColumn resolveColumnReference(ResultSetNode target,
          * order by clause may be found in the user specified select list now even though it was
          * not found when pullUpOrderByColumn was called.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         if( resCol == null && addedColumnOffset >= 0)
             resolveAddedColumn(target);
 							
         if (resCol == null || resCol.isNameGenerated()){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			String errString = cr.getColumnName();
 			throw StandardException.newException(SQLState.LANG_ORDER_BY_COLUMN_NOT_FOUND, errString);
 		}
@@ -544,6 +584,7 @@ private ResultColumn resolveColumnReference(ResultSetNode target,
 	 * - resets addedColumnOffset to -1 to indicate this is not an added col
 	 * - calls back to the OrderByList to adjust any other added cols
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1861
 	void clearAddedColumnOffset()
 	{
 		list.closeGap(addedColumnOffset);
@@ -574,17 +615,20 @@ void collapseAddedColumnGap(int gap)
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (expression != null)
 		{
 			expression = (ValueNode)expression.accept(v);
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6008
     ValueNode getExpression() {
         return expression;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByList.java
index 1a0b70b044..01f559834d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByList.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.OrderByList
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -47,6 +48,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * and the last column in the list is the least significant.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 class OrderByList extends OrderedColumnList<OrderByColumn>
 						implements RequiredRowOrdering {
 
@@ -76,7 +78,9 @@ class OrderByList extends OrderedColumnList<OrderByColumn>
      * @param cm The context manager
     */
    OrderByList(ResultSetNode rs, ContextManager cm) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
        super(OrderByColumn.class, cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6009
        this.isTableValueCtorOrdering =
                 (rs instanceof UnionNode &&
                 ((UnionNode)rs).tableConstructor()) ||
@@ -88,6 +92,8 @@ class OrderByList extends OrderedColumnList<OrderByColumn>
 	
 		@param column	The column to add to the list
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void addOrderByColumn(OrderByColumn column)
 	{
 		addElement(column);
@@ -111,7 +117,10 @@ boolean allAscending()
 	
 		@param position	The column to get from the list
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     OrderByColumn getOrderByColumn(int position) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(position >=0 && position < size());
         }
@@ -126,6 +135,8 @@ OrderByColumn getOrderByColumn(int position) {
 	 * 	@param target	The underlying result set
 	 *	@exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindOrderByColumns(ResultSetNode target)
 					throws StandardException {
 
@@ -133,6 +144,7 @@ void bindOrderByColumns(ResultSetNode target)
 		resultToSort = target;
 
 		/* Only 1012 columns allowed in ORDER BY clause */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (size() > Limits.DB2_MAX_ELEMENTS_IN_ORDER_BY)
 		{
 			throw StandardException.newException(SQLState.LANG_TOO_MANY_ELEMENTS);
@@ -141,6 +153,7 @@ void bindOrderByColumns(ResultSetNode target)
         for (OrderByColumn obc : this)
 		{
 			obc.bindOrderByColumn(target, this);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1861
 
 			/*
 			** Always sort if we are ordering on an expression, and not
@@ -169,8 +182,10 @@ void bindOrderByColumns(ResultSetNode target)
 	 *
 	 * @param gap   column which has been removed from the result column list
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1861
 	void closeGap(int gap)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (OrderByColumn obc : this)
 		{
 			obc.collapseAddedColumnGap(gap);
@@ -184,12 +199,15 @@ void closeGap(int gap)
 		@param target	The underlying result set
 	
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void pullUpOrderByColumns(ResultSetNode target)
 					throws StandardException {
 
 		/* Remember the target for use in optimization */
 		resultToSort = target;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (OrderByColumn obc : this)
 		{
 			obc.pullUpOrderByColumn(target);
@@ -211,6 +229,8 @@ boolean isInOrderPrefix(ResultColumnList sourceRCL)
 		if (SanityManager.DEBUG)
 		{
             int rclSize = sourceRCL.size();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             if (size() > rclSize)
 			{
 				SanityManager.THROWASSERT(
@@ -223,6 +243,7 @@ boolean isInOrderPrefix(ResultColumnList sourceRCL)
 		int size = size();
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (elementAt(index).getResultColumn() !=
                 sourceRCL.elementAt(index))
 			{
@@ -240,6 +261,7 @@ boolean isInOrderPrefix(ResultColumnList sourceRCL)
 	 */
 	void resetToSourceRCs()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (OrderByColumn obc : this)
 		{
 			obc.resetToSourceRC();
@@ -258,8 +280,11 @@ ResultColumnList reorderRCL(ResultColumnList resultColumns)
 		throws StandardException
 	{
         ResultColumnList newRCL = new ResultColumnList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		/* The new RCL starts with the ordering columns */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (OrderByColumn obc : this)
 		{
 			newRCL.addElement(obc.getResultColumn());
@@ -286,6 +311,7 @@ void removeConstantColumns(PredicateList whereClause)
 			 loc >= 0;
 			 loc--)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (elementAt(loc).constantColumn(whereClause))
 			{
 				removeElementAt(loc);
@@ -304,6 +330,7 @@ void removeDupColumns()
 		/* Walk the list backwards so we can remove elements safely */
 		for (int loc = size() - 1; loc > 0; loc--)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             OrderByColumn obc = elementAt(loc);
 			int           colPosition = obc.getColumnPosition();
 
@@ -379,6 +406,8 @@ void generate(ActivationClassBuilder acb,
 		child.generate(acb, mb);
 
 		resultSetNumber = cc.getNextResultSetNumber();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 
 		// is a distinct query
 		mb.push(false);
@@ -390,6 +419,7 @@ void generate(ActivationClassBuilder acb,
 
 		// row allocator
         mb.push(acb.addItem(child.getResultColumns().buildRowTemplate()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
 		mb.push(child.getResultColumns().getTotalColumnSize());
 
@@ -404,6 +434,7 @@ void generate(ActivationClassBuilder acb,
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getSortResultSet",
 							ClassName.NoPutResultSet, 9);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 
 	}
 
@@ -415,6 +446,7 @@ void generate(ActivationClassBuilder acb,
      * @exception StandardException     Thrown on error
      */
     public int sortRequired(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6148
         RowOrdering rowOrdering,
         OptimizableList optimizableList,
         int[] proposedJoinOrder) throws StandardException
@@ -460,6 +492,7 @@ public int sortRequired(
             // non-NULL values, then a sort is required, as the index holds
             // NULL values unconditionally higher than non-NULL values
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
             if (obc.isNullsOrderedLow())
 				return RequiredRowOrdering.SORT_REQUIRED;
 
@@ -565,6 +598,7 @@ public int sortRequired(
 					 * from those multiple scans may not be ordered correctly.
 					 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6148
                    for (int i=0;
                         i < proposedJoinOrder.length &&
                             proposedJoinOrder[i] != -1; // -1: partial order
@@ -831,7 +865,10 @@ boolean requiresDescending(ColumnReference cRef, int numOptimizables)
 	public String toString() {
 
         StringBuilder buff = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (columnOrdering != null) {
 			for (int i = 0; i < columnOrdering.length; i++) {
 				buff.append("[" + i + "] " + columnOrdering[i] + "\n");
@@ -848,6 +885,8 @@ public String toString() {
 	}
 
 	public int getResultSetNumber() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 		return resultSetNumber;
 	}
 
@@ -856,6 +895,7 @@ public int getResultSetNumber() {
      * {@literal <table value constructor>}, i.e. a {@code VALUES} clause.
      */
     public boolean isTableValueCtorOrdering() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6009
         return isTableValueCtorOrdering;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByNode.java
index ef6f85020f..2bc5f14903 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderByNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.OrderByNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -35,6 +36,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * is required.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class OrderByNode extends SingleChildResultSetNode
 {
 
@@ -68,6 +71,7 @@ class OrderByNode extends SingleChildResultSetNode
         // (Copy maintains ResultColumn.expression for now.)
         final ResultColumnList prRCList =
             childRes.getResultColumns().copyListAndObjects();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( childRes.getResultColumns() );
         childRes.setResultColumns(prRCList);
 
@@ -86,11 +90,14 @@ class OrderByNode extends SingleChildResultSetNode
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
 		{
 			super.printSubNodes(depth);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 
 			if (orderByList != null)
 			{
@@ -101,6 +108,7 @@ void printSubNodes(int depth)
 	}
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 	ResultColumnDescriptor[] makeResultDescriptors()
 	{
 	    return childResult.makeResultDescriptors();
@@ -117,6 +125,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 							throws StandardException
 	{
 		// Get the cost estimate for the child
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getCostEstimate() == null)
 		{
 			setCostEstimate( childResult.getFinalCostEstimate() );
@@ -135,6 +144,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		// code generation for the PRN above us will fail when calling
 		// resultColumns.generateCore -> VCN.generateExpression, cf. the Sanity
 		// assert in VCN.generateExpression on sourceResultSetNumber >= 0.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setResultSetNumber( orderByList.getResultSetNumber() );
 		getResultColumns().setResultSetNumber(getResultSetNumber());
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderedColumn.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderedColumn.java
index e43100148a..6629083969 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderedColumn.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderedColumn.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.OrderedColumn
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -36,6 +37,8 @@ public abstract class OrderedColumn extends QueryTreeNode
 	protected int	columnPosition = UNMATCHEDPOSITION;
 
     public OrderedColumn(ContextManager cm) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         super(cm);
     }
 
@@ -65,6 +68,7 @@ boolean isAscending()
 	 */
     boolean isNullsOrderedLow()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
 		return false;
 	}
 
@@ -101,6 +105,8 @@ int getColumnPosition()
 	/**
 	 * Set the position of this column
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setColumnPosition(int columnPosition)
 	{
 		this.columnPosition = columnPosition;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java
index cd178c86eb..67394cea4c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.OrderedColumnList
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -30,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 public abstract class OrderedColumnList<E extends OrderedColumn>
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     extends QueryTreeNodeVector<E>
 {
     public OrderedColumnList(Class<E> eltClass,
@@ -57,20 +59,24 @@ IndexColumnOrder[] getColumnOrdering()
 			so we use a hashtable for lookup of the positions
 		*/
         HashSet<Integer> hashColumns = new HashSet<Integer>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		actualCols = 0;
 
 		for (int i = 0; i < numCols; i++)
 		{
             OrderedColumn oc = elementAt(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			// order by (lang) positions are 1-based,
 			// order items (store) are 0-based.
 			int position = oc.getColumnPosition() - 1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 			if (hashColumns.add(position))
 			{
 				ordering[i] = new IndexColumnOrder(position,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
 												oc.isAscending(),
 												oc.isNullsOrderedLow());
 				actualCols++;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParameterNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParameterNode.java
index 58a882ae7c..b8f5bd919a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParameterNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParameterNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ParameterNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -112,6 +113,8 @@ public class ParameterNode extends ValueNode
 	 * @param defaultValue				The default value for this parameter
      * @param cm                        The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ParameterNode(int parameterNumber,
                   DataValueDescriptor defaultValue,
                   ContextManager cm) {
@@ -138,6 +141,7 @@ int getParameterNumber()
 	 *			are bound.
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-738
 	void setDescriptors(DataTypeDescriptor[] descriptors)
 	{
 		userParameterTypes = descriptors;
@@ -149,6 +153,8 @@ void setDescriptors(DataTypeDescriptor[] descriptors)
 	 * @param descriptor	The DataTypeServices to set for this parameter
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setType(DataTypeDescriptor descriptor) throws StandardException
 	{
 		/* Make sure the type is nullable. */
@@ -167,6 +173,7 @@ void setType(DataTypeDescriptor descriptor) throws StandardException
 		//an infinite loop if this setType ends up calling the local
 		//setType method
 		super.setType(descriptor);
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 
 		if ( getJSQLType() == null ) { setJSQLType(  new JSQLType( descriptor ) ); }
 	}
@@ -175,6 +182,8 @@ void setType(DataTypeDescriptor descriptor) throws StandardException
 	 * Mark this as a return output parameter (e.g.
 	 * ? = CALL myMethod())
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setReturnOutputParam(ValueNode valueNode)
 	{
 		returnOutputParameter = valueNode;
@@ -208,6 +217,8 @@ boolean isReturnOutputParam()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode bindExpression(FromList fromList,
                              SubqueryList subqueryList,
                              List<AggregateNode> aggregates)
@@ -378,6 +389,8 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 	} // End of generateExpression
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     TypeId getTypeId() throws StandardException
 	{
 		return (returnOutputParameter != null) ?
@@ -406,6 +419,8 @@ TypeId getTypeId() throws StandardException
 	 */
     static void generateParameterValueSet(ExpressionClassBuilder acb,
 								   int		numberOfParameters,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                                    List<ParameterNode>     parameterList)
 		throws StandardException
 	{
@@ -419,6 +434,8 @@ static void generateParameterValueSet(ExpressionClassBuilder acb,
 			*/
             boolean
                 hasReturnParam = (parameterList.get(0)).isReturnOutputParam();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			/*
 			** Generate the following:
@@ -489,6 +506,7 @@ DataValueDescriptor getDefaultValue()
     @Override
     boolean requiresTypeFromContext()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		return true;
 	}
 	
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParseException.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParseException.java
index de5b85954f..8cd01562df 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParseException.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParseException.java
@@ -170,6 +170,8 @@ public String getMessage() {
    * string literal.
    */
   protected String add_escapes(String str) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
       StringBuilder retval = new StringBuilder();
       char ch;
       for (int i = 0; i < str.length(); i++) {
@@ -204,6 +206,8 @@ protected String add_escapes(String str) {
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
                  String s = "0000" + Integer.toString(ch, 16);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                  retval.append("\\u");
                  retval.append(s.substring(s.length() - 4, s.length()));
               } else {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParserImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParserImpl.java
index eb12375f1b..2a80455dc1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParserImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ParserImpl.java
@@ -101,6 +101,8 @@ private SQLParser getParser()
         {
 	    SQLParserTokenManager tm = (SQLParserTokenManager) getTokenManager();
 	    /* returned a cached Parser if already exists, otherwise create */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         SQLParser p = cachedParser;
 	    if (p == null) {
 		p = new SQLParser(tm);
@@ -184,6 +186,7 @@ private Visitable parseStatementOrSearchCondition(
 			// As a workaround, the cachedParser object is cleared to ensure
 			// that the exception does not have any side effect.
 			// TODO : Remove the following line if javacc-152 is fixed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2103
 			cachedParser = null;
 		    throw StandardException.newException(SQLState.LANG_LEXICAL_ERROR, e.getMessage());
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/Predicate.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/Predicate.java
index 3ca57c13ca..21e13cbbae 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/Predicate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/Predicate.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.Predicate
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -40,6 +41,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 
 public final class Predicate extends QueryTreeNode implements OptimizablePredicate,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                                                         Comparable<Predicate>
 {
 	/* Top of the predicate */
@@ -73,6 +76,8 @@ public final class Predicate extends QueryTreeNode implements OptimizablePredica
      * @param cm            The context manager
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     Predicate(AndNode andNode, JBitSet referencedSet, ContextManager cm)
 	{
         super(cm);
@@ -237,6 +242,7 @@ public boolean equalsComparisonWithConstantExpression(Optimizable optTable)
 
 	/** @see OptimizablePredicate#selectivity */
 	public double selectivity(Optimizable optTable)
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 	throws StandardException
 	{
 		return andNode.getLeftOperand().selectivity(optTable);
@@ -254,6 +260,8 @@ public int getIndexPosition()
     public int compareTo(Predicate other)
 	{
         Predicate otherPred = other;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		/* Not all operators are "equal". If the predicates are on the
 		 * same key column, then a "=" opertor takes precedence over all
@@ -338,6 +346,8 @@ public int compareTo(Predicate other)
 	 *
 	 * @return AndNode	The andNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     AndNode getAndNode()
 	{
 		return andNode;
@@ -348,6 +358,8 @@ AndNode getAndNode()
 	 *
 	 * @param andNode	The new andNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setAndNode(AndNode andNode)
 	{
 		this.andNode = andNode;
@@ -373,6 +385,8 @@ boolean getPushable()
 	 *
 	 * @param pushable Whether or not the predicate is pushable.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setPushable(boolean pushable) {
 		this.pushable = pushable;
 	}
@@ -382,6 +396,8 @@ void setPushable(boolean pushable) {
 	 *
 	 * @return JBitSet	The referencedSet.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     JBitSet getReferencedSet()
 	{
 		return referencedSet;
@@ -413,6 +429,8 @@ int getEquivalenceClass()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void categorize() throws StandardException
 	{
 		pushable = andNode.categorize(referencedSet, false);
@@ -426,6 +444,8 @@ void categorize() throws StandardException
 	 * @return	The RelationalOperator on the left side of the AND node,
 	 *			if any.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     RelationalOperator getRelop()
 	{
 		
@@ -439,6 +459,8 @@ RelationalOperator getRelop()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final boolean isOrList()
     {
         return(andNode.getLeftOperand() instanceof OrNode);
@@ -465,6 +487,8 @@ final boolean isOrList()
      *
 	 * @exception  StandardException  Standard exception policy.
      **/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final boolean isStoreQualifier()
     {
 		if ((andNode.getLeftOperand() instanceof RelationalOperator) ||
@@ -491,6 +515,8 @@ final boolean isStoreQualifier()
      *
 	 * @exception  StandardException  Standard exception policy.
      **/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final boolean isPushableOrClause(Optimizable optTable)
         throws StandardException
 	{
@@ -550,6 +576,7 @@ final boolean isPushableOrClause(Optimizable optTable)
 	boolean transitiveSearchClauseAdded(RelationalOperator ro)
 	{
         return searchClauses != null &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
             searchClauses.contains(ro.getOperator());
 	}
 
@@ -564,11 +591,13 @@ boolean transitiveSearchClauseAdded(RelationalOperator ro)
 	void setTransitiveSearchClauseAdded(RelationalOperator ro)
 	{
         if (searchClauses == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             searchClauses = new HashSet<Integer>();
         }
 		/* I have to remember that this ro has been added to this predicate as a
 		 * transitive search clause.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
         searchClauses.add(ro.getOperator());
 	}
 
@@ -676,6 +705,8 @@ public String toString()
 	 * is referencing, especially when tracing through code and printing
 	 * assert failure.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String binaryRelOpColRefsToString()
 	{
 		// We only consider binary relational operators here.
@@ -686,6 +717,8 @@ String binaryRelOpColRefsToString()
 		}
 
 		final String DUMMY_VAL = "<expr>";
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         java.lang.StringBuilder sBuf = new java.lang.StringBuilder();
 		BinaryRelationalOperatorNode opNode =
 			(BinaryRelationalOperatorNode)getAndNode().getLeftOperand();
@@ -694,6 +727,7 @@ String binaryRelOpColRefsToString()
 		if (opNode.getLeftOperand() instanceof ColumnReference)
 		{
 			sBuf.append(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     ((ColumnReference)opNode.getLeftOperand()).getTableName());
             sBuf.append('.');
             sBuf.append(
@@ -728,6 +762,8 @@ String binaryRelOpColRefsToString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -746,11 +782,13 @@ void printSubNodes(int depth)
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (andNode != null)
 		{
 			andNode = (AndNode)andNode.accept(v);
@@ -764,6 +802,8 @@ void acceptChildren(Visitor v)
 	 */
 
     void copyFields(Predicate otherPred) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		this.equivalenceClass = otherPred.getEquivalenceClass();
 		this.indexPosition = otherPred.getIndexPosition();
@@ -771,6 +811,7 @@ void copyFields(Predicate otherPred) {
 		this.stopKey = otherPred.isStopKey();
 		this.isQualifier = otherPred.isQualifier();
         this.searchClauses = otherPred.searchClauses;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
 	}
 
@@ -915,6 +956,8 @@ protected Predicate getPredScopedForResultSet(
 		//    <scoped_bin_rel_op> AND TRUE
 		// First create the boolean constant for TRUE.
         ValueNode trueNode = new BooleanConstantNode(true, getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		BinaryRelationalOperatorNode opNode =
 			(BinaryRelationalOperatorNode)getAndNode().getLeftOperand();
@@ -922,7 +965,10 @@ protected Predicate getPredScopedForResultSet(
 		// Create a new op node with left and right operands that point
 		// to the received result set's columns as appropriate.
 		BinaryRelationalOperatorNode newOpNode = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 opNode.kind,
 				opNode.getScopedOperand(
 					BinaryRelationalOperatorNode.LEFT,
@@ -934,6 +980,8 @@ protected Predicate getPredScopedForResultSet(
 					parentRSNsTables,
 					childRSN,
 					whichRC),
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 opNode.getForQueryRewrite(),
 				getContextManager());
 
@@ -942,6 +990,8 @@ protected Predicate getPredScopedForResultSet(
 
 		// Create and bind a new AND node in CNF form,
 		// i.e. "<newOpNode> AND TRUE".
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         AndNode newAnd = new AndNode(newOpNode, trueNode, getContextManager());
 		newAnd.postBindFixup();
 
@@ -954,6 +1004,8 @@ protected Predicate getPredScopedForResultSet(
 		newAnd.categorize(tableMap, false);
 
 		// Now put the pieces together to get a new predicate.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         Predicate newPred =
                 new Predicate(newAnd, tableMap, getContextManager());
 
@@ -1069,6 +1121,8 @@ protected boolean remapScopedPred()
 			(BinaryRelationalOperatorNode)andNode.getLeftOperand();
 
         ValueNode operand;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		if (SanityManager.DEBUG)
 		{
@@ -1186,6 +1240,8 @@ protected boolean isScopedToSourceResultSet()
 		 * to a source result set further down the tree and
 		 * thus we return true.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ValueNode exp;
 		ColumnReference cRef = (ColumnReference)operand;
 		if (cRef.isScoped())
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/PredicateList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/PredicateList.java
index 1b2683a57d..92c3c3445c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/PredicateList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/PredicateList.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.PredicateList
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -54,6 +55,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 class PredicateList extends QueryTreeNodeVector<Predicate>
                     implements OptimizablePredicateList
 {
@@ -63,6 +65,7 @@ class PredicateList extends QueryTreeNodeVector<Predicate>
 
     PredicateList(ContextManager cm)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         super(Predicate.class, cm);
 	}
 
@@ -87,6 +90,7 @@ public OptimizablePredicate getOptPredicate(int index)
 	public final void removeOptPredicate(int predCtr) throws StandardException
 	{
         Predicate predicate = removeElementAt(predCtr);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         if (predicate.isStartKey())
             numberOfStartPredicates--;
@@ -289,6 +293,7 @@ public void classify(Optimizable optTable, ConglomerateDescriptor cd)
 	/** @see OptimizablePredicateList#markAllPredicatesQualifiers */
 	public void markAllPredicatesQualifiers()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate p : this)
 		{
             p.markQualifier();
@@ -307,12 +312,15 @@ public int hasEqualityPredicateOnOrderedColumn(Optimizable optTable,
 													  boolean isNullOkay)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ValueNode opNode;
 		int size = size();
 		for (int index = 0; index < size; index++)
 		{
 			AndNode			andNode;
 			Predicate		predicate;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             predicate = elementAt(index);
 			//We are not looking at constant comparison predicate.
 			if (predicate.getReferencedMap().hasSingleBitSet())
@@ -321,6 +329,14 @@ public int hasEqualityPredicateOnOrderedColumn(Optimizable optTable,
 			}
 
             andNode = predicate.getAndNode();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			// skip non-equality predicates
 			opNode = andNode.getLeftOperand();
@@ -373,6 +389,8 @@ public boolean hasOptimizableEquijoin(Optimizable optTable,
 										  int columnNumber)
 					throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate predicate : this)
 		{
 			// This method is used by HashJoinStrategy to determine if
@@ -436,8 +454,10 @@ public void putOptimizableEqualityPredicateFirst(Optimizable optTable,
 		int size = size();
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             Predicate predicate = elementAt(index);
             AndNode andNode = predicate.getAndNode();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			// skip non-equality predicates
 			ValueNode opNode = andNode.getLeftOperand();
@@ -483,6 +503,7 @@ private void orderUsefulPredicates(Optimizable optTable,
 		** Clear all the scan flags for this predicate list, so that the
 		** flags that get set are only for the given conglomerate.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate p : this)
 		{
             p.clearScanFlags();
@@ -520,6 +541,7 @@ private void orderUsefulPredicates(Optimizable optTable,
 			for (int index = 0; index < size; index++)
 			{
                 Predicate pred = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 				/*
 				** Skip over it if it's not a relational operator (this includes
@@ -625,6 +647,8 @@ private void orderUsefulPredicates(Optimizable optTable,
 		** Create an array of useful predicates.  Also, count how many
 		** useful predicates there are.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate pred : this)
 		{
 			ColumnReference indexCol = null;
@@ -927,6 +951,8 @@ else if ((thisOperator == RelationalOperator.EQUALS_RELOP) ||
 				Predicate predToPush;
 				if (isIn && !thisPred.isInListProbePredicate())
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                    AndNode andCopy = new AndNode(
 										thisPred.getAndNode().getLeftOperand(),
 										thisPred.getAndNode().getRightOperand(),
@@ -982,6 +1008,8 @@ else if (SanityManager.DEBUG)
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void addPredicate(Predicate predicate) throws StandardException
 	{
 		if (predicate.isStartKey())
@@ -1015,6 +1043,7 @@ protected void transferNonQualifiers(Optimizable optTable, PredicateList otherPL
 		for (int index = size() - 1; index >= 0; index--)
 		{
             Predicate pred = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			// Transfer each non-qualifier
 			if (!pred.isRelationalOpPredicate() ||
@@ -1036,9 +1065,12 @@ protected void transferNonQualifiers(Optimizable optTable, PredicateList otherPL
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void categorize()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate p : this)
 		{
             p.categorize();
@@ -1055,6 +1087,8 @@ void categorize()
 	 *  Like transformation on c1 like 'ASDF%' can leave
 	 *  one of these predicates in the list.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void eliminateBooleanTrueAndBooleanTrue()
 	{
 		/* Walk list backwards since we can delete while
@@ -1101,6 +1135,8 @@ void eliminateBooleanTrueAndBooleanTrue()
 	 *
 	 * @return ValueNode	The rebuilt expression tree.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode restoreConstantPredicates()
 	throws StandardException
 	{
@@ -1115,6 +1151,7 @@ ValueNode restoreConstantPredicates()
 		{
 			/* Look at the current predicate from the predicate list */
             nextAnd = elementAt(index).getAndNode();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			// Skip over the predicate if it is not a constant expression
 			if (! nextAnd.isConstantExpression())
@@ -1198,7 +1235,11 @@ else if (falseAnd != null)
 	 *
 	 * @return ValueNode	The rebuilt expression tree.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode restorePredicates()
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 	throws StandardException
 	{
 		AndNode			nextAnd;
@@ -1209,6 +1250,8 @@ ValueNode restorePredicates()
 		for (int index = 0; index < size; index++)
 		{
             nextAnd = elementAt(index).getAndNode();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			/* We can skip over TRUE AND TRUE */
 			if ((nextAnd.getLeftOperand().isBooleanTrue()) &&
@@ -1266,8 +1309,11 @@ else if (falseAnd != null)
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void remapColumnReferencesToExpressions() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate p : this)
 		{
             p.setAndNode(
@@ -1301,6 +1347,8 @@ void pullExpressions(int numTables,
 		if (searchClause != null)
 		{
 			topAnd = (AndNode) searchClause;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             BooleanConstantNode trueNode =
                     new BooleanConstantNode(true, getContextManager());
 			
@@ -1316,6 +1364,8 @@ void pullExpressions(int numTables,
 
 				/* Add the top AndNode to the PredicateList */
 				newJBitSet = new JBitSet(numTables);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 newPred =
                     new Predicate(thisAnd, newJBitSet, getContextManager());
 				addPredicate(newPred);
@@ -1335,8 +1385,11 @@ void pullExpressions(int numTables,
 	 * 
 	 * @param fromMap	The JBitSet to XOR with.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void xorReferencedSet(JBitSet fromMap)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate p : this)
 		{
 			if (SanityManager.DEBUG)
@@ -1399,7 +1452,9 @@ void pushExpressionsIntoSelect(SelectNode select, boolean copyPredicate)
 		for (int index = size() - 1; index >= 0; index--)
 		{
             Predicate predicate = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             CollectNodesVisitor<ColumnReference> getCRs =
                 new CollectNodesVisitor<ColumnReference>(ColumnReference.class);
 
@@ -1413,8 +1468,10 @@ void pushExpressionsIntoSelect(SelectNode select, boolean copyPredicate)
 			boolean state = colRefs.size() > 0;
 			if (state)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 for (ColumnReference ref : colRefs)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2998
 					if (!ref.pointsToColumnReference())
 					{
 						state = false;
@@ -1479,6 +1536,7 @@ else if (!(inNode.getRightOperandList().isConstantExpression()))
                 }
 
 				// Remap this crNode to underlying column reference in the select, if possible.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				ColumnReference newCRNode = select.findColumnReferenceInResult(crNode.getColumnName());
 				if (newCRNode == null)
 					continue;
@@ -1501,8 +1559,11 @@ else if (!(inNode.getRightOperandList().isConstantExpression()))
 						inNode.setLeftOperand(newCRNode);
 					}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     BinaryRelationalOperatorNode newRelop =
                             new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                                         opNode.kind,
 										newCRNode,
 										opNode.getRightOperand(),
@@ -1528,12 +1589,15 @@ else if (!(inNode.getRightOperandList().isConstantExpression()))
                 //             /   \
                 //    leftOperand  true
                 //
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                ValueNode trueNode =
                         new BooleanConstantNode(true, getContextManager());
                 AndNode newAnd =
                         new AndNode(leftOperand, trueNode, getContextManager());
 				newAnd.postBindFixup();
 				JBitSet tableMap = new JBitSet(select.getReferencedTableMap().size());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 				// Use newly constructed predicate
                 predicate =
@@ -1558,6 +1622,7 @@ else if (!(inNode.getRightOperandList().isConstantExpression()))
 			}
 
 			// Push it into the select
+//IC see: https://issues.apache.org/jira/browse/DERBY-772
  			select.pushExpressionsIntoSelect(predicate);
 		}		
 	}
@@ -1571,14 +1636,17 @@ else if (!(inNode.getRightOperandList().isConstantExpression()))
 	void markReferencedColumns()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         CollectNodesVisitor<ColumnReference> collectCRs =
             new CollectNodesVisitor<ColumnReference>(ColumnReference.class);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate p : this)
 		{
             p.getAndNode().accept(collectCRs);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (ColumnReference ref : collectCRs.getList())
 		{
 			ResultColumn source = ref.getSource();
@@ -1618,6 +1686,7 @@ void checkTopPredicatesForEqualsConditions(
     boolean     resultColTable)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate p : this)
 		{
             p.getAndNode().checkTopPredicatesForEqualsConditions(
@@ -1633,6 +1702,7 @@ void checkTopPredicatesForEqualsConditions(
 	 */
 	 boolean allPushable()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate p : this)
 		{
             if (! p.getPushable())
@@ -1653,6 +1723,7 @@ boolean allPushable()
      boolean allReference(FromBaseTable fbt) {
          int tableNumber = fbt.getTableNumber();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
          for (Predicate p : this) {
              if (!p.getReferencedSet().get(tableNumber)) {
                  return false;
@@ -1681,6 +1752,7 @@ PredicateList getPushablePredicates(JBitSet referencedTableMap)
 		// Walk the list backwards because of possible deletes
 		for (int index = size() - 1; index >= 0; index--)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             Predicate predicate = elementAt(index);
 			if (! predicate.getPushable())
 			{
@@ -1695,6 +1767,8 @@ PredicateList getPushablePredicates(JBitSet referencedTableMap)
 				/* Add the matching predicate to the push list */
 				if (pushPList == null)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     pushPList = new PredicateList(getContextManager());
 				}
 				pushPList.addPredicate(predicate);
@@ -1727,6 +1801,7 @@ void decrementLevel(FromList fromList, int decrement)
 		 * CRs from the subquery and decrement their 
 		 * nesting level.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate predicate : this)
 		{
 			ColumnReference cr1 = null;
@@ -1827,12 +1902,15 @@ void joinClauseTransitiveClosure(int numTables,
 		PredicateList[] joinClauses = new PredicateList[numTables];
 		for (int index = 0; index < numTables; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             joinClauses[index] = new PredicateList(getContextManager());
 		}
 
 		/* Pull the equijoin clauses, putting each one in the list for
 		 * each of the tables being joined.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate predicate : this)
 		{
 			ValueNode vn = predicate.getAndNode().getLeftOperand();
@@ -1882,9 +1960,11 @@ void joinClauseTransitiveClosure(int numTables,
 			/* Put all of the join clauses that already have an equivalence 
              * class at the head of the outer list to optimize search.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			ArrayList<Predicate> movePreds = new ArrayList<Predicate>();
 			for (int jcIndex = outerJCL.size() - 1; jcIndex >= 0; jcIndex--)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 Predicate predicate = outerJCL.elementAt(jcIndex);
 				if (predicate.getEquivalenceClass() != -1)
 				{
@@ -1894,6 +1974,8 @@ void joinClauseTransitiveClosure(int numTables,
 			}
 			for (int mpIndex = 0; mpIndex < movePreds.size(); mpIndex++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 outerJCL.insertElementAt(movePreds.get(mpIndex), 0);
 			}
 
@@ -1912,6 +1994,7 @@ void joinClauseTransitiveClosure(int numTables,
 				 * that have not already been assigned an equivalence class.
 				 */
                 Predicate outerP = outerJCL.elementAt(outerIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 				if (outerP.getEquivalenceClass() == -1)
 				{
@@ -1944,6 +2027,7 @@ void joinClauseTransitiveClosure(int numTables,
 				 * in the chain/equivalence class
 				 */
 				PredicateList middleJCL = joinClauses[middleTableNumber];
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 for (Predicate middleP : middleJCL)
 				{
 					/* Skip those Predicates that have already been
@@ -2011,6 +2095,7 @@ void joinClauseTransitiveClosure(int numTables,
 					for ( ; innerIndex < innerJCL.size(); innerIndex++)
 					{
                         innerP = innerJCL.elementAt(innerIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 						// Skip over predicates with other equivalence classes
 						if (innerP.getEquivalenceClass() != -1 &&
@@ -2070,7 +2155,10 @@ void joinClauseTransitiveClosure(int numTables,
 
 					// No match, add new equijoin
 					// Build a new predicate
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     BinaryRelationalOperatorNode newEquals =
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                         new BinaryRelationalOperatorNode(
                             BinaryRelationalOperatorNode.K_EQUALS,
                             outerCR.getClone(),
@@ -2111,6 +2199,7 @@ void joinClauseTransitiveClosure(int numTables,
 						outerJCL.addElement(newPred);
 					}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4387
                     if (outerJCL != innerJCL) {
                         innerJCL.addElement(newPred);
                     } else {
@@ -2149,11 +2238,14 @@ void joinClauseTransitiveClosure(int numTables,
 	 void searchClauseTransitiveClosure(int numTables, boolean hashJoinSpecified)
 		 throws StandardException
 	 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         PredicateList equijoinClauses = new PredicateList(getContextManager());
         PredicateList searchClauses = new PredicateList(getContextManager());
 		RelationalOperator	equalsNode = null;
 
 		int size = size();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 		for (int index = 0; index < size; index++)
 		{
 			AndNode			andNode;
@@ -2234,6 +2326,7 @@ else if (isConstantOrParameterNode(left) &&
 		 * NOTE: We can append to the searchClauses while walking
 		 * them, thus we cannot cache the value of size().
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 		for (int scIndex = 0; scIndex < searchClauses.size(); scIndex++)
 		{
 			ColumnReference searchCR;
@@ -2252,9 +2345,12 @@ else if (isConstantOrParameterNode(left) &&
 				searchCR = (ColumnReference) ((BinaryComparisonOperatorNode) ro).getLeftOperand();
 
 				// Don't get value for parameterNode since not known yet.
+//IC see: https://issues.apache.org/jira/browse/DERBY-808
 				if (((BinaryComparisonOperatorNode) ro).getRightOperand() instanceof ConstantNode)
 				{
 					ConstantNode currCN = (ConstantNode) ((BinaryComparisonOperatorNode) ro).getRightOperand();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     searchODV = currCN.getValue();
 				}
 				else searchODV = null;
@@ -2264,6 +2360,7 @@ else if (isConstantOrParameterNode(left) &&
 			int colNumber = searchCR.getColumnNumber();
 
 			// Look for any equijoin clauses of interest
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (Predicate predicate : equijoinClauses)
 			{
 				/* Skip the current equijoin clause if it has already been used
@@ -2279,6 +2376,8 @@ else if (isConstantOrParameterNode(left) &&
 				}
 
 				BinaryRelationalOperatorNode equals = (BinaryRelationalOperatorNode)
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         predicate.getAndNode().getLeftOperand();
 				ColumnReference leftCR = (ColumnReference) equals.getLeftOperand();
 				ColumnReference rightCR = (ColumnReference) equals.getRightOperand();
@@ -2313,6 +2412,7 @@ else if (rightCR.getTableNumber() == tableNumber &&
                 ColumnReference searchCR2;
                 RelationalOperator ro2;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 for (Predicate sc : searchClauses)
 				{
 					DataValueDescriptor currODV = null;
@@ -2326,9 +2426,12 @@ else if (rightCR.getTableNumber() == tableNumber &&
 					else
 					{
 						searchCR2 = (ColumnReference) ((BinaryComparisonOperatorNode) ro2).getLeftOperand();
+//IC see: https://issues.apache.org/jira/browse/DERBY-808
 						if (((BinaryComparisonOperatorNode) ro2).getRightOperand() instanceof ConstantNode)
 						{
 							ConstantNode currCN = (ConstantNode) ((BinaryComparisonOperatorNode) ro2).getRightOperand();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                             currODV = currCN.getValue();
 						}
 						else currODV = null;
@@ -2354,6 +2457,8 @@ else if (rightCR.getTableNumber() == tableNumber &&
 				if (! match)
 				{
 					// Build a new predicate
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     OperatorNode roClone =
                         (OperatorNode)ro.getTransitiveSearchClause(
                             (ColumnReference)otherCR.getClone());
@@ -2373,6 +2478,9 @@ else if (rightCR.getTableNumber() == tableNumber &&
                     //             /   \
                     //       roClone    true
                     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     ValueNode trueNode =
                             new BooleanConstantNode(true, getContextManager());
                     AndNode newAnd =
@@ -2405,6 +2513,7 @@ else if (rightCR.getTableNumber() == tableNumber &&
 		for (int index = size() - 1; index >= 0; index--)
 		{
             Predicate predicate = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			if (predicate.transitiveSearchClauseAdded(equalsNode))
 			{
@@ -2427,6 +2536,7 @@ void removeRedundantPredicates()
 		int outer = size() - 1;
 		while (outer >= 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             Predicate predicate = elementAt(outer);
 			int equivalenceClass = predicate.getEquivalenceClass();
 
@@ -2439,6 +2549,7 @@ void removeRedundantPredicates()
 			// Walk the rest of the list backwards.
 			for (int inner = outer - 1; inner >= 0; inner--)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 Predicate innerPredicate = elementAt(inner);
 				if (innerPredicate.getEquivalenceClass() == equivalenceClass)
 				{
@@ -2515,6 +2626,7 @@ public void transferPredicates(OptimizablePredicateList otherList,
 		for (int index = size() - 1; index >= 0; index--)
 		{
             predicate = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			if (SanityManager.DEBUG)
 			{
@@ -2570,6 +2682,8 @@ public void transferAllPredicates(OptimizablePredicateList otherList)
 	{
 		PredicateList	theOtherList = (PredicateList) otherList;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate predicate : this)
 		{
 			/*
@@ -2613,6 +2727,7 @@ public void copyPredicatesToOtherList(OptimizablePredicateList otherList)
 	 */
 	public boolean isRedundantPredicate(int predNum)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Predicate pred = elementAt(predNum);
 		if (pred.getEquivalenceClass() == -1)
 		{
@@ -2721,6 +2836,7 @@ public void generateStopKey(ExpressionClassBuilderInterface acbi,
 
 			int	colNum = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (Predicate pred : this)
             {
 				if ( ! pred.isStopKey() )
@@ -2764,6 +2880,7 @@ public int stopOperator(Optimizable optTable)
 		for (int index = size - 1; index >= 0; index--)
 		{
             Predicate pred = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			if ( ! pred.isStopKey() )
 				continue;
@@ -2866,6 +2983,7 @@ void generateInListValues(ExpressionClassBuilder acb,
 		for (int index = size() - 1; index >= 0; index--)
 		{
             Predicate pred = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			// Don't do anything if it's not an IN-list probe predicate.
 			if (!pred.isInListProbePredicate())
@@ -2888,6 +3006,7 @@ void generateInListValues(ExpressionClassBuilder acb,
 			{
 				for (int i = 0; i < index; i++)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     if (elementAt(i).isInListProbePredicate())
 					{
 						SanityManager.THROWASSERT("Found multiple probe " +
@@ -2948,6 +3067,7 @@ public void generateQualifiers(
         throws StandardException
 	{
         String retvalType  = ClassName.Qualifier + "[][]";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5989
 
         // If there are no qualifiers, return null.
         if (numberOfQualifiers == 0) {
@@ -2992,6 +3112,7 @@ public void generateQualifiers(
             VMOpcode.INVOKESTATIC, 
             acb.getBaseClassName(), "reinitializeQualifiers", "void", 1);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5989
         if (SanityManager.DEBUG)
         {
             if (numberOfQualifiers > size())
@@ -3007,6 +3128,7 @@ public void generateQualifiers(
         int num_of_or_conjunctions = 0;
         for (int i = 0; i < numberOfQualifiers; i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (elementAt(i).isOrList())
             {
                 num_of_or_conjunctions++;
@@ -3016,13 +3138,17 @@ public void generateQualifiers(
 
         /* Assign the initializer to the Qualifier[] field */
         consMB.pushNewArray(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ClassName.Qualifier + "[]", num_of_or_conjunctions + 1);
         consMB.setField(qualField);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
         // Allocate qualifiers[0] which is an entry for each of the leading
         // AND clauses.
 
         consMB.getField(qualField);             // 1st arg allocateQualArray
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         consMB.push(0);                   // 2nd arg allocateQualArray
         consMB.push(numberOfQualifiers - num_of_or_conjunctions);  // 3rd arg allocateQualArray
 
@@ -3044,6 +3170,7 @@ public void generateQualifiers(
 		 * instantiation.
 		 */
         orderQualifiers();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5989
 
 		/* Generate each of the qualifiers, if any */
 
@@ -3056,6 +3183,7 @@ public void generateQualifiers(
 		{
 
             Predicate pred = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			if (!pred.isQualifier())
             {
@@ -3107,6 +3235,8 @@ else if (pred.isOrList())
             {
 
                 Predicate pred = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
                 if (SanityManager.DEBUG)
                 {
@@ -3118,6 +3248,7 @@ else if (pred.isOrList())
                 // call, then we walk the list assigning each of the OR's to
                 // entries in the array in generateSingleQualifierCode().
                 ArrayList<RelationalOperator> a_list = new ArrayList<RelationalOperator>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
                 QueryTreeNode node = pred.getAndNode().getLeftOperand();
 
@@ -3129,6 +3260,7 @@ else if (pred.isOrList())
                     // (ie. A = 1)
                     if (or_node.getLeftOperand() instanceof RelationalOperator)
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                         a_list.add( (RelationalOperator) or_node.getLeftOperand());
                     }
 
@@ -3140,6 +3272,7 @@ else if (pred.isOrList())
                 // clause.  ie. (a = 1 or b = 2), will allocate a 2 entry array.
 
                 consMB.getField(qualField);        // 1st arg allocateQualArray
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 consMB.push(and_idx);        // 2nd arg allocateQualArray
                 consMB.push(a_list.size());  // 3rd arg allocateQualArray
 
@@ -3157,6 +3290,7 @@ else if (pred.isOrList())
                             optTable,
                             absolute,
                             acb,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                             a_list.get(i),
                             qualField,
                             and_idx,
@@ -3216,9 +3350,12 @@ private void orderQualifiers()
 
         for (int i = sortList.length - 1; i >= 0; i--)
             sortList[i] = new PredicateList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		int predIndex;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate pred : this)
         {
 			if (! pred.isQualifier())
@@ -3310,6 +3447,7 @@ public void generateStartKey(ExpressionClassBuilderInterface acbi,
 
 			int	colNum = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (Predicate pred : this)
             {
 				if ( ! pred.isStartKey() )
@@ -3356,6 +3494,7 @@ public boolean sameStartStopPosition()
 		 * a start key iff it is a stop key.
 		 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate pred : this)
         {
 			if ( (pred.isStartKey() && (! pred.isStopKey())) ||
@@ -3400,6 +3539,7 @@ private LocalField generateIndexableRow(ExpressionClassBuilder acb, int numberOf
 			acb.newFieldDeclaration(Modifier.PRIVATE, ClassName.ExecIndexRow);
 		
 		mb.setField(field);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 		return field;
 	}
@@ -3571,6 +3711,7 @@ boolean constantColumn(ColumnReference colRef)
 		/*
 		** Walk this list
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate pred : this)
 		{
 			RelationalOperator relop = pred.getRelop();
@@ -3638,6 +3779,7 @@ public void adjustForSortElimination(
 		 * at execution time.
 		 */
 		OrderByList orderBy = (OrderByList)ordering;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate pred : this)
 		{
 			if (!pred.isInListProbePredicate())
@@ -3679,6 +3821,8 @@ public double selectivity(Optimizable optTable)
 		 * list; we'll work with the workingPredicates list from now on in this
 		 * routine. 
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         PredicateList workingPredicates =
             new PredicateList(getContextManager());
 
@@ -3688,6 +3832,7 @@ public double selectivity(Optimizable optTable)
 				continue;
 
 			/* to workingPredicates only add useful predicates... */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             workingPredicates.addOptPredicate(elementAt(i));
 		}
 
@@ -3739,6 +3884,7 @@ public double selectivity(Optimizable optTable)
 			for (int j = 0; j < numWorkingPredicates; j++)
 			{
                 Predicate pred = workingPredicates.elementAt(j);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 				int ip = pred.hasEqualOnColumnList(baseColumnList, 
 												   optTable);
@@ -3792,9 +3938,11 @@ public double selectivity(Optimizable optTable)
 		double selectivity = 1.0;
 
 		ArrayList<Predicate> maxPreds = new ArrayList<Predicate>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		while (true)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 			maxPreds.clear();
 			int conglomIndex = chooseLongestMatch(predsForConglomerates,
 												  maxPreds, numWorkingPredicates);
@@ -3810,6 +3958,8 @@ public double selectivity(Optimizable optTable)
 				/* remove the predicates that we've calculated the selectivity
 				 * of, from workingPredicates.
 				 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 Predicate p = maxPreds.get(i);
 				workingPredicates.removeOptPredicate(p);
 			}	
@@ -3910,6 +4060,8 @@ private int chooseLongestMatch(PredicateWrapperList[] predArray, List<Predicate>
 		 * [p2] shuld be considered again later.
 		*/
 		PredicateWrapperList pwl = predArray[position];
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         List<PredicateWrapper> uniquepreds = pwl.createLeadingUnique();
 		
         /* uniqueprds is a list of predicates (along with wrapper) that I'm
@@ -3918,6 +4070,8 @@ private int chooseLongestMatch(PredicateWrapperList[] predArray, List<Predicate>
 		*/
 		for (int i = 0; i < uniquepreds.size(); i++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             Predicate p = uniquepreds.get(i).getPredicate();
 			ret.add(p);
 			for (int j = 0; j < predArray.length; j++)
@@ -3953,6 +4107,7 @@ private int chooseLongestMatch(PredicateWrapperList[] predArray, List<Predicate>
 	 * Compute selectivity the old fashioned way.
 	 */
 	private double selectivityNoStatistics(Optimizable optTable)
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 	throws StandardException
 	{
 		double selectivity = 1.0;
@@ -3960,6 +4115,8 @@ private double selectivityNoStatistics(Optimizable optTable)
 		for (int i = 0; i < size(); i++)
 		{
 			OptimizablePredicate pred = (OptimizablePredicate)elementAt(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             selectivity *= pred.selectivity(optTable);
 		}
 		
@@ -4023,6 +4180,7 @@ private static class PredicateWrapperList
 
 		PredicateWrapperList(int maxValue)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			pwList = new ArrayList<PredicateWrapper>(maxValue);
 		}
 		
@@ -4050,6 +4208,7 @@ void removeElementAt(int index)
 
 		PredicateWrapper elementAt(int i)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			return pwList.get(i);
 		}
 
@@ -4065,6 +4224,7 @@ void insert(PredicateWrapper pw)
 					break;
 			}
 			numPreds++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 			pwList.add(i, pw);
 		} 
 		
@@ -4088,12 +4248,14 @@ int uniqueSize()
 		 */
 		void retainLeadingContiguous()
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
             if (pwList.isEmpty()) {
 				return;
             }
 
 			if (elementAt(0).getIndexPosition() != 0)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				pwList.clear();
 				numPreds = numDuplicates = 0;
 				return;
@@ -4119,6 +4281,7 @@ void retainLeadingContiguous()
 				if (elementAt(k).getIndexPosition() == 
 							elementAt(k-1).getIndexPosition())
 					numDuplicates--;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 				pwList.remove(k);
 			}
 			numPreds = j + 1;
@@ -4140,8 +4303,10 @@ private List<PredicateWrapper> createLeadingUnique()
 			if (lastIndexPosition != 0)
 				return null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             ArrayList<PredicateWrapper> scratch = new ArrayList<PredicateWrapper>();
 			scratch.add(elementAt(0));	// always add 0.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 
 			for (int i = 1; i < numPreds; i++)
 			{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java
index 187595690a..0edb68c6fc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.PrivilegeNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -75,6 +76,8 @@ class PrivilegeNode extends QueryTreeNode
      * @param specificPrivileges null for routines and usage
      * @param cm                 the context manager
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     PrivilegeNode(int                 objectType,
                   Object              objectOfPrivilege,
                   TablePrivilegesNode specificPrivileges,
@@ -97,6 +100,8 @@ class PrivilegeNode extends QueryTreeNode
                                       "null specific privileges used with table privilege");
             }
             objectName = (TableName) objectOfPrivilege;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             this.specificPrivileges = specificPrivileges;
             break;
             
@@ -125,6 +130,8 @@ class PrivilegeNode extends QueryTreeNode
      * @param restrict   True if this is a REVOKE...RESTRICT action
      * @param cm         The context manager
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     PrivilegeNode(int            objectType,
                   TableName      objectName,
                   String         privilege,
@@ -152,6 +159,8 @@ class PrivilegeNode extends QueryTreeNode
      * @exception StandardException	Standard error policy.
      */
     public QueryTreeNode bind(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             HashMap<Provider,Provider> dependencies,
             List<String> grantees,
             boolean isGrant ) throws StandardException
@@ -209,6 +218,8 @@ public QueryTreeNode bind(
             }
 				
             AliasDescriptor proc = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             List<AliasDescriptor> list = getDataDictionary().getRoutineList(
                 sd.getUUID().toString(),
                 objectName.getTableName(),
@@ -234,6 +245,8 @@ public QueryTreeNode bind(
                                 objectName.getFullTableName());
                     }
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 proc = list.get(0);
             }
             else
@@ -243,6 +256,8 @@ public QueryTreeNode bind(
                 for (int i = list.size() - 1; (!found) && i >= 0; i--)
                 {
                     proc = list.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
                     RoutineAliasInfo
                         routineInfo = (RoutineAliasInfo) proc.getAliasInfo();
@@ -263,6 +278,8 @@ public QueryTreeNode bind(
                 if( ! found)
                 {
                     // reconstruct the signature for the error message
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     StringBuilder sb =
                             new StringBuilder(objectName.getFullTableName());
                     sb.append( "(");
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
index f15210d91e..b6b2a3b1fb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ProjectRestrictNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -56,6 +57,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class ProjectRestrictNode extends SingleChildResultSetNode
 {
 	/**
@@ -72,6 +75,8 @@ class ProjectRestrictNode extends SingleChildResultSetNode
 	 * Restriction as a PredicateList
 	 */
     PredicateList restrictionList;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 	/**
 	 * List of subqueries in projection
@@ -110,6 +115,8 @@ class ProjectRestrictNode extends SingleChildResultSetNode
      * @param cm            The context manager
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ProjectRestrictNode(ResultSetNode    childResult,
                         ResultColumnList projection,
                         ValueNode        restriction,
@@ -120,6 +127,7 @@ class ProjectRestrictNode extends SingleChildResultSetNode
                         ContextManager   cm)
 	{
         super(childResult, tableProperties, cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( projection );
         this.restriction = restriction;
         this.restrictionList = restrictionList;
@@ -254,6 +262,7 @@ public CostEstimate optimizeIt(
 		CostEstimate childCost;
 
 		setCostEstimate( getCostEstimate( optimizer ) );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/*
 		** Don't re-optimize a child result set that has already been fully
@@ -328,7 +337,9 @@ else if ( ! accessPathModified)
 
 			/* Copy child cost to this node's cost */
 			childCost = childResult.getCostEstimate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			getCostEstimate().setCost(
 							childCost.getEstimatedCost(),
 							childCost.rowCount(),
@@ -377,6 +388,7 @@ else if ( ! accessPathModified)
 			optimizer.considerCost(this, restrictionList, getCostEstimate(), outerCost);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return getCostEstimate();
 	}
 
@@ -519,6 +531,8 @@ public boolean pushOptPredicate(OptimizablePredicate optimizablePredicate)
 		/* Add the matching predicate to the restrictionList */
 		if (restrictionList == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             restrictionList = new PredicateList(getContextManager());
 		}
 		restrictionList.addPredicate((Predicate) optimizablePredicate);
@@ -705,6 +719,7 @@ else if (!(childResult instanceof FromBaseTable))
 			(trulyTheBestAccessPath.getJoinStrategy() != null) &&
 			trulyTheBestAccessPath.getJoinStrategy().isHashJoin();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if ((restrictionList != null) &&
             !alreadyPushed &&
             !hashJoinWithThisPRN &&
@@ -811,6 +826,8 @@ private Optimizable replaceWithHashTableNode()
 		 * requalification list.
 		 */
 		PredicateList searchRestrictionList =
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 new PredicateList(getContextManager());
 		PredicateList joinQualifierList =
                 new PredicateList(getContextManager());
@@ -827,9 +844,12 @@ private Optimizable replaceWithHashTableNode()
 		/* Break out the non-qualifiers from HTN's join qualifier list and make that
 		 * the new restriction list for this PRN.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         restrictionList = new PredicateList(getContextManager());
         /* For non-base table, we remove first 2 lists from requal list to avoid adding duplicates.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Predicate p : searchRestrictionList) {
             requalificationRestrictionList.removeOptPredicate(p);
         }
@@ -867,6 +887,8 @@ private Optimizable replaceWithHashTableNode()
 		searchRestrictionList.accept(rcrv);
 
 		/* We can finally put the HTN between ourself and our old child. */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         childResult = new HashTableNode(childResult,
                                         tableProperties,
                                         htRCList,
@@ -973,6 +995,8 @@ String getUserSpecifiedJoinStrategy()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -1030,6 +1054,8 @@ void printSubNodes(int depth)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList) 
@@ -1039,6 +1065,7 @@ ResultSetNode preprocess(int numTables,
 
 		/* Build the referenced table map */
 		setReferencedTableMap( (JBitSet) childResult.getReferencedTableMap().clone() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		return this;
 	}
@@ -1055,6 +1082,8 @@ ResultSetNode preprocess(int numTables,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void pushExpressions(PredicateList predicateList)
 					throws StandardException
 	{
@@ -1075,12 +1104,15 @@ void pushExpressions(PredicateList predicateList)
 		/* Build a list of the single table predicates that we can push down */
         PredicateList pushPList =
             predicateList.getPushablePredicates(getReferencedTableMap());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* If this is a PRN above a SelectNode, probably due to a 
 		 * view or derived table which couldn't be flattened, then see
 		 * if we can push any of the predicates which just got pushed
 		 * down to our level into the SelectNode.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		if (pushPList != null &&
 				(childResult instanceof SelectNode))
 		{
@@ -1095,6 +1127,7 @@ void pushExpressions(PredicateList predicateList)
             //
             // Similarly, don't push if we have OFFSET and/or FETCH FROM.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
             if (childSelect.hasWindows() ||
                 childSelect.hasOffsetFetchFirst()) {
             } else {
@@ -1145,6 +1178,8 @@ else if (pushPList != null && pushPList.size() != 0)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode addNewPredicate(Predicate predicate)
 			throws StandardException
 	{
@@ -1187,6 +1222,8 @@ boolean flattenableInFromSubquery(FromList fromList)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode ensurePredicateList(int numTables)
 		throws StandardException
 	{
@@ -1206,6 +1243,8 @@ ResultSetNode ensurePredicateList(int numTables)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode optimize(DataDictionary dataDictionary,
 								  PredicateList predicates,
 								  double outerRows) 
@@ -1221,6 +1260,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 		// RESOLVE: SHOULD FACTOR IN THE NON-OPTIMIZABLE PREDICATES THAT
 		// WERE NOT PUSHED DOWN
         setCostEstimate( getOptimizerFactory().getCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		getCostEstimate().setCost(childResult.getCostEstimate().getEstimatedCost(),
 							childResult.getCostEstimate().rowCount(),
@@ -1236,6 +1276,8 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 	 * 			the cost estimate for the child node.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getCostEstimate()
 	{
 		/*
@@ -1244,6 +1286,7 @@ CostEstimate getCostEstimate()
 		** that optimization was done directly on the child node,
 		** in which case the cost estimate will be null here.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (super.getCostEstimate() == null)
         {
 			return childResult.getCostEstimate();
@@ -1261,9 +1304,12 @@ CostEstimate getCostEstimate()
 	 * 			the final cost estimate for the child node.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getFinalCostEstimate()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getCandidateFinalCostEstimate() != null)
         {
             // we already set it, so just return it.
@@ -1304,6 +1350,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 	{
 		if (SanityManager.DEBUG)
             SanityManager.ASSERT(getResultColumns() != null, "Tree structure bad");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         //
         // If we are projecting and restricting the stream from a table
@@ -1365,6 +1412,7 @@ private void generateMinion(ExpressionClassBuilder acb,
 				childResult.generateResultSet(acb, mb);
 			else
 				childResult.generate((ActivationClassBuilder)acb, mb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			setCostEstimate( childResult.getFinalCostEstimate() );
 			return;
 		}
@@ -1403,8 +1451,13 @@ private void generateMinion(ExpressionClassBuilder acb,
 
 		// Map the result columns to the source columns
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
         ResultColumnList.ColumnMapping mappingArrays =
             getResultColumns().mapSourceColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         int[] mapArray = mappingArrays.mapArray;
         boolean[] cloneMap = mappingArrays.cloneMap;
@@ -1473,6 +1526,7 @@ private void generateMinion(ExpressionClassBuilder acb,
 		 */
 		if (projectSubquerys != null && projectSubquerys.size() > 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			projectSubquerys.setPointOfAttachment(getResultSetNumber());
 		}
 		if (restrictSubquerys != null && restrictSubquerys.size() > 0)
@@ -1536,6 +1590,7 @@ private void generateMinion(ExpressionClassBuilder acb,
 			// as-is, with the performance trade-off as discussed above.)
 
 			/* Generate the Row function for the projection */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			getResultColumns().generateCore(acb, mb, false);
 		}
 		else
@@ -1585,9 +1640,12 @@ private void generateMinion(ExpressionClassBuilder acb,
 		
 		mb.push(mapArrayItem);
         mb.push(cloneMapItem);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		mb.push(getResultColumns().reusableResult());
 		mb.push(doesProjection);
         mb.push(validatingCheckConstraints);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         if ( validatingBaseTableUUIDString == null )
         {
             mb.push( UUID.NULL );
@@ -1615,6 +1673,7 @@ boolean nopProjectRestrict()
 		** This ProjectRestrictNode is not a No-Op if it does any
 		** restriction.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-4411
 		if ( (restriction != null) || (constantRestriction != null) ||
 			 (restrictionList != null && restrictionList.size() > 0) )
 		{
@@ -1642,6 +1701,8 @@ boolean nopProjectRestrict()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void generateNOPProjectRestrict()
 			throws StandardException
 	{
@@ -1657,6 +1718,8 @@ void generateNOPProjectRestrict()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode considerMaterialization(JBitSet outerTables)
 		throws StandardException
 	{
@@ -1692,6 +1755,7 @@ ResultSetNode considerMaterialization(JBitSet outerTables)
 				/* We get a shallow copy of the ResultColumnList and its 
 				 * ResultColumns.  (Copy maintains ResultColumn.expression for now.)
 				 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				prRCList = getResultColumns();
 				setResultColumns(getResultColumns().copyListAndObjects());
 
@@ -1702,12 +1766,15 @@ ResultSetNode considerMaterialization(JBitSet outerTables)
 				prRCList.genVirtualColumnNodes(this, getResultColumns());
 
 				/* Finally, we create the new MaterializeResultSetNode */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 mrsn = new MaterializeResultSetNode(
 									this,
 									prRCList,
 									tableProperties,
 									getContextManager());
 				// Propagate the referenced table map if it's already been created
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				if (getReferencedTableMap() != null)
 				{
 					mrsn.setReferencedTableMap((JBitSet) getReferencedTableMap().clone());
@@ -1732,6 +1799,8 @@ ResultSetNode considerMaterialization(JBitSet outerTables)
 				 * they get applied while building the MaterializeResultSet.
 				 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 mrsn = new MaterializeResultSetNode(
 									childResult,
 									prRCList,
@@ -1806,7 +1875,9 @@ boolean isPossibleDistinctScan(Set<BaseColumnNode> distinctColumns)
 		}
 
 		HashSet<BaseColumnNode> columns = new HashSet<BaseColumnNode>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         for (ResultColumn rc : getResultColumns()) {
 			BaseColumnNode bc = rc.getBaseColumnNode();
 			if (bc == null) return false;
@@ -1834,11 +1905,13 @@ void markForDistinctScan()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (restriction != null)
 		{
 			restriction = (ValueNode)restriction.accept(v);
@@ -1868,12 +1941,15 @@ void setRefActionInfo(long fkIndexConglomId,
 								   dependentScan);
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setRestriction(ValueNode restriction) {
 		this.restriction = restriction;
 	}
 
     @Override
     public void pushQueryExpressionSuffix() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         childResult.pushQueryExpressionSuffix();
     }
 
@@ -1886,6 +1962,8 @@ public void pushQueryExpressionSuffix() {
 	 * @param orderByList	The order by list
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 	void pushOrderByList(OrderByList orderByList)
 	{
 		childResult.pushOrderByList(orderByList);
@@ -1905,6 +1983,8 @@ void pushOffsetFetchFirst( ValueNode offset, ValueNode fetchFirst, boolean hasJD
         childResult.pushOffsetFetchFirst( offset, fetchFirst, hasJDBClimitClause );
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
     void setValidatingCheckConstraints( String baseTableUUIDString ) {
         validatingCheckConstraints = true;
         validatingBaseTableUUIDString = baseTableUUIDString;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
index e4ad28f261..03e171b06f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
@@ -1604,6 +1604,7 @@ SortedSet<N> getOffsetOrderedNodes(Class<N> type)
      */
     static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java
index bd59c5e3a5..63817b8dc5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.QueryTreeNodeVector
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -36,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 class QueryTreeNodeVector<E extends QueryTreeNode> extends QueryTreeNode
                                                    implements Iterable<E>
 {
@@ -52,8 +54,11 @@ public final int size()
 		return v.size();
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final E elementAt(int index)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return v.get(index);
 	}
 
@@ -64,6 +69,8 @@ void addElement(E qt)
 
     final E removeElementAt(int index)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return v.remove(index);
 	}
 
@@ -79,6 +86,7 @@ final int indexOf(E qt)
 
     final void setElementAt(E qt, int index)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 		v.set(index, qt);
 	}
 
@@ -90,6 +98,7 @@ final void destructiveAppend(QueryTreeNodeVector<E> qtnv)
 
     final void nondestructiveAppend(QueryTreeNodeVector<E> qtnv)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         v.addAll(qtnv.v);
 	}
 
@@ -98,6 +107,7 @@ final void removeAllElements()
 		v.clear();
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final void insertElementAt(E qt, int index)
 	{
 		v.add(index, qt);
@@ -111,9 +121,11 @@ final void insertElementAt(E qt, int index)
 	 */
     @Override
     void printSubNodes(int depth) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (SanityManager.DEBUG) {
 			for (int index = 0; index < size(); index++) {
 				debugPrint(formatNodeString("[" + index + "]:", depth));
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 E elt = elementAt(index);
 				elt.treePrint(depth);
 			}
@@ -129,6 +141,7 @@ void printSubNodes(int depth) {
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
@@ -137,6 +150,7 @@ void acceptChildren(Visitor v)
 		int size = size();
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             Visitable vbl = elementAt(index).accept(v);
             setElementAt(eltClass.cast(vbl), index);
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java
index 93608b8eae..3c533bf2d9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ReferencedTablesVisitor
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -91,6 +92,7 @@ public boolean skipChildren(Visitable node)
 
 	public boolean visitChildrenFirst(Visitable node)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RelationalOperator.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
index e85d21db16..4cba99442e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.RelationalOperator
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -35,6 +36,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 interface RelationalOperator
 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final int EQUALS_RELOP = 1;
     final int NOT_EQUALS_RELOP = 2;
     final int GREATER_THAN_RELOP = 3;
@@ -338,6 +341,8 @@ int getOrderableVariantType(Optimizable optTable)
 	 */
     boolean compareWithKnownConstant(
         Optimizable optTable, boolean considerParameters);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 	/**
 	 * Return an Object representing the known value that this relational
@@ -345,6 +350,8 @@ boolean compareWithKnownConstant(
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DataValueDescriptor getCompareValue(Optimizable optTable)
 					throws StandardException;
 
@@ -365,6 +372,8 @@ DataValueDescriptor getCompareValue(Optimizable optTable)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     RelationalOperator getTransitiveSearchClause(ColumnReference otherCR)
 		throws StandardException;
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java
index b54cf500ed..a52fc0eb45 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.RemapCRsVisitor
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -94,6 +95,7 @@ public boolean skipChildren(Visitable node)
 
 	public boolean visitChildrenFirst(Visitable node)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RenameNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RenameNode.java
index 20f4ca04ef..7e7ab8b41c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RenameNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RenameNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.RenameNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -92,6 +93,8 @@ class RenameNode extends DDLStatementNode
 	 *
 	 * @exception StandardException Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     RenameNode(Object tableName,
                String oldObjectName,
                String newObjectName,
@@ -127,6 +130,8 @@ class RenameNode extends DDLStatementNode
 				initAndCheck(actingObjectName);
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 this.oldObjectName = oldObjectName;
                 this.newObjectName = newObjectName;
 				break;
@@ -182,6 +187,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		if (usedAlterTable)
@@ -276,6 +283,8 @@ public void bindStatement() throws StandardException
 		{
 			case StatementType.RENAME_TABLE:
 				/* Verify that new table name does not exist in the database */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 TableDescriptor tabDesc = getTableDescriptor(newObjectName, sd);
                 if (tabDesc != null)
                     throw descriptorExistsException(tabDesc, sd);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
index efd55965cb..ced59869ec 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ReplaceAggregatesWithCRVisitor
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -50,6 +51,7 @@ class ReplaceAggregatesWithCRVisitor implements Visitor
 	}
 
     ReplaceAggregatesWithCRVisitor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         ResultColumnList rcl, int tableNumber, Class<?> skipOverClass)
 	{
 		this.rcl = rcl;
@@ -66,6 +68,7 @@ class ReplaceAggregatesWithCRVisitor implements Visitor
 	 * @param rcl the result column list
 	 * @param nodeToSkip don't examine anything below nodeToSkip
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     ReplaceAggregatesWithCRVisitor(ResultColumnList rcl, Class<?> nodeToSkip)
 	{
 		this.rcl = rcl;
@@ -118,6 +121,7 @@ public boolean skipChildren(Visitable node)
 	
 	public boolean visitChildrenFirst(Visitable node)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReplaceWindowFuncCallsWithCRVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReplaceWindowFuncCallsWithCRVisitor.java
index 69886da3e8..8d3b0171b4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReplaceWindowFuncCallsWithCRVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ReplaceWindowFuncCallsWithCRVisitor.java
@@ -1,5 +1,7 @@
 /*
    Derby - Class org.apache.derby.impl.sql.compile.ReplaceWindowFuncCallsWithCRVisitor
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -44,8 +46,11 @@ class ReplaceWindowFuncCallsWithCRVisitor implements Visitor
 	 * @param tableNumber	The tableNumber for the new CRs
 	 * @param skipOverClass Don't go past this
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ReplaceWindowFuncCallsWithCRVisitor(ResultColumnList rcl,
 											int tableNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                                             Class<?> skipOverClass)
 	{
 		this.rcl = rcl;
@@ -100,6 +105,7 @@ public boolean skipChildren(Visitable node)
 	 */
 	public boolean visitChildrenFirst(Visitable node)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultColumn.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultColumn.java
index 5f71b2dca1..31e1518322 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultColumn.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultColumn.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ResultColumn
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -61,6 +62,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class ResultColumn extends ValueNode
                 implements ResultColumnDescriptor, Comparable<ResultColumn>
 {
@@ -122,6 +125,8 @@ class ResultColumn extends ValueNode
 	/* virtualColumnId is the ResultColumn's position (1-based) within the ResultSet */
 	private int		virtualColumnId;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn(ContextManager cm) {
         super(cm);
     }
@@ -132,6 +137,7 @@ class ResultColumn extends ValueNode
      * @param cm context manager
      */
     ResultColumn(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             String underlyingName,
             ValueNode expression,
             ContextManager cm) throws StandardException {
@@ -153,11 +159,13 @@ class ResultColumn extends ValueNode
             ContextManager cm) throws StandardException {
         super(cm);
         setTypeExpressionAndDefault(expression);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         _underlyingName = cr.getColumnName();
         _derivedColumnName = cr.getColumnName();
 
         // When we bind, we'll want to make sure the reference has the right
         // table name.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         _reference = cr;
     }
 
@@ -173,10 +181,12 @@ class ResultColumn extends ValueNode
             ContextManager cm) throws StandardException {
         super(cm);
         setTypeExpressionAndDefault(expression);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         _underlyingName = cd.getColumnName();
         _derivedColumnName = _underlyingName;
         setType(cd.getType());
         _columnDescriptor = cd;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         _autoincrement = cd.isAutoincrement();
     }
 
@@ -194,7 +204,9 @@ class ResultColumn extends ValueNode
         setTypeExpressionAndDefault(expression);
         setType(dtd);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         if (_expression instanceof ColumnReference) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             _reference = (ColumnReference)expression;
         }
     }
@@ -203,6 +215,7 @@ private void setTypeExpressionAndDefault(ValueNode expression) {
         setExpression(expression);
 
         if (expression != null &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 expression instanceof DefaultNode) {
             // This result column represents a <default> keyword in an insert or
             // update statement
@@ -241,6 +254,8 @@ boolean isRightOuterJoinUsingClause()
 	 *  
 	 * @param value True/False
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setRightOuterJoinUsingClause(boolean value)
 	{
 		rightOuterJoinUsingClause = value;
@@ -258,6 +273,8 @@ void setRightOuterJoinUsingClause(boolean value)
 	 * rightOuterJoinUsingClause will be used during the code generation 
 	 * time.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     JoinNode getJoinResultSet() {
 		return joinResultSet;
 	}
@@ -271,6 +288,8 @@ JoinNode getJoinResultSet() {
 	 *   This case is talking about column c as in "select c"
 	 * @param resultSet - The ResultColumn belongs to this JoinNode
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setJoinResultset(JoinNode resultSet)
 	{
 		joinResultSet = resultSet;
@@ -285,6 +304,8 @@ boolean isDefaultColumn()
 		return defaultColumn;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setDefaultColumn(boolean value)
 	{
 		defaultColumn = value;
@@ -296,9 +317,12 @@ void setDefaultColumn(boolean value)
 	 */
     boolean wasDefaultColumn()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3950
 		return wasDefault;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setWasDefaultColumn(boolean value)
 	{
 		wasDefault = value;
@@ -319,6 +343,7 @@ void setWasDefaultColumn(boolean value)
 	 */
 	boolean columnNameMatches(String columnName)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return columnName.equals(_derivedColumnName) ||
 			columnName.equals( _underlyingName ) ||
 			columnName.equals(getSourceColumnName());
@@ -349,6 +374,7 @@ String getUnderlyingOrAliasName()
         {
 			return getSourceColumnName();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		else if ( _underlyingName != null )
         {
 			return _underlyingName;
@@ -384,6 +410,7 @@ boolean isUpdatable()
 	 */
 	String getSourceColumnName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_expression instanceof ColumnReference)
 			return ((ColumnReference)_expression).getColumnName();
 		return null;
@@ -395,10 +422,13 @@ String getSourceColumnName()
 
 	public String getName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _derivedColumnName;
 	}
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getSchemaName() throws StandardException
 	{
 		if ((_columnDescriptor!=null) &&
@@ -415,8 +445,11 @@ String getSchemaName() throws StandardException
 	}
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getTableName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_unqualifiedTableName != null)
 		{
 			return _unqualifiedTableName;
@@ -437,6 +470,7 @@ String getTableName()
 	 */
 	public String getSourceTableName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _unqualifiedSourceTableName;
 	}
 
@@ -445,6 +479,7 @@ public String getSourceTableName()
 	 */
 	public String getSourceSchemaName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _sourceSchemaName;
 	}
 
@@ -452,8 +487,11 @@ public String getSourceSchemaName()
 	 * Clear the table name for the underlying ColumnReference.
 	 * See UpdateNode.scrubResultColumns() for full explaination.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void clearTableName()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_expression instanceof ColumnReference)
 		{
 			((ColumnReference) _expression).setQualifiedTableName( (TableName) null );
@@ -467,6 +505,7 @@ public DataTypeDescriptor getType()
 
 	public int getColumnPosition()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_columnDescriptor!=null)
 			return _columnDescriptor.getPosition();
 		else
@@ -484,8 +523,11 @@ public int getColumnPosition()
 	 * @param expression	The expression to be set in this ResultColumn
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setExpression(ValueNode expression)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_expression = expression;
 	}
 
@@ -495,8 +537,11 @@ void setExpression(ValueNode expression)
 	 * @return ValueNode	this.expression
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getExpression()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _expression;
 	}
 
@@ -522,19 +567,24 @@ void setExpressionToNullNode()
 	 * @param name	The name to set in this ResultColumn
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setName(String name)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if ( _underlyingName == null )
 		{
 			_underlyingName = name;
 		}
 		else {
 			if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			SanityManager.ASSERT(_reference == null || 
 				name.equals(_reference.getColumnName()), 
 				"don't change name from reference name");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_derivedColumnName = name;
 	}
 
@@ -543,14 +593,18 @@ void setName(String name)
 	 */
     boolean isNameGenerated()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _isNameGenerated;
 	}
 
 	/**
 	 * Set that this result column name is generated.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setNameGenerated(boolean value)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_isNameGenerated = value;
 	}
 
@@ -562,6 +616,8 @@ void setNameGenerated(boolean value)
 	 *
 	 * @param resultSetNumber	The resultSetNumber.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setResultSetNumber(int resultSetNumber)
 	{
 		this.resultSetNumber = resultSetNumber;
@@ -583,6 +639,8 @@ public int getResultSetNumber()
 	 * @param adjust	The adjustment for the virtualColumnId
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void adjustVirtualColumnId(int adjust)
 	{
 		virtualColumnId += adjust;
@@ -594,6 +652,8 @@ void adjustVirtualColumnId(int adjust)
 	 * @param id	The virtualColumnId for this ResultColumn
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setVirtualColumnId(int id)
 	{
 		virtualColumnId = id;
@@ -623,9 +683,13 @@ int getVirtualColumnId()
 	 *
 	 * @param removedColumnId   id of the column being removed.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void collapseVirtualColumnIdGap(int removedColumnId)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_columnDescriptor == null && virtualColumnId > removedColumnId)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1861
 			virtualColumnId--;
 	}
 
@@ -635,8 +699,11 @@ void collapseVirtualColumnIdGap(int removedColumnId)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void guaranteeColumnName() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_derivedColumnName == null)
 		{
 			/* Unions may also need generated names, if both sides name don't match */
@@ -656,9 +723,11 @@ public String toString()
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			return "derivedColumnName: " + _derivedColumnName + "\n" +
 				"underlyingName: " + _underlyingName + "\n" +
 				"tableName: " + _unqualifiedTableName + "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3950
 				"isDefaultColumn: " + defaultColumn + "\n" +
 				"wasDefaultColumn: " + wasDefault + "\n" +
 				"isNameGenerated: " + _isNameGenerated + "\n" +
@@ -689,16 +758,20 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
 		{
 			super.printSubNodes(depth);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			if (_expression != null)
 			{
 				printLabel(depth, "expression: ");
 				_expression.treePrint(depth + 1);
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			if (_reference != null)
 			{
 				printLabel(depth, "reference: ");
@@ -726,6 +799,7 @@ void printSubNodes(int depth)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     ResultColumn bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
@@ -734,6 +808,7 @@ ResultColumn bindExpression(FromList fromList, SubqueryList subqueryList, List<A
 		** Don't do it if this result column doesn't have a type yet.
 		** This can happen if the parameter is part of a table constructor.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_expression.requiresTypeFromContext())
 		{
 			if (getTypeServices() != null)
@@ -758,9 +833,11 @@ ResultColumn bindExpression(FromList fromList, SubqueryList subqueryList, List<A
 
 		setExpression( _expression.bindExpression(fromList, subqueryList,
                                                  aggregates) );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
 		if (_expression instanceof ColumnReference)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			_autoincrement = ((ColumnReference)_expression).getSource().isAutoincrement();
 		}
 			
@@ -793,6 +870,8 @@ void bindResultColumnByPosition(TableDescriptor tableDescriptor,
 				throws StandardException
 	{
         ColumnDescriptor    colDesc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
         colDesc = tableDescriptor.getColumnDescriptor(columnId);
 
@@ -841,6 +920,7 @@ void bindResultColumnByName(TableDescriptor tableDescriptor,
         ColumnDescriptor    colDesc;
 
         colDesc = tableDescriptor.getColumnDescriptor(_derivedColumnName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         if (colDesc == null)
 		{
@@ -853,9 +933,14 @@ void bindResultColumnByName(TableDescriptor tableDescriptor,
 				errorString += schemaName + ".";
 			errorString += tableDescriptor.getName();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			throw StandardException.newException(SQLState.LANG_COLUMN_NOT_FOUND_IN_TABLE, _derivedColumnName, errorString);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         setColumnDescriptor(tableDescriptor, colDesc);
 		setVirtualColumnId(columnId);
 		if (isPrivilegeCollectionRequired())
@@ -867,6 +952,8 @@ void bindResultColumnByName(TableDescriptor tableDescriptor,
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void typeUntypedNullExpression( ResultColumn bindingRC)
 			throws StandardException
 	{
@@ -879,6 +966,7 @@ void typeUntypedNullExpression( ResultColumn bindingRC)
 			throw StandardException.newException(SQLState.LANG_NULL_IN_VALUES_CLAUSE);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         if( _expression instanceof UntypedNullConstantNode)
         	//since we don't know the type of such a constant node, we just
         	//use the default values for collation type and derivation.
@@ -912,6 +1000,7 @@ else if( ( _expression instanceof ColumnReference) && _expression.getTypeService
 	void setColumnDescriptor(TableDescriptor tableDescriptor,
 				ColumnDescriptor columnDescriptor) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if ( columnDescriptor != null ) { setType(columnDescriptor.getType()); }
 		_columnDescriptor = columnDescriptor;
 
@@ -925,6 +1014,7 @@ void setColumnDescriptor(TableDescriptor tableDescriptor,
             (_reference.getMergeTableID() == ColumnReference.MERGE_UNKNOWN)
             ) 
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			if ( (tableDescriptor != null) && ! tableDescriptor.getName().equals(
 					_reference.getTableName()) ) 
 			{
@@ -935,6 +1025,7 @@ void setColumnDescriptor(TableDescriptor tableDescriptor,
 				*/
 				String realName = tableDescriptor.getName();
 				String refName = _reference.getTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 				throw StandardException.newException(SQLState.LANG_TABLE_NAME_MISMATCH, 
 					realName, refName);
@@ -950,6 +1041,8 @@ void setColumnDescriptor(TableDescriptor tableDescriptor,
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumnToExpression()
 				throws StandardException
 	{
@@ -959,6 +1052,7 @@ void bindResultColumnToExpression()
 		** necessary to clone the object here.
 		*/
 		setType(_expression.getTypeServices());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		if (_expression instanceof ColumnReference)
 		{
@@ -974,7 +1068,10 @@ void bindResultColumnToExpression()
 	 * Set the column source's table name
 	 * @param t The source table name
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setSourceTableName(String t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_unqualifiedSourceTableName = t;
 	}
 
@@ -982,7 +1079,10 @@ void setSourceTableName(String t) {
 	 * Set the column source's schema name
 	 * @param s The source schema name
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setSourceSchemaName(String s) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_sourceSchemaName = s;
 	}
 
@@ -1002,12 +1102,14 @@ void setSourceSchemaName(String s) {
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     ResultColumn preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
 								PredicateList outerPredicateList) 
 					throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_expression == null)
 			return this;
 		setExpression( _expression.preprocess(numTables, outerFromList,
@@ -1027,6 +1129,8 @@ ResultColumn preprocess(int numTables,
 
 		@exception StandardException thrown if types not suitable.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void checkStorableExpression(ResultColumn toStore)
 					throws StandardException
 	{
@@ -1057,6 +1161,8 @@ private void checkStorableExpression(ValueNode source)
 
 		@exception StandardException thrown if types not suitable.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void checkStorableExpression()
 					throws StandardException
 	{
@@ -1077,6 +1183,7 @@ void checkStorableExpression()
     void generateExpression(ExpressionClassBuilder ecb, MethodBuilder mb)
 									throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         _expression.generateExpression(ecb, mb);
 	}
 
@@ -1092,6 +1199,8 @@ void generateExpression(ExpressionClassBuilder ecb, MethodBuilder mb)
 	 * @exception StandardException		Thrown on error
 	 */
 /*PUSHCOMPILE
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void generateNulls(ExpressionClassBuilder acb,
 									MethodBuilder mb,
 									Expression getColumnExpress) 
@@ -1186,6 +1295,7 @@ boolean columnTypeAndLengthMatch(ResultColumn otherColumn)
 		** case.
 		*/
 		if ((otherExpression != null) && (otherExpression.requiresTypeFromContext()) ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			(_expression.requiresTypeFromContext()))
 		{
 			return false;
@@ -1309,6 +1419,7 @@ boolean columnTypeAndLengthMatch(ResultColumn otherColumn)
 	 */
     boolean isGenerated()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return (_isGenerated == true);
 	}
 
@@ -1319,14 +1430,18 @@ boolean isGenerated()
 	 */
     boolean isGeneratedForUnmatchedColumnInInsert()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return (_isGeneratedForUnmatchedColumnInInsert == true);
 	}
 
 	/**
 	 * Mark this a columm as a generated column
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markGenerated()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_isGenerated = true;
 		/* A generated column is a referenced column */
 		_isReferenced = true;
@@ -1335,8 +1450,11 @@ void markGenerated()
 	/**
 	 * Mark this a columm as generated for an unmatched column in an insert
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markGeneratedForUnmatchedColumnInInsert()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_isGeneratedForUnmatchedColumnInInsert = true;
 		/* A generated column is a referenced column */
 		_isReferenced = true;
@@ -1349,14 +1467,18 @@ void markGeneratedForUnmatchedColumnInInsert()
 	 */
     boolean isReferenced()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _isReferenced;
 	}
 
 	/**
 	 * Mark this column as a referenced column.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setReferenced()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_isReferenced = true;
 	}
 
@@ -1369,6 +1491,7 @@ void pullVirtualIsReferenced()
         if( isReferenced())
             return;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         for( ValueNode expr = _expression; expr != null && (expr instanceof VirtualColumnNode);)
         {
             VirtualColumnNode vcn = (VirtualColumnNode) expr;
@@ -1385,8 +1508,11 @@ void pullVirtualIsReferenced()
 	/**
 	 * Mark this column as an unreferenced column.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setUnreferenced()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_isReferenced = false;
 	}
 
@@ -1399,6 +1525,7 @@ void markAllRCsInChainReferenced()
 		setReferenced();
 
 		ValueNode vn = _expression;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		while (vn instanceof VirtualColumnNode)
 		{
@@ -1416,22 +1543,29 @@ void markAllRCsInChainReferenced()
 	 */
     boolean isRedundant()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _isRedundant;
 	}
 
 	/**
 	 * Mark this ResultColumn as redundant.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setRedundant()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_isRedundant = true;
 	}
 
 	/**
 	 * Mark this ResultColumn as a grouping column in the SELECT list
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markAsGroupingColumn()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_isGroupingColumn = true;
 	}
 
@@ -1445,6 +1579,7 @@ void markAsGroupingColumn()
 
 	void rejectParameter() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if ((_expression != null) && (_expression.isParameterNode()))
 			throw StandardException.newException(SQLState.LANG_PARAM_IN_SELECT_LIST);
 	}
@@ -1455,6 +1590,8 @@ void rejectParameter() throws StandardException
     public int compareTo(ResultColumn other)
 	{
         ResultColumn otherResultColumn = other;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		return this.getColumnPosition() - otherResultColumn.getColumnPosition();
 	}
@@ -1464,6 +1601,7 @@ public int compareTo(ResultColumn other)
 	 */
 	void markUpdated()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_updated = true;
 	}
 
@@ -1473,6 +1611,7 @@ void markUpdated()
 	 */
 	void markUpdatableByCursor()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		_updatableByCursor = true;
 	}
 
@@ -1483,6 +1622,7 @@ void markUpdatableByCursor()
 	 */
 	boolean updated()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _updated;
 	}
 
@@ -1494,6 +1634,7 @@ boolean updated()
     @Override
 	public boolean updatableByCursor()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _updatableByCursor;
 	}
 
@@ -1516,6 +1657,7 @@ ResultColumn cloneMe() throws StandardException
 		 * The SELECT generated for the HAVING needs its own copy
 		 * of the ColumnReferences.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_expression instanceof ColumnReference)
 		{
 			cloneExpr = ((ColumnReference) _expression).getClone();
@@ -1549,6 +1691,7 @@ ResultColumn cloneMe() throws StandardException
 		// For OFFSET/FETCH we need the also clone table name to avoid failing
 		// check #2 in EmbedResultSet#checksBeforeUpdateXXX. Clone schema for
 		// good measure...
+//IC see: https://issues.apache.org/jira/browse/DERBY-4079
 		newResultColumn.setSourceTableName(getSourceTableName());
 		newResultColumn.setSourceSchemaName(getSourceSchemaName());
 
@@ -1590,6 +1733,7 @@ ResultColumn cloneMe() throws StandardException
   		}
 
         newResultColumn.copyTagsFrom( this );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
 
   		return newResultColumn;
 	}
@@ -1644,6 +1788,7 @@ protected int getOrderableVariantType() throws StandardException
         int expType;
         if (isAutoincrementGenerated()) {
             expType = Qualifier.VARIANT;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         } else if (_expression != null) {
             expType = _expression.getOrderableVariantType();
         } else {
@@ -1672,11 +1817,13 @@ protected int getOrderableVariantType() throws StandardException
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_expression != null)
 		{
 			setExpression( (ValueNode)_expression.accept(v) );
@@ -1710,6 +1857,7 @@ void verifyOrderable() throws StandardException
 	  Otherwise return null.
 	  */
 	ColumnDescriptor getTableColumnDescriptor() {return _columnDescriptor;}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 	/**
 	 * Returns true if this result column is a placeholder for a generated
@@ -1717,9 +1865,12 @@ void verifyOrderable() throws StandardException
 	 */
     boolean isAutoincrementGenerated()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return _autoincrementGenerated;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setAutoincrementGenerated()
 	{
 		_autoincrementGenerated = true;
@@ -1735,6 +1886,8 @@ public boolean isAutoincrement()
 		return _autoincrement;
   	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setAutoincrement()
   	{
   		_autoincrement = true;
@@ -1742,6 +1895,7 @@ void setAutoincrement()
         
     public boolean isGroupingColumn()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         return _isGroupingColumn;
     }
         
@@ -1774,6 +1928,8 @@ private DataValueDescriptor convertConstant(TypeId toTypeId, int maxWidth,
 
 				if (sourceWidth <= maxWidth)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
 					if(formatId == StoredFormatIds.VARCHAR_TYPE_ID)
 						return dvf.getVarcharDataValue(sourceValue);
 				}
@@ -1786,6 +1942,8 @@ private DataValueDescriptor convertConstant(TypeId toTypeId, int maxWidth,
 					if (sourceValue.charAt(posn) != ' ')
 					{
 						String typeName = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
 						if (formatId == StoredFormatIds.VARCHAR_TYPE_ID)
 								typeName = TypeId.VARCHAR_NAME;
 						throw StandardException.newException(SQLState.LANG_STRING_TRUNCATION, 
@@ -1795,6 +1953,8 @@ private DataValueDescriptor convertConstant(TypeId toTypeId, int maxWidth,
 					}
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
 				if (formatId == StoredFormatIds.VARCHAR_TYPE_ID)
 					return dvf.getVarcharDataValue(sourceValue.substring(0, maxWidth));
 
@@ -1813,6 +1973,7 @@ public TableName getTableNameObject() {
 	public	ColumnReference	getReference() { return _reference; }
 
     /** Get the column descriptor */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
     ColumnDescriptor    getColumnDescriptor() { return _columnDescriptor; }
 	
 	/**
@@ -1823,7 +1984,10 @@ public TableName getTableNameObject() {
 	 * @return a BaseColumnNode,
 	 *   or null if a BaseColumnNode cannot be found
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     BaseColumnNode getBaseColumnNode() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		ValueNode vn = _expression;
 		while (true) {
 			if (vn instanceof ResultColumn) {
@@ -1835,6 +1999,7 @@ BaseColumnNode getBaseColumnNode() {
 			} else if (vn instanceof BaseColumnNode) {
 				return (BaseColumnNode) vn;
 			} else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-13
 				return null;
 			}
 		}
@@ -1861,6 +2026,7 @@ BaseColumnNode getBaseColumnNode() {
     int getTableNumber()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (_expression instanceof ColumnReference)
 			return ((ColumnReference)_expression).getTableNumber();
 		else if (_expression instanceof VirtualColumnNode)
@@ -1887,8 +2053,10 @@ else if (_expression instanceof VirtualColumnNode)
 	
     boolean isEquivalent(ValueNode o) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (isSameNodeKind(o)) {
         	ResultColumn other = (ResultColumn)o;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         	if (_expression != null) {
         		return _expression.isEquivalent(other._expression);
         	}
@@ -1903,6 +2071,7 @@ boolean isEquivalent(ValueNode o) throws StandardException
 	 */
 	public boolean hasGenerationClause()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         if ( (_columnDescriptor != null) && _columnDescriptor.hasGenerationClause() ) { return true; }
         else { return false; }
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultColumnList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
index b88311ce80..c011368fe7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
@@ -1,6 +1,7 @@
 /*
    Derby - Class org.apache.derby.impl.sql.compile.ResultColumnList
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -64,6 +65,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * @see ResultColumn
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 class ResultColumnList extends QueryTreeNodeVector<ResultColumn>
 {
 	/* Is this the ResultColumnList for an index row? */
@@ -106,6 +108,7 @@ class ResultColumnList extends QueryTreeNodeVector<ResultColumn>
 	private int initialListSize = 0;
 
     ResultColumnList(ContextManager cm) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         super(ResultColumn.class, cm);
 	}
 
@@ -116,6 +119,8 @@ class ResultColumnList extends QueryTreeNodeVector<ResultColumn>
 	 * @param resultColumn	The ResultColumn to add to the list
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void addResultColumn(ResultColumn resultColumn)
 	{
 		/* Vectors are 0-based, ResultColumns are 1-based */
@@ -131,6 +136,8 @@ void addResultColumn(ResultColumn resultColumn)
 	 * @param destructiveCopy	Whether or not this is a descructive copy
 	 *							from resultColumns
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void appendResultColumns(ResultColumnList resultColumns,
 									boolean destructiveCopy)
 	{
@@ -143,6 +150,7 @@ void appendResultColumns(ResultColumnList resultColumns,
 		** so the new virtual column ids start at the original size
 		** of this list, plus one.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : resultColumns)
 		{
 			/* ResultColumns are 1-based */
@@ -168,6 +176,8 @@ void appendResultColumns(ResultColumnList resultColumns,
 	 * @return	the column at that position.
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getResultColumn(int position)
 	{
 		/*
@@ -178,6 +188,7 @@ ResultColumn getResultColumn(int position)
 		{
 			// this wraps the cast needed, 
 			// and the 0-based nature of the Vectors.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = elementAt(position-1);
 			if (rc.getColumnPosition() == position)
 			{
@@ -191,6 +202,7 @@ ResultColumn getResultColumn(int position)
 		int size = size();
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = elementAt(index);
 			if (rc.getColumnPosition() == position)
 			{
@@ -223,6 +235,7 @@ ResultColumn getResultColumn(int colNum, ResultSetNode rsn,
 
 		for (int index = size() - 1; index >= 0; index--)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = elementAt(index);
 			if (!(rc.getExpression() instanceof ColumnReference))
 			{
@@ -231,6 +244,8 @@ ResultColumn getResultColumn(int colNum, ResultSetNode rsn,
 				continue;
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ColumnReference colRef = (ColumnReference)rc.getExpression();
 			if ((rsn == colRef.getSourceResultSet(crColNum)) &&
 				(crColNum[0] == colNum))
@@ -252,6 +267,8 @@ ResultColumn getResultColumn(int colNum, ResultSetNode rsn,
 	 *
 	 * @return	the column at that position, null if out of range
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getOrderByColumn(int position)
 	{
 		// this wraps the cast needed, and the 0-based nature of the Vectors.
@@ -270,6 +287,8 @@ ResultColumn getOrderByColumn(int position)
 	 * @return	the column that matches that name.
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getResultColumn(String columnName)
 	{
         return getResultColumn( columnName, true );
@@ -285,8 +304,11 @@ ResultColumn getResultColumn(String columnName)
 	 * @return	the column that matches that name.
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getResultColumn(String columnName, boolean markIfReferenced )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn resultColumn : this)
 		{
 			if (columnName.equals( resultColumn.getName()) )
@@ -322,12 +344,18 @@ ResultColumn getResultColumn(String columnName, boolean markIfReferenced )
      */
     public ResultColumn getResultColumn(int tableNumber,
                                         int columnNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4679
+//IC see: https://issues.apache.org/jira/browse/DERBY-4595
                                         String columnName)
     {
         int size = size();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4679
+//IC see: https://issues.apache.org/jira/browse/DERBY-2526
+//IC see: https://issues.apache.org/jira/browse/DERBY-3023
         for (int index = 0; index < size; index++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn resultColumn = elementAt(index);
             ResultColumn rc = resultColumn;
 
@@ -341,6 +369,7 @@ public ResultColumn getResultColumn(int tableNumber,
                     if (rsn instanceof FromTable) {
                         FromTable ft = (FromTable)rsn;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4679
                         if (ft.getTableNumber() == tableNumber) {
                             // We have the right table, now try to match the
                             // column number. Looking at a join, for a base
@@ -378,6 +407,8 @@ public ResultColumn getResultColumn(int tableNumber,
                                 // resultColumn. Now do sanity check that column
                                 // name is correct. Remove when DERBY-4695 is
                                 // fixed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4679
+//IC see: https://issues.apache.org/jira/browse/DERBY-4595
                                 if (columnName.equals(
                                             vcn.getSourceColumn().getName())) {
                                     resultColumn.setReferenced();
@@ -411,6 +442,7 @@ public ResultColumn getResultColumn(int tableNumber,
                     if (cr.getTableNumber() == tableNumber &&
                             cr.getColumnNumber() == columnNumber) {
                         // Found matching (t,c) within this top resultColumn
+//IC see: https://issues.apache.org/jira/browse/DERBY-4679
                         resultColumn.setReferenced();
                         return resultColumn;
                     } else {
@@ -442,12 +474,15 @@ public ResultColumn getResultColumn(int tableNumber,
 	 * @return	the column that matches that name.
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getResultColumn(String columnsTableName, String columnName)
 	{
 		int size = size();
 		for (int index = 0; index < size; index++)
 		{
             ResultColumn resultColumn = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			/* If the column's table name is non-null, then we have found a match
 			 * only if the RC's table name is non-null and the same as the
@@ -493,6 +528,8 @@ ResultColumn getResultColumn(String columnsTableName, String columnName)
 	 * @exception StandardException	Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getAtMostOneResultColumn(
 								ColumnReference cr,
 								String exposedTableName,
@@ -502,6 +539,7 @@ ResultColumn getAtMostOneResultColumn(
 		ResultColumn	retRC = null;
 		String			columnName = cr.getColumnName();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn resultColumn : this)
 		{
 			if (columnName.equals( resultColumn.getName()))
@@ -575,6 +613,8 @@ boolean columnsAreUpdatable()
 	 * @return	the column that matches that name.
 	 * @exception StandardException thrown on ambiguity
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getOrderByColumnToBind(
             String columnName,
             TableName tableName,
@@ -588,6 +628,7 @@ ResultColumn getOrderByColumnToBind(
 		for (int index = 0; index < size; index++)
 		{
             resultColumn = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			/* The order by column is qualified, then it is okay to consider
 			 * this RC if:
@@ -597,6 +638,7 @@ ResultColumn getOrderByColumnToBind(
 			 *	   from the same table (as determined by the tableNumbers).
 			 */
             boolean columnNameMatches;
+//IC see: https://issues.apache.org/jira/browse/DERBY-127
 			if (tableName != null)
 			{
                 ValueNode rcExpr = resultColumn.getExpression();
@@ -604,6 +646,7 @@ ResultColumn getOrderByColumnToBind(
 						continue;
 
                 ColumnReference cr = (ColumnReference) rcExpr;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 if( (! tableName.equals( cr.getQualifiedTableName())) && tableNumber != cr.getTableNumber())
                 {
                     continue;
@@ -641,6 +684,8 @@ ResultColumn getOrderByColumnToBind(
 				{
 					retVal = resultColumn;
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-147
+//IC see: https://issues.apache.org/jira/browse/DERBY-147
 				else if (! retVal.isEquivalent(resultColumn))
 				{
 					throw StandardException.newException(SQLState.LANG_DUPLICATE_COLUMN_FOR_ORDER_BY, columnName);
@@ -649,6 +694,7 @@ else if (index >= size - orderBySelect)
 				{// remove the column due to pullup of orderby item
 					removeElement(resultColumn);
 					decOrderBySelect();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1861
 					obc.clearAddedColumnOffset();
 					collapseVirtualColumnIdGap(
 							resultColumn.getColumnPosition());
@@ -671,6 +717,7 @@ else if (index >= size - orderBySelect)
 	 */
 	private void collapseVirtualColumnIdGap(int gap)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this) {
             rc.collapseVirtualColumnIdGap(gap);
         }
@@ -710,6 +757,8 @@ private void collapseVirtualColumnIdGap(int gap)
 	 * @return	the column that matches that name, or NULL if pull-up needed
 	 * @exception StandardException thrown on ambiguity
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn findResultColumnForOrderBy(
                             String columnName, TableName tableName)
 		throws StandardException
@@ -720,12 +769,14 @@ ResultColumn findResultColumnForOrderBy(
 		for (int index = 0; index < size; index++)
 		{
             resultColumn = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			// We may be checking on "ORDER BY T.A" against "SELECT *".
 			// exposedName will not be null and "*" will not have an expression
 			// or tablename.
 			// We may be checking on "ORDER BY T.A" against "SELECT T.B, T.A".
                         boolean columnNameMatches;
+//IC see: https://issues.apache.org/jira/browse/DERBY-127
 			if (tableName != null)
 			{
 				ValueNode rcExpr = resultColumn.getExpression();
@@ -734,6 +785,7 @@ ResultColumn findResultColumnForOrderBy(
                     continue;
                 }
 				ColumnReference cr = (ColumnReference) rcExpr;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 if( ! tableName.equals( cr.getQualifiedTableName()))
                 {
                     continue;
@@ -760,7 +812,9 @@ else if (! retVal.isEquivalent(resultColumn))
 				}
 				else if (index >= size - orderBySelect)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1861
 					if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1861
 						SanityManager.THROWASSERT(
 							"Unexpectedly found ORDER BY column '" +
 							columnName + "' pulled up at position " +index);
@@ -804,6 +858,7 @@ void copyResultColumnNames(ResultColumnList nameList)
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn thisResultColumn = elementAt(index);
             ResultColumn nameListResultColumn = nameList.elementAt(index);
 
@@ -825,6 +880,7 @@ void copyResultColumnNames(ResultColumnList nameList)
 	 * @exception StandardException		Thrown on error
 	 */
     void bindExpressions(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
@@ -835,6 +891,7 @@ void bindExpressions(
 		int size = size();
  		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn vn = elementAt(index);
             vn = vn.bindExpression(fromList, subqueryList, aggregates);
 			setElementAt(vn, index);
@@ -849,9 +906,12 @@ void bindExpressions(
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumnsToExpressions()
 					throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
             rc.bindResultColumnToExpression();
@@ -867,6 +927,8 @@ void bindResultColumnsToExpressions()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumnsByName(TableDescriptor targetTableDescriptor)
 					throws StandardException
 	{
@@ -874,7 +936,9 @@ void bindResultColumnsByName(TableDescriptor targetTableDescriptor)
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             elementAt(index).bindResultColumnByName(
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 						targetTableDescriptor,
 						index + 1
 					);
@@ -907,6 +971,7 @@ FormatableBitSet bindResultColumnsByName(TableDescriptor targetTableDescriptor,
 		for (int index = 0; index < size; index++)
 		{
             ResultColumn rc = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			rc.bindResultColumnByName(
 						targetTableDescriptor,
@@ -931,6 +996,7 @@ FormatableBitSet bindResultColumnsByName(TableDescriptor targetTableDescriptor,
 					throw StandardException.newException(SQLState.LANG_DUPLICATE_COLUMN_NAME_INSERT, colName);
 				}
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
             columnBitSet.set( colIdx);
 		}
 		return columnBitSet;
@@ -956,6 +1022,7 @@ void bindResultColumnsByName(ResultColumnList fullRCL,
 	{
 		int			size = size();
         HashSet<String>     seenNames = new HashSet<String>(size + 2, 0.999f);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		for (int index = 0; index < size; index++)
 		{
@@ -1003,6 +1070,11 @@ void bindResultColumnsByName(ResultColumnList fullRCL,
 											null,
 											(TableDescriptor) null,
 											null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 											0, 0, false);
 			rc.setColumnDescriptor(null, cd);
 			rc.setVirtualColumnId(index + 1);
@@ -1019,6 +1091,8 @@ void bindResultColumnsByName(ResultColumnList fullRCL,
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumnsByPosition(TableDescriptor targetTableDescriptor)
 					throws StandardException
 	{
@@ -1030,6 +1104,7 @@ void bindResultColumnsByPosition(TableDescriptor targetTableDescriptor)
 			** Add one to the iterator index, because iterator indexes start at zero,
 			** and column numbers start at one.
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             elementAt(index).bindResultColumnByPosition(
 						targetTableDescriptor,
 						index + 1);
@@ -1050,6 +1125,8 @@ void bindResultColumnsByPosition(TableDescriptor targetTableDescriptor)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void preprocess(int numTables,
 							FromList outerFromList,
 							SubqueryList outerSubqueryList,
@@ -1060,6 +1137,7 @@ void preprocess(int numTables,
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn resultColumn = elementAt(index);
 			setElementAt(resultColumn.preprocess(numTables,
 												 outerFromList,
@@ -1083,6 +1161,7 @@ void checkStorableExpressions(ResultColumnList toStore)
 		for (int index = 0; index < size; index++)
 		{
             ResultColumn    otherRC = toStore.elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             elementAt(index).checkStorableExpression(otherRC);
 		}
@@ -1107,6 +1186,7 @@ int[] getStreamStorableColIds(int heapColCount) throws StandardException
 		int ssCount = 0;
 		boolean[] isSS = new boolean[heapColCount];//Should be table length.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			if (rc.getTypeId().streamStorable())
@@ -1142,6 +1222,7 @@ int[] getStreamStorableColIds(int heapColCount) throws StandardException
 	void checkStorableExpressions()
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
             rc.checkStorableExpression();
@@ -1261,6 +1342,7 @@ void generateCore(ExpressionClassBuilder acb,
 			// fieldX.setColumn(columnNumber, (DataValueDescriptor) columnExpr);
 			// and add them to exprFun.
             rc = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			/* If we are not generating nulls, then we can skip this RC if
 			 * it is simply propagating a column from the source result set.
@@ -1299,6 +1381,7 @@ void generateCore(ExpressionClassBuilder acb,
 					int virtualColumnIdRightTable = -1;
 					int virtualColumnIdLeftTable = -1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     for (ResultColumn joinColumn : jnRCL) {
 						if (joinColumn.getName().equals(rc.getUnderlyingOrAliasName())) {
 							if (joinColumn.isRightOuterJoinUsingClause())
@@ -1398,6 +1481,7 @@ void generateCore(ExpressionClassBuilder acb,
             //
 			if ( rc.hasGenerationClause() )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6346
                 ValueNode   expr = rc.getExpression();
                 if ( (expr != null) && !(expr instanceof VirtualColumnNode) )
                 {
@@ -1465,6 +1549,7 @@ else if (genNulls ||
 				userExprFun.callMethod(VMOpcode.INVOKEINTERFACE, ClassName.Row, "getColumn",
 					ClassName.DataValueDescriptor, 1); // the express
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 				acb.generateNullWithExpress(userExprFun, rc.getTypeCompiler(),
 						rc.getTypeServices().getCollationType());
 			}
@@ -1498,6 +1583,7 @@ public	ExecRow	buildEmptyRow()
 		ExecRow				row = getExecutionFactory().getValueRow( columnCount );
 		int					position = 1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			DataTypeDescriptor dataType = rc.getTypeServices();
@@ -1565,8 +1651,10 @@ public	ExecRow	buildEmptyIndexRow(TableDescriptor td,
      * @return an instance that produces rows of the same shape as this
      * result column list
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
     ExecRowBuilder buildRowTemplate(FormatableBitSet referencedCols,
                                     boolean skipPropagatedCols)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
             throws StandardException
     {
         int columns = (referencedCols == null) ?
@@ -1577,8 +1665,10 @@ ExecRowBuilder buildRowTemplate(FormatableBitSet referencedCols,
         // Get the index of the first column to set in the row template.
         int colNum = (referencedCols == null) ? 0 : referencedCols.anySetBit();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this) {
             ValueNode sourceExpr = rc.getExpression();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
             if (sourceExpr instanceof CurrentRowLocationNode) {
                 builder.setColumn(colNum + 1, newRowLocationTemplate());
@@ -1607,6 +1697,7 @@ ExecRowBuilder buildRowTemplate(FormatableBitSet referencedCols,
     /**
      * Shorthand for {@code buildRowTemplate(null, false)}.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
     ExecRowBuilder buildRowTemplate() throws StandardException {
         return buildRowTemplate(null, false);
     }
@@ -1638,6 +1729,7 @@ private void genCreateRow(ExpressionClassBuilder acb,
 		cb.push(numCols);
 		cb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null,
 							rowAllocatorMethod, rowAllocatorType, 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		cb.setField(field);
 		/* Increase the statement counter in constructor.  Code size in
 		 * constructor can become too big (more than 64K) for Java compiler
@@ -1652,6 +1744,8 @@ private void genCreateRow(ExpressionClassBuilder acb,
      * conglomerate.
      */
     private RowLocation newRowLocationTemplate() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4279
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         LanguageConnectionContext lcc = getLanguageConnectionContext();
         DataDictionary dd = lcc.getDataDictionary();
 
@@ -1681,6 +1775,8 @@ private RowLocation newRowLocationTemplate() throws StandardException {
 	 *
 	 * @return	A ResultDescription for this ResultSetNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnDescriptor[] makeResultDescriptors()
 	{
 	    ResultColumnDescriptor colDescs[] = new ResultColumnDescriptor[size()];
@@ -1689,6 +1785,7 @@ ResultColumnDescriptor[] makeResultDescriptors()
 		for (int index = 0; index < size; index++)
 		{
 		    // the ResultColumn nodes are descriptors, so take 'em...
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
             colDescs[index] = getExecutionFactory().getResultColumnDescriptor(((ResultColumnDescriptor) elementAt(index)));
 		}
 
@@ -1704,22 +1801,28 @@ ResultColumnDescriptor[] makeResultDescriptors()
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void expandAllsAndNameColumns(FromList fromList)
 					throws StandardException
 	{
 		boolean			expanded = false;
 		ResultColumnList allExpansion;
 		TableName			fullTableName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-13
 
 		/* First walk result column list looking for *'s to expand */
 		for (int index = 0; index < size(); index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = elementAt(index);
 			if (rc instanceof AllResultColumn)
 			{
 				expanded = true;
 
 				//fullTableName = ((AllResultColumn) rc).getFullTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-13
                 TableName temp = rc.getTableNameObject();
                 if(temp != null) {
                    String sName = temp.getSchemaName();
@@ -1783,9 +1886,12 @@ void expandAllsAndNameColumns(FromList fromList)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void nameAllResultColumns()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
             rc.guaranteeColumnName();
@@ -1810,9 +1916,13 @@ void nameAllResultColumns()
 	boolean columnTypesAndLengthsMatch()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn resultColumn : this)
 		{
 			/* Skip over generated columns */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4442
+//IC see: https://issues.apache.org/jira/browse/DERBY-4419
+//IC see: https://issues.apache.org/jira/browse/DERBY-4425
 			if (resultColumn.isGenerated())
 			{
 				continue;
@@ -1838,6 +1948,7 @@ boolean columnTypesAndLengthsMatch(ResultColumnList otherRCL)
 		for (int index = 0; index < size; index++)
 		{
             ResultColumn resultColumn = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             ResultColumn otherResultColumn = otherRCL.elementAt(index);
 
@@ -1886,8 +1997,11 @@ boolean nopProjection(ResultColumnList childRCL)
 		int size = size();
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn thisColumn = elementAt(index);
             ResultColumn referencedColumn;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			/*
 			** A No-Op projection can point to a VirtualColumnNode or a
@@ -1911,6 +2025,7 @@ else if (thisColumn.getExpression() instanceof ColumnReference)
 			}
 
             ResultColumn childColumn = childRCL.elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			if (referencedColumn != childColumn)
 			{
@@ -1930,10 +2045,13 @@ else if (thisColumn.getExpression() instanceof ColumnReference)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList copyListAndObjects()
 					throws StandardException
 	{
         ResultColumnList newList = new ResultColumnList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		/* Walk the current list - for each ResultColumn in the list, make a copy
 		 * and add it to the new list.
@@ -1954,6 +2072,8 @@ ResultColumnList copyListAndObjects()
 	 * to be removed. 
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void removeOrderByColumns()
 	{
 		int idx = size() - 1;
@@ -1973,6 +2093,8 @@ void removeOrderByColumns()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void genVirtualColumnNodes(ResultSetNode sourceResultSet,
 									  ResultColumnList sourceResultColumnList)
 				throws StandardException
@@ -1993,6 +2115,8 @@ void genVirtualColumnNodes(ResultSetNode sourceResultSet,
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void genVirtualColumnNodes(ResultSetNode sourceResultSet,
 									  ResultColumnList sourceResultColumnList,
 									  boolean markReferenced)
@@ -2003,8 +2127,10 @@ void genVirtualColumnNodes(ResultSetNode sourceResultSet,
 		for (int index = 0; index < size; index++)
 		{
             ResultColumn resultColumn = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			/* Vectors are 0-based, VirtualColumnIds are 1-based */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             resultColumn.setExpression
                 (
                  new VirtualColumnNode
@@ -2031,8 +2157,11 @@ void genVirtualColumnNodes(ResultSetNode sourceResultSet,
 	 *
 	 * @param adjust		The size of the increment.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void adjustVirtualColumnIds(int adjust)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn resultColumn : this)
 		{
 			resultColumn.adjustVirtualColumnId(adjust);
@@ -2065,6 +2194,7 @@ void    doProjection() throws StandardException
 		int				numDeleted = 0;
         ResultColumnList deletedRCL = new ResultColumnList(getContextManager());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn resultColumn : this)
         {
 			/* RC's for FromBaseTables are marked as referenced during binding.
@@ -2100,6 +2230,7 @@ void    doProjection() throws StandardException
 		// Go back and delete the RCs to be delete from the list
 		for (int index = 0; index < deletedRCL.size(); index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             removeElement(deletedRCL.elementAt(index));
 		}
 	}
@@ -2111,10 +2242,13 @@ void    doProjection() throws StandardException
 	 *
 	 * @return String	The first duplicate column name, if any.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String verifyUniqueNames(boolean errForGenCols)
 					throws StandardException
 	{
         HashSet<String> seenNames = new HashSet<String>(size() + 2, 0.999f);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         for (ResultColumn rc : this)
 		{
@@ -2124,6 +2258,8 @@ String verifyUniqueNames(boolean errForGenCols)
             String colName = rc.getName();
             boolean alreadySeen = !seenNames.add(colName);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 			if (alreadySeen)
 			{
 				return colName;
@@ -2143,6 +2279,8 @@ String verifyUniqueNames(boolean errForGenCols)
 	 *
 	 * @exception StandardException	Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void propagateDCLInfo(ResultColumnList derivedRCL, String tableName)
 					throws StandardException
 	{
@@ -2178,6 +2316,7 @@ void propagateDCLInfo(ResultColumnList derivedRCL, String tableName)
 
 	void rejectParameters() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			rc.rejectParameter();
@@ -2230,6 +2369,8 @@ void rejectXMLValues() throws StandardException
 		int sz = size();
 
         for (int i = 1; i <= sz; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			if (i > initialListSize)
 			// this RC was generated internally and will not
@@ -2252,8 +2393,11 @@ void rejectXMLValues() throws StandardException
 	 *
 	 * @param resultSetNumber	The resultSetNumber
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setResultSetNumber(int resultSetNumber)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
             rc.setResultSetNumber(resultSetNumber);
@@ -2265,8 +2409,11 @@ void setResultSetNumber(int resultSetNumber)
 	 * Useful when chopping a ResultSetNode out of a tree when there are
 	 * still references to its RCL.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setRedundant()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
             rc.setRedundant();
@@ -2286,6 +2433,7 @@ void checkColumnUpdateability(
             ExecPreparedStatement cursorStmt, String cursorName)
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn resultColumn : this)
 		{
 			if (resultColumn.updated() &&
@@ -2316,6 +2464,8 @@ void checkColumnUpdateability(
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void    setUnionResultExpression(ResultColumnList otherRCL,
                                          int tableNumber,
                                          int level,
@@ -2345,11 +2495,14 @@ void    setUnionResultExpression(ResultColumnList otherRCL,
 
 		/* Make a dummy TableName to be shared by all new CRs */
         dummyTN = new TableName(null, null, getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		int size = visibleSize();
 		for (int index = 0; index < size; index++)
 		{
 			ColumnReference newCR;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn thisRC = elementAt(index);
             ResultColumn otherRC = otherRCL.elementAt(index);
 			ValueNode	 thisExpr = thisRC.getExpression();
@@ -2394,6 +2547,8 @@ void    setUnionResultExpression(ResultColumnList otherRCL,
 												otherExpr.getTypeServices(),
 												cf);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             newCR = new ColumnReference(
                     thisRC.getName(), dummyTN, getContextManager());
 			newCR.setType(resultType);
@@ -2494,6 +2649,7 @@ boolean isExactTypeAndLengthMatch(ResultColumnList otherRCL)
 		int size = visibleSize();
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn thisRC = elementAt(index);
             ResultColumn otherRC = otherRCL.elementAt(index);
 
@@ -2517,6 +2673,7 @@ boolean isExactTypeAndLengthMatch(ResultColumnList otherRCL)
 	 */
 	public	boolean updateOverlaps(int[] columns)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			if ( ! rc.updated())
@@ -2555,6 +2712,7 @@ ResultColumn[] getSortedByPosition()
 		*/
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             result[index] = elementAt(index);
 		}
 
@@ -2596,6 +2754,8 @@ public	int[]	sortMe()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList expandToAll(TableDescriptor td,
 								TableName tableName)
 						throws StandardException
@@ -2607,6 +2767,8 @@ ResultColumnList expandToAll(TableDescriptor td,
 		int							posn;
 
 		/* Get a new ResultColumnList */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         retval = new ResultColumnList(getContextManager());
 		/*
 		** Form a sorted array of the ResultColumns
@@ -2622,6 +2784,8 @@ ResultColumnList expandToAll(TableDescriptor td,
 		for (int index = 0; index < cdlSize; index++)
 		{
             cd = cdl.elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			if ((posn < originalRCS.length) &&
 				(cd.getPosition() == originalRCS[posn].getColumnPosition()))
@@ -2661,6 +2825,8 @@ ResultColumnList expandToAll(TableDescriptor td,
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindUntypedNullsToResultColumns(ResultColumnList bindingRCL)
 				throws StandardException
 	{
@@ -2676,6 +2842,7 @@ void bindUntypedNullsToResultColumns(ResultColumnList bindingRCL)
 		int size = size();
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn    bindingRC = bindingRCL.elementAt(index);
             ResultColumn    thisRC = elementAt(index);
 
@@ -2688,6 +2855,7 @@ void bindUntypedNullsToResultColumns(ResultColumnList bindingRCL)
 	 */
 	void markUpdated()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
             rc.markUpdated();
@@ -2725,8 +2893,11 @@ void markUpdatableByCursor()
 	 * 
 	 * @return String	The 1st column name, if any, that is not in the list.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String verifyCreateConstraintColumnList(TableElementList tel)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
             String colName = rc.getName();
@@ -2744,6 +2915,8 @@ String verifyCreateConstraintColumnList(TableElementList tel)
 	 *
 	 * @param columnNames	String[] to hold the column names.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void exportNames(String[] columnNames)
 	{
 		if (SanityManager.DEBUG)
@@ -2763,6 +2936,7 @@ void exportNames(String[] columnNames)
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             columnNames[index] = elementAt(index).getName();
 		}
 	}
@@ -2775,10 +2949,13 @@ void exportNames(String[] columnNames)
 	 *
 	 * @return ResultColumn	The parent ResultColumn
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn findParentResultColumn(ResultColumn childRC)
 	{
 		ResultColumn	parentRC = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			if (rc.getExpression() instanceof ColumnReference)
@@ -2816,6 +2993,7 @@ else if (rc.getExpression() instanceof VirtualColumnNode)
 	 */
 	void markUpdated(ResultColumnList updateColumns)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn updateColumn : updateColumns)
 		{
             ResultColumn resultColumn = getResultColumn(updateColumn.getName());
@@ -2845,8 +3023,11 @@ void markUpdated(ResultColumnList updateColumns)
      * @param updateColumns     A list representing the columns
 	 *							to be updated.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markColumnsInSelectListUpdatableByCursor(List<String> updateColumns)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		commonCodeForUpdatableByCursor(updateColumns, true);
 	}
 
@@ -2862,6 +3043,8 @@ void markColumnsInSelectListUpdatableByCursor(List<String> updateColumns)
 	 * list but we will not find updatable column c12 in the select column list
 	 */
     private void commonCodeForUpdatableByCursor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             List<String> updateColumns,
             boolean dealingWithSelectResultColumnList)
 	{
@@ -2882,10 +3065,13 @@ private void commonCodeForUpdatableByCursor(
 			for (int index = 0; index < ucSize; index++)
 			{
                 columnName = updateColumns.get(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 				resultColumn = getResultColumn(columnName);
 				if (SanityManager.DEBUG)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 					if (resultColumn == null && !dealingWithSelectResultColumnList)
 					{
 						SanityManager.THROWASSERT("No result column found with name " +
@@ -2908,6 +3094,8 @@ private void commonCodeForUpdatableByCursor(
      * @param updateColumns     A list representing the columns
 	 *							to be updated.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markUpdatableByCursor(List<String> updateColumns)
 	{
 		commonCodeForUpdatableByCursor(updateColumns, false);
@@ -2936,6 +3124,7 @@ boolean updatableByCursor(int columnPosition)
     boolean isCloneable()
 	{
 		boolean retcode = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			if (! rc.getExpression().isCloneable())
@@ -2954,8 +3143,11 @@ boolean isCloneable()
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void remapColumnReferencesToExpressions() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			// The expression may be null if this column is an identity
@@ -2963,6 +3155,8 @@ void remapColumnReferencesToExpressions() throws StandardException
 			// is a ColumnReference; we call through to the ColumnReference
 			// to give it a chance to remap itself from the outer query
 			// node to this one.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1089
+//IC see: https://issues.apache.org/jira/browse/DERBY-2015
 			if (rc.getExpression() != null)
 				rc.setExpression(
 					rc.getExpression().remapColumnReferencesToExpressions());
@@ -2997,6 +3191,7 @@ boolean hasConsistentTypeInfo() throws StandardException
 
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (ResultColumn rc : this)
 			{
 				ValueNode	 	expr = rc.getExpression();
@@ -3055,6 +3250,7 @@ int countReferencedColumns()
 	{
 		int numReferenced = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			if (rc.isReferenced())
@@ -3071,6 +3267,8 @@ int countReferencedColumns()
 	 * @param idArray	int[] for column ids
 	 * @param basis		0 (for 0-based ids) or 1 (for 1-based ids)
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void recordColumnReferences(int[] idArray, int basis)
 	{
 		int currArrayElement = 0;
@@ -3098,6 +3296,8 @@ int getPosition( String name, int basis )
 		for (int index = 0; index < size; index++)
 		{
             ResultColumn rc = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			if ( name.equals( rc.getName() ) )
 			{
@@ -3120,9 +3320,12 @@ int getPosition( String name, int basis )
 	 * @param tableColMap	JBitSet[] for tables
 	 * @param tableNumber	Table number of column references
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void recordColumnReferences(boolean[] colArray1, JBitSet[] tableColMap,
 			int tableNumber)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			int columnNumber;
@@ -3153,6 +3356,7 @@ int allTopCRsFromSameTable()
 	{
 		int tableNumber = -1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			ValueNode vn = rc.getExpression();
@@ -3179,6 +3383,8 @@ else if (tableNumber != cr.getTableNumber())
 	 * Clear the column references from the RCL. (Restore RCL back to a state
 	 * where none of the RCs are marked as referenced.)
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void clearColumnReferences()
 	{
         for (ResultColumn rc : this)
@@ -3195,8 +3401,11 @@ void clearColumnReferences()
 	 *
 	 * @param targetList	The list to copy to
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void copyReferencedColumnsToNewList(ResultColumnList targetList)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			if (rc.isReferenced())
@@ -3212,9 +3421,13 @@ void copyReferencedColumnsToNewList(ResultColumnList targetList)
 	 * @param targetList	The list to copy to,
 	 * @param copyList      1 based bitMap we copy columns associated with set bits.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void copyColumnsToNewList(
         ResultColumnList targetList, FormatableBitSet copyList)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			if (copyList.isSet(rc.getColumnPosition())) 
@@ -3230,12 +3443,15 @@ void copyColumnsToNewList(
 	 *
 	 * @return the FormatableBitSet
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FormatableBitSet getColumnReferenceMap()
 	{
 		FormatableBitSet colMap = new FormatableBitSet(size());
 		int size = size();
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = elementAt(index);
 			if (rc.isReferenced())
 			{
@@ -3252,12 +3468,15 @@ FormatableBitSet getColumnReferenceMap()
      */
     void pullVirtualIsReferenced()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
         {
             rc.pullVirtualIsReferenced();
         }
     } // end of pullVirtualIsReferenced
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void clearTableNames()
 	{
         for (ResultColumn rc : this)
@@ -3306,6 +3525,7 @@ int getTotalColumnSize()
 	{
 		int colSize = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
             colSize += rc.getMaximumColumnSize();
@@ -3323,6 +3543,8 @@ int getTotalColumnSize()
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void createListFromResultSetMetaData(ResultSetMetaData rsmd,
 												TableName tableName,
 												String javaClassName)
@@ -3350,9 +3572,11 @@ void createListFromResultSetMetaData(ResultSetMetaData rsmd,
 				int jdbcColumnType = rsmd.getColumnType(index);
 
 				switch (jdbcColumnType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 				case Types.JAVA_OBJECT:
 				case Types.OTHER:
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
                     cti = TypeId.getUserDefinedTypeId(
                             rsmd.getColumnTypeName(index));
 					break;
@@ -3422,6 +3646,8 @@ else if (jdbcColumnType == Types.LONGVARCHAR ||
     public ResultColumn addColumn( TableName tableName, String columnName, DataTypeDescriptor dts )
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ValueNode bcn = new BaseColumnNode(columnName,
                                            tableName,
                                            dts,
@@ -3443,6 +3669,8 @@ public ResultColumn addColumn( TableName tableName, String columnName, DataTypeD
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void addRCForRID()
 		throws StandardException
 	{
@@ -3467,9 +3695,12 @@ void addRCForRID()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markAllUnreferenced()
 				throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
             rc.setUnreferenced();
@@ -3487,6 +3718,7 @@ void markAllUnreferenced()
 	 */
 	boolean allExpressionsAreColumns(ResultSetNode sourceRS)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			//DERBY-4631
@@ -3499,6 +3731,7 @@ boolean allExpressionsAreColumns(ResultSetNode sourceRS)
 			// By returning false here, we allow Derby to generate
 			// code for functionality equivalent to COALESCE to
 			// determine join column's value. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (rc.isRightOuterJoinUsingClause())
 				return false;
 			
@@ -3551,6 +3784,10 @@ boolean allExpressionsAreColumns(ResultSetNode sourceRS)
 	 *
 	 * @return	Array representiong mapping of RCs to source RCs.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
     ColumnMapping mapSourceColumns()
 	{
         int[] mapArray = new int[size()];
@@ -3560,11 +3797,13 @@ ColumnMapping mapSourceColumns()
 
         // key: virtual column number, value: index
         Map<Integer,Integer> seenMap = new HashMap<Integer,Integer>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		int size = size();
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             resultColumn = elementAt(index);
 			if (resultColumn.getExpression() instanceof VirtualColumnNode)
 			{
@@ -3578,6 +3817,10 @@ ColumnMapping mapSourceColumns()
 				else
 				{
 					// Virtual column #s are 1-based
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
                     ResultColumn rc = vcn.getSourceColumn();
                     updateArrays(mapArray, cloneMap, seenMap, rc, index);
 
@@ -3600,6 +3843,10 @@ else if (resultColumn.getExpression() instanceof ColumnReference)
 				{
 					// Virtual column #s are 1-based
                     ResultColumn rc = cr.getSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
 
                     updateArrays(mapArray, cloneMap, seenMap, rc, index);
 				}
@@ -3610,14 +3857,21 @@ else if (resultColumn.getExpression() instanceof ColumnReference)
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
         ColumnMapping result = new ColumnMapping(mapArray, cloneMap);
         return result;
 	}
 
 	/** Set the nullability of every ResultColumn in this list 
 	 * @throws StandardException */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setNullability(boolean nullability) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
             rc.setNullability(nullability);
@@ -3670,6 +3924,7 @@ FormatableBitSet getReferencedFormatableBitSet(boolean positionedUpdate, boolean
 	
 		for (index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn oldCol = elementAt(index);
 			if (oldCol.isReferenced())
 			{
@@ -3738,10 +3993,13 @@ ResultColumnList compactColumns(boolean positionedUpdate, boolean always)
 		}
 	
         ResultColumnList newCols = new ResultColumnList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		int size = size();
 		for (index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn oldCol = elementAt(index);
 			if (oldCol.isReferenced())
 			{
@@ -3806,10 +4064,14 @@ ResultColumnList getJoinColumns(ResultColumnList joinColumns)
             throws StandardException
 	{
         ResultColumnList    newRCL = new ResultColumnList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		/* Find all of the join columns and put them 1st on the
 		 * new RCL.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn joinRC : joinColumns)
 		{
 			String columnName = joinRC.getName();
@@ -3845,6 +4107,8 @@ void resetVirtualColumnIds()
 		for (int index = 0; index < size; index++)
 		{
 			/* ResultColumns are 1-based */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             elementAt(index).setVirtualColumnId(index + 1);
 		}
 	}
@@ -3859,6 +4123,7 @@ void resetVirtualColumnIds()
 	 */
 	boolean reusableResult()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			if ((rc.getExpression() instanceof ConstantNode) ||
@@ -3890,6 +4155,7 @@ int[] getColumnPositions( TableDescriptor td )
 
 		for ( int index = 0; index < size; index++ )
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn resultColumn = elementAt( index );
 			columnName = resultColumn.getName();
 			cd = td.getColumnDescriptor( columnName );
@@ -3912,6 +4178,8 @@ int[] getColumnPositions( TableDescriptor td )
 	 *
 	 * @return the array of strings
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String[] getColumnNames()
 	{
 		String strings[] = new String[size()];
@@ -3920,6 +4188,7 @@ String[] getColumnNames()
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn resultColumn = elementAt(index);
 			strings[index] = resultColumn.getName();
 		}
@@ -3936,6 +4205,7 @@ String[] getColumnNames()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4426
 	void replaceOrForbidDefaults(TableDescriptor ttd,
                                  ResultColumnList tcl,
                                  boolean allowDefaults)
@@ -3946,9 +4216,11 @@ void replaceOrForbidDefaults(TableDescriptor ttd,
 		for (int index = 0; index < size; index++)
 		{
             ResultColumn rc = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			if (rc.isDefaultColumn())
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4426
                 if (!allowDefaults) {
                     throw StandardException.newException(
                         SQLState.LANG_INVALID_USE_OF_DEFAULT);
@@ -3963,6 +4235,7 @@ void replaceOrForbidDefaults(TableDescriptor ttd,
 				}
 				else if (index < tcl.size())
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     ResultColumn trc = tcl.elementAt(index);
 					cd = ttd.getColumnDescriptor(trc.getName());
 				}
@@ -3997,7 +4270,10 @@ else if (index < tcl.size())
 				else
 				{
 					rc.setExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                             new UntypedNullConstantNode(getContextManager()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3950
                     rc.setWasDefaultColumn( true );
 				}
                 rc.setDefaultColumn(false);
@@ -4036,6 +4312,7 @@ void    setDefault( ResultColumn rc, ColumnDescriptor cd, DefaultInfoImpl defaul
 	void checkForInvalidDefaults()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			if (rc.isAutoincrementGenerated())
@@ -4056,6 +4333,7 @@ void checkForInvalidDefaults()
 	void verifyAllOrderable() 
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : this)
 		{
 			rc.verifyOrderable();
@@ -4100,6 +4378,8 @@ void verifyAllOrderable()
 	private	ResultColumn	makeColumnFromName( String columnName )
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
        return new ResultColumn(columnName, null, getContextManager());
 	}
 
@@ -4112,6 +4392,8 @@ private	ResultColumn	makeColumnFromName( String columnName )
 	{
 		ContextManager	cm = getContextManager();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ResultColumn rc = new ResultColumn(
 				columnName,
                 new ColumnReference(columnName, tableName, cm),
@@ -4128,6 +4410,8 @@ private	ResultColumn	makeColumnFromName( String columnName )
 	 *
 	 * @exception StandardException		If the column is an ai column
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void forbidOverrides(ResultColumnList sourceRSRCL)
 		throws StandardException
 	{
@@ -4142,17 +4426,21 @@ void forbidOverrides(ResultColumnList sourceRSRCL)
 	 * @exception StandardException		If the column is an ai column
 	 */
     void forbidOverrides(ResultColumnList sourceRSRCL, boolean defaultsWereReplaced )
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 		throws StandardException
 	{
 		int size = size();
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = elementAt(index);
 			ResultColumn sourceRC = 
                 (sourceRSRCL == null) ? null : sourceRSRCL.elementAt(index);
 			ColumnDescriptor cd = rc.getTableColumnDescriptor();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3950
             if ( (cd != null) && cd.hasGenerationClause() )
             {
                 if ( !defaultsWereReplaced && (sourceRC != null) && !sourceRC.hasGenerationClause() && !sourceRC.wasDefaultColumn() )
@@ -4160,6 +4448,7 @@ void forbidOverrides(ResultColumnList sourceRSRCL, boolean defaultsWereReplaced
                     throw StandardException.newException(SQLState.LANG_CANT_OVERRIDE_GENERATION_CLAUSE, rc.getName());
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4146
                 if ( sourceRC != null ) { sourceRC.setColumnDescriptor(cd.getTableDescriptor(), cd); }
             }
 			
@@ -4172,6 +4461,7 @@ void forbidOverrides(ResultColumnList sourceRSRCL, boolean defaultsWereReplaced
 				{
 					sourceRC.setColumnDescriptor(cd.getTableDescriptor(), cd);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
 				}else{
 					if(cd.isAutoincAlways())
 						throw StandardException.newException(SQLState.LANG_AI_CANNOT_MODIFY_AI,
@@ -4181,6 +4471,8 @@ void forbidOverrides(ResultColumnList sourceRSRCL, boolean defaultsWereReplaced
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void incOrderBySelect()
 	{
 		orderBySelect++;
@@ -4198,6 +4490,7 @@ int getOrderBySelect()
 
     public void copyOrderBySelect( ResultColumnList src)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-127
         orderBySelect = src.orderBySelect;
     }
 
@@ -4219,6 +4512,7 @@ private int numGeneratedColumns()
 		boolean inVisibleRange = false;
 		for (int i = sz - 1; i >= 0; i--) 
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = elementAt(i);
 			if (rc.isGenerated()) 
 			{
@@ -4244,6 +4538,7 @@ int numGeneratedColumnsForGroupBy()
 		int numGenerated = 0;
 		int sz = size();
 		for (int i = sz - 1; i >= 0; i--) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = elementAt(i);
 			if (rc.isGenerated() && rc.isGroupingColumn())
 			{
@@ -4261,6 +4556,7 @@ void removeGeneratedGroupingColumns()
 		int sz = size();
 		for (int i = sz - 1; i >= 0; i--) 
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = elementAt(i);
 			if (rc.isGenerated() && rc.isGroupingColumn()) 
 			{
@@ -4288,8 +4584,11 @@ int visibleSize()
     @Override
 	public String toString()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (SanityManager.DEBUG) {
 			return "indexRow: " + indexRow + "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 				 "orderBySelect: " + orderBySelect + "\n" +
 				(indexRow ? "conglomerateId: " + conglomerateId + "\n"
 				 : "") +
@@ -4301,6 +4600,10 @@ public String toString()
 
 
     private static boolean streamableType(ResultColumn rc) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
         DataTypeDescriptor dtd = rc.getType();
         TypeId s = TypeId.getBuiltInTypeId(dtd.getTypeName());
 
@@ -4314,6 +4617,7 @@ private static boolean streamableType(ResultColumn rc) {
 
     private static void updateArrays(int[] mapArray,
                              boolean[] cloneMap,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                              Map<Integer,Integer> seenMap,
                              ResultColumn rc,
                              int index) {
@@ -4324,12 +4628,15 @@ private static void updateArrays(int[] mapArray,
 
         if (streamableType(rc)) {
             Integer seenIndex = seenMap.get(Integer.valueOf(vcId));
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
             if (seenIndex != null) {
                 // We have already mapped this column at index
                 // seenIndex, so mark occurence 2..n  for cloning.
                 cloneMap[index] = true;
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 seenMap.put(vcId, index);
             }
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultSetNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
index 3f764b8c5b..c8a80c1acd 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ResultSetNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -77,6 +78,8 @@ public abstract class ResultSetNode extends QueryTreeNode
 	// query. Subclasses will set this value where appropriate.
 	private CostEstimate		candidateFinalCostEstimate;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode(ContextManager cm) {
         super(cm);
     }
@@ -122,6 +125,7 @@ void printSubNodes(int depth)
 			if (resultColumns != null)
 			{
 				printLabel(depth, "resultColumns: ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				resultColumns.treePrint(depth + 1);
 			}
 		}
@@ -135,6 +139,7 @@ void printSubNodes(int depth)
 
     /** Set whether this is a cursor target table */
     void    setCursorTargetTable( boolean yesOrNo ) { cursorTargetTable = yesOrNo; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
     /** Get the scratch estimate */
     CostEstimate    getScratchCostEstimate() { return scratchCostEstimate; }
@@ -162,6 +167,8 @@ public  int getResultSetNumber()
 	 *
 	 * @return	The CostEstimate for this ResultSetNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getCostEstimate()
 	{
 		return costEstimate;
@@ -169,17 +176,21 @@ CostEstimate getCostEstimate()
 
     /** Set the CostEstimate for this ResultSetNode */
     void    setCostEstimate( CostEstimate ce ) { costEstimate = ce; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 	/**
 	 * Get the final CostEstimate for this ResultSetNode.
 	 *
 	 * @return	The final CostEstimate for this ResultSetNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getFinalCostEstimate()
 		throws StandardException
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			if (candidateFinalCostEstimate == null)
 			{
 				SanityManager.THROWASSERT(
@@ -203,6 +214,8 @@ CostEstimate getFinalCostEstimate()
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void assignResultSetNumber() throws StandardException
 	{
 		resultSetNumber = getCompilerContext().getNextResultSetNumber();
@@ -221,6 +234,8 @@ void assignResultSetNumber() throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 							FromList fromListParam) 
 							throws StandardException {
@@ -239,6 +254,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindVTITables(FromList fromListParam)
 		throws StandardException {
 		return this;
@@ -253,6 +270,8 @@ ResultSetNode bindVTITables(FromList fromListParam)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressions(FromList fromListParam)
 					throws StandardException
 	{
@@ -271,6 +290,8 @@ void bindExpressions(FromList fromListParam)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressionsWithTables(FromList fromListParam)
 					throws StandardException
 	{
@@ -290,6 +311,8 @@ void bindExpressionsWithTables(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindTargetExpressions(FromList fromListParam)
 					throws StandardException
 	{
@@ -315,11 +338,13 @@ void setTableConstructorTypes(ResultColumnList typeColumns)
         // sub-class. For all other nodes, just go through the result columns
         // and set the type for dynamic parameters.
         for (int i = 0; i < resultColumns.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = resultColumns.elementAt(i);
             ValueNode re = rc.getExpression();
 
             if (re != null && re.requiresTypeFromContext()) {
                 ResultColumn typeCol = typeColumns.elementAt(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
                 re.setType(typeCol.getTypeServices());
             }
         }
@@ -328,6 +353,8 @@ void setTableConstructorTypes(ResultColumnList typeColumns)
 	/**
 	 * Remember that this node is the source result set for an INSERT.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setInsertSource()
 	{
 		insertSource = true;
@@ -344,6 +371,8 @@ void setInsertSource()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
 					throws StandardException
 {
@@ -365,6 +394,8 @@ void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList getAllResultColumns(TableName allTableName)
 					throws StandardException
 	{
@@ -388,6 +419,8 @@ ResultColumnList getAllResultColumns(TableName allTableName)
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getMatchingColumn(
 						ColumnReference columnReference)
 						throws StandardException
@@ -415,6 +448,8 @@ ResultColumn getMatchingColumn(
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode setResultToBooleanTrueNode(boolean onlyConvertAlls)
 		throws StandardException
 	{
@@ -425,6 +460,8 @@ ResultSetNode setResultToBooleanTrueNode(boolean onlyConvertAlls)
 		 */
 		if (resultColumns.elementAt(0) instanceof AllResultColumn)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
            resultColumn = new ResultColumn("", null, getContextManager());
 		}
 		else if (onlyConvertAlls)
@@ -433,9 +470,11 @@ else if (onlyConvertAlls)
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             resultColumn = resultColumns.elementAt(0);
 	
 			/* Nothing to do if query is already select TRUE ... */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5501
             if (resultColumn.getExpression().isBooleanTrue() &&
                     resultColumns.size() == 1)
 			{
@@ -443,6 +482,8 @@ else if (onlyConvertAlls)
 			}
 		}
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
        BooleanConstantNode booleanNode =
                 new BooleanConstantNode(true, getContextManager());
 
@@ -464,6 +505,8 @@ else if (onlyConvertAlls)
 	 * @return FromList
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FromList getFromList()
 		throws StandardException
 	{
@@ -482,6 +525,8 @@ FromList getFromList()
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumns(FromList fromListParam)
 				throws StandardException
 	{
@@ -541,6 +586,8 @@ void bindResultColumns(TableDescriptor targetTableDescriptor,
 			if (targetTableDescriptor != null)
 			{
 				resultColumns.bindResultColumnsByName(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         targetTableDescriptor, statement);
 			}
 			else
@@ -563,6 +610,8 @@ void bindResultColumns(TableDescriptor targetTableDescriptor,
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindUntypedNullsToResultColumns(ResultColumnList rcl)
 				throws StandardException
 	{
@@ -587,6 +636,8 @@ void bindUntypedNullsToResultColumns(ResultColumnList rcl)
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
@@ -614,6 +665,8 @@ void projectResultColumns() throws StandardException
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode ensurePredicateList(int numTables)
 		throws StandardException
 	{
@@ -634,6 +687,8 @@ ResultSetNode ensurePredicateList(int numTables)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode addNewPredicate(Predicate predicate)
 			throws StandardException
 	{
@@ -720,6 +775,8 @@ ResultSetNode genProjectRestrictForReordering()
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode optimize(DataDictionary dataDictionary,
 								  PredicateList predicates,
 								  double outerRows) 
@@ -741,6 +798,8 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode modifyAccessPaths() throws StandardException
 	{
 		/* Default behavior is to do nothing */
@@ -757,6 +816,8 @@ ResultSetNode modifyAccessPaths() throws StandardException
 	 * @return The modified query tree
 	 * @exception StandardException        Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode modifyAccessPaths(PredicateList predList)
 		throws StandardException
 	{
@@ -764,6 +825,7 @@ ResultSetNode modifyAccessPaths(PredicateList predList)
 		return modifyAccessPaths();
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 	ResultColumnDescriptor[] makeResultDescriptors()
 	{
 	    return resultColumns.makeResultDescriptors();
@@ -792,6 +854,8 @@ boolean columnTypesAndLengthsMatch()
 	 *
 	 * @param newRCL		The new ResultColumnList for this ResultSetNode
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setResultColumns(ResultColumnList newRCL)
 	{
 		resultColumns = newRCL;
@@ -802,6 +866,8 @@ void setResultColumns(ResultColumnList newRCL)
 	 *
 	 * @return ResultColumnList for this ResultSetNode
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumnList getResultColumns()
 	{
 		return resultColumns;
@@ -812,6 +878,8 @@ ResultColumnList getResultColumns()
 	 *
 	 * @param newRTM	The new referencedTableMap for this ResultSetNode
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setReferencedTableMap(JBitSet newRTM)
 	{
 		referencedTableMap = newRTM;
@@ -833,6 +901,8 @@ public JBitSet getReferencedTableMap()
 	 *
 	 * @param passedMap	The table map to fill in.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void fillInReferencedTableMap(JBitSet passedMap)
 	{
 	}
@@ -845,6 +915,8 @@ void fillInReferencedTableMap(JBitSet passedMap)
 	 *									directly under a ResultColumn
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void rejectParameters() throws StandardException
 	{
 		/* Okay if no resultColumns yet - means no parameters there */
@@ -864,6 +936,8 @@ void rejectParameters() throws StandardException
 	 * @exception StandardException		Thrown if an XML value found
 	 *									directly under a ResultColumn
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void rejectXMLValues() throws StandardException
 	{
 		if (resultColumns != null)
@@ -876,10 +950,13 @@ void rejectXMLValues() throws StandardException
 	 * Rename generated result column names as '1', '2' etc... These will be the result
 	 * column names seen by JDBC clients.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void renameGeneratedResultNames() throws StandardException
 	{
 		for (int i=0; i<resultColumns.size(); i++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ResultColumn rc = resultColumns.elementAt(i);
 			if (rc.isNameGenerated())
 				rc.setName(Integer.toString(i+1));
@@ -891,6 +968,8 @@ void renameGeneratedResultNames() throws StandardException
 		if it is the one controlling the statement -- i.e., it is
 		the outermost result set node for the statement.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markStatementResultSet()
 	{
 		statementResultSet = true;
@@ -914,10 +993,16 @@ void markStatementResultSet()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4442
+//IC see: https://issues.apache.org/jira/browse/DERBY-3
+//IC see: https://issues.apache.org/jira/browse/DERBY-4433
+//IC see: https://issues.apache.org/jira/browse/DERBY-1644
 	ResultSetNode enhanceRCLForInsert(
 			InsertNode target, boolean inOrder, int[] colMap)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 		if (!inOrder ||
                 resultColumns.visibleSize() < target.resultColumnList.size()) {
 			return generateProjectRestrictForInsert(target, colMap);
@@ -958,6 +1043,10 @@ ResultColumnList getRCLForInsert(InsertNode target, int[] colMap)
 			}
 			else
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4442
+//IC see: https://issues.apache.org/jira/browse/DERBY-3
+//IC see: https://issues.apache.org/jira/browse/DERBY-4433
+//IC see: https://issues.apache.org/jira/browse/DERBY-1644
 				newResultColumn = genNewRCForInsert(
 						target.targetTableDescriptor,
 						target.targetVTI,
@@ -990,6 +1079,10 @@ private ResultColumn genNewRCForInsert(TableDescriptor targetTD,
 		throws StandardException
 	{
         ResultColumn newResultColumn;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		// the i-th column's value was not specified, so create an
 		// expression containing its default value (null for now)
@@ -1012,6 +1105,7 @@ private ResultColumn genNewRCForInsert(TableDescriptor targetTD,
 	    
 	    //Column has constant default value , 
 	    //if it have defaultInfo and not be autoincrement.
+//IC see: https://issues.apache.org/jira/browse/DERBY-167
             if (defaultInfo != null && ! colDesc.isAutoincrement())
             {
                 //RESOLVEPARAMETER - skip the tree if we have the value
@@ -1034,7 +1128,10 @@ private ResultColumn genNewRCForInsert(TableDescriptor targetTD,
                         String defaultText = defaultInfo.getDefaultText();
                         ValueNode defaultTree = parseDefault(defaultText);
                         defaultTree = defaultTree.bindExpression
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                             (getFromList(), (SubqueryList) null, (List<AggregateNode>) null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         newResultColumn = new ResultColumn(
                                 defaultTree.getTypeServices(),
                                 defaultTree,
@@ -1052,6 +1149,8 @@ private ResultColumn genNewRCForInsert(TableDescriptor targetTD,
             }
             else if (colDesc.isAutoincrement())
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 newResultColumn =
                         new ResultColumn(colDesc, null, getContextManager());
                 newResultColumn.setAutoincrementGenerated();
@@ -1081,10 +1180,18 @@ else if (colDesc.isAutoincrement())
 	 * @return a ProjectRestrictNode whos RCL matches the target RCL
 	 */
 	private ResultSetNode generateProjectRestrictForInsert(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4442
+//IC see: https://issues.apache.org/jira/browse/DERBY-3
+//IC see: https://issues.apache.org/jira/browse/DERBY-4433
+//IC see: https://issues.apache.org/jira/browse/DERBY-1644
 			InsertNode target, int[] colMap)
 		throws StandardException
 	{
 		// our newResultCols are put into the bound form straight away.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ResultColumnList
                 newResultCols = new ResultColumnList(getContextManager());
 
@@ -1107,6 +1214,8 @@ private ResultSetNode generateProjectRestrictForInsert(
 				oldResultColumn =
 						resultColumns.getResultColumn(colMap[index] + 1);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 newColumnReference = new ColumnReference(
                         oldResultColumn.getName(), null, getContextManager());
 
@@ -1130,6 +1239,8 @@ private ResultSetNode generateProjectRestrictForInsert(
 				// column descriptors into the result, we grab it from there.
 				// alternatively, we could do what the else clause does,
 				// and look it up in the DD again.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                newResultColumn = new ResultColumn(
 						dtd,
 						newColumnReference,
@@ -1156,6 +1267,8 @@ private ResultSetNode generateProjectRestrictForInsert(
 		 *		   top of the query tree which has ColumnReferences under
 		 *		   its ResultColumnList prior to expression push down.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return new ProjectRestrictNode(this,
                                        newResultCols,
                                        null,
@@ -1176,6 +1289,8 @@ private ResultSetNode generateProjectRestrictForInsert(
          )
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         ValueNode dummy = new UntypedNullConstantNode(getContextManager());
         ResultColumn newResultColumn =
             new ResultColumn(colDesc.getType(), dummy, getContextManager());
@@ -1222,6 +1337,7 @@ private ResultSetNode generateProjectRestrictForInsert(
 		/* Finally, we can call the parser */
 		// Since this is always nested inside another SQL statement, so topLevel flag
 		// should be false
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 		Visitable qt = p.parseStatement(values);
 		if (SanityManager.DEBUG)
 		{
@@ -1240,6 +1356,7 @@ private ResultSetNode generateProjectRestrictForInsert(
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         defaultTree = ((CursorNode) qt).getResultSetNode().getResultColumns().
                 elementAt(0).getExpression();
 
@@ -1259,6 +1376,7 @@ private ResultSetNode generateProjectRestrictForInsert(
 	public ResultDescription makeResultDescription()
 	{
 	    ResultColumnDescriptor[] colDescs = makeResultDescriptors();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 
 	    return getExecutionFactory().getResultDescription(colDescs, null);
 	}
@@ -1327,6 +1445,8 @@ void notCursorTargetTable()
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode genProjectRestrict()
 				throws StandardException
 	{
@@ -1343,6 +1463,10 @@ ResultSetNode genProjectRestrict()
 		prRCList.genVirtualColumnNodes(this, resultColumns);
 
 		/* Finally, we create the new ProjectRestrictNode */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return new ProjectRestrictNode(
 								this,
 								prRCList,
@@ -1351,6 +1475,8 @@ ResultSetNode genProjectRestrict()
 								null,	/* Project subquery list */
 								null,	/* Restrict subquery list */
 								null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                                 getContextManager());
 	}
 
@@ -1377,6 +1503,8 @@ ResultSetNode genProjectRestrict()
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode genProjectRestrict(int numTables)
 				throws StandardException
 	{
@@ -1419,6 +1547,7 @@ void generateNormalizationResultSet(
 		mb.push(false);
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getNormalizeResultSet",
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 					ClassName.NoPutResultSet, 6);
 	}
 
@@ -1437,6 +1566,8 @@ void generateNormalizationResultSet(
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode changeAccessPath() throws StandardException
 	{
 		return this;
@@ -1521,6 +1652,7 @@ protected OptimizerImpl getOptimizerImpl()
 
     /** Get the optimizer being used on this result set */
     Optimizer   getOptimizer()  { return optimizer; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
     /** Set the optimizer for use on this result set */
     void    setOptimizer( Optimizer opt ) { optimizer = opt; }
@@ -1545,11 +1677,13 @@ protected CostEstimate getNewCostEstimate()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (resultColumns != null)
 		{
 			resultColumns = (ResultColumnList)resultColumns.accept(v);
@@ -1564,6 +1698,8 @@ void acceptChildren(Visitor v)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode considerMaterialization(JBitSet outerTables)
 		throws StandardException
 	{
@@ -1647,6 +1783,7 @@ void pushOrderByList(OrderByList orderByList)
      */
     void pushOffsetFetchFirst( ValueNode offset, ValueNode fetchFirst, boolean hasJDBClimitClause )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
         if (SanityManager.DEBUG)
         {
             SanityManager.THROWASSERT(
@@ -1745,6 +1882,7 @@ boolean returnsAtMostOneRow()
      *
      * @exception StandardException         Thrown on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4426
     void replaceOrForbidDefaults(TableDescriptor ttd,
                                  ResultColumnList tcl,
                                  boolean allowDefaults)
@@ -1847,6 +1985,8 @@ static int numDistinctAggregates(List<AggregateNode> aggregates)
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             if ((aggregates.get(index)).isDistinct()) {
                 count++;
             }
@@ -1857,6 +1997,8 @@ static int numDistinctAggregates(List<AggregateNode> aggregates)
 
 	// It may be we have a SELECT view underneath a LOJ.
 	// Return null for now.. we don't do any optimization.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     JBitSet LOJgetReferencedTables(int numTables)
 				throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RevokeNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RevokeNode.java
index 91bdd4b602..f208402d72 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RevokeNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RevokeNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.RevokeNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -32,6 +33,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * This class represents a REVOKE statement.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class RevokeNode extends DDLStatementNode
 {
     private PrivilegeNode privileges;
@@ -65,6 +68,8 @@ public String toString()
 		if (SanityManager.DEBUG)
 		{
             StringBuilder sb = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
             for(String grantee : grantees) {
                 if( sb.length() > 0)
@@ -81,6 +86,8 @@ public String toString()
 		}
     } // end of toString
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
         return "REVOKE";
@@ -95,6 +102,7 @@ String statementToString()
     @Override
 	public void bindStatement() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         privileges = (PrivilegeNode) privileges.bind( new HashMap<Provider,Provider>(), grantees, false);
     } // end of bind
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RevokeRoleNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RevokeRoleNode.java
index a515fdbeef..eda55b4d94 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RevokeRoleNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RevokeRoleNode.java
@@ -76,7 +76,10 @@ public String toString()
 	{
 		if (SanityManager.DEBUG) {
             StringBuilder sb1 = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for( Iterator<?> it = roles.iterator(); it.hasNext();) {
 				if( sb1.length() > 0) {
 					sb1.append( ", ");
@@ -85,7 +88,10 @@ public String toString()
 			}
 
             StringBuilder sb2 = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for( Iterator<?> it = grantees.iterator(); it.hasNext();) {
 				if( sb2.length() > 0) {
 					sb2.append( ", ");
@@ -104,6 +110,8 @@ public String toString()
 	} // end of toString
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "REVOKE role";
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RoutineDesignator.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RoutineDesignator.java
index f6584fdfee..0d6c458348 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RoutineDesignator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RoutineDesignator.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.RoutineDesignator
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -39,6 +40,8 @@ class RoutineDesignator
 	 * if null then the signature is not specified and this designator is ambiguous if there is
 	 * more than one function (procedure) with this name.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     List<TypeDescriptor> paramTypeList;
 	AliasDescriptor aliasDescriptor;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowCountNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowCountNode.java
index 27e9853578..b27d72e6eb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowCountNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowCountNode.java
@@ -69,6 +69,8 @@ public final class RowCountNode extends SingleChildResultSetNode
      * @param cm                 The context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     RowCountNode(ResultSetNode    childResult,
                  ResultColumnList rcl,
                  ValueNode        offset,
@@ -79,6 +81,7 @@ public final class RowCountNode extends SingleChildResultSetNode
 
         super(childResult, null, cm);
         setResultColumns( rcl );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         this.offset = offset;
         this.fetchFirst = fetchFirst;
@@ -104,6 +107,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
         assignResultSetNumber();
 
         setCostEstimate( childResult.getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         acb.pushGetResultSetFactoryExpression(mb);
 
@@ -116,6 +120,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
         boolean dynamicFetchFirst = false;
 
         // arg4
+//IC see: https://issues.apache.org/jira/browse/DERBY-4208
         if (offset != null) {
             generateExprFun(acb, mb, offset);
         } else {
@@ -131,6 +136,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
         mb.push( hasJDBClimitClause );  // arg6
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         mb.push(getCostEstimate().rowCount()); // arg7
         mb.push(getCostEstimate().getEstimatedCost()); // arg8
 
@@ -143,6 +149,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 
     private void generateExprFun(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4208
         ExpressionClassBuilder ecb,
         MethodBuilder mb,
         ValueNode vn) throws StandardException {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowNumberFunctionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowNumberFunctionNode.java
index 37b60260e8..4d30ad2488 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowNumberFunctionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowNumberFunctionNode.java
@@ -52,6 +52,7 @@ public final class RowNumberFunctionNode extends WindowFunctionNode
      */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
             throws StandardException
     {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java
index 666bc0ae3d..7ea17bc27b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java
@@ -98,6 +98,8 @@ public boolean orderedOnColumn(int direction,
 			return false;
 
         ColumnOrdering co = ordering.get(orderPosition);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		/*
 		** Is the column in question ordered with the given direction at
@@ -119,6 +121,8 @@ public boolean orderedOnColumn(int direction,
 		/*
 		** Return true if the table is always ordered.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         if (alwaysOrdered(tableNumber))
 		{
 			return true;
@@ -135,6 +139,8 @@ public boolean orderedOnColumn(int direction,
 
 		for (int i = 0; i < ordering.size(); i++) {
             ColumnOrdering co = ordering.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			/*
 			** Is the column in question ordered with the given direction at
@@ -158,11 +164,14 @@ public void addOrderedColumn(int direction,
 								int tableNumber,
 								int columnNumber)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         if (!unorderedOptimizables.isEmpty()) {
 			return;
         }
 
         ColumnOrdering currColOrder;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		if (ordering.isEmpty())
 		{
@@ -172,6 +181,7 @@ public void addOrderedColumn(int direction,
 		else
 		{
             currColOrder =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				ordering.get(ordering.size() - 1);
 		}
 
@@ -191,11 +201,13 @@ public void addOrderedColumn(int direction,
 	/** @see RowOrdering#nextOrderPosition */
 	public void nextOrderPosition(int direction)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         if (!unorderedOptimizables.isEmpty()) {
 			return;
         }
 
 		currentColumnOrdering = new ColumnOrdering(direction);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 		ordering.add(currentColumnOrdering);
 	}
 
@@ -223,8 +235,11 @@ public void optimizableAlwaysOrdered(Optimizable optimizable)
 		int tableNumber = (hasTableNumber ? optimizable.getTableNumber() : 0);
 		if (
 			(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 				(ordering.isEmpty()) ||
 				(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     hasTableNumber && ordering.get(0).hasTable(tableNumber)
 				)
 			)
@@ -238,6 +253,7 @@ public void optimizableAlwaysOrdered(Optimizable optimizable)
 			if (optimizable.hasTableNumber())
 				removeOptimizable(optimizable.getTableNumber());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 			alwaysOrderedOptimizables.add(optimizable);
 		}
 	}
@@ -252,7 +268,9 @@ public void columnAlwaysOrdered(Optimizable optimizable, int columnNumber)
 	/** @see RowOrdering#alwaysOrdered */
 	public boolean alwaysOrdered(int tableNumber)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Iterator<Optimizable> it = alwaysOrderedOptimizables.iterator();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         while (it.hasNext()) {
             Optimizable optTable = it.next();
 
@@ -280,6 +298,8 @@ public void removeOptimizable(int tableNumber)
 			/*
 			** First, remove the table from all the ColumnOrderings
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ColumnOrdering ord = ordering.get(i);
 			ord.removeColumns(tableNumber);
 			if (ord.empty())
@@ -303,6 +323,7 @@ public void removeOptimizable(int tableNumber)
     private void removeOptimizable(int tableNumber, ArrayList<Optimizable> list)
 	{
         ListIterator<Optimizable> it = list.listIterator();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         while (it.hasNext())
 		{
@@ -318,6 +339,7 @@ private void removeOptimizable(int tableNumber, ArrayList<Optimizable> list)
 	/** @see RowOrdering#addUnorderedOptimizable */
 	public void addUnorderedOptimizable(Optimizable optimizable)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 		unorderedOptimizables.add(optimizable);
 	}
 
@@ -334,6 +356,7 @@ public void copy(RowOrdering copyTo) {
 		RowOrderingImpl dest = (RowOrderingImpl) copyTo;
 
 		/* Clear the ordering of what we're copying to */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5060
 		dest.ordering.clear();
 		dest.currentColumnOrdering = null;
 
@@ -351,6 +374,7 @@ public void copy(RowOrdering copyTo) {
 
 		for (int i = 0; i < ordering.size(); i++) {
 			ColumnOrdering co = ordering.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 			dest.ordering.add(co.cloneMe());
 
@@ -364,6 +388,8 @@ public void copy(RowOrdering copyTo) {
 	}
 
 	private void rememberCurrentColumnOrdering(int posn) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         currentColumnOrdering = ordering.get(posn);
 	}
 
@@ -378,6 +404,8 @@ public String toString() {
 
 			for (i = 0; i < unorderedOptimizables.size(); i++) 
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 Optimizable opt = unorderedOptimizables.get(i);
 				if (opt.getBaseTableName() != null)
 				{
@@ -395,6 +423,7 @@ public String toString() {
 
 			for (i = 0; i < alwaysOrderedOptimizables.size(); i++) 
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				Optimizable opt = alwaysOrderedOptimizables.get(i);
 				if (opt.getBaseTableName() != null)
 				{
@@ -426,6 +455,7 @@ private boolean unorderedOptimizablesOtherThan(Optimizable optimizable)
 		{
 			Optimizable thisOpt =
 				unorderedOptimizables.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 			if (thisOpt != optimizable)
 				return true;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
index ddb677458b..8ce3e80bc6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.RowResultSetNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -56,6 +57,7 @@ class RowResultSetNode extends FromTable
     private List<AggregateNode> aggregates;
 
     QueryExpressionClauses qec = new QueryExpressionClauses();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
 
 	/**
      * Constructor for a RowResultSetNode.
@@ -69,12 +71,15 @@ class RowResultSetNode extends FromTable
                      ContextManager cm) {
         super(null /* correlationName */, tableProperties, cm);
         setResultColumns( valuesClause );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         if (getResultColumns() != null) {
 			getResultColumns().markInitialSize();
         }
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "VALUES";
@@ -87,6 +92,8 @@ String statementToString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -99,6 +106,7 @@ void printSubNodes(int depth)
 				subquerys.treePrint(depth + 1);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
             printQueryExpressionSuffixClauses(depth, qec);
 		}
 	}
@@ -112,10 +120,15 @@ public boolean referencesSessionSchema() throws StandardException {
 	 * Modify the RCL of this node to match the target of the insert.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4442
+//IC see: https://issues.apache.org/jira/browse/DERBY-3
+//IC see: https://issues.apache.org/jira/browse/DERBY-4433
+//IC see: https://issues.apache.org/jira/browse/DERBY-1644
 	ResultSetNode enhanceRCLForInsert(
 			InsertNode target, boolean inOrder, int[] colMap)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (!inOrder || getResultColumns().size() < target.resultColumnList.size()) {
 			setResultColumns( getRCLForInsert(target, colMap) );
 		}
@@ -144,6 +157,7 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 		** fetched.  Is this true, and if not, does it make a difference?
 		** There's nothing to optimize in this case.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getCostEstimate() == null)
 		{
 			setCostEstimate( getOptimizerFactory().getCostEstimate() );
@@ -169,6 +183,8 @@ public CostEstimate estimateCost(OptimizablePredicateList predList,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 							FromList fromListParam) 
 					throws StandardException
@@ -189,6 +205,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressions(FromList fromListParam)
 					throws StandardException
 	{
@@ -197,6 +215,7 @@ void bindExpressions(FromList fromListParam)
         subquerys = new SubqueryList(getContextManager());
 
         aggregates = new ArrayList<AggregateNode>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		/* Verify that there are no DEFAULTs in the RCL.
 		 * DEFAULT is only valid for an insert, and it has
@@ -206,6 +225,7 @@ void bindExpressions(FromList fromListParam)
 		 * so we need to check for that here and throw an exception if found.
 		 */
 		getResultColumns().checkForInvalidDefaults();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Believe it or not, a values clause can contain correlated column references
 		 * and subqueries.  In order to get correlated column resolution working 
@@ -224,7 +244,9 @@ void bindExpressions(FromList fromListParam)
 		}
 		setLevel(nestingLevel);
 		fromListParam.insertElementAt(this, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		getResultColumns().bindExpressions(fromListParam, subquerys,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                                       aggregates);
 		// Pop ourselves back out of the FROM list
 		fromListParam.removeElementAt(0);
@@ -235,7 +257,9 @@ void bindExpressions(FromList fromListParam)
 		}
 
 		SelectNode.checkNoWindowFunctions(getResultColumns(), "VALUES");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i = 0; i < qec.size(); i++) {
             final OrderByList obl = qec.getOrderByList(i);
 
@@ -258,6 +282,8 @@ void bindExpressions(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressionsWithTables(FromList fromListParam)
 					throws StandardException
 	{
@@ -274,6 +300,8 @@ void bindExpressionsWithTables(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindTargetExpressions(FromList fromListParam)
 					throws StandardException
 	{
@@ -288,6 +316,8 @@ void bindTargetExpressions(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindUntypedNullsToResultColumns(ResultColumnList bindingRCL)
 				throws StandardException
 	{
@@ -302,6 +332,7 @@ void bindUntypedNullsToResultColumns(ResultColumnList bindingRCL)
 		*/
 		if (bindingRCL == null)
 			bindingRCL = getResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		getResultColumns().bindUntypedNullsToResultColumns(bindingRCL);
 	}
@@ -320,6 +351,8 @@ void bindUntypedNullsToResultColumns(ResultColumnList bindingRCL)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getMatchingColumn(
 						ColumnReference columnReference)
 						throws StandardException
@@ -336,6 +369,8 @@ ResultColumn getMatchingColumn(
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getExposedName() throws StandardException
 	{
 		return null;
@@ -350,6 +385,8 @@ String getExposedName() throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
 					throws StandardException
 	{
@@ -357,6 +394,7 @@ void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
 
     @Override
     public void pushQueryExpressionSuffix() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         qec.push();
     }
 
@@ -371,6 +409,7 @@ public void pushQueryExpressionSuffix() {
     @Override
 	void pushOrderByList(OrderByList orderByList)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         qec.setOrderByList(orderByList);
 	}
 
@@ -384,6 +423,7 @@ void pushOrderByList(OrderByList orderByList)
     @Override
     void pushOffsetFetchFirst( ValueNode offset, ValueNode fetchFirst, boolean hasJDBClimitClause )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         qec.setOffset(offset);
         qec.setFetchFirst(fetchFirst);
         qec.setHasJDBCLimitClause(hasJDBClimitClause);
@@ -415,6 +455,8 @@ void pushOffsetFetchFirst( ValueNode offset, ValueNode fetchFirst, boolean hasJD
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
@@ -427,6 +469,7 @@ ResultSetNode preprocess(int numTables,
                 new PredicateList(getContextManager()));
 
 		/* Allocate a dummy referenced table map */ 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setReferencedTableMap( new JBitSet(numTables) );
 		getReferencedTableMap().set(tableNumber);
 
@@ -435,6 +478,7 @@ ResultSetNode preprocess(int numTables,
         // Well, not very likely here, since we're here:
         //     VALUES x followed by ORDER BY 1,1,2
         // but for completeness...
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i = 0; i < qec.size(); i++) {
             final OrderByList obl = qec.getOrderByList(i);
 
@@ -456,6 +500,8 @@ ResultSetNode preprocess(int numTables,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode ensurePredicateList(int numTables)
 		throws StandardException
 	{
@@ -474,6 +520,8 @@ ResultSetNode ensurePredicateList(int numTables)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode addNewPredicate(Predicate predicate)
 			throws StandardException
 	{
@@ -489,6 +537,7 @@ ResultSetNode addNewPredicate(Predicate predicate)
 		/* We get a shallow copy of the ResultColumnList and its 
 		 * ResultColumns.  (Copy maintains ResultColumn.expression for now.)
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		prRCList = getResultColumns();
 		setResultColumns( getResultColumns().copyListAndObjects() );
 
@@ -499,6 +548,8 @@ ResultSetNode addNewPredicate(Predicate predicate)
 		prRCList.genVirtualColumnNodes(this, getResultColumns());
 
 		/* Put the new predicate in a list */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         predList = new PredicateList(getContextManager());
 		predList.addPredicate(predicate);
 
@@ -537,6 +588,7 @@ boolean flattenableInFromSubquery(FromList fromList)
 			return false;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         if ((aggregates != null) && !aggregates.isEmpty())
 		{
 			return false;
@@ -546,6 +598,7 @@ boolean flattenableInFromSubquery(FromList fromList)
 		** Don't flatten if select list contains something
 		** that isn't clonable
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if ( ! getResultColumns().isCloneable())
 		{
 			return false;
@@ -589,6 +642,8 @@ boolean flattenableInFromSubquery(FromList fromList)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode optimize(DataDictionary dataDictionary,
 								  PredicateList	predicateList,
 								  double outerRows) 
@@ -600,11 +655,13 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 		** This seems like overkill, but it's just an object allocation...
 		*/
         setCostEstimate( getOptimizerFactory().getCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// RESOLVE: THE COST SHOULD TAKE SUBQUERIES INTO ACCOUNT
 		getCostEstimate().setCost(0.0d, outerRows, outerRows);
 
 		subquerys.optimize(dataDictionary, outerRows);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6008
 		return this;
 	}
 
@@ -626,6 +683,8 @@ public Optimizable modifyAccessPath(JBitSet outerTables) throws StandardExceptio
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode modifyAccessPaths() throws StandardException
 	{
 		ResultSetNode treeTop = this;
@@ -635,6 +694,7 @@ ResultSetNode modifyAccessPaths() throws StandardException
 		/* Generate the OrderByNode if a sort is still required for
 		 * the order by.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i = 0; i < qec.size(); i++) {
             final OrderByList obl = qec.getOrderByList(i);
             if (obl != null) {
@@ -648,6 +708,7 @@ ResultSetNode modifyAccessPaths() throws StandardException
             final ValueNode fetchFirst = qec.getFetchFirst(i);
             Boolean hasJDBClimitClause = qec.getHasJDBCLimitClause()[i];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
             if (offset != null || fetchFirst != null) {
                 ResultColumnList newRcl =
                     treeTop.getResultColumns().copyListAndObjects();
@@ -694,6 +755,7 @@ void setTableConstructorTypes(ResultColumnList typeColumns)
 			throws StandardException
 	{
 		if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			SanityManager.ASSERT(getResultColumns().visibleSize() <= typeColumns.size(),
 				"More columns in ResultColumnList than in base table");
 
@@ -752,6 +814,7 @@ else if (re instanceof CharConstantNode)
 				// That will set the correct length and perform truncation checks etc.
 
                 ResultColumn typeCol = typeColumns.elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 				TypeId colTypeId = typeCol.getTypeId();
 
@@ -787,6 +850,7 @@ else if (colTypeId.getJDBCTypeId() == java.sql.Types.LONGVARBINARY) {
 			}
 			else if (re instanceof BitConstantNode)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 ResultColumn typeCol   = typeColumns.elementAt(index);
                 TypeId       colTypeId = typeCol.getTypeId();
 
@@ -840,6 +904,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 	{
 		if (SanityManager.DEBUG)
             SanityManager.ASSERT(getResultColumns() != null, "Tree structure bad");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// Get our final cost estimate.
 		setCostEstimate( getFinalCostEstimate() );
@@ -875,11 +940,13 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		acb.pushGetResultSetFactoryExpression(mb);
 
 		acb.pushThisAsActivation(mb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		getResultColumns().generate(acb, mb);
 		mb.push(canCache);
 		mb.push(getResultSetNumber());
 		mb.push(getCostEstimate().rowCount());
 		mb.push(getCostEstimate().getEstimatedCost());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getRowResultSet",
                 ClassName.NoPutResultSet, 6);
 	}
@@ -888,11 +955,13 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
      * {@inheritDoc}
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4426
 	void replaceOrForbidDefaults(TableDescriptor ttd,
                                  ResultColumnList tcl,
                                  boolean allowDefaults)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		getResultColumns().replaceOrForbidDefaults(ttd, tcl, allowDefaults);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
index 9a519c1838..b94fb6bf9d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SQLToJavaValueNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -63,6 +64,8 @@ class SQLToJavaValueNode extends JavaValueNode
 	 *					the Java domain.
      * @param cm        The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     SQLToJavaValueNode(ValueNode value, ContextManager cm) {
         super(cm);
         this.value = value;
@@ -115,6 +118,9 @@ String getJavaTypeName()
 	  */
     @Override
     String getPrimitiveTypeName()
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 		throws StandardException
 	{
 		JSQLType	myType = getJSQLType();
@@ -145,6 +151,7 @@ JSQLType getJSQLType() throws StandardException
 	{
 		if ( jsqlType == null )
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 			if ( value.requiresTypeFromContext()) 
 			{
   				ParameterNode pn;
@@ -181,7 +188,9 @@ JSQLType getJSQLType() throws StandardException
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
     JavaValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -440,6 +449,7 @@ private void generateReturnsNullOnNullCheck(MethodBuilder mb)
 		  mb.getField(returnsNullOnNullState);
 		mb.completeConditional();
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		mb.setField(returnsNullOnNullState);
 	}
 
@@ -494,11 +504,13 @@ Object getConstantValueAsObject()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (value != null)
 		{
 			value = (ValueNode)value.accept(v);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SavepointNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SavepointNode.java
index 87346fc05f..2d1584543c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SavepointNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SavepointNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SavepointNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -31,6 +32,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * statement.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class SavepointNode extends DDLStatementNode
 {
 	private String	savepointName; //name of the savepoint
@@ -88,6 +91,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		if (savepointStatementType == 1)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
index 66aec6d2bf..e28ad41ecf 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ScrollInsensitiveResultSetNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -36,6 +37,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class ScrollInsensitiveResultSetNode  extends SingleChildResultSetNode
 {
 	/**
@@ -52,6 +55,7 @@ class ScrollInsensitiveResultSetNode  extends SingleChildResultSetNode
                             Properties tableProperties,
                             ContextManager cm) {
         super(childResult, tableProperties, cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( rcl );
 	}
 
@@ -66,6 +70,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 	{
 		if (SanityManager.DEBUG)
             SanityManager.ASSERT(getResultColumns() != null, "Tree structure bad");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Get the next ResultSet #, so that we can number this ResultSetNode, its
 		 * ResultColumnList and ResultSet.
@@ -78,6 +83,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		// Get the cost estimate for the child
 		setCostEstimate( childResult.getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		int erdNumber = acb.addItem(makeResultDescription());
 
@@ -85,6 +91,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		childResult.generate(acb, mb);
 		acb.pushThisAsActivation(mb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		mb.push(getResultSetNumber());
 		mb.push(getResultColumns().size());
 
@@ -96,6 +103,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		mb.push(getCostEstimate().getEstimatedCost());
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getScrollInsensitiveResultSet",
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 						ClassName.NoPutResultSet, 7);
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SelectNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SelectNode.java
index 666b180893..edd58f6c94 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SelectNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SelectNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SelectNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -57,6 +58,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class SelectNode extends ResultSetNode
 {
 	/**
@@ -90,14 +93,18 @@ class SelectNode extends ResultSetNode
 	 * List of windows.
 	 */
 	WindowList windows;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 
     /** Full plan for this SELECT as specified in an optimizer override */
     OptimizerPlan   overridingPlan;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
 
 	/**
 	 * List of window function calls (e.g. ROW_NUMBER, AVG(i), DENSE_RANK).
 	 */
 	List<WindowFunctionNode> windowFuncCalls;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	/** User specified a group by without aggregates and we turned 
 	 * it into a select distinct 
@@ -107,6 +114,7 @@ class SelectNode extends ResultSetNode
 	boolean		orderByQuery ;
 
     QueryExpressionClauses qec = new QueryExpressionClauses();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
 
 	/* PredicateLists for where clause */
 	PredicateList wherePredicates;
@@ -132,12 +140,15 @@ class SelectNode extends ResultSetNode
 	
 	private int nestingLevel;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     SelectNode(ResultColumnList selectList,
               FromList fromList,
               ValueNode whereClause,
               GroupByList groupByList,
               ValueNode havingClause,
               WindowList windowDefinitionList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
               OptimizerPlan overridingPlan,
               ContextManager cm) throws StandardException {
         super(cm);
@@ -145,6 +156,7 @@ class SelectNode extends ResultSetNode
 		 * Consider adding selectAggregates and whereAggregates 
 		 */
         setResultColumns( selectList );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         if (getResultColumns() != null) {
 			getResultColumns().markInitialSize();
@@ -163,13 +175,18 @@ class SelectNode extends ResultSetNode
 		// column list and in genProjectRestrict for such window specifications
 		// used in window functions in ORDER BY.
         this.windows = windowDefinitionList;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         this.overridingPlan = overridingPlan;
         
 		bindTargetListOnly = false;
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-3301
 		this.originalWhereClauseHadSubqueries = false;
 		if (this.whereClause != null){
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             CollectNodesVisitor<SubqueryNode> cnv =
                 new CollectNodesVisitor<SubqueryNode>(
                     SubqueryNode.class, SubqueryNode.class);
@@ -180,16 +197,22 @@ class SelectNode extends ResultSetNode
 		}
 
 		if (getResultColumns() != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
             // Collect simply contained window functions (note: *not*
             // any inside nested SELECTs) used in result columns, and
             // check them for any <in-line window specification>s.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			CollectNodesVisitor<WindowFunctionNode> cnvw =
                 new CollectNodesVisitor<WindowFunctionNode>(WindowFunctionNode.class,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5954
                                         SelectNode.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			getResultColumns().accept(cnvw);
 			windowFuncCalls = cnvw.getList();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 
 			for (int i=0; i < windowFuncCalls.size(); i++) {
 				WindowFunctionNode wfn =
@@ -221,6 +244,8 @@ private WindowList addInlinedWindowDefinition (WindowList wl,
 
 		if (wl == null) {
 			// This is the first window we see, so initialize list.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             wl = new WindowList(getContextManager());
 		}
 
@@ -260,6 +285,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "SELECT";
@@ -288,6 +315,8 @@ boolean hasDistinct()
 	 */
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -330,12 +359,15 @@ void printSubNodes(int depth)
 				groupByList.treePrint(depth + 1);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 			if (havingClause != null) {
 				printLabel(depth, "havingClause:");
 				havingClause.treePrint(depth + 1);
 			}
 
             printQueryExpressionSuffixClauses(depth, qec);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
 
 			if (preJoinFL != null)
 			{
@@ -343,6 +375,8 @@ void printSubNodes(int depth)
 				preJoinFL.treePrint(depth + 1);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 			if (windows != null)
 			{
 				printLabel(depth, "windows: ");
@@ -357,6 +391,8 @@ void printSubNodes(int depth)
 	 * @return FromList	The fromList for this SelectNode.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     FromList getFromList()
 	{
 		return fromList;
@@ -373,6 +409,8 @@ FromList getFromList()
 	 *
 	 * @return	ColumnReference	ColumnReference to the column, if found
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ColumnReference findColumnReferenceInResult(String colName)
 					throws StandardException
 	{
@@ -387,6 +425,7 @@ ColumnReference findColumnReferenceInResult(String colName)
 			return null;
 
 		// Loop through the result columns looking for a match
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         for (ResultColumn rc : getResultColumns())
 		{
 			if (! (rc.getExpression() instanceof ColumnReference))
@@ -394,6 +433,7 @@ ColumnReference findColumnReferenceInResult(String colName)
 
 			ColumnReference crNode = (ColumnReference) rc.getExpression();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			if (crNode.getColumnName().equals(colName))
 				return (ColumnReference) crNode.getClone();
 		}
@@ -406,6 +446,8 @@ ColumnReference findColumnReferenceInResult(String colName)
 	 *
 	 * @return ValueNode	The whereClause for this SelectNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getWhereClause()
 	{
 		return whereClause;
@@ -416,6 +458,8 @@ ValueNode getWhereClause()
 	 *
 	 * @return PredicateList	The wherePredicates for this SelectNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     PredicateList getWherePredicates()
 	{
 		return wherePredicates;
@@ -426,6 +470,8 @@ PredicateList getWherePredicates()
 	 *
 	 * @return SubqueryList	The selectSubquerys for this SelectNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     SubqueryList getSelectSubquerys()
 	{
 		return selectSubquerys;
@@ -436,6 +482,8 @@ SubqueryList getSelectSubquerys()
 	 *
 	 * @return SubqueryList	The whereSubquerys for this SelectNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     SubqueryList getWhereSubquerys()
 	{
 		return whereSubquerys;
@@ -455,6 +503,8 @@ SubqueryList getWhereSubquerys()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 						   FromList fromListParam) 
 					throws StandardException
@@ -496,8 +546,10 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 		}
 
         // if an explicit join plan is requested, bind it
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         if ( overridingPlan != null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
             overridingPlan.bind( dataDictionary, getLanguageConnectionContext(), getCompilerContext() );
         }
         
@@ -514,6 +566,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressions(FromList fromListParam)
 					throws StandardException
 	{
@@ -526,7 +580,9 @@ void bindExpressions(FromList fromListParam)
 		int fromListSize = fromList.size();
 		int numDistinctAggs;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             SanityManager.ASSERT(fromList != null && getResultColumns() != null,
                 "Both fromList and resultColumns are expected to be non-null");
         }
@@ -549,8 +605,11 @@ void bindExpressions(FromList fromListParam)
 			fromList.bindExpressions( fromListParam );
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         selectSubquerys = new SubqueryList(getContextManager());
 		selectAggregates = new ArrayList<AggregateNode>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		/* Splice our FromList on to the beginning of fromListParam, before binding
 		 * the expressions, for correlated column resolution.
@@ -571,7 +630,10 @@ void bindExpressions(FromList fromListParam)
 		// WindowFunctionNode.bindExpression.
 
 		fromListParam.setWindows(windows);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		getResultColumns().bindExpressions(fromListParam, 
 									  selectSubquerys,
 									  selectAggregates);
@@ -588,13 +650,17 @@ void bindExpressions(FromList fromListParam)
 			return;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		whereAggregates = new ArrayList<AggregateNode>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         whereSubquerys = new SubqueryList(getContextManager());
         
         CompilerContext cc = getCompilerContext();
         
 		if (whereClause != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
             cc.beginScope( CompilerContext.WHERE_SCOPE );
 			cc.pushCurrentPrivType( Authorizer.SELECT_PRIV);
 
@@ -613,6 +679,7 @@ void bindExpressions(FromList fromListParam)
 			** in the WHERE clause at all.
 			** Note: a similar check is made in JoinNode.
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2442
 			if (whereAggregates.size() > 0)
 			{
 				throw StandardException.newException(SQLState.LANG_NO_AGGREGATES_IN_WHERE_CLAUSE);
@@ -621,12 +688,17 @@ void bindExpressions(FromList fromListParam)
 			/* If whereClause is a parameter, (where ?/where -?/where +?), then we should catch it and throw exception
 			 */
 			if (whereClause.isParameterNode())
+//IC see: https://issues.apache.org/jira/browse/DERBY-5885
 				throw StandardException.newException(SQLState.LANG_UNTYPED_PARAMETER_IN_WHERE_CLAUSE );
 			
 			whereClause = whereClause.checkIsBoolean();
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 			getCompilerContext().popCurrentPrivType();
             cc.endScope( CompilerContext.WHERE_SCOPE );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 			checkNoWindowFunctions(whereClause, "WHERE");
 		}
 
@@ -634,11 +706,16 @@ void bindExpressions(FromList fromListParam)
         {
             int previousReliability = orReliability( CompilerContext.HAVING_CLAUSE_RESTRICTION );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			havingAggregates = new ArrayList<AggregateNode>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             havingSubquerys = new SubqueryList(getContextManager());
 			havingClause.bindExpression(
 					fromListParam, havingSubquerys, havingAggregates);
 			havingClause = havingClause.checkIsBoolean();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 			checkNoWindowFunctions(havingClause, "HAVING");
             
             cc.setReliability( previousReliability );
@@ -665,6 +742,7 @@ void bindExpressions(FromList fromListParam)
             // We expect zero aggregates, so initialize the holder array
             // with zero capacity.
             ArrayList<AggregateNode> groupByAggregates = new ArrayList<AggregateNode>(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
             groupByList.bindGroupByColumns(this, groupByAggregates);
 
@@ -675,10 +753,13 @@ void bindExpressions(FromList fromListParam)
 			*/
 			if (SanityManager.DEBUG)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                 SanityManager.ASSERT(groupByAggregates.isEmpty(),
                     "Unexpected aggregate list generated by GROUP BY clause");
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 			checkNoWindowFunctions(groupByList, "GROUP BY");
 		}
 		/* If ungrouped query with aggregates in SELECT list, verify
@@ -695,6 +776,7 @@ void bindExpressions(FromList fromListParam)
 
   			VerifyAggregateExpressionsVisitor visitor = 
   				new VerifyAggregateExpressionsVisitor(groupByList);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			getResultColumns().accept(visitor);
 		}       
 
@@ -708,6 +790,7 @@ void bindExpressions(FromList fromListParam)
 			throw StandardException.newException(SQLState.LANG_USER_AGGREGATE_MULTIPLE_DISTINCTS);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i = 0; i < qec.size(); i++) {
             final OrderByList obl = qec.getOrderByList(i);
 
@@ -718,6 +801,7 @@ void bindExpressions(FromList fromListParam)
             bindOffsetFetch(qec.getOffset(i), qec.getFetchFirst(i));
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
         getCompilerContext().skipTypePrivileges( wasSkippingTypePrivileges );
     }
 
@@ -731,6 +815,8 @@ void bindExpressions(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressionsWithTables(FromList fromListParam)
 					throws StandardException
 	{
@@ -748,6 +834,8 @@ void bindExpressionsWithTables(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindTargetExpressions(FromList fromListParam)
 					throws StandardException
 	{
@@ -755,6 +843,7 @@ void bindTargetExpressions(FromList fromListParam)
 		 * With a FromSubquery in the FromList we cannot bind target expressions 
 		 * at this level (DERBY-3321)
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         CollectNodesVisitor<FromSubquery> cnv =
             new CollectNodesVisitor<FromSubquery>(
                 FromSubquery.class, FromSubquery.class);
@@ -779,6 +868,8 @@ void bindTargetExpressions(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumns(FromList fromListParam)
 				throws StandardException
 	{
@@ -791,6 +882,7 @@ void bindResultColumns(FromList fromListParam)
 		fromList.bindResultColumns(fromListParam);
 		super.bindResultColumns(fromListParam);
 		/* Only 1012 elements allowed in select list */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getResultColumns().size() > Limits.DB2_MAX_ELEMENTS_IN_SELECT_LIST)
 		{
 			throw StandardException.newException(SQLState.LANG_TOO_MANY_ELEMENTS);
@@ -862,6 +954,7 @@ void bindResultColumns(TableDescriptor targetTableDescriptor,
 	void pushExpressionsIntoSelect(Predicate predicate)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		wherePredicates.pullExpressions(getReferencedTableMap().size(), predicate.getAndNode());
 		fromList.pushPredicates(wherePredicates);
 	}
@@ -876,11 +969,15 @@ void pushExpressionsIntoSelect(Predicate predicate)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
 					throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         for (ResultColumn rc : getResultColumns()) {
             if (!(rc instanceof AllResultColumn)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5501
                 continue;
             }
 
@@ -897,6 +994,7 @@ void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
              * name can come from an outer query block.
              */
             String fullTableName = ((AllResultColumn)rc).getFullTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             if (fullTableName != null) {
                 if (fromList.getFromTableByName
@@ -945,6 +1043,8 @@ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
 	 *									directly under a ResultColumn
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void rejectParameters() throws StandardException
 	{
 		super.rejectParameters();
@@ -953,6 +1053,7 @@ void rejectParameters() throws StandardException
 
     @Override
     public void pushQueryExpressionSuffix() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         qec.push();
     }
 
@@ -967,6 +1068,7 @@ public void pushQueryExpressionSuffix() {
     @Override
 	void pushOrderByList(OrderByList orderByList)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         qec.setOrderByList(orderByList);
 		// remember that there was an order by list
 		orderByQuery = true;
@@ -982,6 +1084,7 @@ void pushOrderByList(OrderByList orderByList)
     @Override
     void pushOffsetFetchFirst( ValueNode offset, ValueNode fetchFirst, boolean hasJDBClimitClause )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         qec.setOffset(offset);
         qec.setFetchFirst(fetchFirst);
         qec.setHasJDBCLimitClause(Boolean.valueOf(hasJDBClimitClause));
@@ -1013,6 +1116,8 @@ void pushOffsetFetchFirst( ValueNode offset, ValueNode fetchFirst, boolean hasJD
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fl)
@@ -1039,10 +1144,13 @@ ResultSetNode preprocess(int numTables,
 		boolean anyChange = fromList.LOJ_reorderable(numTables);
 		if (anyChange)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             FromList afromList = new FromList(
                     getOptimizerFactory().doJoinOrderOptimization(),
                     getContextManager());
 			bindExpressions(afromList);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4736
             fromList.bindResultColumns(afromList);
 		}
 
@@ -1064,6 +1172,7 @@ ResultSetNode preprocess(int numTables,
 		 * we can flatten/optimize any subqueries in the
 		 * select list.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		getResultColumns().preprocess(numTables, 
 								 fromList, whereSubquerys,
 								 wherePredicates);
@@ -1082,6 +1191,7 @@ ResultSetNode preprocess(int numTables,
 			// Mark subqueries that are part of the where clause as such so
 			// that we can avoid flattening later, particularly for nested 
 			// WHERE EXISTS subqueries.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3301
 			if (whereSubquerys != null){
 				whereSubquerys.markWhereSubqueries();
 			}
@@ -1128,9 +1238,12 @@ ResultSetNode preprocess(int numTables,
 		 */
 
 		// Flatten any flattenable FromSubquerys or JoinNodes
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		fromList.flattenFromTables(getResultColumns(), 
 								   wherePredicates, 
 								   whereSubquerys,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4698
+//IC see: https://issues.apache.org/jira/browse/DERBY-3880
                                    groupByList,
                                    havingClause);
 
@@ -1143,6 +1256,7 @@ ResultSetNode preprocess(int numTables,
 			}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
             for (int i = 0; i < qec.size(); i++) {
                 final OrderByList obl = qec.getOrderByList(i);
                 if (obl != null)
@@ -1159,6 +1273,7 @@ ResultSetNode preprocess(int numTables,
                     if (obl.size() == 0)
                     {
                         qec.setOrderByList(i, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                         getResultColumns().removeOrderByColumns();
                     }
                 }
@@ -1171,6 +1286,7 @@ ResultSetNode preprocess(int numTables,
 		 */
 		if (groupByList != null &&
 			havingClause == null &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 			selectAggregates.isEmpty() &&
 			whereAggregates.isEmpty())
 		{
@@ -1206,6 +1322,7 @@ ResultSetNode preprocess(int numTables,
 			
 			if (distinctTable != -1)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				if (fromList.returnsAtMostSingleRow(getResultColumns(), 
 											   whereClause, wherePredicates,
 											   getDataDictionary()))
@@ -1214,6 +1331,7 @@ ResultSetNode preprocess(int numTables,
 				}
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
             for (int i = 0; i < qec.size(); i++) {
                 /* If we were unable to eliminate the distinct and we have
                  * an order by then we can consider eliminating the sort for
@@ -1231,12 +1349,14 @@ ResultSetNode preprocess(int numTables,
                  *      is as expected.
                  */
                 final OrderByList obl = qec.getOrderByList(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
 
                 if (isDistinct && obl != null && obl.allAscending())
                 {
                     /* Order by list currently restricted to columns in select
                      * list, so we will always eliminate the order by here.
                      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                     if (obl.isInOrderPrefix(getResultColumns()))
                     {
                         qec.setOrderByList(i, null);
@@ -1251,6 +1371,7 @@ ResultSetNode preprocess(int numTables,
                          */
                         newTop = genProjectRestrictForReordering();
                         obl.resetToSourceRCs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                         setResultColumns( obl.reorderRCL(getResultColumns()) );
                         newTop.getResultColumns().removeOrderByColumns();
                         qec.setOrderByList(i, null);
@@ -1273,6 +1394,7 @@ ResultSetNode preprocess(int numTables,
 		fromList.pushPredicates(wherePredicates);
 
 		/* Set up the referenced table map */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setReferencedTableMap( new JBitSet(numTables) );
 		int flSize = fromList.size();
 		for (int index = 0; index < flSize; index++)
@@ -1289,14 +1411,17 @@ ResultSetNode preprocess(int numTables,
 
 
         if (qec.getOrderByList(0) != null) { // only relevant for first one
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
 
 			// Collect window function calls and in-lined window definitions
 			// contained in them from the orderByList.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             CollectNodesVisitor<WindowFunctionNode> cnvw =
                 new CollectNodesVisitor<WindowFunctionNode>(
                     WindowFunctionNode.class);
             qec.getOrderByList(0).accept(cnvw);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
 
             for (WindowFunctionNode wfn : cnvw.getList()) {
 				windowFuncCalls.add(wfn);
@@ -1408,6 +1533,8 @@ private ValueNode normExpressions(ValueNode boolClause)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode addNewPredicate(Predicate predicate)
 			throws StandardException
 	{
@@ -1450,6 +1577,7 @@ boolean flattenableInFromSubquery(FromList fromList)
 		}
 
 		/* Don't flatten if selectNode contains a group by or having clause */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2442
 		if ((groupByList != null) || (havingClause != null))
 		{
 			return false;
@@ -1457,6 +1585,7 @@ boolean flattenableInFromSubquery(FromList fromList)
 
 		/* Don't flatten if select list contains something that isn't cloneable.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (! getResultColumns().isCloneable())
 		{
 			return false;
@@ -1469,6 +1598,7 @@ boolean flattenableInFromSubquery(FromList fromList)
 			return false;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i = 0; i < qec.size(); i++) {
             // Don't flatten if selectNode now has an order by or offset/fetch
             // clause
@@ -1497,6 +1627,8 @@ boolean flattenableInFromSubquery(FromList fromList)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode genProjectRestrict(int origFromListSize)
 				throws StandardException
 	{
@@ -1505,7 +1637,9 @@ ResultSetNode genProjectRestrict(int origFromListSize)
 		ResultSetNode		prnRSN;
 
         prnRSN = new ProjectRestrictNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 fromList.elementAt(0),   /* Child ResultSet */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 getResultColumns(),      /* Projection */
                 whereClause,            /* Restriction */
                 wherePredicates,/* Restriction as PredicateList */
@@ -1525,11 +1659,14 @@ ResultSetNode genProjectRestrict(int origFromListSize)
 		if (((selectAggregates != null) && (selectAggregates.size() > 0)) 
 			|| (groupByList != null))
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			List<AggregateNode> aggs = selectAggregates;
 			if (havingAggregates != null && !havingAggregates.isEmpty()) {
 				havingAggregates.addAll(selectAggregates);
 				aggs = havingAggregates;
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             GroupByNode gbn = new GroupByNode(prnRSN,
                     groupByList,
                     aggs,
@@ -1539,11 +1676,13 @@ ResultSetNode genProjectRestrict(int origFromListSize)
                     getContextManager());
 			gbn.considerPostOptimizeOptimizations(originalWhereClause != null);
 			gbn.assignCostEstimate(getOptimizer().getOptimizedCost());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 			groupByList = null;
 			prnRSN  = gbn.getParent();
 
 			// Remember whether or not we can eliminate the sort.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6008
             for (int i=0; i < eliminateSort.length; i++ ) {
                 eliminateSort[i] = eliminateSort[i] || gbn.getIsInSortedOrder();
             }
@@ -1561,6 +1700,7 @@ ResultSetNode genProjectRestrict(int origFromListSize)
 			}
 
             WindowDefinitionNode wn = windows.elementAt(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             WindowResultSetNode wrsn = new WindowResultSetNode(
 					prnRSN,
@@ -1570,16 +1710,19 @@ ResultSetNode genProjectRestrict(int origFromListSize)
 					getContextManager());
 
 			prnRSN = wrsn.getParent();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			wrsn.assignCostEstimate(getOptimizer().getOptimizedCost());
 		}
 
 
 		// if it is distinct, that must also be taken care of.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
 		if (isDistinct)
 		{
 			// We first verify that a distinct is valid on the
 			// RCL.
 			getResultColumns().verifyAllOrderable();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 			/* See if we can push duplicate elimination into the store
 			 * via a hash scan.  This is possible iff:
@@ -1607,9 +1750,11 @@ ResultSetNode genProjectRestrict(int origFromListSize)
 			if (origFromListSize == 1 && !orderByAndDistinctMerged)
 			{
 				boolean simpleColumns = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				HashSet<BaseColumnNode> distinctColumns = new HashSet<BaseColumnNode>();
 				int size = getResultColumns().size();
 				for (int i = 1; i <= size; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 					BaseColumnNode bc = getResultColumns().getResultColumn(i).getBaseColumnNode();
 					if (bc == null) {
 						simpleColumns = false;
@@ -1629,11 +1774,15 @@ ResultSetNode genProjectRestrict(int origFromListSize)
 				 * duplicates without a sorter. 
 				 */
 				boolean inSortedOrder = isOrderedResult(getResultColumns(), prnRSN, !(orderByAndDistinctMerged));
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 prnRSN = new DistinctNode(
                         prnRSN, inSortedOrder, null, getContextManager());
 				prnRSN.setCostEstimate( getCostEstimate().cloneMe() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
                 // Remember whether or not we can eliminate the sort.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6008
                 for (int i=0; i < eliminateSort.length; i++) {
                     eliminateSort[i] = eliminateSort[i] || inSortedOrder;
                 }
@@ -1644,6 +1793,7 @@ ResultSetNode genProjectRestrict(int origFromListSize)
 		 * the order by.
 		 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i=0; i < qec.size(); i++) {
             final OrderByList obl = qec.getOrderByList(i);
             if (obl != null) {
@@ -1653,6 +1803,7 @@ ResultSetNode genProjectRestrict(int origFromListSize)
                                              obl,
                                              null,
                                              getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                     prnRSN.setCostEstimate( getCostEstimate().cloneMe() );
                 }
 
@@ -1690,9 +1841,11 @@ ResultSetNode genProjectRestrict(int origFromListSize)
 
             // Do this only after the main ORDER BY; any extra added by
             // IntersectOrExceptNode should sit on top of us.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
             ValueNode offset = qec.getOffset(i);
             ValueNode fetchFirst = qec.getFetchFirst(i);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
             if (offset != null || fetchFirst != null) {
                 // Keep the same RCL on top, since there may be references to
                 // its result columns above us.
@@ -1705,13 +1858,17 @@ ResultSetNode genProjectRestrict(int origFromListSize)
                         topList,
                         offset,
                         fetchFirst,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
                         qec.getHasJDBCLimitClause()[i].booleanValue(),
                         getContextManager());
             }
         }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		if (wasGroupBy &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			getResultColumns().numGeneratedColumnsForGroupBy() > 0 &&
 			windows == null) // windows handling already added a PRN which
 							 // obviates this.
@@ -1732,12 +1889,18 @@ ResultSetNode genProjectRestrict(int origFromListSize)
 			// select sum(j),i from t group by i having i
 			//             in (select i from t group by i,j )
 			//
+//IC see: https://issues.apache.org/jira/browse/DERBY-4450
+//IC see: https://issues.apache.org/jira/browse/DERBY-681
 			ResultColumnList topList = prnRSN.getResultColumns();
 			ResultColumnList newSelectList = topList.copyListAndObjects();
 			prnRSN.setResultColumns(newSelectList);
 
 			topList.removeGeneratedGroupingColumns();
 			topList.genVirtualColumnNodes(prnRSN, newSelectList);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             prnRSN = new ProjectRestrictNode(
 						prnRSN,
 						topList,
@@ -1749,6 +1912,7 @@ ResultSetNode genProjectRestrict(int origFromListSize)
 						getContextManager());
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i=0; i < qec.size(); i++) {
             final OrderByList obl = qec.getOrderByList(i);
 
@@ -1765,10 +1929,12 @@ ResultSetNode genProjectRestrict(int origFromListSize)
              */
             if (eliminateSort[i])
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
                 prnRSN.adjustForSortElimination(obl);
             }
 
             /* Set the cost of this node in the generated node */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             prnRSN.setCostEstimate( getCostEstimate().cloneMe() );
         }
 
@@ -1800,6 +1966,7 @@ private boolean isOrderedResult(ResultColumnList resultColumns,
 		 * or a ConstantNode.
 		 */
 		int numCRs = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : resultColumns)
 		{
 			if (rc.getExpression() instanceof ColumnReference)
@@ -1822,6 +1989,7 @@ else if (! (rc.getExpression() instanceof ConstantNode))
 
 		// Now populate the CR array and see if ordered
 		int crsIndex = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : resultColumns)
 		{
 			if (rc.getExpression() instanceof ColumnReference)
@@ -1830,6 +1998,7 @@ else if (! (rc.getExpression() instanceof ConstantNode))
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		return newTopRSN.isOrderedOn(crs, permuteOrdering, (List<FromBaseTable> ) null);
 	}
 
@@ -1842,6 +2011,8 @@ else if (! (rc.getExpression() instanceof ConstantNode))
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode ensurePredicateList(int numTables)
 		throws StandardException
 	{
@@ -1861,6 +2032,8 @@ ResultSetNode ensurePredicateList(int numTables)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode optimize(DataDictionary dataDictionary,
 								  PredicateList	predicateList,
 								  double outerRows) 
@@ -1871,6 +2044,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 		/* Optimize any subquerys before optimizing the underlying result set */
 
 		/* selectSubquerys is always allocated at bind() time */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(selectSubquerys != null,
                     "selectSubquerys is expected to be non-null");
@@ -1903,6 +2077,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 			// Iterate backwards because we might be deleting entries.
 			for (int i = wherePredicates.size() - 1; i >= 0; i--)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 if (wherePredicates.elementAt(i).isScopedForPush())
                 {
 					wherePredicates.removeOptPredicate(i);
@@ -1940,6 +2115,8 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 		if (predicateList != null)
 		{
 			if (wherePredicates == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 wherePredicates = new PredicateList(getContextManager());
 			}
 
@@ -1963,7 +2140,10 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         opt = getOptimizer(fromList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
                 wherePredicates,
                 dataDictionary,
                 qec.getOrderByList(0), // use first one
@@ -1989,6 +2169,8 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 		{
 			for (int i = wherePredicates.size() - 1; i >= 0; i--)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 Predicate pred = (Predicate)wherePredicates.getOptPredicate(i);
 				if (pred.isScopedForPush())
 				{
@@ -2000,6 +2182,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 
 		/* Get the cost */
         setCostEstimate( opt.getOptimizedCost() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* Update row counts if this is a scalar aggregate */
 		if ((selectAggregates != null) && (selectAggregates.size() > 0)) 
@@ -2021,6 +2204,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 
         // dispose of the optimizer we created above
         if ( optimizerTracingIsOn() ) { getOptimizerTracer().traceEndQueryBlock(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
         return this;
 	}
@@ -2039,6 +2223,7 @@ private Optimizer getOptimizer(
 							OptimizerPlan overridingPlan)
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getOptimizer() == null)
 		{
 			/* Get an optimizer. */
@@ -2074,6 +2259,8 @@ private Optimizer getOptimizer(
 	 * @exception StandardException        Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode modifyAccessPaths(PredicateList predList)
 		throws StandardException
 	{
@@ -2085,6 +2272,7 @@ ResultSetNode modifyAccessPaths(PredicateList predList)
 
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			SanityManager.ASSERT(getOptimizer() != null,
 				"SelectNode's optimizer not expected to be null when " +
 				"modifying access paths.");
@@ -2103,6 +2291,8 @@ ResultSetNode modifyAccessPaths(PredicateList predList)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode modifyAccessPaths() throws StandardException
 	{
 		int				 origFromListSize = fromList.size();
@@ -2117,6 +2307,7 @@ ResultSetNode modifyAccessPaths() throws StandardException
 		** This should be the same optimizer we got above.
 		*/
 		getOptimizer().modifyAccessPaths();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// Load the costEstimate for the final "best" join order.
 		setCostEstimate( getOptimizer().getFinalCost() );
@@ -2136,6 +2327,8 @@ ResultSetNode modifyAccessPaths() throws StandardException
 			{
 				for (int i = wherePredicates.size() - 1; i >= 0; i--)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     Predicate pred =
                             (Predicate)wherePredicates.getOptPredicate(i);
 					if (pred.isScopedForPush())
@@ -2184,19 +2377,23 @@ ResultSetNode modifyAccessPaths() throws StandardException
 			 * and create new VirtualColumnNodes for the original's 
 			 * ResultColumn.expressions.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             leftResultSet = fromList.elementAt(0);
 			leftRCList = leftResultSet.getResultColumns();
 			leftResultSet.setResultColumns(leftRCList.copyListAndObjects());
 			leftRCList.genVirtualColumnNodes(leftResultSet, leftResultSet.getResultColumns());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 			/* Get right's ResultColumnList, assign shallow copy back to it,
 			 * create new VirtualColumnNodes for the original's 
 			 * ResultColumn.expressions and increment the virtualColumnIds.
 			 * (Right gets appended to left, so only right's ids need updating.)
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             rightResultSet = fromList.elementAt(1);
 			rightRCList = rightResultSet.getResultColumns();
 			rightResultSet.setResultColumns(rightRCList.copyListAndObjects());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			rightRCList.genVirtualColumnNodes(rightResultSet, rightResultSet.getResultColumns());
 			rightRCList.adjustVirtualColumnIds(leftRCList.size());
 
@@ -2207,6 +2404,8 @@ ResultSetNode modifyAccessPaths() throws StandardException
 			 * replace the 1st 2 entries in the FromList.
 			 */
 			fromList.setElementAt(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 new JoinNode(leftResultSet,
                              rightResultSet,
                              null,
@@ -2214,6 +2413,7 @@ ResultSetNode modifyAccessPaths() throws StandardException
                              leftRCList,
                              null,
                              //user supplied optimizer overrides
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
                              fromList.properties,
                              getContextManager()),
                 0);
@@ -2232,9 +2432,12 @@ ResultSetNode modifyAccessPaths() throws StandardException
 	 *          this SelectNode's optimizer.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getFinalCostEstimate()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return getOptimizer().getFinalCost();
 	}
 
@@ -2258,6 +2461,7 @@ boolean isUpdatableCursor(DataDictionary dd) throws StandardException
 			return false;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2442
 		if (groupByList != null || havingClause != null)
 		{
 			return false;
@@ -2406,6 +2610,8 @@ boolean subqueryReferencesTarget(String name, boolean baseTable)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindUntypedNullsToResultColumns(ResultColumnList bindingRCL)
 				throws StandardException
 	{
@@ -2457,6 +2663,7 @@ boolean uniqueSubquery(boolean additionalEQ)
 	{
 		ColumnReference additionalCR = null;
         ResultColumn rc = getResultColumns().elementAt(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		/* Figure out if we have an additional ColumnReference
 		 * in an equality comparison.
@@ -2507,6 +2714,8 @@ int updateTargetLockMode()
     @Override
 	boolean returnsAtMostOneRow()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return (groupByList == null &&
                 selectAggregates != null &&
                 !selectAggregates.isEmpty());
@@ -2539,11 +2748,13 @@ public boolean referencesSessionSchema()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (fromList != null)
 		{
 			fromList = (FromList)fromList.accept(v);
@@ -2565,6 +2776,7 @@ void acceptChildren(Visitor v)
 
         // visiting these clauses was added as part of DERBY-6263. a better fix might be to fix the
         // visitor rather than skip it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6263
         if ( !(v instanceof HasCorrelatedCRsVisitor) )
         {
             if (selectSubquerys != null)
@@ -2581,6 +2793,7 @@ void acceptChildren(Visitor v)
                 groupByList = (GroupByList) groupByList.accept( v );
             }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
             for (int i = 0; i < qec.size(); i++) {
                 final OrderByList obl = qec.getOrderByList(i);
 
@@ -2618,6 +2831,7 @@ void acceptChildren(Visitor v)
 	 */
     boolean hasAggregatesInSelectList()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2442
 		return !selectAggregates.isEmpty();
 	}
 
@@ -2632,6 +2846,8 @@ boolean hasAggregatesInSelectList()
 	 */
     boolean hasWindows()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		return windows != null;
 	}
 
@@ -2658,6 +2874,7 @@ static void checkNoWindowFunctions(QueryTreeNode clause,
      * A no-op for SelectNode.
      */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4426
     void replaceOrForbidDefaults(TableDescriptor ttd,
                                  ResultColumnList tcl,
                                  boolean allowDefaults)
@@ -2666,6 +2883,7 @@ void replaceOrForbidDefaults(TableDescriptor ttd,
     }
 
     boolean hasOffsetFetchFirst() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         return qec.hasOffsetFetchFirst();
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetConstraintsNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetConstraintsNode.java
index e170f513a3..b0a832c9b2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetConstraintsNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetConstraintsNode.java
@@ -81,6 +81,7 @@ public String toString()
     }
 
     String formatList(List<TableName> constraints) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (SanityManager.DEBUG) {
             StringBuilder sb = new StringBuilder();
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java
index 15e4da4f6f..84bbcc7d49 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SetOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -53,6 +54,7 @@ abstract class SetOperatorNode extends TableOperatorNode
 	boolean			all;
 
     QueryExpressionClauses qec = new QueryExpressionClauses();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
 
 	// List of scoped predicates for pushing during optimization.
 	private PredicateList leftOptPredicates;
@@ -78,6 +80,8 @@ abstract class SetOperatorNode extends TableOperatorNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     SetOperatorNode(ResultSetNode leftResult,
                     ResultSetNode rightResult,
                     boolean all,
@@ -201,6 +205,7 @@ public Optimizable modifyAccessPath(JBitSet outerTables,
 		 */
 
 		// Find all UnionNodes in the subtree.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         CollectNodesVisitor<UnionNode> cnv =
                 new CollectNodesVisitor<UnionNode>(UnionNode.class);
 		this.accept(cnv);
@@ -223,6 +228,8 @@ public Optimizable modifyAccessPath(JBitSet outerTables,
 			// _unscoped_ form, which means they are intended for _this_
 			// node instead of this node's children.  That's exactly what
 			// we want.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ResultSetNode prnRSN = new ProjectRestrictNode(
 				topNode,					// Child ResultSet
 				topNode.getResultColumns(),	// Projection
@@ -232,6 +239,7 @@ public Optimizable modifyAccessPath(JBitSet outerTables,
 				null,						// Subquerys in Restriction
 				null,						// Table properties
 				getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			prnRSN.setCostEstimate( ce.cloneMe() );
 			prnRSN.setReferencedTableMap(topNode.getReferencedTableMap());
 			topNode = prnRSN;
@@ -377,6 +385,7 @@ public boolean pushOptPredicate(OptimizablePredicate optimizablePredicate)
 		// and if so just use that.
 		Predicate scopedPred = null;
 		if (leftScopedPreds == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			leftScopedPreds = new HashMap<Predicate,Predicate>();
 		else
 			scopedPred = leftScopedPreds.get(pred);
@@ -392,6 +401,7 @@ public boolean pushOptPredicate(OptimizablePredicate optimizablePredicate)
 
 		scopedPred = null;
 		if (rightScopedPreds == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			rightScopedPreds = new HashMap<Predicate,Predicate>();
 		else
 			scopedPred = rightScopedPreds.get(pred);
@@ -413,6 +423,8 @@ public boolean pushOptPredicate(OptimizablePredicate optimizablePredicate)
 		// modifyAccessPaths() in this class for more.
 		if (pushedPredicates == null)
             pushedPredicates = new PredicateList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		pushedPredicates.addOptPredicate(pred);
 		return true;
@@ -462,6 +474,8 @@ public void pullOptPredicates(
 		RemapCRsVisitor rcrv = new RemapCRsVisitor(false);
 		for (int i = 0; i < pushedPredicates.size(); i++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             Predicate pred = (Predicate)pushedPredicates.getOptPredicate(i);
 			if (pred.isScopedForPush())
 			{
@@ -532,12 +546,15 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
 		{
 			super.printSubNodes(depth);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
             printQueryExpressionSuffixClauses(depth, qec);
 		}
 	}
@@ -552,6 +569,8 @@ void printSubNodes(int depth)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumns(FromList fromListParam)
 					throws StandardException
 	{
@@ -625,6 +644,8 @@ private void buildRCL() throws StandardException
 		 * may have been 1 or more *'s in the left's SELECT list.
 		 */
 		setResultColumns( leftResultSet.getResultColumns().copyListAndObjects() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         // The generated grouping columns of the left result set should not be
         // part of the result from the set operation (DERBY-3764).
@@ -648,6 +669,8 @@ private void buildRCL() throws StandardException
 	 * @exception StandardException		Thrown on error.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindUntypedNullsToResultColumns(ResultColumnList rcl)
 				throws StandardException
 	{
@@ -676,6 +699,7 @@ void bindUntypedNullsToResultColumns(ResultColumnList rcl)
      * {@inheritDoc}
      */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4426
     void replaceOrForbidDefaults(TableDescriptor ttd,
                                  ResultColumnList tcl,
                                  boolean allowDefaults)
@@ -697,6 +721,7 @@ void replaceOrForbidDefaults(TableDescriptor ttd,
 	 * @return	The number of new types found in the RowResultSetNode
 	 */
 	int getParamColumnTypes(DataTypeDescriptor[] types, RowResultSetNode rrsn)
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 	 throws StandardException
 	{
 		int	numTypes = 0;
@@ -706,7 +731,9 @@ int getParamColumnTypes(DataTypeDescriptor[] types, RowResultSetNode rrsn)
 		{
 			if (types[i] == null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 ResultColumn rc = rrsn.getResultColumns().elementAt(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 				if ( ! (rc.getExpression().requiresTypeFromContext()))
 				{
 					types[i] = rc.getExpression().getTypeServices();
@@ -742,7 +769,9 @@ void setParamColumnTypes(DataTypeDescriptor[] types, RowResultSetNode rrsn)
 		for (int index = 0; index < rrclSize; index++)
 		{
             ResultColumn rc = rrcl.elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 			if (rc.getExpression().requiresTypeFromContext())
 			{
 				/*
@@ -758,6 +787,7 @@ void setParamColumnTypes(DataTypeDescriptor[] types, RowResultSetNode rrsn)
     public void bindExpressions(FromList fromList) throws StandardException {
         // Actions for UnionNode qua top node of a multi-valued table value
         // constructor
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i = 0; i < qec.size(); i++) {
             final OrderByList obl = qec.getOrderByList(i);
 
@@ -782,6 +812,8 @@ public void bindExpressions(FromList fromList) throws StandardException {
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindTargetExpressions(FromList fromListParam)
 					throws StandardException
 	{
@@ -791,6 +823,7 @@ void bindTargetExpressions(FromList fromListParam)
 
     @Override
     public void pushQueryExpressionSuffix() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         qec.push();
     }
 
@@ -805,6 +838,7 @@ public void pushQueryExpressionSuffix() {
     @Override
 	void pushOrderByList(OrderByList orderByList)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         qec.setOrderByList(orderByList);
 	}
 
@@ -818,6 +852,7 @@ void pushOrderByList(OrderByList orderByList)
     @Override
     void pushOffsetFetchFirst( ValueNode offset, ValueNode fetchFirst, boolean hasJDBClimitClause )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         qec.setOffset(offset);
         qec.setFetchFirst(fetchFirst);
         qec.setHasJDBCLimitClause(hasJDBClimitClause);
@@ -849,6 +884,8 @@ void pushOffsetFetchFirst( ValueNode offset, ValueNode fetchFirst, boolean hasJD
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
@@ -861,6 +898,7 @@ ResultSetNode preprocess(int numTables,
 		rightResultSet = rightResultSet.preprocess(numTables, gbl, fromList);
 
 		/* Build the referenced table map (left || right) */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setReferencedTableMap( (JBitSet) leftResultSet.getReferencedTableMap().clone() );
         getReferencedTableMap().or(rightResultSet.getReferencedTableMap());
 
@@ -879,6 +917,7 @@ ResultSetNode preprocess(int numTables,
 		 *		above the select so that the shape of the result set
 		 *		is as expected.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i = 0; i < qec.size(); i++) {
             OrderByList obl = qec.getOrderByList(i);
 
@@ -888,6 +927,7 @@ ResultSetNode preprocess(int numTables,
                 /* Order by list currently restricted to columns in select
                  * list, so we will always eliminate the order by here.
                  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 if (obl.isInOrderPrefix(getResultColumns()))
                 {
                     obl = null;
@@ -910,6 +950,7 @@ ResultSetNode preprocess(int numTables,
             // UnionNode qua top of table value constructor with ordering
             // If we have more than 1 ORDERBY columns, we may be able to
             // remove duplicate columns, e.g., "ORDER BY 1, 1, 2".
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
             if (obl != null && obl.size() > 1) {
                 obl.removeDupColumns();
             }
@@ -927,6 +968,8 @@ ResultSetNode preprocess(int numTables,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode ensurePredicateList(int numTables)
 		throws StandardException
 	{
@@ -942,6 +985,8 @@ ResultSetNode ensurePredicateList(int numTables)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
 					throws StandardException
 	{
@@ -1029,6 +1074,8 @@ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode setResultToBooleanTrueNode(boolean onlyConvertAlls)
 		throws StandardException
 	{
@@ -1059,6 +1106,8 @@ ResultSetNode setResultToBooleanTrueNode(boolean onlyConvertAlls)
 		// Now create a ResultColumnList that simply holds the "*".
 
         ResultColumnList rcl = new ResultColumnList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
        ResultColumn allResultColumn =
                 new AllResultColumn(null, getContextManager());
@@ -1074,7 +1123,10 @@ ResultSetNode setResultToBooleanTrueNode(boolean onlyConvertAlls)
 				null,     // WHERE clause
 				null,     // GROUP BY list
 				null,     // having clause
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 				null, /* window list */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
 				null, /* optimizer override plan */
 				getContextManager());
 
@@ -1144,6 +1196,8 @@ PredicateList getLeftOptPredicateList()
 		throws StandardException
 	{
 		if (leftOptPredicates == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             leftOptPredicates = new PredicateList(getContextManager());
 		}
 
@@ -1159,6 +1213,8 @@ PredicateList getRightOptPredicateList()
 		throws StandardException
 	{
 		if (rightOptPredicates == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             rightOptPredicates = new PredicateList(getContextManager());
 		}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetRoleNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetRoleNode.java
index 7f9f2f58d8..f3facc2424 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetRoleNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetRoleNode.java
@@ -36,6 +36,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * statement.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class SetRoleNode extends MiscellaneousStatementNode
 {
     private String      name;
@@ -133,6 +135,8 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
     private void generateParameterValueSet(ActivationClassBuilder acb)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         List<ParameterNode>
             parameterList = getCompilerContext().getParameterList();
         // parameter list size should be 1
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
index f734dee41f..c0f3b392ad 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SetSchemaNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -40,6 +41,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class SetSchemaNode extends MiscellaneousStatementNode
 {
 	private String 	name;
@@ -84,6 +87,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "SET SCHEMA";
@@ -137,6 +142,8 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 	void generateParameterValueSet(ActivationClassBuilder acb)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         List<ParameterNode>
             parameterList = getCompilerContext().getParameterList();
 		// parameter list size should be 1
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java
index 9f6ee91342..2f8168c6af 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SetTransactionIsolationNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -35,6 +36,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class SetTransactionIsolationNode extends TransactionStatementNode
 {
 	private int		isolationLevel;
@@ -71,6 +74,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "SET TRANSACTION ISOLATION";
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java
index 401c34236b..655cf86080 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SimpleStringOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -57,6 +58,7 @@ class SimpleStringOperatorNode extends UnaryOperatorNode
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -77,6 +79,7 @@ ValueNode bindExpression(
 				case Types.LONGVARCHAR:
 				case Types.CLOB:
 					break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 				case Types.JAVA_OBJECT:
 				case Types.OTHER:	
 				{
@@ -91,6 +94,8 @@ ValueNode bindExpression(
 								getCastToCharWidth(
 									operand.getTypeServices()));
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     operand = new CastNode(operand, dtd, getContextManager());
 					
 				// DERBY-2910 - Match current schema collation for implicit cast as we do for
@@ -133,6 +138,7 @@ void bindParameter()
 		** for a bit.
 		*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		operand.setType(DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.VARCHAR));
 		//collation of ? operand should be same as the compilation schema
 		operand.setCollationUsingCompilationSchema();
@@ -143,6 +149,8 @@ void bindParameter()
 	 * in UnaryOperatorNode for code generation purposes.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getReceiverInterfaceName() {
 	    return ClassName.StringDataValue;
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
index cc533cb4c3..3a93ec117c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SingleChildResultSetNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -51,6 +52,8 @@ abstract class SingleChildResultSetNode extends FromTable
 	// Does this node have the truly... for the underlying tree
 	protected boolean hasTrulyTheBestAccessPath;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     SingleChildResultSetNode(
             ResultSetNode childResult,
             Properties tableProperties,
@@ -61,6 +64,7 @@ abstract class SingleChildResultSetNode extends FromTable
 
         /* Propagate the child's referenced table map, if one exists */
         if (childResult.getReferencedTableMap() != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             setReferencedTableMap
                 ( (JBitSet)childResult.getReferencedTableMap().clone() );
         }
@@ -86,6 +90,8 @@ public AccessPath getTrulyTheBestAccessPath()
 	 *
 	 * @return ResultSetNode	The childResult from this node.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode getChildResult()
 	{
 		return childResult;
@@ -183,6 +189,8 @@ else if (childResult.getOptimizerImpl() != null)
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -234,6 +242,8 @@ public boolean referencesSessionSchema()
 	 * @param level		The query block level for this FromTable.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setLevel(int level)
 	{
 		super.setLevel(level);
@@ -286,6 +296,8 @@ boolean subqueryReferencesTarget(String name, boolean baseTable)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList) 
@@ -295,6 +307,7 @@ ResultSetNode preprocess(int numTables,
 
 		/* Build the referenced table map */
 		setReferencedTableMap( (JBitSet) childResult.getReferencedTableMap().clone() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		return this;
 	}
@@ -311,6 +324,8 @@ ResultSetNode preprocess(int numTables,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode addNewPredicate(Predicate predicate)
 			throws StandardException
 	{
@@ -330,6 +345,8 @@ ResultSetNode addNewPredicate(Predicate predicate)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void pushExpressions(PredicateList predicateList)
 					throws StandardException
 	{
@@ -370,6 +387,8 @@ boolean flattenableInFromSubquery(FromList fromList)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode ensurePredicateList(int numTables)
 		throws StandardException
 	{
@@ -389,6 +408,8 @@ ResultSetNode ensurePredicateList(int numTables)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode optimize(DataDictionary dataDictionary,
 								  PredicateList predicates,
 								  double outerRows) 
@@ -402,6 +423,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 										predicates,
 										outerRows);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setCostEstimate( getOptimizerFactory().getCostEstimate() );
 		getCostEstimate().setCost(childResult.getCostEstimate().getEstimatedCost(),
 							childResult.getCostEstimate().rowCount(),
@@ -416,6 +438,8 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode modifyAccessPaths() throws StandardException
 	{
 		childResult = childResult.modifyAccessPaths();
@@ -429,6 +453,8 @@ ResultSetNode modifyAccessPaths() throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode changeAccessPath() throws StandardException
 	{
 		childResult = childResult.changeAccessPath();
@@ -540,6 +566,7 @@ boolean isNotExists()
 	 */
 	protected boolean reflectionNeededForProjection()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		return ! (getResultColumns().allExpressionsAreColumns(childResult));
 	}
 
@@ -569,6 +596,8 @@ void adjustForSortElimination(RequiredRowOrdering rowOrdering)
 	 * 			the final cost estimate for the child node.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getFinalCostEstimate()
 		throws StandardException
 	{
@@ -578,6 +607,7 @@ CostEstimate getFinalCostEstimate()
 		** that optimization was done directly on the child node,
 		** in which case the cost estimate will be null here.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getCostEstimate() == null)
         {
 			return childResult.getFinalCostEstimate();
@@ -596,11 +626,13 @@ CostEstimate getFinalCostEstimate()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (childResult != null)
 		{
 			childResult = (ResultSetNode)childResult.accept(v);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java
index 7acebbe0ec..6aab1b7c52 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SpecialFunctionNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -49,6 +50,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	 <UL>
 	 <LI> USER
 	 <LI> CURRENT_USER
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 	 <LI> CURRENT_ROLE
 	 <LI> SESSION_USER
 	 <LI> SYSTEM_USER
@@ -63,6 +65,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 	 This node is used rather than some use of MethodCallNode for
 	 runtime performance. MethodCallNode does not provide a fast access
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
      to the current language connection or activation, since it is geared
 	 towards user defined routines.
 
@@ -76,6 +80,7 @@ class SpecialFunctionNode extends ValueNode
 	String sqlName;
 
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_IDENTITY_VAL = 0;
     final static int K_CURRENT_ISOLATION = 1;
     final static int K_CURRENT_SCHEMA = 2;
@@ -102,6 +107,7 @@ class SpecialFunctionNode extends ValueNode
 	*/
 	private String methodType;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     SpecialFunctionNode(int kind, ContextManager cm) {
         super(cm);
         this.kind = kind;
@@ -128,6 +134,8 @@ class SpecialFunctionNode extends ValueNode
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode bindExpression(FromList fromList,
                              SubqueryList subqueryList,
                              List<AggregateNode> aggregates)
@@ -135,6 +143,7 @@ ValueNode bindExpression(FromList fromList,
     {
         DataTypeDescriptor dtd;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         switch (kind) {
         case K_USER:
         case K_CURRENT_USER:
@@ -150,6 +159,7 @@ ValueNode bindExpression(FromList fromList,
                     sqlName = "SYSTEM_USER";
                     break;
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             methodName = "getCurrentUserId";
 			methodType = "java.lang.String";
             
@@ -162,6 +172,7 @@ ValueNode bindExpression(FromList fromList,
 			break;
 
         case K_SESSION_USER:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             methodName = "getSessionUserId";
             methodType = "java.lang.String";
             sqlName = "SESSION_USER";
@@ -180,13 +191,16 @@ ValueNode bindExpression(FromList fromList,
             dtd = DataDictionary.TYPE_SYSTEM_IDENTIFIER;
 			break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         case K_CURRENT_ROLE:
 			sqlName = "CURRENT_ROLE";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 			methodName = "getCurrentRoleIdDelimited";
 			methodType = "java.lang.String";
 			dtd = DataTypeDescriptor.getBuiltInDataTypeDescriptor(
 				// size: 2+(2*128) start and end text quote plus max # of
 				// escapes
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 				Types.VARCHAR, true, 2+(2*128)); 
 			//SQL spec Section 6.4 Syntax Rule 4 says that the collation type
 			//of these functions will be the collation of character set
@@ -195,6 +209,7 @@ ValueNode bindExpression(FromList fromList,
 			//be implicit. (set by default)
 			break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         case K_IDENTITY_VAL:
 			sqlName = "IDENTITY_VAL_LOCAL";
 			methodName = "getIdentityValue";
@@ -213,6 +228,7 @@ ValueNode bindExpression(FromList fromList,
 			//derivation will be implicit. (set by default).
 			break;
 		default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (SanityManager.DEBUG) {
                 SanityManager.THROWASSERT(
                         "Invalid type for SpecialFunctionNode " + kind);
@@ -259,7 +275,9 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 											 ClassName.LanguageConnectionContext, 0);
 		int argCount = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 		if (methodName.equals("getCurrentRoleIdDelimited") ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 methodName.equals("getCurrentSchemaName") ||
                 methodName.equals("getCurrentUserId")) {
 
@@ -273,6 +291,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		String fieldType = getTypeCompiler().interfaceName();
 		LocalField field = acb.newFieldDeclaration(Modifier.PRIVATE, fieldType);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 		acb.generateDataValue(mb, getTypeCompiler(), 
 				getTypeServices().getCollationType(), field);
 	}
@@ -284,6 +303,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 	public String toString() {
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 			return "sqlName: " + sqlName + "\n" +
 				super.toString();
 		}
@@ -295,6 +315,7 @@ public String toString() {
 
     @Override
     boolean isSameNodeKind(ValueNode o) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return super.isSameNodeKind(o) &&
                 ((SpecialFunctionNode)o).kind == this.kind;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StatementNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StatementNode.java
index 03af1b9c40..7f4028519c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StatementNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StatementNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.StatementNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -54,6 +55,8 @@ public abstract class StatementNode extends QueryTreeNode
     /** Cached empty list object. */
     static final TableDescriptor[] EMPTY_TD_LIST = new TableDescriptor[0];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     StatementNode(ContextManager cm) {
         super(cm);
     }
@@ -88,6 +91,7 @@ public boolean isAtomic() throws StandardException
 	 */
 	public boolean needsSavepoint()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 		return true;
 	}
 	
@@ -98,6 +102,7 @@ public boolean needsSavepoint()
 	 * @return the name of the underlying sps
 	 */
 	public String getSPSName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2096
 		return null;
 	}
 
@@ -159,6 +164,8 @@ public String toString()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     abstract String statementToString();
 	
 	/**
@@ -306,6 +313,7 @@ public GeneratedClass generate(ByteArray byteCode) throws StandardException
         // executing this statement. Implements the abstract method
         // BaseActivation.createResultSet().
         MethodBuilder mbWorker = generatingClass.getClassBuilder().newMethodBuilder(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
                 Modifier.PROTECTED,
                 ClassName.ResultSet,
                 "createResultSet");
@@ -328,10 +336,12 @@ public GeneratedClass generate(ByteArray byteCode) throws StandardException
 		// for us, given the resultSetExpr to use.
 		//   return (this.resultSet = #resultSetExpr);
 		generatingClass.finishExecuteMethod();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
 
 		// wrap up the constructor by putting a return at the end of it
 		generatingClass.finishConstructor();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 		try {
 			// cook the completed class into a real class
 			// and stuff it into activationClass
@@ -364,6 +374,7 @@ public GeneratedClass generate(ByteArray byteCode) throws StandardException
      *      table fails
      */
     public TableDescriptor[] updateIndexStatisticsFor()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4938
             throws StandardException {
         // Do nothing, overridden by appropriate nodes.
         return EMPTY_TD_LIST;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
index cb265df11d..0aded9246a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.StaticClassFieldReferenceNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -64,6 +65,8 @@ public final class StaticClassFieldReferenceNode extends JavaValueNode
 	 * @param	fieldName		The field name
      * @param   cm              The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     StaticClassFieldReferenceNode(
             String javaClassName,
             String fieldName,
@@ -89,6 +92,8 @@ public final class StaticClassFieldReferenceNode extends JavaValueNode
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     JavaValueNode bindExpression(FromList fromList,
                                  SubqueryList subqueryList,
                                  List<AggregateNode> aggregates)
@@ -221,6 +226,7 @@ int getOrderableVariantType()
 	 * @exception StandardException		Thrown on error
 	 */
     void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 	throws StandardException
 	{
 		/*
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
index c8c34dd33a..ac6866c39e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.StaticMethodCallNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -84,6 +85,8 @@ For a application call like CALL MYPROC(?) the logically Java method call is
 		- the parameter is passed directly to the method call (no casts or expressions).
 		- the method's parameter type is a Java array type.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     Since this is a dynamic decision we compile in code to take both paths,
     based upon a boolean is INOUT which is derived from the
     ParameterValueSet. Code is logically (only single parameter String[] shown
@@ -99,6 +102,8 @@ ParameterValueSet. Code is logically (only single parameter String[] shown
 
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class StaticMethodCallNode extends MethodCallNode
 {
 	private TableName procedureName;
@@ -143,6 +148,8 @@ class StaticMethodCallNode extends MethodCallNode
      *                          method belongs to.
      * @param cm                The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     StaticMethodCallNode(
             String methodName,
             String javaClassName,
@@ -177,6 +184,7 @@ class StaticMethodCallNode extends MethodCallNode
     public  void    setAppearsInGroupBy() { appearsInGroupBy = true; }
     
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
     TableName getFullName()
 	{
 		return  procedureName;
@@ -195,7 +203,9 @@ TableName getFullName()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
     JavaValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -219,6 +229,7 @@ private JavaValueNode bindExpressionMinion(
         throws StandardException
     {
         bindParameters(fromList, subqueryList, aggregates);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
 		
 		/* If javaClassName is null then we assume that the current methodName
@@ -240,9 +251,12 @@ private JavaValueNode bindExpressionMinion(
             // The field methodName is used by resolveRoutine and
             // is set to the name of the routine (procedureName.getTableName()).
             resolveRoutine( fromList, subqueryList, aggregates, sd, noSchema );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
 
             if ( (ad != null) && (ad.getAliasType() == AliasInfo.ALIAS_TYPE_AGGREGATE_AS_CHAR) )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 resolvedAggregate = new AggregateNode(
                      ((SQLToJavaValueNode) methodParms[ 0 ]).getSQLValueNode(),
                      new UserAggregateDefinition( ad ), 
@@ -254,6 +268,7 @@ private JavaValueNode bindExpressionMinion(
 
                 // Propagate tags used to flag nodes which need privilege checks. See DERBY-6429.
                 resolvedAggregate.copyTagsFrom( this );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
 
                 // The parser may have noticed that this aggregate is invoked in a
                 // GROUP BY clause. That is not allowed.
@@ -266,7 +281,9 @@ private JavaValueNode bindExpressionMinion(
             }
 
             SchemaDescriptor savedSd = sd;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-475
             if (ad == null && noSchema && !forCallStatement)
             {
                 // Resolve to a built-in SYSFUN function but only
@@ -276,6 +293,7 @@ private JavaValueNode bindExpressionMinion(
                 // an in-memory table, set up in DataDictioanryImpl.
                 sd = getSchemaDescriptor("SYSFUN", true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
                 resolveRoutine(fromList, subqueryList, aggregates, sd, noSchema);
             }
 
@@ -301,6 +319,7 @@ private JavaValueNode bindExpressionMinion(
 
                     forCallStatement = true; // temporarily: resolve
                                              // as procedure
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
                     resolveRoutine(fromList, subqueryList, aggregates, sd, noSchema);
                     forCallStatement = false; // restore it
 
@@ -313,6 +332,7 @@ private JavaValueNode bindExpressionMinion(
                     // Maybe a function is being CALLed ?
                     forCallStatement = false; // temporarily: resolve
                                               // as function
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
                     resolveRoutine(fromList, subqueryList, aggregates, sd, noSchema);
                     forCallStatement = true; // restore it
 
@@ -369,9 +389,13 @@ private JavaValueNode bindExpressionMinion(
             if (
                 javaClassName.startsWith( "org.apache.derby." ) &&
                 !javaClassName.startsWith( "org.apache.derby.impl.tools.optional." ) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                 !javaClassName.startsWith( "org.apache.derby.optional.lucene." ) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
                 !javaClassName.startsWith( "org.apache.derby.optional.json." ) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6600
                 !javaClassName.startsWith( "org.apache.derby.optional.api." ) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
                 !javaClassName.startsWith( "org.apache.derby.optional.dump." ) &&
                 !javaClassName.startsWith( "org.apache.derby.vti." )
                 )
@@ -389,8 +413,11 @@ private JavaValueNode bindExpressionMinion(
 		resolveMethodCall( javaClassName, true );
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		if (isPrivilegeCollectionRequired())
 			getCompilerContext().addRequiredRoutinePriv(ad);
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 
 		// If this is a function call with a variable length
 		// return type, then we need to push a CAST node.
@@ -421,6 +448,8 @@ private JavaValueNode bindExpressionMinion(
 							);
 							
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     ValueNode returnValueToSQL =
                             new JavaToSQLValueNode(this, getContextManager());
 
@@ -434,9 +463,12 @@ private JavaValueNode bindExpressionMinion(
                             returnType.getCollationType(),
                             StringDataValue.COLLATION_DERIVATION_IMPLICIT);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                     JavaValueNode returnValueToJava = new SQLToJavaValueNode(
                             returnValueCastNode, getContextManager());
 					returnValueToJava.setCollationType(returnType.getCollationType());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                     return returnValueToJava.bindExpression(fromList, subqueryList, aggregates);
 				}
 
@@ -533,11 +565,14 @@ private void optimizeDomainValueConversion() throws StandardException {
 	 * be required.
 	 */
     private void resolveRoutine(FromList fromList, SubqueryList subqueryList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
                                 List<AggregateNode> aggregates, SchemaDescriptor sd,
                                 boolean noSchema)
             throws StandardException {
 		if (sd.getUUID() != null) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         List<AliasDescriptor> list = getDataDictionary().getRoutineList(
             sd.getUUID().toString(),
             methodName,
@@ -587,9 +622,11 @@ else if (parameterCount != methodParms.length)
 				int parameterMode = rai.getParameterModes()[ getRoutineArgIdx( rai, p ) ];
 
                 if (parameterMode != (ParameterMetaData.parameterModeIn)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
 
 					String arrayType;
 					switch (typeId.getJDBCTypeId()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
 						case java.sql.Types.BOOLEAN:
 						case java.sql.Types.SMALLINT:
 						case java.sql.Types.INTEGER:
@@ -603,6 +640,7 @@ else if (parameterCount != methodParms.length)
 							break;
 					}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 					typeId = TypeId.getUserDefinedTypeId(arrayType);
 				}
 
@@ -657,6 +695,8 @@ else if (parameterCount != methodParms.length)
                 {
                     coerceMethodParameter
                         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                          fromList, subqueryList, aggregates,
                          rai,
                          methodParms.length,
@@ -669,6 +709,7 @@ else if (parameterCount != methodParms.length)
 			if (sigParameterCount != parameterCount) {
 
 				DataTypeDescriptor dtd = new DataTypeDescriptor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 						TypeId.getUserDefinedTypeId("java.sql.ResultSet[]"),
 						0,
 						0,
@@ -693,6 +734,7 @@ else if (parameterCount != methodParms.length)
             { isSystemCode = true; }
 
             routineDefiner = sd.getAuthorizationId();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
 			break;
 		}
@@ -700,6 +742,7 @@ else if (parameterCount != methodParms.length)
 
         if ( (ad == null) && (methodParms.length == 1) )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
             ad = AggregateNode.resolveAggregate
                 ( getDataDictionary(), sd, methodName, noSchema );
         }
@@ -715,6 +758,7 @@ else if (parameterCount != methodParms.length)
         (
          FromList fromList,
          SubqueryList subqueryList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
          List<AggregateNode> aggregates,
          RoutineAliasInfo rai,
          int    parameterCount, // number of declared routine args
@@ -736,8 +780,10 @@ else if (parameterCount != methodParms.length)
         }
 
         boolean isParameterMarker = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
         if ((sqlParamNode == null) || !sqlParamNode.requiresTypeFromContext())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             if (parameterMode != (ParameterMetaData.parameterModeIn))
             {
                 throw StandardException.newException
@@ -769,6 +815,7 @@ else if (parameterCount != methodParms.length)
             // type of the procedure parameter.
             if (sqlParamNode instanceof UntypedNullConstantNode)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
                 sqlParamNode.setType(paramdtd);
             }
             else
@@ -820,6 +867,7 @@ else if (parameterCount != methodParms.length)
             // correctly as 10 characters long.
             if (parameterTypeId.variableLength())
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                 if (parameterMode != (ParameterMetaData.parameterModeOut))
                 { needCast = true; }
             }
@@ -837,6 +885,8 @@ else if (parameterCount != methodParms.length)
             
             if (sqlParamNode == null)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 sqlParamNode =
                     new JavaToSQLValueNode(methodParms[p], getContextManager());
             }
@@ -851,6 +901,7 @@ else if (parameterCount != methodParms.length)
             methodParms[p] =
                     new SQLToJavaValueNode(castNode, getContextManager());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
             methodParms[p] = methodParms[p].bindExpression(
                     fromList, subqueryList, aggregates);
         }
@@ -864,6 +915,8 @@ else if (parameterCount != methodParms.length)
      * Wrap a parameter in a CAST node.
      */
     public static ValueNode makeCast (ValueNode parameterNode,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                                       DataTypeDescriptor targetType,
                                       ContextManager cm)
         throws StandardException
@@ -876,6 +929,7 @@ public static ValueNode makeCast (ValueNode parameterNode,
         // if truncation occurs when stuffing a string value into a
         // VARCHAR, so make sure CAST doesn't issue warning only.
         ((CastNode)castNode).setAssignmentSemantics();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5749
 
         return castNode;
     }
@@ -892,6 +946,7 @@ public static ValueNode makeCast (ValueNode parameterNode,
 	 * @param mb  method builder
 	 */
     private void generatePushNestedSessionContext(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         ActivationClassBuilder acb,
         MethodBuilder mb,
         boolean hadDefinersRights,
@@ -906,9 +961,13 @@ private void generatePushNestedSessionContext(
 					  "getLanguageConnectionContext",
 					  ClassName.LanguageConnectionContext, 0);
 		acb.pushThisAsActivation(mb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         mb.push(hadDefinersRights);
         mb.push(definer);
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                       "pushNestedSessionContext",
                       "void", 3);
 	}
@@ -938,8 +997,10 @@ void generateOneParameter(ExpressionClassBuilder acb,
 			// a dynmaically registered out parameter it must be a simple ? parameter
 
             parameterMode = (ParameterMetaData.parameterModeIn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
 
 			if (sql2j != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 				if (sql2j.getSQLValueNode().requiresTypeFromContext()) {
 	  				ParameterNode pn;
 		  			if (sql2j.getSQLValueNode() instanceof UnaryOperatorNode) 
@@ -961,6 +1022,7 @@ void generateOneParameter(ExpressionClassBuilder acb,
 											"getParameterValueSet", ClassName.ParameterValueSet, 0);
 
 						constructor.push(applicationParameterNumber);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                         constructor.push(ParameterMetaData.parameterModeUnknown);
 						constructor.callMethod(VMOpcode.INVOKEINTERFACE, null,
 											"setParameterMode", "void", 2);
@@ -971,6 +1033,7 @@ void generateOneParameter(ExpressionClassBuilder acb,
 		}
 
 		switch (parameterMode) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
         case (ParameterMetaData.parameterModeIn):
         case (ParameterMetaData.parameterModeInOut):
         case (ParameterMetaData.parameterModeUnknown):
@@ -1019,6 +1082,7 @@ void generateOneParameter(ExpressionClassBuilder acb,
 			mb.putField(lf);
 
 			// set the IN part of the parameter into the INOUT parameter.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
             if (parameterMode != (ParameterMetaData.parameterModeOut)) {
 				mb.swap();
 				mb.setArrayElement(0);
@@ -1120,6 +1184,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		if (returnsNullOnNullState != null) {
 			mb.push(false);
 			mb.setField(returnsNullOnNullState);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 			// for the call to the generated method below.
 			mb.pushThis();
@@ -1187,7 +1252,11 @@ else if (sqlAllowed == RoutineAliasInfo.MODIFIES_SQL_DATA)
 			// If no SQL, there is no need to setup a nested session
 			// context.
 			if (sqlAllowed != RoutineAliasInfo.NO_SQL) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                 generatePushNestedSessionContext(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                     (ActivationClassBuilder) acb,
                     mb,
                     routineInfo.hasDefinersRights(),
@@ -1203,6 +1272,7 @@ else if (sqlAllowed == RoutineAliasInfo.MODIFIES_SQL_DATA)
 				mb.callMethod(VMOpcode.INVOKEINTERFACE, null,
 									"getSQLAllowed", "short", 0);
 				mb.setField(functionEntrySQLAllowed);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 			}
 			
@@ -1252,6 +1322,7 @@ else if (sqlAllowed == RoutineAliasInfo.MODIFIES_SQL_DATA)
 					cons.pushNewArray("java.sql.ResultSet[]", compiledResultSets);
 					cons.setField(procedureResultSetsHolder);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 					// arguments for the dynamic result sets
 					for (int i = 0; i < compiledResultSets; i++) {
@@ -1384,6 +1455,7 @@ else if (sqlAllowed == RoutineAliasInfo.MODIFIES_SQL_DATA)
 					int parameterMode = parameterModes[ getRoutineArgIdx( i ) ];
                     
                     if (parameterMode != (ParameterMetaData.parameterModeIn)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
 
 						// must be a parameter if it is INOUT or OUT.
 						ValueNode sqlParamNode = ((SQLToJavaValueNode) methodParms[i]).getSQLValueNode();
@@ -1414,6 +1486,7 @@ else if (sqlAllowed == RoutineAliasInfo.MODIFIES_SQL_DATA)
 
 						// is the underlying type for the OUT/INOUT parameter primitive.
                         // if this is a varargs arg then we have to strip off another array level
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                         Class<?> cellType = ((Method) method).
                                 getParameterTypes()[ getRoutineArgIdx( i ) ].
                                 getComponentType();
@@ -1452,6 +1525,7 @@ else if (paramdtd.getTypeId().isBooleanTypeId())
 						}
 
 						// The value needs to be set thorugh the setValue(Object) method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4499
 						if (isAnsiUDT)
 						{
 							mb.upCast("java.lang.Object");
@@ -1463,6 +1537,7 @@ else if (paramdtd.getTypeId().isBooleanTypeId())
 							mb.push(isNumericType ? paramdtd.getPrecision() : paramdtd.getMaximumWidth());
 							mb.push(paramdtd.getScale());
 							mb.push(isNumericType);
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 							mb.callMethod(VMOpcode.INVOKEINTERFACE, ClassName.VariableSizeDataValue, "setWidth", "void", 3);
 							// mb.endStatement();
 						}
@@ -1480,6 +1555,7 @@ else if (paramdtd.getTypeId().isBooleanTypeId())
 	 */
 	int getPrivType()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		return Authorizer.EXECUTE_PRIV;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubqueryList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubqueryList.java
index fcaae9955b..187dcc3737 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubqueryList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubqueryList.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SubqueryList
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -31,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 class SubqueryList extends QueryTreeNodeVector<SubqueryNode>
 {
     SubqueryList(ContextManager cm) {
@@ -44,6 +46,8 @@ class SubqueryList extends QueryTreeNodeVector<SubqueryNode>
 	 *
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void addSubqueryNode(SubqueryNode subqueryNode) throws StandardException
 	{
 		addElement(subqueryNode);
@@ -59,9 +63,12 @@ void addSubqueryNode(SubqueryNode subqueryNode) throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void optimize(DataDictionary dataDictionary, double outerRows)
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (SubqueryNode sqn : this)
 		{
             sqn.optimize(dataDictionary, outerRows);
@@ -75,9 +82,12 @@ void optimize(DataDictionary dataDictionary, double outerRows)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void modifyAccessPaths()
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (SubqueryNode sqn : this)
 		{
             sqn.modifyAccessPaths();
@@ -97,6 +107,7 @@ void modifyAccessPaths()
     boolean referencesTarget(String name, boolean baseTable)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (SubqueryNode sqn : this)
 		{
             if (sqn.isMaterializable())
@@ -142,9 +153,12 @@ public boolean referencesSessionSchema()
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setPointOfAttachment(int pointOfAttachment)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (SubqueryNode sqn : this)
 		{
             sqn.setPointOfAttachment(pointOfAttachment);
@@ -160,6 +174,7 @@ void setPointOfAttachment(int pointOfAttachment)
 	 */
 	void decrementLevel(int decrement)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (SubqueryNode sqn : this)
 		{
             sqn.getResultSet().decrementLevel(decrement);
@@ -172,6 +187,8 @@ void decrementLevel(int decrement)
      * so we can avoid flattening later.
 	 * 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markHavingSubqueries() {
         for (SubqueryNode sqn : this)
 	    {
@@ -183,7 +200,10 @@ void markHavingSubqueries() {
 	 * Mark all of the subqueries in this list as being part of a where clause
 	 * so we can avoid flattening later if needed.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void markWhereSubqueries() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (SubqueryNode sqn : this)
 		{
             sqn.setWhereSubquery(true);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubqueryNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
index bf944ea19c..90f71123be 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.SubqueryNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -71,6 +72,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class SubqueryNode extends ValueNode
 {
 	/*
@@ -166,6 +169,8 @@ class SubqueryNode extends ValueNode
 	 * NotNode above the SubqueryNode in the tree.
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final static int NOTIMPLEMENTED_SUBQUERY        = -1;
     final static int FROM_SUBQUERY      = 0;
     final static int IN_SUBQUERY            = 1;
@@ -200,6 +205,8 @@ class SubqueryNode extends ValueNode
      * @param cm            Context Manager
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     SubqueryNode(ResultSetNode resultSet,
                  int subqueryType,
                  ValueNode leftOperand,
@@ -223,6 +230,8 @@ class SubqueryNode extends ValueNode
 		 * built-in functions, etc.
 		 */
 		underTopAndNode = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         this.leftOperand = leftOperand;
 	}
 
@@ -258,6 +267,8 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -276,12 +287,15 @@ void printSubNodes(int depth)
 				leftOperand.treePrint(depth + 1);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 			if (orderByList != null)
 			{
 				printLabel(depth, "orderByList: ");
 				orderByList.treePrint(depth + 1);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
             if (offset != null)
             {
                 printLabel(depth, "offset: ");
@@ -301,6 +315,8 @@ void printSubNodes(int depth)
 	 *
 	 * @return ResultSetNode underlying this SubqueryNode.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode getResultSet()
 	{
 		return resultSet;
@@ -321,6 +337,8 @@ int getSubqueryType()
 	 *
 	 * @param subqueryType of this subquery.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setSubqueryType(int subqueryType)
 	{
 		this.subqueryType = subqueryType;
@@ -333,6 +351,8 @@ void setSubqueryType(int subqueryType)
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setPointOfAttachment(int pointOfAttachment)
 		throws StandardException
 	{
@@ -409,6 +429,8 @@ public boolean referencesSessionSchema() throws StandardException {
 	 * @exception StandardException			Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
@@ -448,6 +470,7 @@ ValueNode remapColumnReferencesToExpressions()
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
@@ -462,6 +485,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
          * case of EXISTS; NOT EXISTS does not appear prior to preprocessing)
          * can only return a single column, so we must check here.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5501
         if (subqueryType != EXISTS_SUBQUERY && resultColumns.visibleSize() != 1)
 		{
 			throw StandardException.newException(SQLState.LANG_NON_SINGLE_COLUMN_SUBQUERY);
@@ -543,9 +567,12 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 		if (leftOperand != null)
 		{
 			leftOperand = leftOperand.bindExpression(fromList, subqueryList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                                        aggregates);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
 		if (orderByList != null) {
 			orderByList.pullUpOrderByColumns(resultSet);
 		}
@@ -560,6 +587,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 		}
 
         bindOffsetFetch(offset, fetchFirst);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
 
 		/* reject any untyped nulls in the subquery */
 		resultSet.bindUntypedNullsToResultColumns(null);
@@ -575,6 +603,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 		 */
 		if (leftOperand != null && leftOperand.requiresTypeFromContext())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             leftOperand.setType(resultColumns.elementAt(0).getTypeServices());
 		}
 
@@ -604,6 +633,8 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -623,8 +654,11 @@ ValueNode preprocess(int numTables,
 		ValueNode	topNode = this;
 
         final boolean haveOrderBy; // need to remember for flattening decision
+//IC see: https://issues.apache.org/jira/browse/DERBY-6688
 
         // Push the order by list down to the ResultSet
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
         if (orderByList != null) {
             haveOrderBy = true;
             // If we have more than 1 ORDERBY columns, we may be able to
@@ -707,6 +741,7 @@ ValueNode preprocess(int numTables,
                       fetchFirst == null &&
 					  !isWhereExistsAnyInWithWhereSubquery() &&
                       parentComparisonOperator != null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5077
 
 		if (flattenable)
 		{
@@ -719,6 +754,8 @@ ValueNode preprocess(int numTables,
 			// Flatten the subquery
 			RowResultSetNode rrsn = (RowResultSetNode) resultSet;
             FromList fl = new FromList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 			// Remove ourselves from the outer subquery list
 			outerSubqueryList.removeElement(this);
@@ -773,11 +810,17 @@ ValueNode preprocess(int numTables,
 		boolean flattenableNotExists = (isNOT_EXISTS() || canAllBeFlattened());
 
 		flattenable = (resultSet instanceof SelectNode) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
  			          !((SelectNode)resultSet).hasWindows() &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6688
+//IC see: https://issues.apache.org/jira/browse/DERBY-6688
                       !haveOrderBy &&
                       offset == null &&
                       fetchFirst == null &&
 					  underTopAndNode && !havingSubquery &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-3301
+//IC see: https://issues.apache.org/jira/browse/DERBY-3301
 					  !isWhereExistsAnyInWithWhereSubquery() &&
 					  (isIN() || isANY() || isEXISTS() || flattenableNotExists ||
                        parentComparisonOperator != null);
@@ -785,6 +828,7 @@ ValueNode preprocess(int numTables,
 		if (flattenable)
 		{
 			SelectNode	select = (SelectNode) resultSet;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2442
 			if ((!select.hasAggregatesInSelectList()) &&
 			    (select.havingClause == null))
 			{
@@ -802,12 +846,14 @@ ValueNode preprocess(int numTables,
 				additionalEQ = additionalEQ &&
 								((leftOperand instanceof ConstantNode) ||
 								 (leftOperand instanceof ColumnReference) ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 								 (leftOperand.requiresTypeFromContext()));
 				/* If we got this far and we are an expression subquery
 				 * then we want to set leftOperand to be the left side
 				 * of the comparison in case we pull the comparison into
 				 * the flattened subquery.
 				 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5077
                 if (parentComparisonOperator != null)
 				{
 					leftOperand = parentComparisonOperator.getLeftOperand();
@@ -1115,6 +1161,8 @@ private ValueNode flattenToNormalJoin(int numTables,
 		 */
 		if (leftOperand == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
            return new BooleanConstantNode(true, getContextManager());
 		}
 		else
@@ -1203,6 +1251,7 @@ private ValueNode flattenToExistsJoin(int numTables,
      * @return the right operand
      */
     private ValueNode getRightOperand() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         ResultColumn firstRC = resultSet.getResultColumns().elementAt(0);
         return firstRC.getExpression();
     }
@@ -1270,6 +1319,8 @@ boolean hasCorrelatedCRs() throws StandardException
 			 */
 			if (oldRCL.size() > 1)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 ResultColumnList
                         newRCL = new ResultColumnList(getContextManager());
 				newRCL.addResultColumn(oldRCL.getResultColumn(1));
@@ -1339,6 +1390,8 @@ private UnaryComparisonOperatorNode pushNewPredicate(
 		UnaryComparisonOperatorNode	ucoNode = null;
 		ValueNode					rightOperand;
         ContextManager              cm = getContextManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		/* We have to ensure that the resultSet immediately under us has
 		 * a PredicateList, otherwise we can't push the predicate down.
@@ -1357,6 +1410,8 @@ private UnaryComparisonOperatorNode pushNewPredicate(
 		*/
 		ResultColumnList newRCL = resultColumns.copyListAndObjects();
 		newRCL.genVirtualColumnNodes(resultSet, resultColumns);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         resultSet = new ProjectRestrictNode(
 										resultSet,	// child
 										newRCL,			// result columns
@@ -1365,9 +1420,12 @@ private UnaryComparisonOperatorNode pushNewPredicate(
 										null,			// project subqueries
 										null,			// restrict subqueries	
 										null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                                         cm);
 		resultColumns = newRCL;
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         firstRC = resultColumns.elementAt(0);
 		rightOperand = firstRC.getExpression();
 
@@ -1393,6 +1451,8 @@ private UnaryComparisonOperatorNode pushNewPredicate(
 			{
 				/* Create a normalized structure.
 				 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 BooleanConstantNode
                         falseNode = new BooleanConstantNode(false, cm);
                 OrNode newOr =
@@ -1428,6 +1488,8 @@ private UnaryComparisonOperatorNode pushNewPredicate(
 
 		/* Place an AndNode above the <BinaryComparisonOperator> */
         andNode = new AndNode(andLeft, getTrueNode(), cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		/* Build the referenced table map for the new predicate */
 		tableMap = new JBitSet(numTables);
@@ -1455,6 +1517,7 @@ private UnaryComparisonOperatorNode pushNewPredicate(
 			case LT_ANY_SUBQUERY:
 			case GE_ANY_SUBQUERY:
 			case GT_ANY_SUBQUERY:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 ucoNode = new IsNullNode(this, true, cm);
 				break;
 
@@ -1465,8 +1528,11 @@ private UnaryComparisonOperatorNode pushNewPredicate(
 			case LT_ALL_SUBQUERY:
 			case GE_ALL_SUBQUERY:
 			case GT_ALL_SUBQUERY:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 ucoNode = new IsNullNode(this, false, cm);
 				break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             default:
                 if (SanityManager.DEBUG) {
                     SanityManager.NOTREACHED();
@@ -1550,6 +1616,7 @@ else if (parentOperator == RelationalOperator.GREATER_THAN_RELOP)
 			case EQ_ANY_SUBQUERY:
 			case NOT_IN_SUBQUERY:
 			case NE_ALL_SUBQUERY:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 kind = BinaryRelationalOperatorNode.K_EQUALS;
 				break;
 
@@ -1584,7 +1651,10 @@ else if (parentOperator == RelationalOperator.GREATER_THAN_RELOP)
 					"subqueryType (" + subqueryType + ") is an unexpected type");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         BinaryComparisonOperatorNode bcoNode = new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 kind,
                 leftOperand,
                 rightOperand,
@@ -1729,6 +1799,8 @@ ValueNode eliminateNots(boolean underNotNode)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode changeToCNF(boolean underTopAndNode)
 					throws StandardException
 	{
@@ -1829,6 +1901,8 @@ public boolean isMaterializable() throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void optimize(DataDictionary dataDictionary, double outerRows)
 					throws StandardException
 	{
@@ -1845,6 +1919,8 @@ void optimize(DataDictionary dataDictionary, double outerRows)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void modifyAccessPaths() throws StandardException
 	{
 		resultSet = resultSet.modifyAccessPaths();
@@ -1978,11 +2054,14 @@ void generateExpression(
 				mb.getField(subRS);
 				mb.conditionalIfNull();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 ResultSetNode materialSubNode =
                         new MaterializeSubqueryNode(subRS, getContextManager());
 
 				// Propagate the resultSet's cost estimate to the new node.
 				materialSubNode.setCostEstimate( resultSet.getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 				((ProjectRestrictNode) resultSet).setChildResult(materialSubNode);
 
@@ -1995,6 +2074,7 @@ void generateExpression(
 				mb.completeConditional();
 		
 				mb.setField(subRS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
                 executeMB.pushNull( ClassName.NoPutResultSet);
                 executeMB.setField(subRS);
@@ -2080,6 +2160,7 @@ else if (resultSet.returnsAtMostOneRow())
 		mb.push(subqResultSetNumber);
 		mb.push(subqueryNumber);
 		mb.push(pointOfAttachment);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		mb.push( costEstimate.rowCount() );
 		mb.push( costEstimate.getEstimatedCost() );
 
@@ -2137,6 +2218,7 @@ else if (resultSet.returnsAtMostOneRow())
 		}
 		
 		mb.setField(rsFieldLF);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 		/* rs.openCore() */
 		mb.getField(rsFieldLF);
@@ -2235,6 +2317,7 @@ private LocalField generateMaterialization(
 
 		// generate: field = value (value is on stack)
 		mb.setField(field);
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
 
 		return field;
 	}
@@ -2245,6 +2328,8 @@ private BooleanConstantNode getTrueNode()
 	{
 		if (trueNode == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
            trueNode = new BooleanConstantNode(true, getContextManager());
 		}
 		return trueNode;
@@ -2258,6 +2343,7 @@ private BooleanConstantNode getTrueNode()
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
@@ -2271,6 +2357,7 @@ void acceptChildren(Visitor v)
 			return;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (resultSet != null)
 		{
 			resultSet = (ResultSetNode)resultSet.accept(v);
@@ -2351,6 +2438,7 @@ private void changeToCorrespondingExpressionType()
   		{
   			case EQ_ANY_SUBQUERY:
   			case IN_SUBQUERY:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 nodeType = BinaryRelationalOperatorNode.K_EQUALS;
   				break;
 
@@ -2407,6 +2495,7 @@ private void setDataTypeServices(ResultColumnList resultColumns)
 		 */
 		if (subqueryType == EXPRESSION_SUBQUERY)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             dts = resultColumns.elementAt(0).getTypeServices();
 		}
 		else
@@ -2449,6 +2538,7 @@ public void setHavingSubquery(boolean havingSubquery) {
 	 * @return true if it is part of a where clause, otherwise false
 	 */
     boolean isWhereSubquery() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3301
 		return whereSubquery;
 	}
 
@@ -2456,6 +2546,8 @@ boolean isWhereSubquery() {
 	 * Mark this subquery as being part of a where clause.
 	 * @param whereSubquery
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setWhereSubquery(boolean whereSubquery) {
 		this.whereSubquery = whereSubquery;
 	}
@@ -2512,6 +2604,9 @@ boolean isWhereExistsAnyInWithWhereSubquery()
      * @return order by list if specified, else null.
      */
     public OrderByList getOrderByList() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
+//IC see: https://issues.apache.org/jira/browse/DERBY-4
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
         return orderByList;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubstituteExpressionVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubstituteExpressionVisitor.java
index fa91dcfe01..cb925b7b67 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubstituteExpressionVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SubstituteExpressionVisitor.java
@@ -36,6 +36,7 @@ class SubstituteExpressionVisitor implements Visitor
     private Class<?>  skipOverClass;
 	
 	SubstituteExpressionVisitor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ValueNode s, ValueNode t, Class<?> skipThisClass)
 	{
 		source = s;
@@ -46,6 +47,8 @@ class SubstituteExpressionVisitor implements Visitor
 	/**
 	 * used by GroupByNode to process expressions by complexity level.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getSource()
 	{
 		return source;
@@ -83,6 +86,7 @@ public boolean skipChildren(Visitable node)
 
 	public boolean visitChildrenFirst(Visitable node)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
index 72490b79d6..50d895aaed 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
@@ -35,6 +35,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Definition for the SUM()/AVG() aggregates.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class SumAvgAggregateDefinition
 		implements AggregateDefinition 
 {
@@ -67,6 +69,7 @@ public final DataTypeDescriptor	getAggregator(DataTypeDescriptor inputType,
 			TypeId compType = inputType.getTypeId();
 		
 			CompilerContext cc = (CompilerContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				QueryTreeNode.getContext(CompilerContext.CONTEXT_ID);
 			TypeCompilerFactory tcf = cc.getTypeCompilerFactory();
 			TypeCompiler tc = tcf.getTypeCompiler(compType);
@@ -92,6 +95,7 @@ public final DataTypeDescriptor	getAggregator(DataTypeDescriptor inputType,
 		{
 			if (SanityManager.DEBUG)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 				SanityManager.THROWASSERT("Unexpected exception", e);
 			}
 		}
@@ -129,6 +133,8 @@ protected String getOperator()
 	/**
 	 * This is set by the parser.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final void setSumOrAvg(boolean isSum)
 	{
 		this.isSum = isSum;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableElementList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableElementList.java
index e92a03f9f9..f0495007eb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableElementList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableElementList.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.TableElementList
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -60,6 +61,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 class TableElementList extends QueryTreeNodeVector<TableElementNode>
 {
 	private int				numColumns;
@@ -90,9 +92,11 @@ void addTableElement(TableElementNode tableElement)
 	 * of the character string types in create table node
 	 * @param sd
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3923
 	void setCollationTypesOnCharacterStringColumns(SchemaDescriptor sd)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TableElementNode te : this)
 		{
             if (te instanceof ColumnDefinitionNode)
@@ -108,6 +112,7 @@ void setCollationTypesOnCharacterStringColumns(SchemaDescriptor sd)
 	 * of a character string column.
 	 * @param sd
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3923
 	void setCollationTypeOnCharacterStringColumn(SchemaDescriptor sd, ColumnDefinitionNode cdn )
         throws StandardException
     {
@@ -121,6 +126,8 @@ void setCollationTypeOnCharacterStringColumn(SchemaDescriptor sd, ColumnDefiniti
         DataTypeDescriptor  dtd = cdn.getType();
         if ( dtd == null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             if ( !cdn.hasGenerationClause() )
             {
                 throw StandardException.newException
@@ -152,6 +159,7 @@ void validate(DDLStatementNode ddlStmt,
 		int numAutoCols = 0;
 
 		int			size = size();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         HashSet<String> columnNames = new HashSet<String>(size + 2, 0.999f);
         HashSet<String> constraintNames = new HashSet<String>(size + 2, 0.999f);
 		//all the primary key/unique key constraints for this table
@@ -175,6 +183,7 @@ void validate(DDLStatementNode ddlStmt,
 					if (cd.getConstraintType() == DataDictionary.PRIMARYKEY_CONSTRAINT ||
 					cd.getConstraintType() == DataDictionary.UNIQUE_CONSTRAINT)
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                         constraints.add(cd);
                     }
 				}
@@ -185,6 +194,7 @@ void validate(DDLStatementNode ddlStmt,
 		if (ddlStmt instanceof CreateTableNode)
 			tableType = ((CreateTableNode)ddlStmt).tableType;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TableElementNode tableElement : this)
 		{
 			if (tableElement instanceof ColumnDefinitionNode)
@@ -196,6 +206,7 @@ void validate(DDLStatementNode ddlStmt,
 				{
 					throw StandardException.newException(SQLState.LANG_LONG_DATA_TYPE_NOT_ALLOWED, cdn.getColumnName());
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 				checkForDuplicateColumns(ddlStmt, columnNames, cdn.getColumnName());
 				cdn.checkUserType(td);
 				cdn.bindAndValidateDefault(dd, td);
@@ -247,6 +258,7 @@ else if (tableElement.getElementType() == TableElementNode.AT_DROP_COLUMN)
 				String destName = null;
 				String[] destColumnNames = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                 for (int i = 0; i < constraints.size(); i++)
 				{
 
@@ -269,13 +281,16 @@ else if (destConstraint instanceof ConstraintDescriptor)
 						throw StandardException.newException(SQLState.LANG_MULTIPLE_CONSTRAINTS_WITH_SAME_COLUMNS,
 						cdn.getConstraintMoniker(), destName);
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                 constraints.add(cdn);
 			}
 
 			/* Make sure that there are no duplicate constraint names in the list */
             checkForDuplicateConstraintNames(ddlStmt, constraintNames, cdn.getConstraintMoniker());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
 			/* Make sure that the constraint we are trying to drop exists */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             if (cdn.getConstraintType() == DataDictionary.DROP_CONSTRAINT ||
                 cdn.getConstraintType() == DataDictionary.MODIFY_CONSTRAINT)
 			{
@@ -290,6 +305,7 @@ else if (destConstraint instanceof ConstraintDescriptor)
 
 					String dropSchemaName = cdn.getDropSchemaName();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-158
 					SchemaDescriptor sd = dropSchemaName == null ? td.getSchemaDescriptor() :
 											getSchemaDescriptor(dropSchemaName);
 
@@ -299,6 +315,7 @@ else if (destConstraint instanceof ConstraintDescriptor)
 										false);
 					if (cd == null)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                         throw StandardException.newException(SQLState.LANG_DROP_OR_ALTER_NON_EXISTING_CONSTRAINT,
 								(sd.getSchemaName() + "."+ dropConstraintName),
 								td.getQualifiedName());
@@ -321,6 +338,7 @@ else if (cdn.hasUniqueKeyConstraint())
 
                 // unique constraints on nullable columns added in 10.4, 
                 // disallow until database hard upgraded at least to 10.4.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
                 if (!dd.checkVersion(
                         DataDictionary.DD_VERSION_DERBY_10_4, null))
                 {
@@ -356,6 +374,7 @@ else if (cdn.hasForeignKeyConstraint())
     public  void    validatePrimaryKeyNullability()
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TableElementNode tableElement : this)
 		{
 			if (! (tableElement.hasConstraint()))
@@ -392,6 +411,7 @@ int countConstraints(int constraintType)
 	{
 		int	numConstraints = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TableElementNode element : this)
 		{
             if (element instanceof ConstraintDefinitionNode &&
@@ -411,6 +431,7 @@ int countGenerationClauses()
 	{
 		int	numGenerationClauses = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TableElementNode element : this)
 		{
             if (element instanceof ColumnDefinitionNode &&
@@ -447,6 +468,7 @@ int genColumnInfos( ColumnInfo[] colInfos)
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (elementAt(index).getElementType() == TableElementNode.AT_DROP_COLUMN)
 			{
                 String columnName = elementAt(index).getName();
@@ -455,6 +477,11 @@ int genColumnInfos( ColumnInfo[] colInfos)
 								columnName,
 								td.getColumnDescriptor( columnName ).getType(),
                                 null, null, null, null, null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 								ColumnInfo.DROP, 0, 0, false, 0);
 				break;
 			}
@@ -503,13 +530,20 @@ int genColumnInfos( ColumnInfo[] colInfos)
 							   (coldef.isAutoincrementColumn() ? 
 								coldef.getAutoincrementStart() : 0),
 							   (coldef.isAutoincrementColumn() ? 
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 								coldef.getAutoincrementIncrement() : 0),
 							   (coldef.isAutoincrementColumn() ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
  								coldef.getAutoincrementCycle() : false),
 							   (coldef.isAutoincrementColumn() ? 
 								coldef.getAutoinc_create_or_modify_Start_Increment() : -1));
 
 			/* Remember how many constraints that we've seen */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (coldef.hasConstraint())
 			{
 				numConstraints++;
@@ -526,6 +560,8 @@ int genColumnInfos( ColumnInfo[] colInfos)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void appendNewColumnsToRCL(FromBaseTable table)
 		throws StandardException
 	{
@@ -533,6 +569,8 @@ void appendNewColumnsToRCL(FromBaseTable table)
 		ResultColumnList rcl = table.getResultColumns();
 		TableName		 exposedName = table.getTableName();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 		for (int index = 0; index < size; index++)
 		{
 			if (elementAt(index) instanceof ColumnDefinitionNode)
@@ -542,6 +580,8 @@ void appendNewColumnsToRCL(FromBaseTable table)
 				ValueNode		valueNode;
 
 				/* Build a ResultColumn/BaseColumnNode pair for the column */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 valueNode = new BaseColumnNode(cdn.getColumnName(),
 									  		exposedName,
 											cdn.getType(),
@@ -566,6 +606,7 @@ void appendNewColumnsToRCL(FromBaseTable table)
 	void bindAndValidateCheckConstraints(FromList fromList)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         FromBaseTable table = (FromBaseTable) fromList.elementAt(0);
         CompilerContext cc = getCompilerContext();
 
@@ -610,6 +651,7 @@ void bindAndValidateCheckConstraints(FromList fromList)
 
 				// Tell the compiler context to only allow deterministic nodes
 				cc.setReliability( CompilerContext.CHECK_CONSTRAINT );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                 checkTree = checkTree.bindExpression(
                         fromList, (SubqueryList) null, aggregates);
 
@@ -643,6 +685,8 @@ void bindAndValidateCheckConstraints(FromList fromList)
 			 */
             ResultColumnList rcl = table.getResultColumns();
             int numReferenced = rcl.countReferencedColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ResultColumnList refRCL = new ResultColumnList(getContextManager());
 			rcl.copyReferencedColumnsToNewList(refRCL);
 
@@ -651,6 +695,7 @@ void bindAndValidateCheckConstraints(FromList fromList)
 			 */
 			if (cdn.getColumnList() != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 String colName = cdn.getColumnList().elementAt(0).getName();
 				if (numReferenced > 1 ||
                     !colName.equals(refRCL.elementAt(0).getName()))
@@ -680,21 +725,26 @@ void bindAndValidateCheckConstraints(FromList fromList)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4145
 	void bindAndValidateGenerationClauses( SchemaDescriptor sd, FromList fromList, FormatableBitSet generatedColumns, TableDescriptor baseTable )
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         FromBaseTable    table = (FromBaseTable) fromList.elementAt(0);
         ResultColumnList tableColumns = table.getResultColumns();
         int              columnCount = table.getResultColumns().size();
 
         // complain if a generation clause references another generated column
         findIllegalGenerationReferences( fromList, baseTable );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4145
 
         generatedColumns.grow( columnCount + 1 );
         
         CompilerContext cc = getCompilerContext();
 
         ArrayList<AggregateNode> aggregates = new ArrayList<AggregateNode>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         for (TableElementNode element : this)
 		{
@@ -736,10 +786,12 @@ void bindAndValidateGenerationClauses( SchemaDescriptor sd, FromList fromList, F
 				// Tell the compiler context to forbid subqueries and
 				// non-deterministic functions.
 				cc.setReliability( CompilerContext.GENERATION_CLAUSE_RESTRICTION );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                 generationTree = generationClauseNode.bindExpression(
                         fromList, (SubqueryList) null, aggregates);
 
                 SelectNode.checkNoWindowFunctions(generationClauseNode, "generation clause");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6690
 
                 //
                 // If the user did not declare a type for this column, then the column type defaults
@@ -750,6 +802,7 @@ void bindAndValidateGenerationClauses( SchemaDescriptor sd, FromList fromList, F
                 //
                 DataTypeDescriptor  generationClauseType = generationTree.getTypeServices();
                 DataTypeDescriptor  declaredType = cdn.getType();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3923
                 if ( declaredType == null )
                 {
                     cdn.setType( generationClauseType );
@@ -781,6 +834,7 @@ void bindAndValidateGenerationClauses( SchemaDescriptor sd, FromList fromList, F
                 }
 
 				// no aggregates, please
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                 if (!aggregates.isEmpty())
 				{
 					throw StandardException.newException( SQLState.LANG_AGGREGATE_IN_GENERATION_CLAUSE, cdn.getName());
@@ -816,6 +870,7 @@ void bindAndValidateGenerationClauses( SchemaDescriptor sd, FromList fromList, F
 
             for ( int i = 0; i < numReferenced; i++ )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 referencedColumnNames[i] =
                     rcl.elementAt(generationClauseColumnReferences[i] - 1).
                         getName();
@@ -843,9 +898,11 @@ void bindAndValidateGenerationClauses( SchemaDescriptor sd, FromList fromList, F
 	 * @param baseTable  Table descriptor if this is an ALTER TABLE statement.
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4145
 	void findIllegalGenerationReferences( FromList fromList, TableDescriptor baseTable )
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<ColumnDefinitionNode>   generatedColumns = new ArrayList<ColumnDefinitionNode>();
         HashSet<String>     names = new HashSet<String>();
 
@@ -861,6 +918,7 @@ void findIllegalGenerationReferences( FromList fromList, TableDescriptor baseTab
         }
         
         // find all of the generated columns
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TableElementNode element : this)
 		{
 			ColumnDefinitionNode cdn;
@@ -871,6 +929,7 @@ void findIllegalGenerationReferences( FromList fromList, TableDescriptor baseTab
 
 			if (!cdn.hasGenerationClause()) { continue; }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4145
             generatedColumns.add( cdn );
             names.add( cdn.getColumnName() );
         }
@@ -880,6 +939,8 @@ void findIllegalGenerationReferences( FromList fromList, TableDescriptor baseTab
         int    count = generatedColumns.size();
         for ( int i = 0; i < count; i++ )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ColumnDefinitionNode    cdn = generatedColumns.get( i );
             GenerationClauseNode    generationClauseNode = cdn.getGenerationClauseNode();
             List<ColumnReference>   referencedColumns =
@@ -923,6 +984,7 @@ void validateForeignKeysOnGenerationClauses(FromList fromList, FormatableBitSet
 
         // loop through the foreign keys, looking for keys which violate the
         // rulse we're enforcing
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TableElementNode element : this)
 		{
 			if (! (element instanceof FKConstraintDefinitionNode))
@@ -959,6 +1021,7 @@ void validateForeignKeysOnGenerationClauses(FromList fromList, FormatableBitSet
             // SET DEFAULT or whose update rule is ON UPDATE CASCADE.
             // See if any of the key columns are generated columns.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (ResultColumn keyCol : fk.getColumnList())
             {
                 String keyColName = keyCol.getName();
@@ -984,6 +1047,7 @@ void validateForeignKeysOnGenerationClauses(FromList fromList, FormatableBitSet
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3008
 	void genConstraintActions(boolean forCreateTable,
 				ConstraintConstantAction[] conActions,
 				String tableName,
@@ -993,6 +1057,7 @@ void genConstraintActions(boolean forCreateTable,
 	{
 		int conActionIndex = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TableElementNode ten : this)
 		{
 			String[]	columnNames = null;
@@ -1035,6 +1100,7 @@ void genConstraintActions(boolean forCreateTable,
                 // "unique with duplicate null" backing index for constraints 
                 // that contain at least one nullable column.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 				if (constraintDN.constraintType ==
 					DataDictionary.UNIQUE_CONSTRAINT && 
 					(dd.checkVersion(
@@ -1057,6 +1123,9 @@ void genConstraintActions(boolean forCreateTable,
 						forCreateTable,
 						unique,
                         uniqueWithDuplicateNulls,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                         cChars[0], // deferrable?
                         cChars[1], // initiallyDeferred?
 						null, constraintDN,
@@ -1071,6 +1140,7 @@ void genConstraintActions(boolean forCreateTable,
 					indexAction = genIndexAction(
 						forCreateTable,
 						constraintDN.requiresUniqueIndex(), false,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                         cChars[0],
                         cChars[1],
 						null, constraintDN,
@@ -1081,6 +1151,7 @@ void genConstraintActions(boolean forCreateTable,
 
 			if (constraintType == DataDictionary.DROP_CONSTRAINT)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3008
                 if (SanityManager.DEBUG)
                 {
                     // Can't drop constraints on a create table.
@@ -1098,6 +1169,7 @@ void genConstraintActions(boolean forCreateTable,
 												 constraintDN.getDropBehavior(),
                                                  constraintDN.getVerifyType());
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             else if (constraintType == DataDictionary.MODIFY_CONSTRAINT) {
                 conActions[conActionIndex] =
                     getGenericConstantActionFactory().
@@ -1116,6 +1188,8 @@ else if (constraintType == DataDictionary.MODIFY_CONSTRAINT) {
 				ProviderList apl = constraintDN.getAuxiliaryProviderList();
 				ConstraintInfo refInfo = null;
                 ProviderInfo[]  providerInfos;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 				if (constraintDN instanceof FKConstraintDefinitionNode)
 				{
@@ -1142,7 +1216,9 @@ else if (constraintType == DataDictionary.MODIFY_CONSTRAINT) {
 						getCreateConstraintConstantAction(
 												 constraintName, 
 											     constraintType,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                                  cChars,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3008
                                                  forCreateTable,
 												 tableName, 
 												 ((td != null) ? td.getUUID() : (UUID) null),
@@ -1235,6 +1311,7 @@ private IndexConstantAction genIndexAction(
 
 		if (constraintType == DataDictionary.DROP_CONSTRAINT)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3008
             if (SanityManager.DEBUG)
             {
                 if (forCreateTable)
@@ -1258,11 +1335,16 @@ private IndexConstantAction genIndexAction(
 				isAscending[i] = true;
 
 			return	getGenericConstantActionFactory().getCreateIndexConstantAction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3008
                     forCreateTable, 
                     isUnique, 
                     isUniqueWithDuplicateNulls,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                     hasDeferrableChecking,
                     initiallyDeferred,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                     constraintType,
                     "BTREE", // indexType
                     sd.getSchemaName(),
@@ -1309,6 +1391,7 @@ private Properties checkIndexPageSizeProperty(ConstraintDefinitionNode cdn)
 
         int approxLength = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : cdn.getColumnList())
         {
             String colName = rc.getName();
@@ -1347,6 +1430,7 @@ private Properties checkIndexPageSizeProperty(ConstraintDefinitionNode cdn)
 	 * @exception StandardException		Thrown on error
 	 */
 	private void checkForDuplicateColumns(DDLStatementNode ddlStmt,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 									Set<String> seenNames,
 									String colName)
 			throws StandardException
@@ -1375,6 +1459,7 @@ private void checkForDuplicateColumns(DDLStatementNode ddlStmt,
 	 * @exception StandardException		Thrown on error
 	 */
 	private void checkForDuplicateConstraintNames(DDLStatementNode ddlStmt,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 									Set<String> seenNames,
 									String constraintName)
 			throws StandardException
@@ -1440,6 +1525,7 @@ private void verifyUniqueColumnList(DDLStatementNode ddlStmt,
 	 */
 	private void setColumnListToNotNull(ConstraintDefinitionNode cdn)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : cdn.getColumnList())
 		{
             findColumnDefinition(rc.getName()).setNullability(false);
@@ -1458,6 +1544,7 @@ private boolean areColumnsNullable (
     ConstraintDefinitionNode    cdn, 
     TableDescriptor             td) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : cdn.getColumnList())
         {
             String colName = rc.getName();
@@ -1477,6 +1564,7 @@ private boolean areColumnsNullable (
 
     private void checkForNullColumns(ConstraintDefinitionNode cdn, TableDescriptor td) throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn rc : cdn.getColumnList())
         {
             DataTypeDescriptor dtd = (td == null) ?
@@ -1486,12 +1574,14 @@ private void checkForNullColumns(ConstraintDefinitionNode cdn, TableDescriptor t
             // todo dtd may be null if the column does not exist, we should check that first
             if (dtd != null && dtd.isNullable())
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3523
                 String errorState = 
                    (getLanguageConnectionContext().getDataDictionary()
                         .checkVersion(DataDictionary.DD_VERSION_DERBY_10_4, null))
                     ? SQLState.LANG_ADD_PRIMARY_KEY_ON_NULL_COLS
                     : SQLState.LANG_DB2_ADD_UNIQUE_OR_PRIMARY_KEY_ON_NULL_COLS;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 throw StandardException.newException(errorState, rc.getName());
             }
         }
@@ -1526,6 +1616,7 @@ private DataTypeDescriptor getColumnDataTypeDescriptor(String colName, TableDesc
      * not in the list.
      */
     private ColumnDefinitionNode findColumnDefinition(String colName) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TableElementNode te : this) {
             if (te instanceof ColumnDefinitionNode) {
                 ColumnDefinitionNode cdn = (ColumnDefinitionNode) te;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableElementNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableElementNode.java
index e6581e1595..a3562c1a02 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableElementNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableElementNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.TableElementNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -31,6 +32,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class TableElementNode extends QueryTreeNode
 {
     /////////////////////////////////////////////////////////////////////////
@@ -74,6 +77,8 @@ class TableElementNode extends QueryTreeNode
 	 * @param name	The name of the table element, if any
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     TableElementNode(String name, ContextManager cm)
 	{
         super(cm);
@@ -156,6 +161,8 @@ boolean hasConstraint()
 	 *
 	 * @return String	The name.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getName()
 	{
 		return name;
@@ -175,6 +182,7 @@ int	getElementType()
 		else if ( this instanceof ConstraintDefinitionNode ) { return AT_DROP_CONSTRAINT; }
 		else if ( this instanceof ModifyColumnNode )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (((ModifyColumnNode)this).kind == ModifyColumnNode.K_DROP_COLUMN)
             {
                 return AT_DROP_COLUMN;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableName.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableName.java
index 2af71c31d4..370bfe8993 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableName.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableName.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.TableName
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -53,6 +54,7 @@ public class TableName extends QueryTreeNode
     TableName(String schemaName, String tableName, ContextManager cm)
 	{
         super(cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-18
 		hasSchema = schemaName != null;
         this.schemaName = schemaName;
         this.tableName = tableName;
@@ -119,6 +121,8 @@ public String getSchemaName()
 	 * @param schemaName	 Schema name as a String
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setSchemaName(String schemaName)
 	{
 		this.schemaName = schemaName;
@@ -131,6 +135,8 @@ void setSchemaName(String schemaName)
 	 * @return Full table name as a String
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getFullTableName()
 	{
 		if (schemaName != null)
@@ -144,6 +150,7 @@ String getFullTableName()
      */
     public  String  getFullSQLName()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         return IdUtil.mkQualifiedName( schemaName, tableName );
     }
 
@@ -156,6 +163,7 @@ public  String  getFullSQLName()
     @Override
 	public String toString()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-18
 		if (hasSchema)
 			return getFullTableName();
 		else
@@ -174,6 +182,7 @@ public String toString()
 	 */
     boolean equals(TableName otherTableName)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-127
         if( otherTableName == null)
             return false;
         
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
index f5e8dabb36..3065ee45d2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.TableOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -66,6 +67,8 @@ abstract class TableOperatorNode extends FromTable
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     TableOperatorNode(ResultSetNode  leftResultSet,
                       ResultSetNode  rightResultSet,
                       Properties     tableProperties,
@@ -89,7 +92,11 @@ abstract class TableOperatorNode extends FromTable
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindUntypedNullsToResultColumns(ResultColumnList rcl)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4365
+//IC see: https://issues.apache.org/jira/browse/DERBY-3757
 	throws StandardException
 	{
 		leftResultSet.bindUntypedNullsToResultColumns(rcl);
@@ -264,6 +271,8 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -273,6 +282,7 @@ void printSubNodes(int depth)
 			if (leftResultSet != null)
 			{
 				printLabel(depth, "leftResultSet: ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				leftResultSet.treePrint(depth + 1);
 			}
 
@@ -289,6 +299,8 @@ void printSubNodes(int depth)
 	 *
 	 * @return ResultSetNode	The leftResultSet from this node.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode getLeftResultSet()
 	{
 		return leftResultSet;
@@ -299,6 +311,8 @@ ResultSetNode getLeftResultSet()
 	 *
 	 * @return ResultSetNode	The rightResultSet from this node.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode getRightResultSet()
 	{
 		return rightResultSet;
@@ -316,6 +330,8 @@ ResultSetNode getLeftmostResultSet()
 		}
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setLeftmostResultSet(ResultSetNode newLeftResultSet)
 	{
 		if (leftResultSet instanceof TableOperatorNode)
@@ -334,6 +350,8 @@ void setLeftmostResultSet(ResultSetNode newLeftResultSet)
 	 * @param level		The query block level for this FromTable.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setLevel(int level)
 	{
 		super.setLevel(level);
@@ -354,6 +372,8 @@ void setLevel(int level)
 	 * @return	The exposed name for this table.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getExposedName()
 	{
 		return null;
@@ -369,6 +389,8 @@ String getExposedName()
 	 *
 	 * @param nestedInParens	Whether or not this node is nested in parens.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setNestedInParens(boolean nestedInParens)
 	{
 	}
@@ -389,6 +411,8 @@ void setNestedInParens(boolean nestedInParens)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 						  FromList fromListParam) 
 							throws StandardException
@@ -416,6 +440,8 @@ ResultSetNode bindNonVTITables(DataDictionary dataDictionary,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode bindVTITables(FromList fromListParam)
 							throws StandardException
 	{
@@ -433,6 +459,8 @@ ResultSetNode bindVTITables(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressions(FromList fromListParam)
 				throws StandardException
 	{
@@ -460,6 +488,8 @@ void bindExpressions(FromList fromListParam)
 	 *									directly under a ResultColumn
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void rejectParameters() throws StandardException
 	{
 		leftResultSet.rejectParameters();
@@ -476,6 +506,8 @@ void rejectParameters() throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindExpressionsWithTables(FromList fromListParam)
 					throws StandardException
 	{
@@ -505,6 +537,8 @@ void bindExpressionsWithTables(FromList fromListParam)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindResultColumns(FromList fromListParam)
 					throws StandardException
 	{
@@ -608,6 +642,8 @@ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode preprocess(int numTables,
 									GroupByList gbl,
 									FromList fromList)
@@ -633,6 +669,7 @@ ResultSetNode preprocess(int numTables,
 		}
 
 		/* Build the referenced table map (left || right) */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		setReferencedTableMap( (JBitSet) leftResultSet.getReferencedTableMap().clone() );
         getReferencedTableMap().or(rightResultSet.getReferencedTableMap());
 		getReferencedTableMap().set(tableNumber);
@@ -662,6 +699,7 @@ ResultSetNode preprocess(int numTables,
     @Override
     void projectResultColumns() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         getResultColumns().doProjection();
     }
     
@@ -688,6 +726,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 				throws StandardException
 	{
         setCostEstimate( getOptimizerFactory().getCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/* RESOLVE: This is just a stub for now */
 		leftResultSet = leftResultSet.optimize(
@@ -700,6 +739,7 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 											outerRows);
 
 		/* The cost is the sum of the two child costs */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		getCostEstimate().setCost(leftResultSet.getCostEstimate().getEstimatedCost(),
 							 leftResultSet.getCostEstimate().rowCount(),
 							 leftResultSet.getCostEstimate().singleScanRowCount() +
@@ -716,6 +756,8 @@ ResultSetNode optimize(DataDictionary dataDictionary,
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode modifyAccessPaths() throws StandardException
 	{
 		/* Beetle 4454 - union all with another union all would modify access
@@ -743,6 +785,8 @@ ResultSetNode modifyAccessPaths() throws StandardException
 				 */
 				leftOptimizer.modifyAccessPaths();
 				leftResultSet = (ResultSetNode)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
 					leftOptimizer.getOptimizable(0);
 			}
 			else
@@ -773,6 +817,8 @@ ResultSetNode modifyAccessPaths() throws StandardException
 				 */
 				rightOptimizer.modifyAccessPaths();
 				rightResultSet = (ResultSetNode)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
 					rightOptimizer.getOptimizable(0);
 			}
 			else
@@ -838,6 +884,8 @@ protected ResultSetNode optimizeSource(
 
 		if (sourceResultSet instanceof FromTable)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             FromList optList = new FromList(
                     getOptimizerFactory().doJoinOrderOptimization(),
                     (FromTable)sourceResultSet,
@@ -855,6 +903,7 @@ protected ResultSetNode optimizeSource(
 													getDataDictionary(),
 													(RequiredRowOrdering) null,
 													getCompilerContext().getNumTables(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
 													null,
 													  lcc);
 			optimizer.prepForNextRound();
@@ -891,6 +940,7 @@ else if (sourceResultSet == rightResultSet)
 			retval = sourceResultSet;
 
             // dispose of the recursively created optimizer
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
             if ( optimizerTracingIsOn() ) { getOptimizerTracer().traceEndQueryBlock(); }
 		}
 		else
@@ -947,11 +997,13 @@ void adjustForSortElimination(RequiredRowOrdering rowOrdering)
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (leftResultSet != null)
 		{
 			leftResultSet = (ResultSetNode)leftResultSet.accept(v);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TablePrivilegesNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TablePrivilegesNode.java
index f96d4cb3d6..9da2c47dc8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TablePrivilegesNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TablePrivilegesNode.java
@@ -1,7 +1,9 @@
 /*
 
    Derby - Class org.apache.derby.impl.sql.compile.TablePrivilegesNode
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -41,6 +43,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * This class represents a set of privileges on one table.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class TablePrivilegesNode extends QueryTreeNode
 {
 	private boolean[] actionAllowed = new boolean[ TablePrivilegeInfo.ACTION_COUNT];
@@ -73,6 +77,8 @@ void addAll()
 	 *
 	 * @exception StandardException standard error policy.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void addAction( int action, ResultColumnList privilegeColumnList)
 	{
 		actionAllowed[ action] = true;
@@ -90,6 +96,8 @@ else if( columnLists[ action] == null)
 	 * @param td The table descriptor
 	 * @param isGrant grant if true; revoke if false
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bind( TableDescriptor td, boolean isGrant) throws StandardException
 	{
 		this.td = td;
@@ -100,6 +108,7 @@ void bind( TableDescriptor td, boolean isGrant) throws StandardException
 				columnBitSets[action] = columnLists[ action].bindResultColumnsByName( td, (DMLStatementNode) null);
 
 			// Prevent granting non-SELECT privileges to views
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
 			if (td.getTableType() == TableDescriptor.VIEW_TYPE && action != TablePrivilegeInfo.SELECT_ACTION)
 				if (actionAllowed[action])
 					throw StandardException.newException(SQLState.AUTH_GRANT_REVOKE_NOT_ALLOWED,
@@ -143,11 +152,13 @@ private void bindPrivilegesForView ( TableDescriptor td)
 		ViewDescriptor vd = dd.getViewDescriptor(td);
 		DependencyManager dm = dd.getDependencyManager();
 		ProviderInfo[] pis = dm.getPersistentProviderInfos(vd);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		this.descriptorList = new ArrayList<Provider>();
 					
 		int siz = pis.length;
 		for (int i=0; i < siz; i++) 
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
 				Provider provider = (Provider) pis[i].getDependableFinder().getDependable(dd, pis[i].getObjectId());
 							
 				if (provider instanceof TableDescriptor || 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
index 7372e62630..4ac44c0c5f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.TernaryOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -51,6 +52,7 @@ class TernaryOperatorNode extends OperatorNode
 {
 
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_TRIM = 0;
     final static int K_LOCATE = 1;
     final static int K_SUBSTRING = 2;
@@ -114,6 +116,7 @@ class TernaryOperatorNode extends OperatorNode
                     ContextManager cm)
     {
         super(cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         this.kind = kind;
         constructorMinion(
                 receiver, leftOperand, rightOperand, -1);
@@ -195,6 +198,8 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -235,11 +240,13 @@ void printSubNodes(int depth)
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		receiver = receiver.bindExpression(fromList, subqueryList, 
             aggregates);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
 		leftOperand = leftOperand.bindExpression(fromList, subqueryList,
                 aggregates);
@@ -250,6 +257,7 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
                 aggregates);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind == K_TRIM) {
 			trimBind();
         } else if (kind == K_LOCATE) {
@@ -281,6 +289,8 @@ ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggr
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -322,16 +332,19 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		LocalField field = acb.newFieldDeclaration(Modifier.PRIVATE, resultInterfaceType);
 
 		receiver.generateExpression(acb, mb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind == K_TRIM)
 		{
 			mb.push(trimType);
 			leftOperand.generateExpression(acb, mb);
 			mb.cast(leftInterfaceType);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3081
 
 			mb.getField(field);
 			nargs = 3;
 			receiverType = receiverInterfaceType;
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         else if (kind == K_LOCATE)
 		{
 			leftOperand.generateExpression(acb, mb); 
@@ -342,6 +355,7 @@ else if (kind == K_LOCATE)
 			nargs = 3;
 		
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         else if (kind == K_SUBSTRING)
 		{
 			leftOperand.generateExpression(acb, mb); 
@@ -361,14 +375,17 @@ else if (kind == K_SUBSTRING)
 			nargs = 4;
 			receiverType = receiverInterfaceType;
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         else if (kind == K_TIMESTAMPADD || kind == K_TIMESTAMPDIFF)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-81
             Object intervalType = leftOperand.getConstantValueAsObject();
             if( SanityManager.DEBUG)
                 SanityManager.ASSERT( intervalType != null && intervalType instanceof Integer,
                                       "Invalid interval type used for " + operator);
             mb.push( ((Integer) intervalType).intValue());
             rightOperand.generateExpression( acb, mb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             mb.upCast(TernaryArgType[kind][2]);
             acb.getCurrentDateExpression( mb);
 			mb.getField(field);
@@ -390,6 +407,8 @@ else if (kind == K_TIMESTAMPADD || kind == K_TIMESTAMPDIFF)
 	 *
 	 * @param newLeftOperand	The new leftOperand
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setLeftOperand(ValueNode newLeftOperand)
 	{
 		leftOperand = newLeftOperand;
@@ -400,6 +419,8 @@ void setLeftOperand(ValueNode newLeftOperand)
 	 *
 	 * @return The current leftOperand.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getLeftOperand()
 	{
 		return leftOperand;
@@ -410,6 +431,8 @@ ValueNode getLeftOperand()
 	 *
 	 * @param newRightOperand	The new rightOperand
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setRightOperand(ValueNode newRightOperand)
 	{
 		rightOperand = newRightOperand;
@@ -420,6 +443,8 @@ void setRightOperand(ValueNode newRightOperand)
 	 *
 	 * @return The current rightOperand.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getRightOperand()
 	{
 		return rightOperand;
@@ -473,6 +498,8 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	 * @exception StandardException			Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
@@ -516,11 +543,13 @@ boolean constantExpression(PredicateList whereClause)
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (receiver != null)
 		{
 			receiver = (ValueNode)receiver.accept(v);
@@ -556,6 +585,7 @@ private ValueNode trimBind()
 		// handle parameters here
 
 		/* Is there a ? parameter for the receiver? */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		if (receiver.requiresTypeFromContext())
 		{
 			/*
@@ -564,6 +594,7 @@ private ValueNode trimBind()
 			** for a varchar.
 			*/
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 			receiver.setType(getVarcharDescriptor());
             //check if this parameter can pick up it's collation from the 
 			//character that will be used for trimming. If not(meaning the
@@ -654,6 +685,8 @@ private void setResultType(TypeId resultType) throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode locateBind() throws StandardException
 	{
 		TypeId	firstOperandType, secondOperandType, offsetType;
@@ -663,6 +696,7 @@ ValueNode locateBind() throws StandardException
 		 * left/firstOperand's.  If the left/firstOperand are both parameters,
 		 * both will be max length.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		if( receiver.requiresTypeFromContext())
 		{
 			if( leftOperand.requiresTypeFromContext())
@@ -689,6 +723,7 @@ ValueNode locateBind() throws StandardException
 		 * Is there a ? parameter for the second arg.  Copy the receiver's.
 		 * If the receiver are both parameters, both will be max length.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		if(leftOperand.requiresTypeFromContext())
 		{
 			if(receiver.requiresTypeFromContext())
@@ -713,6 +748,7 @@ ValueNode locateBind() throws StandardException
 		/*
 		 * Is there a ? parameter for the third arg.  It will be an int.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		if( rightOperand.requiresTypeFromContext())
 		{
 			rightOperand.setType(
@@ -756,6 +792,8 @@ protected ValueNode castArgToString(ValueNode vn) throws StandardException
 	                vnTC.getCastToCharWidth(
 		                    vn.getTypeServices()));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ValueNode newNode = new CastNode(vn, dtd, getContextManager());
             
             // DERBY-2910 - Match current schema collation for implicit cast as we do for
@@ -776,15 +814,19 @@ protected ValueNode castArgToString(ValueNode vn) throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode substrBind()
 			throws StandardException
 	{
 		TypeId	receiverType;
 		TypeId	resultType = TypeId.getBuiltInTypeId(Types.VARCHAR);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2352
 
 		// handle parameters here
 
 		/* Is there a ? parameter for the receiver? */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		if (receiver.requiresTypeFromContext())
 		{
 			/*
@@ -793,6 +835,7 @@ ValueNode substrBind()
 			** for a varchar.
 			*/
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 			receiver.setType(getVarcharDescriptor());
 			//collation of ? operand should be same as the compilation schema 
 			//because that is the only context available for us to pick up the
@@ -827,6 +870,7 @@ ValueNode substrBind()
 		** Check the type of the receiver - this function is allowed only on
 		** string value types.  
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2352
 		receiverType = receiver.getTypeId();
 		switch (receiverType.getJDBCTypeId())
 		{
@@ -840,6 +884,10 @@ ValueNode substrBind()
 				throwBadType("SUBSTR", receiverType.getSQLTypeName());
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
 		if (receiverType.getTypeFormatId() == StoredFormatIds.CLOB_TYPE_ID) {
 		// special case for CLOBs: if we start with a CLOB, we have to get
 		// a CLOB as a result (as opposed to a VARCHAR), because we can have a 
@@ -883,6 +931,7 @@ ValueNode substrBind()
 	 */
 
  	private ValueNode timestampAddBind() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-81
 			throws StandardException
 	{
         if( ! bindParameter( rightOperand, Types.INTEGER))
@@ -891,6 +940,7 @@ private ValueNode timestampAddBind()
             if( jdbcType != Types.TINYINT && jdbcType != Types.SMALLINT &&
                 jdbcType != Types.INTEGER && jdbcType != Types.BIGINT)
                 throw StandardException.newException(SQLState.LANG_INVALID_FUNCTION_ARG_TYPE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
                                                      rightOperand.getTypeId().getSQLTypeName(), 2,
                                                      operator);
         }
@@ -912,6 +962,7 @@ private ValueNode timestampDiffBind()
 	{
         bindDateTimeArg( rightOperand, 2);
         bindDateTimeArg( receiver, 3);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2386
         setType(DataTypeDescriptor.getBuiltInDataTypeDescriptor( Types.BIGINT));
         return this;
     } // End of timestampDiffBind
@@ -922,6 +973,7 @@ private void bindDateTimeArg( ValueNode arg, int argNumber) throws StandardExcep
         {
             if( ! arg.getTypeId().isDateTimeTimeStampTypeId())
                 throw StandardException.newException(SQLState.LANG_INVALID_FUNCTION_ARG_TYPE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
                                                      arg.getTypeId().getSQLTypeName(), argNumber,
                                                      operator);
         }
@@ -943,6 +995,7 @@ private void bindDateTimeArg( ValueNode arg, int argNumber) throws StandardExcep
      */
     private boolean bindParameter( ValueNode arg, int jdbcType) throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
         if( arg.requiresTypeFromContext() && arg.getTypeId() == null)
         {
             arg.setType( new DataTypeDescriptor(TypeId.getBuiltInTypeId( jdbcType), true));
@@ -951,6 +1004,8 @@ private boolean bindParameter( ValueNode arg, int jdbcType) throws StandardExcep
         return false;
     } // end of bindParameter
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getReceiver()
 	{
 		return receiver;
@@ -972,6 +1027,7 @@ protected void bindToBuiltIn()
 		/* If the receiver is not a built-in type, then generate a bound conversion
 		 * tree to a built-in type.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (receiver.getTypeId().userType())
 		{
 			receiver = receiver.genSQLJavaSQLTree();
@@ -980,6 +1036,7 @@ protected void bindToBuiltIn()
 		/* If the left operand is not a built-in type, then generate a bound conversion
 		 * tree to a built-in type.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (leftOperand.getTypeId().userType())
 		{
 			leftOperand = leftOperand.genSQLJavaSQLTree();
@@ -990,6 +1047,7 @@ protected void bindToBuiltIn()
 		 */
 		if (rightOperand != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			if (rightOperand.getTypeId().userType())
 			{
 				rightOperand = rightOperand.genSQLJavaSQLTree();
@@ -1002,6 +1060,7 @@ private DataTypeDescriptor getVarcharDescriptor() {
 	}
         
     boolean isSameNodeKind(ValueNode o) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return super.isSameNodeKind(o) &&
                 ((TernaryOperatorNode)o).kind == this.kind;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
index 9ec3e99aa3..004c53dc4d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.TestConstraintNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -59,6 +60,7 @@ class TestConstraintNode extends UnaryLogicalOperatorNode
             ValueNode booleanValue,
             String sqlState,
             String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             ConstraintDescriptor cd,
             ContextManager cm) throws StandardException {
         super(booleanValue,
@@ -87,6 +89,7 @@ class TestConstraintNode extends UnaryLogicalOperatorNode
 	 * @exception StandardException		Thrown on error
 	 */
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -98,6 +101,8 @@ ValueNode bindExpression(
 
 		if (!operand.getTypeServices().getTypeId().isBooleanTypeId())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             operand = new CastNode(
 					operand,
 					new DataTypeDescriptor(TypeId.BOOLEAN_ID, true),
@@ -136,6 +141,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		mb.push(sqlState);
 		mb.push(tableName);
         mb.push(constraintName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         if (deferrable) {
             acb.pushThisAsActivation(mb); // arg 4
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
index b06a70c890..5da60017d6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.TimestampOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -36,6 +37,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * The TimestampOperatorNode class implements the timestamp( date, time) function.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class TimestampOperatorNode extends BinaryOperatorNode
 {
 
@@ -73,7 +76,9 @@ class TimestampOperatorNode extends BinaryOperatorNode
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -84,6 +89,7 @@ ValueNode bindExpression(
 
 		//Set the type if there is a parameter involved here 
 		if (leftOperand.requiresTypeFromContext()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 			leftOperand.setType(DataTypeDescriptor.getBuiltInDataTypeDescriptor( Types.DATE));
 		}
 		//Set the type if there is a parameter involved here 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
index 506bb8e3d0..64091f10ef 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.TransactionStatementNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -33,6 +34,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 abstract class TransactionStatementNode extends StatementNode
 {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     TransactionStatementNode(ContextManager cm) {
         super(cm);
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java
index 3a88df3cab..4d7fabed0a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java
@@ -26,6 +26,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * a REFERENCING clause for a trigger.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class TriggerReferencingStruct
 {
     String identifier;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java
index 404c225c69..a41f283881 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java
@@ -83,6 +83,7 @@ static TypeCompiler staticGetTypeCompiler(TypeId typeId)
                                                                         typeId);
 
                   case Types.BIT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
                   case Types.BOOLEAN:
                         return booleanTypeCompiler =
                                         getAnInstance(PACKAGE_NAME + "BooleanTypeCompiler",
@@ -91,6 +92,8 @@ static TypeCompiler staticGetTypeCompiler(TypeId typeId)
 
                   case Types.CHAR:
                           sqlTypeName = typeId.getSQLTypeName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
                           return charTypeCompiler =
                               getAnInstance(PACKAGE_NAME + "CharTypeCompiler",
                                                       charTypeCompiler,
@@ -121,6 +124,7 @@ static TypeCompiler staticGetTypeCompiler(TypeId typeId)
                                                                 longintTypeCompiler,
                                                                 typeId);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
                   case Types.BLOB:
                         return blobTypeCompiler =
                                 getAnInstance(PACKAGE_NAME + "LOBTypeCompiler",
@@ -133,8 +137,11 @@ static TypeCompiler staticGetTypeCompiler(TypeId typeId)
                                                           longvarbitTypeCompiler,
                                                           typeId);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
                   case Types.CLOB:
                       sqlTypeName = typeId.getSQLTypeName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
                       return clobTypeCompiler =
                           getAnInstance(PACKAGE_NAME + "CLOBTypeCompiler",
                                         clobTypeCompiler,
@@ -188,11 +195,14 @@ static TypeCompiler staticGetTypeCompiler(TypeId typeId)
 
                   case Types.VARCHAR:
                           sqlTypeName = typeId.getSQLTypeName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2720
+//IC see: https://issues.apache.org/jira/browse/DERBY-3315
                           return varcharTypeCompiler =
                               getAnInstance(PACKAGE_NAME + "CharTypeCompiler",
                                                       varcharTypeCompiler,
                                                       typeId);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
                   case Types.JAVA_OBJECT:
                   case Types.OTHER:
                         if (typeId.isRefTypeId())
@@ -211,6 +221,7 @@ static TypeCompiler staticGetTypeCompiler(TypeId typeId)
                                 return btc;
                         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                   case Types.SQLXML:
                         return xmlTypeCompiler =
                                 getAnInstance(PACKAGE_NAME + "XMLTypeCompiler",
@@ -243,10 +254,12 @@ private static TypeCompiler getAnInstance(String className,
                 {
                         Exception exc = null;
                         Class<?> typeCompilerClass = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
                         try
                         {
                                 typeCompilerClass = Class.forName(className);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                                 anInstance  = (TypeCompiler)
                                     typeCompilerClass.getConstructor().newInstance();
                                 ((BaseTypeCompiler) anInstance).setTypeId(typeId);
@@ -263,6 +276,7 @@ private static TypeCompiler getAnInstance(String className,
                         {
                                 exc = ie;
                         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         catch (NoSuchMethodException nsme)
                         {
                                 exc = nsme;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java
index 68dc4babfa..fec45c1e29 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java
@@ -224,6 +224,8 @@ public final char readChar() throws java.io.IOException
      if (inBuf > 0)
      {
         --inBuf;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return buffer[(bufpos == bufsize - 1) ? (bufpos = 0) : ++bufpos];
      }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
index 185260909b..f91923d636 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.UnaryArithmeticOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -41,6 +42,7 @@ class UnaryArithmeticOperatorNode extends UnaryOperatorNode
 	private final static String[] UNARY_METHODS = {"plus","minus","sqrt", "absolute"};
 
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_PLUS = 0;
     final static int K_MINUS = 1;
     final static int K_SQRT = 2;
@@ -79,6 +81,7 @@ class UnaryArithmeticOperatorNode extends UnaryOperatorNode
     @Override
     public boolean requiresTypeFromContext()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind == K_PLUS ||
             kind == K_MINUS) {
             return operand.requiresTypeFromContext(); 
@@ -92,6 +95,7 @@ public boolean requiresTypeFromContext()
     @Override
     public boolean isParameterNode()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind == K_PLUS ||
             kind == K_MINUS) {
             return operand.isParameterNode(); 
@@ -113,6 +117,7 @@ public boolean isParameterNode()
     @Override
 	void bindParameter() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
        if (kind == K_SQRT ||
             kind == K_ABS)
 		{
@@ -122,6 +127,7 @@ void bindParameter() throws StandardException
 		}
         
 		//Derby-582 add support for dynamic parameter for unary plus and minus
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
        if (kind == K_MINUS ||
             kind == K_PLUS)
 			return;
@@ -145,17 +151,20 @@ void bindParameter() throws StandardException
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		//Return with no binding, if the type of unary minus/plus parameter is not set yet.
        if (operand.requiresTypeFromContext() &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 ((kind == K_PLUS ||
                   kind == K_MINUS))
 				&& operand.getTypeServices() == null)
 				return this;
 
         bindOperand(fromList, subqueryList, aggregates);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
        if (kind == K_SQRT ||
             kind == K_ABS)
@@ -170,6 +179,7 @@ else if (kind == K_PLUS ||
 		/*
 		** The result type of a +, -, SQRT, ABS is the same as its operand.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		super.setType(operand.getTypeServices());
 		return this;
 	}
@@ -184,6 +194,7 @@ private void checkOperandIsNumeric(TypeId operandType) throws StandardException
 	    {
 	        throw StandardException.newException(
                     SQLState.LANG_UNARY_ARITHMETIC_BAD_TYPE, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                    (kind == K_PLUS) ? "+" : "-",
 	                        operandType.getSQLTypeName());
 	    }
@@ -203,6 +214,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 									throws StandardException
 	{
 		/* Unary + doesn't do anything.  Just return the operand */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
        if (kind == K_PLUS)
 			operand.generateExpression(acb, mb);
 		else
@@ -228,6 +240,7 @@ private void bindSQRTABS()
 	 	 * If the operand is not a build-in type, generate a bound conversion
 		 * tree to build-in types.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (operandType.userType() )
 		{
 			operand = operand.genSQLJavaSQLTree();
@@ -243,6 +256,7 @@ private void bindSQRTABS()
 						getOperatorString(), operandType.getSQLTypeName());
 
 		/* For SQRT, if operand is not a DOUBLE, convert it to DOUBLE */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
        if (kind == K_SQRT &&
             jdbcType != Types.DOUBLE)
 		{
@@ -259,6 +273,8 @@ private void bindSQRTABS()
 	binding. The setType method will call the binding code after setting
 	the type of the parameter*/
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setType(DataTypeDescriptor descriptor) throws StandardException
 	{
         if (operand.requiresTypeFromContext() && operand.getTypeServices() == null)
@@ -271,6 +287,7 @@ void setType(DataTypeDescriptor descriptor) throws StandardException
 
     @Override
     boolean isSameNodeKind(ValueNode o) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return super.isSameNodeKind(o) &&
                 ((UnaryArithmeticOperatorNode)o).kind == kind;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
index 57e79aa766..a124850605 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.UnaryComparisonOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -42,6 +43,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public abstract class UnaryComparisonOperatorNode extends UnaryOperatorNode
 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     UnaryComparisonOperatorNode(ValueNode operator, ContextManager cm)
             throws StandardException {
         super(operator, cm);
@@ -62,6 +65,7 @@ public abstract class UnaryComparisonOperatorNode extends UnaryOperatorNode
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -80,6 +84,8 @@ ValueNode bindExpression(
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void bindComparisonOperator()
 			throws StandardException
 	{
@@ -129,6 +135,7 @@ ValueNode eliminateNots(boolean underNotNode)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4412
 	abstract UnaryOperatorNode getNegation(ValueNode operand)
 				throws StandardException;
 
@@ -222,6 +229,7 @@ public ValueNode getOperand(ColumnReference cRef, int refSetSize,
             	if (SanityManager.DEBUG)
             	{
             	    SanityManager.THROWASSERT("Failed when trying to " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
             	        "find base table number for column reference check:",
 						se);
             	}
@@ -283,6 +291,7 @@ public void generateExpressionOperand(Optimizable optTable,
 						throws StandardException
 	{
         ExpressionClassBuilder acb = (ExpressionClassBuilder) acbi;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 		acb.generateNull(mb, operand.getTypeCompiler(), 
 				operand.getTypeServices().getCollationType());
 	}
@@ -333,6 +342,7 @@ public void generateQualMethod(ExpressionClassBuilderInterface acbi,
 		MethodBuilder qualMethod = acb.newUserExprFun();
 
 		/* Generate a method that returns that expression */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 		acb.generateNull(qualMethod, operand.getTypeCompiler(),
 				operand.getTypeServices().getCollationType());
 		qualMethod.methodReturn();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java
index 3c169f0cf8..5c0e7fe5bd 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.UnaryDateTimestampOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -46,6 +47,7 @@ class UnaryDateTimestampOperatorNode extends UnaryOperatorNode
     private static final String DATE_METHOD_NAME = "getDate";
     
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_DATE = 0;
     final static int K_TIMESTAMP = 1;
 
@@ -93,6 +95,7 @@ class UnaryDateTimestampOperatorNode extends UnaryOperatorNode
 	 */
     @Override
     ValueNode bindExpression (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
@@ -142,6 +145,8 @@ ValueNode bindExpression (
         {
             DataValueFactory dvf = getLanguageConnectionContext().getDataValueFactory();
             DataValueDescriptor sourceValue = ((ConstantNode) operand).getValue();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             DataValueDescriptor destValue;
             if( sourceValue.isNull())
             {
@@ -155,6 +160,8 @@ ValueNode bindExpression (
                   ? dvf.getTimestamp( sourceValue) : dvf.getDate( sourceValue);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             return new UserTypeConstantNode(destValue, getContextManager());
         }
 
@@ -190,6 +197,7 @@ void generateExpression( ExpressionClassBuilder acb, MethodBuilder mb)
 
     @Override
     boolean isSameNodeKind(ValueNode o) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return super.isSameNodeKind(o) &&
                 ((UnaryDateTimestampOperatorNode)o).kind == kind;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java
index c73a224816..1532abe115 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.UnaryLogicalOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -30,6 +31,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public abstract class UnaryLogicalOperatorNode extends UnaryOperatorNode
 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     UnaryLogicalOperatorNode(ValueNode operand,
             String methodName,
             ContextManager cm) throws StandardException {
@@ -51,6 +54,7 @@ public abstract class UnaryLogicalOperatorNode extends UnaryOperatorNode
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
index c3a00a2871..ab89ff69b7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.UnaryOperatorNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -46,6 +47,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class UnaryOperatorNode extends OperatorNode
 {
 	String	operator;
@@ -74,6 +77,7 @@ class UnaryOperatorNode extends OperatorNode
     // class for XMLPARSE and XMLSERIALIZE.
 
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_XMLPARSE = 0;
     final static int K_XMLSERIALIZE = 1;
     final static int K_BASE = 2; // when UnaryOperatorNode is used as
@@ -127,6 +131,7 @@ class UnaryOperatorNode extends OperatorNode
         this.operand = operand;
         this.operator = operator;
         this.methodName = methodNameOrAddedArgs;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         this.kind = K_BASE;
     }
 
@@ -232,6 +237,8 @@ public String toString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -251,6 +258,8 @@ void printSubNodes(int depth)
 	 *
 	 * @return	The operand of this unary operator.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getOperand()
 	{
 		return operand;
@@ -266,8 +275,11 @@ ValueNode getOperand()
 	 * 
 	 * @return	The parameter operand of this unary operator else null.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ParameterNode getParameterOperand() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		if (requiresTypeFromContext() == false)
 			return null;
 		else {
@@ -297,11 +309,13 @@ ParameterNode getParameterOperand() throws StandardException
 	 */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
         bindOperand(fromList, subqueryList, aggregates);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind == K_XMLPARSE) {
             bindXMLParse();
         } else if (kind == K_XMLSERIALIZE) {
@@ -318,6 +332,7 @@ ValueNode bindExpression(
      * method to bind the operand.
 	 */
 	protected void bindOperand(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
@@ -337,6 +352,7 @@ protected void bindOperand(
 		 * tree to a built-in type.
 		 */
 		if (! (operand instanceof UntypedNullConstantNode) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			operand.getTypeId().userType() &&
 			! (this instanceof IsNullNode))
 		{
@@ -375,6 +391,7 @@ private void bindXMLParse() throws StandardException
 
         // The result type of XMLParse() is always an XML type.
         setType(DataTypeDescriptor.getBuiltInDataTypeDescriptor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                 Types.SQLXML));
     }
 
@@ -449,6 +466,8 @@ private void bindXMLSerialize() throws StandardException
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -508,6 +527,8 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	 * @exception StandardException			Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode remapColumnReferencesToExpressions()
 		throws StandardException
 	{
@@ -552,6 +573,7 @@ boolean constantExpression(PredicateList whereClause)
 
 	void bindParameter() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind == K_XMLPARSE)
 		{
 			/* SQL/XML[2006] allows both binary and character strings for
@@ -584,6 +606,7 @@ void bindParameter() throws StandardException
 			throw StandardException.newException(
 				SQLState.LANG_XMLPARSE_UNKNOWN_PARAM_TYPE);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         else if (kind == K_XMLSERIALIZE) {
         // For now, since JDBC has no type defined for XML, we
         // don't allow binding to an XML parameter.
@@ -610,6 +633,7 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 									throws StandardException
 	{
 		String resultTypeName = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             (kind == K_BASE)
 				? getTypeCompiler().interfaceName()
 				: resultInterfaceType;
@@ -643,6 +667,8 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 			*/
 			mb.putField(field);
 		} else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-688
+//IC see: https://issues.apache.org/jira/browse/DERBY-567
 			mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null,
 				methodName, resultTypeName, 0);
 		}
@@ -657,6 +683,8 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getReceiverInterfaceName() throws StandardException {
 		if (SanityManager.DEBUG)
 		{
@@ -664,6 +692,7 @@ String getReceiverInterfaceName() throws StandardException {
 								"cannot get interface without operand");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (kind != K_BASE)
 			return receiverInterfaceType;
 		
@@ -704,11 +733,13 @@ protected int getOrderableVariantType() throws StandardException
 	 * @exception StandardException on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 	void acceptChildren(Visitor v)
 		throws StandardException
 	{
 		super.acceptChildren(v);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		if (operand != null)
 		{
 			operand = (ValueNode)operand.accept(v);
@@ -727,6 +758,7 @@ void acceptChildren(Visitor v)
     int addXmlOpMethodParams(ExpressionClassBuilder acb,
 		MethodBuilder mb, LocalField resultField) throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if ((kind != K_XMLPARSE) &&
                 (kind != K_XMLSERIALIZE)) {
             // nothing to do.
@@ -784,6 +816,7 @@ int addXmlOpMethodParams(ExpressionClassBuilder acb,
      */
     boolean isEquivalent(ValueNode o) throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (isSameNodeKind(o)) {
     		UnaryOperatorNode other = (UnaryOperatorNode)o;
     		return (operator.equals(other.operator) && 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnionNode.java
index 32befce129..930fc1443b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UnionNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.UnionNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -44,6 +45,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class UnionNode extends SetOperatorNode
 {
 	/* Only optimize it once */
@@ -69,6 +72,8 @@ class UnionNode extends SetOperatorNode
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     UnionNode(ResultSetNode  leftResult,
               ResultSetNode  rightResult,
               boolean        all,
@@ -110,6 +115,8 @@ boolean tableConstructor()
 	 *									directly under a ResultColumn
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void rejectParameters() throws StandardException
 	{
 		if ( ! tableConstructor())
@@ -133,6 +140,7 @@ void setTableConstructorTypes(ResultColumnList typeColumns)
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			SanityManager.ASSERT(getResultColumns().size() <= typeColumns.size(),
 				"More columns in ResultColumnList than in base table.");
 		}
@@ -190,6 +198,10 @@ void setTableConstructorTypes(ResultColumnList typeColumns)
 	 * top of this node and enhance the RCL in that node.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-4442
+//IC see: https://issues.apache.org/jira/browse/DERBY-3
+//IC see: https://issues.apache.org/jira/browse/DERBY-4433
+//IC see: https://issues.apache.org/jira/browse/DERBY-1644
 	ResultSetNode enhanceRCLForInsert(
 			InsertNode target, boolean inOrder, int[] colMap)
 		throws StandardException
@@ -200,6 +212,7 @@ ResultSetNode enhanceRCLForInsert(
 			rightResultSet = target.enhanceAndCheckForAutoincrement
                 ( rightResultSet, inOrder, colMap, false );
 			if (!inOrder ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
                 getResultColumns().size() < target.resultColumnList.size()) {
 				setResultColumns( getRCLForInsert(target, colMap) );
 			}
@@ -295,6 +308,7 @@ public CostEstimate optimizeIt(Optimizer optimizer,
 							 rightResultSet.getCostEstimate().singleScanRowCount());
 
         costEst.add(rightResultSet.getCostEstimate(), costEst);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		/*
 		** Get the cost of this result set in the context of the whole plan.
@@ -307,6 +321,8 @@ public CostEstimate optimizeIt(Optimizer optimizer,
 							(ConglomerateDescriptor) null,
 							outerCost,
 							optimizer,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                             costEst
 							);
 
@@ -336,6 +352,8 @@ public CostEstimate optimizeIt(Optimizer optimizer,
 	 * @exception	StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void pushExpressions(PredicateList predicateList)
 					throws StandardException
 	{
@@ -379,6 +397,8 @@ public Optimizable modifyAccessPath(JBitSet outerTables) throws StandardExceptio
 	 * @exception StandardException		Thrown on error
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode modifyAccessPaths() throws StandardException
 	{
 		ResultSetNode retRSN;
@@ -441,6 +461,8 @@ private ResultSetNode addNewNodes()
 			 */
 			if (! columnTypesAndLengthsMatch())
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 treeTop = new NormalizeResultSetNode(
                         treeTop, null, null, false, getContextManager());
 			}
@@ -456,6 +478,7 @@ private ResultSetNode addNewNodes()
 			 * us would have a tableNumber of -1 instead of our tableNumber.)
 			 */
 			((FromTable)treeTop).setTableNumber(tableNumber);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			treeTop.setReferencedTableMap((JBitSet) getReferencedTableMap().clone());
 			all = true;
 		}
@@ -463,6 +486,7 @@ private ResultSetNode addNewNodes()
 		/* Generate the OrderByNode if a sort is still required for
 		 * the order by.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (int i=0; i < qec.size(); i++) {
             final OrderByList obl = qec.getOrderByList(i);
 
@@ -478,6 +502,7 @@ private ResultSetNode addNewNodes()
             final ValueNode offset = qec.getOffset(i);
             final ValueNode fetchFirst = qec.getFetchFirst(i);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
             if (offset != null || fetchFirst != null) {
                 ResultColumnList newRcl =
                         treeTop.getResultColumns().copyListAndObjects();
@@ -489,6 +514,7 @@ private ResultSetNode addNewNodes()
                         newRcl,
                         offset,
                         fetchFirst,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
                         qec.getHasJDBCLimitClause()[i].booleanValue(),
                         getContextManager());
             }
@@ -539,6 +565,7 @@ public void bindExpressions(FromList fromListParam)
 		** the types of the ? parameters come from the columns being inserted
 		** into in that case.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (topTableConstructor && ( ! isInsertSource()) )
 		{
 			/*
@@ -631,6 +658,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
 		// Get our final cost estimate based on the child estimates.
 		setCostEstimate( getFinalCostEstimate() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
 		// build up the tree.
 
@@ -641,6 +669,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		leftResultSet.generate(acb, mb);
 
 		/* Do we need a NormalizeResultSet above the left ResultSet? */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (! getResultColumns().isExactTypeAndLengthMatch(leftResultSet.getResultColumns()))
 		{
 			acb.pushGetResultSetFactoryExpression(mb);
@@ -654,6 +683,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		rightResultSet.generate(acb, mb);
 
 		/* Do we need a NormalizeResultSet above the right ResultSet? */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (! getResultColumns().isExactTypeAndLengthMatch(rightResultSet.getResultColumns()))
 		{
 			acb.pushGetResultSetFactoryExpression(mb);
@@ -674,10 +704,12 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		 *  arg7: close method
 		 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		mb.push(getResultSetNumber());
 		mb.push(getCostEstimate().rowCount());
 		mb.push(getCostEstimate().getEstimatedCost());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getUnionResultSet",
                 ClassName.NoPutResultSet, 5);
 	}
@@ -691,10 +723,13 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 	 *  the sum of the two child costs.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     CostEstimate getFinalCostEstimate()
 		throws StandardException
 	{
 		// If we already found it, just return it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 		if (getCandidateFinalCostEstimate() != null)
         {
 			return getCandidateFinalCostEstimate();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java
index 52d464537f..602a8d3cf7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.UntypedNullConstantNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -84,7 +85,10 @@ void generateConstant(ExpressionClassBuilder acb, MethodBuilder mb)
 	 *
 	 */
    @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DataValueDescriptor convertDefaultNode(DataTypeDescriptor typeDescriptor)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
 	throws StandardException
 	{
 		/*
@@ -99,6 +103,8 @@ DataValueDescriptor convertDefaultNode(DataTypeDescriptor typeDescriptor)
 	 * bindUntypedNullsToResultColumns is called.
 	 */
    @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode bindExpression(FromList fromList,
                              SubqueryList subqueryList,
                              List<AggregateNode> aggregates)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UpdateNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UpdateNode.java
index 76cb720c4f..684792b738 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UpdateNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UpdateNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.UpdateNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -123,6 +124,8 @@ public String toString()
 	}
 
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String statementToString()
 	{
 		return "UPDATE";
@@ -135,6 +138,8 @@ String statementToString()
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -171,7 +176,10 @@ public void bindStatement() throws StandardException
 	{
 		// We just need select privilege on the expressions
 		getCompilerContext().pushCurrentPrivType( Authorizer.SELECT_PRIV);
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         FromList fromList = new FromList(
                 getOptimizerFactory().doJoinOrderOptimization(),
                 getContextManager());
@@ -184,9 +192,11 @@ public void bindStatement() throws StandardException
 		// check if targetTable is a synonym
 		if (targetTableName != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 			TableName synonymTab = resolveTableToSynonym(this.targetTableName);
 			if (synonymTab != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
 				this.synonymTableName = targetTableName;
 				this.targetTableName  = synonymTab;
 			}
@@ -199,6 +209,7 @@ public void bindStatement() throws StandardException
         if ( inMatchingClause() ) { tagOriginalResultSetColumns(); }
 
         // collect lists of objects which will require privilege checks
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
         ArrayList<String>   explicitlySetColumns = getExplicitlySetColumns();
         List<CastNode> allCastNodes = collectAllCastNodes();
         tagPrivilegedNodes();
@@ -273,9 +284,12 @@ else if (cursorTargetTableName != null)
 		// and we already bound the cursor or the select,
 		// the table descriptor should always be found.
 		verifyTargetTable();
+//IC see: https://issues.apache.org/jira/browse/DERBY-714
+//IC see: https://issues.apache.org/jira/browse/DERBY-571
 
         // add UPDATE_PRIV on all columns on the left side of SET operators
         addUpdatePriv( explicitlySetColumns );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
 
 		/* OVERVIEW - We generate a new ResultColumn, CurrentRowLocation(), and
 		 * prepend it to the beginning of the source ResultColumnList.  This
@@ -338,6 +352,7 @@ else if (cursorTargetTableName != null)
 
 		/* Prepend CurrentRowLocation() to the select's result column list. */
 		if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             SanityManager.ASSERT((resultSet.getResultColumns() != null),	
 							  "resultColumns is expected not to be null at bind time");
 
@@ -346,6 +361,8 @@ else if (cursorTargetTableName != null)
 	 	** from list.
 		*/
         /*
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(resultSet.getFromList().size() == 1,
                     "More than one table in result from list in an update.");
@@ -353,6 +370,7 @@ else if (cursorTargetTableName != null)
         */
 		/* Normalize the SET clause's result column list for synonym */
 		if (synonymTableName != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 			normalizeSynonymColumns( resultSet.getResultColumns(), targetTable );
 		
 		/* Bind the original result columns by column name */
@@ -376,6 +394,9 @@ else if (cursorTargetTableName != null)
         // we have started using sequence generator to create unique ids
         //If we fix this jira for prior releases, we will need to maintain
         // the code for old way of generating unique ids.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
         if (dataDictionary.checkVersion( DataDictionary.DD_VERSION_DERBY_10_11, null )) {
             //Replace any DEFAULTs with the associated tree for the default if
             // allowed, otherwise throw an exception
@@ -387,6 +408,7 @@ else if (cursorTargetTableName != null)
         } else {
     		LanguageConnectionContext lcc = getLanguageConnectionContext();
     		if (lcc.getAutoincrementUpdate() == false)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3950
     			resultSet.getResultColumns().forbidOverrides(null);
         }
 
@@ -477,6 +499,7 @@ else if (cursorTargetTableName != null)
 		*/
 		if (!allColumns && needBaseColumns)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 			getCompilerContext().pushCurrentPrivType( Authorizer.NULL_PRIV);
 			try
 			{
@@ -519,6 +542,8 @@ else if (cursorTargetTableName != null)
 		}
 
         ValueNode rowLocationNode;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		if (needBaseColumns)
 		{
@@ -534,6 +559,7 @@ else if (cursorTargetTableName != null)
         else
         {
            rowLocationNode = new NumericConstantNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
                    TypeId.getBuiltInTypeId(Types.INTEGER), 0,
                    getContextManager());
         }
@@ -563,6 +589,7 @@ else if (cursorTargetTableName != null)
 
         // SQL 2011, section 6.10, SR 4b.
         SelectNode.checkNoWindowFunctions(resultSet, "<update source>");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6565
 
 		/* Bind the expressions */
 		super.bindExpressions();
@@ -574,6 +601,8 @@ else if (cursorTargetTableName != null)
 
         /* Bind the new ResultColumn */
         rowLocationColumn.bindResultColumnToExpression();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
 		resultColumnList.checkStorableExpressions();
 
@@ -582,6 +611,8 @@ else if (cursorTargetTableName != null)
 		 */
 		if (! resultColumnList.columnTypesAndLengthsMatch())
  		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             resultSet = new NormalizeResultSetNode(
                 resultSet, resultColumnList, null, true, getContextManager());
 			
@@ -597,6 +628,8 @@ else if (cursorTargetTableName != null)
 	 			 * order to bind the check constraints.
 	 			 */
 	 			int afterColumnsSize = afterColumns.size();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 afterColumns = new ResultColumnList(getContextManager());
 	 			ResultColumnList normalizedRCs = resultSet.getResultColumns();
 	 			for (int index = 0; index < afterColumnsSize; index++)
@@ -626,8 +659,11 @@ else if (cursorTargetTableName != null)
                 ( dataDictionary, targetTableDescriptor, afterColumns, resultColumnList, true, resultSet );
 
             /* Get and bind all constraints on the columns being updated */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             checkConstraints = bindConstraints(
                 dataDictionary,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 getOptimizerFactory(),
                 targetTableDescriptor,
                 null,
@@ -649,6 +685,9 @@ else if (cursorTargetTableName != null)
             {
                 deferred = true;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
             TransactionController tc = 
                     getLanguageConnectionContext().getTransactionCompile();
 
@@ -659,6 +698,7 @@ else if (cursorTargetTableName != null)
 		identitySequenceUUIDString = getUUIDofSequenceGenerator();
 
 		getCompilerContext().popCurrentPrivType();
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 
         getCompilerContext().removePrivilegeFilter( tagFilter );
 
@@ -683,6 +723,7 @@ int getPrivType()
      * of SET operators.
      */
     private ArrayList<String>   getExplicitlySetColumns()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
         throws StandardException
     {
         ArrayList<String>   result = new ArrayList<String>();
@@ -929,11 +970,14 @@ public ConstantAction makeConstantAction() throws StandardException
 		*/
 		if (targetTableDescriptor.getLockGranularity() == TableDescriptor.TABLE_LOCK_GRANULARITY)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             lckMode = TransactionController.MODE_TABLE;
 		}
 
 
 		return	getGenericConstantActionFactory().getUpdateConstantAction
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             ( targetTableDescriptor,
 			  tc.getStaticCompiledConglomInfo(heapConglomId),
 			  indicesToMaintain,
@@ -942,6 +986,8 @@ public ConstantAction makeConstantAction() throws StandardException
 			  indexNames,
 			  deferred,
 			  targetTableDescriptor.getUUID(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
               lckMode,
 			  false,
 			  changedColumnIds, null, null, 
@@ -955,6 +1001,9 @@ public ConstantAction makeConstantAction() throws StandardException
 				  readColsBitSet.getNumBitsSet(),			
 			  positionedUpdate,
 			  resultSet.isOneRowResultSet(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 			  autoincRowLocation,
 			  inMatchingClause(),
 			  identitySequenceUUIDString
@@ -1020,6 +1069,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 		// DERBY-827 this must be done in execute() since
 		// createResultSet() will only be called once.
 		generateCodeForTemporaryTable(acb);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
 
 		/* generate the parameters */
 		if(!isDependentTable)
@@ -1116,6 +1166,7 @@ protected final int getStatementType()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     FormatableBitSet getReadMap
 	(
 		DataDictionary		dd,
@@ -1128,9 +1179,11 @@ protected final int getStatementType()
 		boolean[]	needsDeferredProcessing = new boolean[1];
 		needsDeferredProcessing[0] = requiresDeferredProcessing();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<ConglomerateDescriptor> conglomerates = new ArrayList<ConglomerateDescriptor>();
 		relevantCdl = new ConstraintDescriptorList();
         relevantTriggers =  new TriggerDescriptorList();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		FormatableBitSet	columnMap = getUpdateReadMap
             (
@@ -1229,8 +1282,10 @@ private int[] getChangedColumnIds(ResultColumnList rcl)
 		DataDictionary		dd,
 		TableDescriptor				baseTable,
 		ResultColumnList			updateColumnList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         List<ConglomerateDescriptor>     conglomerates,
 		ConstraintDescriptorList	relevantConstraints,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         TriggerDescriptorList       relevantTriggers,
 		boolean[]					needsDeferredProcessing,
         ColumnDescriptorList    affectedGeneratedColumns
@@ -1265,6 +1320,7 @@ private int[] getChangedColumnIds(ResultColumnList rcl)
 		** columns where 1 or more columns in the index
 		** are going to be modified.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
         DMLModStatementNode.getXAffectedIndexes(
                 baseTable, updateColumnList, columnMap, conglomerates);
  
@@ -1335,6 +1391,7 @@ private int[] getChangedColumnIds(ResultColumnList rcl)
 			// after the soft-upgrade.
 			boolean in10_9_orHigherVersion = dd.checkVersion(DataDictionary.DD_VERSION_DERBY_10_9,null);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (TriggerDescriptor trd : relevantTriggers) {
 				if (in10_9_orHigherVersion) {
 					// See if we can avoid reading all the columns from the
@@ -1464,6 +1521,7 @@ private int[] getChangedColumnIds(ResultColumnList rcl)
 	)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         ResultColumnList     updateColumnList = updateSet.getResultColumns();
         ColumnDescriptorList generatedColumns = baseTable.getGeneratedColumns();
         HashSet<String>      updatedColumns = new HashSet<String>();
@@ -1487,6 +1545,7 @@ private int[] getChangedColumnIds(ResultColumnList rcl)
 
             // figure out if this generated column is affected by the
             // update
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (String mcn : mentionedColumnNames)
             {
                 if ( updatedColumns.contains( mcn ) )
@@ -1497,11 +1556,14 @@ private int[] getChangedColumnIds(ResultColumnList rcl)
                     
                     // If the generated column isn't in the update list yet,
                     // add it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3922
                     if ( !updatedColumns.contains( gc.getColumnName() ) )
                     {
                         addedGeneratedColumns.add( tableID, gc );
                         
                         // we will fill in the real value later on in parseAndBindGenerationClauses();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                         ValueNode dummy =
                             new UntypedNullConstantNode(getContextManager());
                         ResultColumn newResultColumn = new ResultColumn(
@@ -1538,12 +1600,14 @@ private	void	normalizeCorrelatedColumns( ResultColumnList rcl, FromTable fromTab
 		{ tableNameNode = ((CurrentOfNode) fromTable).getBaseCursorTargetTableName(); }
 		else { tableNameNode = makeTableName( null, fromTable.getBaseTableName() ); }
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn column : rcl)
 		{
 			ColumnReference	reference = column.getReference();
 
 			if ( (reference != null) && correlationName.equals( reference.getTableName() ) )
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 				reference.setQualifiedTableName( tableNameNode );
 			}
 		}
@@ -1558,6 +1622,7 @@ private	void	normalizeCorrelatedColumns( ResultColumnList rcl, FromTable fromTab
 	private void checkTableNameAndScrubResultColumns(ResultColumnList rcl) 
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (ResultColumn column : rcl)
 		{
 			boolean foundMatchingTable = false;			
@@ -1614,6 +1679,7 @@ private void checkTableNameAndScrubResultColumns(ResultColumnList rcl)
 	 * @exception StandardException		Thrown on error
 	 */
 	private	void normalizeSynonymColumns(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1784
     ResultColumnList    rcl, 
     FromTable           fromTable)
 		throws StandardException
@@ -1661,6 +1727,7 @@ private void forbidGenerationOverrides(
         for ( int i = 0; i < count; i++ )
         {
             ResultColumn rc = targetRCL.elementAt( i );
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             // defaults may already have been substituted for MERGE statements
             if ( rc.wasDefaultColumn() ) { continue; }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserAggregateDefinition.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserAggregateDefinition.java
index b54acd370b..908bdb9a96 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserAggregateDefinition.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserAggregateDefinition.java
@@ -100,10 +100,12 @@ public UserAggregateDefinition( AliasDescriptor alias )
 		try
 		{
 			CompilerContext cc = (CompilerContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				QueryTreeNode.getContext(CompilerContext.CONTEXT_ID);
             ClassFactory    classFactory = cc.getClassFactory();
             TypeCompilerFactory tcf = cc.getTypeCompilerFactory();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             Class<?>   derbyAggregatorInterface = classFactory.loadApplicationClass( "org.apache.derby.agg.Aggregator" );
             Class<?>   userAggregatorClass = classFactory.loadApplicationClass( _alias.getJavaClassName() );
 
@@ -126,6 +128,7 @@ public UserAggregateDefinition( AliasDescriptor alias )
                      );
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             Class<?>[] genericParameterTypes =
                 classFactory.getClassInspector().getGenericParameterTypes(
                     derbyAggregatorInterface, userAggregatorClass);
@@ -137,6 +140,7 @@ public UserAggregateDefinition( AliasDescriptor alias )
             AggregateAliasInfo  aai = (AggregateAliasInfo) _alias.getAliasInfo();
             DataTypeDescriptor  expectedInputType = DataTypeDescriptor.getType( aai.getForType() );
             DataTypeDescriptor  expectedReturnType = DataTypeDescriptor.getType( aai.getReturnType() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             Class<?>       expectedInputClass = getJavaClass( classFactory, expectedInputType );
             Class<?>       expectedReturnClass = getJavaClass( classFactory, expectedReturnType );
 
@@ -152,6 +156,7 @@ public UserAggregateDefinition( AliasDescriptor alias )
             for ( int i = 0; i < inputBounds.length; i++ )
             {
                 vetCompatibility
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     ( (Class<?>) inputBounds[ i ], expectedInputClass, SQLState.LANG_UDA_WRONG_INPUT_TYPE );
             }
             if ( genericParameterTypes[ INPUT_TYPE ] != null )
@@ -206,6 +211,8 @@ private void    vetCompatibility( Class<?> actualClass, Class<?> expectedClass,
 	 * Wrap the input operand in an implicit CAST node as necessary in order to
      * coerce it the correct type for the aggregator. Return null if no cast is necessary.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final ValueNode castInputValue
         ( ValueNode inputValue, ContextManager cm )
         throws StandardException
@@ -218,6 +225,8 @@ private void    vetCompatibility( Class<?> actualClass, Class<?> expectedClass,
         if ( expectedInputType.isExactTypeAndLengthMatch( actualInputType ) ) { return null; }
         else
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             return StaticMethodCallNode.makeCast(
                 inputValue, expectedInputType, cm);
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java
index 55c7055404..2cc02267bc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java
@@ -46,6 +46,7 @@ public class UserDefinedTypeCompiler extends BaseTypeCompiler
 	 */
 	public boolean convertible(TypeId otherType, boolean forDataTypeFunction)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
         if ( getTypeId().getBaseTypeId().isAnsiUDT() )
         {
             if ( !otherType.getBaseTypeId().isAnsiUDT() ) { return false; }
@@ -86,6 +87,7 @@ public boolean compatible(TypeId otherType)
 	public boolean storable(TypeId otherType, ClassFactory cf)
 	{
         if ( !otherType.isUserDefinedTypeId() ) { return false; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
 
         UserDefinedTypeIdImpl thisTypeID = (UserDefinedTypeIdImpl) getTypeId().getBaseTypeId();
         UserDefinedTypeIdImpl thatTypeID = (UserDefinedTypeIdImpl) otherType.getBaseTypeId();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
index fe020abbf7..70928e27bc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.UserTypeConstantNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -50,6 +51,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	This is also used to represent nulls in user types, which occurs
 	when NULL is inserted into or supplied as the update value for
    a user type column.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
  */
 class UserTypeConstantNode extends ConstantNode {
@@ -63,6 +66,8 @@ class UserTypeConstantNode extends ConstantNode {
 	** should be represented the same way.
 	*/
     Object  val;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
     UserTypeConstantNode(TypeId t, ContextManager cm)
             throws StandardException {
@@ -172,6 +177,8 @@ private static int getWidth(DataValueDescriptor dvd) {
     @Override
     boolean isNull()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         return (val == null);
 	}
 
@@ -187,6 +194,8 @@ boolean isNull()
 	 *
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     Object getConstantValueAsObject()
 	{
         return val;
@@ -231,8 +240,11 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		*/
 		
 		/* Are we generating a SQL null value? */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         if (val == null)
 	    {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 			acb.generateNull(mb, tc, getTypeServices().getCollationType());
 	    }
         // The code generated here is invoked when the generated class is constructed. However the prepared statement
@@ -271,11 +283,14 @@ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
 		 	*/
 			String typeName = getTypeId().getCorrespondingJavaTypeName();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             mb.push(val.toString());
 			mb.callMethod(VMOpcode.INVOKESTATIC, typeName, "valueOf", typeName, 1);
 
 			LocalField field = acb.newFieldDeclaration(Modifier.PRIVATE, fieldType);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2583
 			acb.generateDataValue(mb, tc, getTypeServices().getCollationType(), field);
 		}
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java
index 1f044449a1..8d1f1fd724 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.VTIDeferModPolicy
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -88,6 +89,7 @@ public static boolean deferIt( int statementType,
             if( statementType == DeferModification.UPDATE_STATEMENT)
             {
                 // Apply the columnRequiresDefer method to updated columns not in the where clause.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 for (String s : deferralSearch.columns) {
                     if (deferralControl.columnRequiresDefer(
                             statementType, s, false)) {
@@ -120,6 +122,7 @@ private VTIDeferModPolicy( FromVTI targetVTI,
         tableNumber = targetVTI.getTableNumber();
         if( statementType == DeferModification.UPDATE_STATEMENT && columnNames != null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
             columns.addAll(Arrays.asList(columnNames));
         }
     }
@@ -137,6 +140,7 @@ public Visitable visit(Visitable node)
                     String columnName = cr.getColumnName();
                     if( statementType == DeferModification.DELETE_STATEMENT)
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
                         if (columns.add(columnName))
                         {
                             if( deferralControl.columnRequiresDefer( statementType, columnName, true))
@@ -199,6 +203,7 @@ public boolean skipChildren(Visitable node)
 
     public boolean visitChildrenFirst(Visitable node)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
         return false;
     }
 } // end of class VTIDeferModPolicy
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ValueNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ValueNode.java
index 34fec7977e..13141b9793 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ValueNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ValueNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ValueNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -59,6 +60,8 @@ public abstract class ValueNode extends QueryTreeNode
 	** Binding will replace all untyped ValueNodes with typed ValueNodes
 	** when it figures out what their types should be.
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode(ContextManager cm) {
         super(cm);
 	}
@@ -72,6 +75,8 @@ final void setType(TypeId typeId,
        throws StandardException
        
        {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         setType(new DataTypeDescriptor(typeId, isNullable, maximumWidth));
        }
 
@@ -86,6 +91,8 @@ final void setType(TypeId typeId,
     {
         setType(
                 new DataTypeDescriptor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                             typeId,
                             precision,
                             scale,
@@ -124,6 +131,8 @@ public String toString()
 	 * @return	The DataTypeServices from this ValueNode.  This
 	 *		may be null if the node isn't bound yet.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DataTypeDescriptor getTypeServices()
 	{
 		return dataTypeServices;
@@ -178,6 +187,8 @@ public void setCollationInfo(int collationType, int collationDerivation)
 	 * @return	The TypeId from this ValueNode.  This
 	 *		may be null if the node isn't bound yet.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     TypeId getTypeId() throws StandardException
 	{
         DataTypeDescriptor dtd = getTypeServices();
@@ -201,6 +212,8 @@ protected final DataValueFactory getDataValueFactory() {
 	 * @return	This ValueNode's TypeCompiler
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final TypeCompiler getTypeCompiler() throws StandardException
 	{
 		return getTypeCompiler(getTypeId());
@@ -214,9 +227,12 @@ final TypeCompiler getTypeCompiler() throws StandardException
 	 *				ValueNode
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setType(DataTypeDescriptor dataTypeServices) throws StandardException
 	{
         // bind the type in case it is a user defined type. this will create a dependency on the udt.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         if ( dataTypeServices != null )
         {
             dataTypeServices = bindUserType( dataTypeServices );
@@ -256,6 +272,7 @@ protected final void setCollationUsingCompilationSchema()
 	 * @throws StandardException
 	 */
 	protected final void setCollationUsingCompilationSchema(int collationDerivation)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
 	throws StandardException {
         setCollationInfo(
                 getSchemaDescriptor(null, false).getCollationType(),
@@ -270,6 +287,8 @@ protected final void setCollationUsingCompilationSchema(int collationDerivation)
      * is not sourced by a column.
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getSourceResultColumn()
 	{
 		return null;
@@ -298,6 +317,7 @@ boolean getTransformed()
 
 	
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 		throws StandardException
 	{
@@ -319,6 +339,8 @@ ValueNode bindExpression(
 	 * @exception StandardException	Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode bindExpression(FromList fromList,
                              SubqueryList subqueryList,
                              List<AggregateNode> aggregates,
@@ -351,6 +373,8 @@ ValueNode bindExpression(FromList fromList,
 	 *
 	 * @exception StandardException	Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode genSQLJavaSQLTree()
 		throws StandardException
 	{
@@ -362,6 +386,8 @@ ValueNode genSQLJavaSQLTree()
 				"genSQLJavaSQLTree() only expected to be called on user types");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         final ContextManager cm = getContextManager();
         JavaValueNode stjvn = new SQLToJavaValueNode(this, cm);
 
@@ -391,6 +417,8 @@ ValueNode genSQLJavaSQLTree()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode preprocess(int numTables,
 								FromList outerFromList,
 								SubqueryList outerSubqueryList,
@@ -410,6 +438,7 @@ ValueNode preprocess(int numTables,
      * @throws StandardException if an error occurs during evaluation
      * @see ConstantExpressionVisitor
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4416
     ValueNode evaluateConstantExpressions() throws StandardException {
         // We normally don't know what the node evaluates to up front, so
         // don't do anything in the default implementation.
@@ -460,6 +489,8 @@ ValueNode eliminateNots(boolean underNotNode)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode genEqualsFalseTree()
 			throws StandardException
 	{
@@ -469,6 +500,7 @@ ValueNode genEqualsFalseTree()
 
         falseNode = new BooleanConstantNode(false, getContextManager());
         equalsNode = new BinaryRelationalOperatorNode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 BinaryRelationalOperatorNode.K_EQUALS,
                 this,
                 falseNode,
@@ -532,6 +564,8 @@ boolean verifyEliminateNots()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode putAndsOnTop()
 					throws StandardException
 	{
@@ -581,6 +615,8 @@ boolean verifyPutAndsOnTop()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode changeToCNF(boolean underTopAndNode)
 					throws StandardException
 	{
@@ -648,6 +684,8 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 	 *
 	 * @return the default schema name for an expression -- null
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getSchemaName() throws StandardException
 	{
 		return null;
@@ -668,6 +706,8 @@ String getSchemaName() throws StandardException
 	 *
 	 * @return the default table name for an expression -- null
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getTableName()
 	{
 		return null;
@@ -678,6 +718,7 @@ String getTableName()
 	 */
 	public boolean updatableByCursor()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-189
 		return false;
 	}
 
@@ -687,6 +728,8 @@ public boolean updatableByCursor()
 	 *
 	 * @return the default column name for an expression -- null.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getColumnName()
 	{
 		return null;
@@ -724,6 +767,8 @@ boolean isCloneable()
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode getClone() throws StandardException
 	{
 		if (SanityManager.DEBUG)
@@ -741,6 +786,8 @@ ValueNode getClone() throws StandardException
 	 * @param oldVN		The ValueNode to copy from.
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void copyFields(ValueNode oldVN) throws StandardException
 	{
 		dataTypeServices = oldVN.getTypeServices();
@@ -754,6 +801,8 @@ void copyFields(ValueNode oldVN) throws StandardException
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNode remapColumnReferencesToExpressions() throws StandardException
 	{
 		return this;
@@ -829,6 +878,7 @@ public	ValueNode	checkIsBoolean()
 		/* If the where clause is not a built-in type, then generate a bound 
 		 * conversion tree to a built-in type.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 		if (whereTypeId.userType())
 		{
 			whereClause = whereClause.genSQLJavaSQLTree();
@@ -895,6 +945,7 @@ final void generate(ActivationClassBuilder acb, MethodBuilder mb)
 	 * in specific cases, such as the RelationalOperators.
 	 */
 	public double selectivity(Optimizable optTable)
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 	throws StandardException
 	{
 		// Return 1 if additional predicates have been generated from this one.
@@ -1055,6 +1106,7 @@ private void updateMaps(JBitSet[] tableColMap, boolean[] eqOuterCols,
 		 * It is a good = for only the All array if
 		 * the right side is a column from this query block.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		if ((arg1 instanceof ConstantNode) || (arg1.requiresTypeFromContext()))
 		{
 			setValueCols(tableColMap, eqOuterCols,
@@ -1236,6 +1288,7 @@ boolean optimizableEqualityNode(Optimizable optTable,
 	 */
     boolean requiresTypeFromContext()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		return false;
 	}
 
@@ -1298,6 +1351,8 @@ boolean isParameterNode()
 	 * 
 	 * @throws StandardException 
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     abstract boolean isEquivalent(ValueNode other)
 		throws StandardException;
 
@@ -1317,6 +1372,7 @@ abstract boolean isEquivalent(ValueNode other)
      */
     boolean isSameNodeKind(ValueNode other) {
         // Default implementation does not look at kinds.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return other != null && other.getClass().equals(this.getClass());
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ValueNodeList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
index 28a420a37b..f3290edf31 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.ValueNodeList
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -40,6 +41,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * e.g. IN list, NOT IN list or BETWEEN in a DML statement.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 class ValueNodeList extends QueryTreeNodeVector<ValueNode>
 {
     ValueNodeList(ContextManager cm) {
@@ -54,6 +56,8 @@ class ValueNodeList extends QueryTreeNodeVector<ValueNode>
 	 * @exception StandardException		Thrown on error
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void addValueNode(ValueNode valueNode) throws StandardException
 	{
 		addElement(valueNode);
@@ -70,6 +74,7 @@ void addValueNode(ValueNode valueNode) throws StandardException
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     void bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
@@ -77,8 +82,10 @@ void bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggregate
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ValueNode vn = elementAt(index);
             vn = vn.bindExpression(fromList, subqueryList, aggregates);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
 			setElementAt(vn, index);
 		}
@@ -93,6 +100,8 @@ void bindExpression(FromList fromList, SubqueryList subqueryList, List<Aggregate
 	 *
 	 * @exception StandardException	Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void genSQLJavaSQLTrees()
 		throws StandardException
 	{
@@ -100,8 +109,10 @@ void genSQLJavaSQLTrees()
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ValueNode valueNode = elementAt(index);
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 			if (valueNode.getTypeId().userType())
 			{
 				setElementAt(valueNode.genSQLJavaSQLTree(), index);
@@ -145,6 +156,8 @@ void genSQLJavaSQLTrees()
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DataTypeDescriptor getDominantTypeServices() throws StandardException
 	{
 		DataTypeDescriptor	dominantDTS = null;
@@ -166,6 +179,7 @@ DataTypeDescriptor getDominantTypeServices() throws StandardException
 			ValueNode			valueNode;
 
             valueNode = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             // Skip nodes that take their type from the context, if they
             // haven't already been bound to a type.
@@ -176,6 +190,7 @@ DataTypeDescriptor getDominantTypeServices() throws StandardException
 
 			DataTypeDescriptor valueNodeDTS = valueNode.getTypeServices();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
 			if (valueNodeDTS.getTypeId().isStringTypeId())
 			{
 				if (firstCollationDerivation == -1)
@@ -205,6 +220,7 @@ else if (firstCollationType != valueNodeDTS.getCollationType())
 
 		//if following if returns true, then it means that we are dealing with 
 		//string operands.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
 		if (firstCollationDerivation != -1)
 		{
 			if (foundCollationMisMatch) {
@@ -232,12 +248,15 @@ else if (firstCollationType != valueNodeDTS.getCollationType())
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     DataTypeDescriptor getTypeServices() throws StandardException
 	{
 		int size = size();
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ValueNode valueNode = elementAt(index);
 			DataTypeDescriptor valueNodeDTS = valueNode.getTypeServices();
 
@@ -268,6 +287,7 @@ boolean allSamePrecendence(int precedence)
 		{
 			ValueNode			valueNode;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             valueNode = elementAt(index);
 			DataTypeDescriptor valueNodeDTS = valueNode.getTypeServices();
 
@@ -292,8 +312,11 @@ boolean allSamePrecendence(int precedence)
 	 * @param leftOperand	Check for compatibility against this parameter's type
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void compatible(ValueNode leftOperand) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         TypeId leftType = leftOperand.getTypeId();
         TypeCompiler leftTC = leftOperand.getTypeCompiler();
 
@@ -325,6 +348,8 @@ void compatible(ValueNode leftOperand) throws StandardException
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void comparable(ValueNode leftOperand) throws StandardException
 	{
 		int			 size = size();
@@ -333,16 +358,20 @@ void comparable(ValueNode leftOperand) throws StandardException
 		for (int index = 0; index < size; index++)
 		{
             valueNode = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			/*
 			** Can the types be compared to each other?  If not, throw an
 			** exception.
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2569
 			if (! leftOperand.getTypeServices().comparable(valueNode.getTypeServices(),
 									false,
 									getClassFactory()))
 			{
 				throw StandardException.newException(SQLState.LANG_NOT_COMPARABLE, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2668
 						leftOperand.getTypeServices().getSQLTypeNameWithCollation(),
 						valueNode.getTypeServices().getSQLTypeNameWithCollation()
 						);
@@ -363,6 +392,7 @@ boolean isNullable()
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (elementAt(index).getTypeServices().isNullable())
 			{
 				return true;
@@ -382,6 +412,7 @@ boolean containsParameterNode()
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (elementAt(index).requiresTypeFromContext())
 			{
 				return true;
@@ -401,6 +432,7 @@ boolean containsAllParameterNodes()
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (! (elementAt(index).requiresTypeFromContext()))
 			{
 				return false;
@@ -420,6 +452,7 @@ boolean containsAllConstantNodes()
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (! (elementAt(index) instanceof ConstantNode))
 			{
 				return false;
@@ -440,6 +473,7 @@ boolean containsOnlyConstantAndParamNodes()
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ValueNode vNode = elementAt(index);
 			if (!vNode.requiresTypeFromContext() &&
 			    !(vNode instanceof ConstantNode))
@@ -506,6 +540,7 @@ void sortInAscendingOrder(DataValueDescriptor judgeODV)
      * @param underNotNode whether or not we are under a NotNode
      * @see ValueNode#eliminateNots(boolean)
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
     void eliminateNots(boolean underNotNode) throws StandardException {
         for (int i = 0; i < size(); i++) {
             setElementAt(elementAt(i).eliminateNots(underNotNode), i);
@@ -519,6 +554,8 @@ void eliminateNots(boolean underNotNode) throws StandardException {
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void setParameterDescriptor(DataTypeDescriptor descriptor)
 						throws StandardException
 	{
@@ -526,7 +563,10 @@ void setParameterDescriptor(DataTypeDescriptor descriptor)
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ValueNode valueNode = elementAt(index);
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 			if (valueNode.requiresTypeFromContext())
 			{
 				valueNode.setType(descriptor);
@@ -545,6 +585,8 @@ void setParameterDescriptor(DataTypeDescriptor descriptor)
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void preprocess(int numTables,
 							FromList outerFromList,
 							SubqueryList outerSubqueryList,
@@ -570,6 +612,8 @@ void preprocess(int numTables,
 	 *
 	 * @exception StandardException			Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ValueNodeList remapColumnReferencesToExpressions()
 		throws StandardException
 	{
@@ -577,6 +621,7 @@ ValueNodeList remapColumnReferencesToExpressions()
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             setElementAt(elementAt(index).remapColumnReferencesToExpressions(),
                          index);
 		}
@@ -596,11 +641,13 @@ ValueNodeList remapColumnReferencesToExpressions()
      * @see ValueNode#isEquivalent(ValueNode)
      */
     boolean isEquivalent(ValueNodeList other) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4600
         if (size() != other.size()) {
             return false;
         }
 
         for (int i = 0; i < size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ValueNode vn1 = elementAt(i);
             ValueNode vn2 = other.elementAt(i);
             if (!vn1.isEquivalent(vn2)) {
@@ -624,6 +671,7 @@ boolean isConstantExpression()
 		{
 			boolean retcode;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             retcode = elementAt(index).isConstantExpression();
 			if (! retcode)
 			{
@@ -643,6 +691,7 @@ boolean constantExpression(PredicateList whereClause)
 		{
 			boolean retcode;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             retcode = elementAt(index).constantExpression(whereClause);
 			if (! retcode)
 			{
@@ -679,6 +728,8 @@ boolean constantExpression(PredicateList whereClause)
 	 * @exception StandardException		Thrown on error
 	 */
     boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
+//IC see: https://issues.apache.org/jira/browse/DERBY-582
 		throws StandardException
 	{
 		/* We stop here when only considering simple predicates
@@ -690,6 +741,7 @@ boolean categorize(JBitSet referencedTabs, boolean simplePredsOnly)
 
 		for (int index = 0; index < size; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             pushable = elementAt(index).categorize(referencedTabs, simplePredsOnly) &&
 					   pushable;
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java
index d4c044b7ae..13809487d1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.VarbitConstantNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -30,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public final class VarbitConstantNode extends BitConstantNode
 {
     // Allowed kinds
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     final static int K_VAR = 0;
     final static int K_LONGVAR = 1;
     final static int K_BLOB = 2;
@@ -54,6 +56,7 @@ public final class VarbitConstantNode extends BitConstantNode
 
         switch (t.getJDBCTypeId()) {
             case Types.VARBINARY:
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 kind = K_VAR;
                 break;
             case Types.LONGVARBINARY:
@@ -75,6 +78,7 @@ public final class VarbitConstantNode extends BitConstantNode
             int bitLength,
             ContextManager cm) throws StandardException {
         super(hexValue, bitLength, cm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         kind = K_VAR;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java
index a1e590d48a..f3395798f5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.VerifyAggregateExpressionsVisitor
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -38,6 +39,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * an aggregate are grouping columns.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class VerifyAggregateExpressionsVisitor implements Visitor
 {
 	private GroupByList groupByList;
@@ -76,6 +79,7 @@ public Visitable visit(Visitable node)
 		
 			if (groupByList == null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-18
 				throw StandardException.newException(SQLState.LANG_INVALID_COL_REF_NON_GROUPED_SELECT_LIST, cr.getSQLColumnName());
 			}
 
@@ -147,6 +151,7 @@ public boolean stopTraversal()
 
 	public boolean visitChildrenFirst(Visitable node)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4421
 		return false;
 	}
 }	
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java
index 24886c7b3b..ed4d710696 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java
@@ -2,6 +2,7 @@
 
    Derby - Class org.apache.derby.impl.sql.compile.VirtualColumnNode
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1377
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
@@ -37,6 +38,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class VirtualColumnNode extends ValueNode
 {
 	/* A VirtualColumnNode contains a pointer to the immediate child result
@@ -62,6 +65,8 @@ class VirtualColumnNode extends ValueNode
 	 * @param columnId			The columnId within the current Row
      * @param cm                The context manager
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     VirtualColumnNode(ResultSetNode sourceResultSet,
                       ResultColumn sourceColumn,
                       int columnId,
@@ -82,6 +87,8 @@ class VirtualColumnNode extends ValueNode
 	 * @param depth		The depth of this node in the tree
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     void printSubNodes(int depth)
 	{
 		if (SanityManager.DEBUG)
@@ -90,6 +97,9 @@ void printSubNodes(int depth)
 
 			printLabel(depth, "sourceColumn: ");
 		    sourceColumn.treePrint(depth + 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4679
+//IC see: https://issues.apache.org/jira/browse/DERBY-2526
+//IC see: https://issues.apache.org/jira/browse/DERBY-3023
             printLabel(depth, "sourceResultSet: ");
             sourceResultSet.treePrint(depth + 1);
 		}
@@ -100,6 +110,8 @@ void printSubNodes(int depth)
 	 *
 	 * @return ResultSetNode	
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultSetNode getSourceResultSet()
 	{
 		return sourceResultSet;
@@ -110,6 +122,8 @@ ResultSetNode getSourceResultSet()
 	 *
 	 * @return ResultSetNode	
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getSourceColumn()
 	{
 		return sourceColumn;
@@ -126,6 +140,8 @@ ResultColumn getSourceColumn()
 	 * 		derived column), it returns NULL.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getTableName()
 	{
 		return sourceColumn.getTableName();
@@ -142,6 +158,8 @@ String getTableName()
 	 *		If the column is not in a schema (i.e. derived column), it returns NULL.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     String getSchemaName() throws StandardException
 	{
 		return sourceColumn.getSchemaName();
@@ -165,6 +183,8 @@ public boolean updatableByCursor()
 	 * @return ResultSetNode	
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     ResultColumn getSourceResultColumn()
 	{
 		return sourceColumn;
@@ -278,6 +298,8 @@ protected int getOrderableVariantType() throws StandardException
 	 *		may be null if the node isn't bound yet.
 	 */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     final public DataTypeDescriptor getTypeServices()
 	{
         return sourceColumn.getTypeServices();
@@ -291,6 +313,7 @@ final public void setType(DataTypeDescriptor dtd) throws StandardException
     
     boolean isEquivalent(ValueNode o) throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (isSameNodeKind(o)) {
     		VirtualColumnNode other = (VirtualColumnNode)o;
     		return sourceColumn.isEquivalent(other.sourceColumn);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowDefinitionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowDefinitionNode.java
index 70a07a059c..93dfe6a726 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowDefinitionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowDefinitionNode.java
@@ -50,6 +50,8 @@ public final class WindowDefinitionNode extends WindowNode
      * @param cm          The context manager
      * @exception StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     WindowDefinitionNode(String         windowName,
                          OrderByList    orderByList,
                          ContextManager cm) throws StandardException {
@@ -110,6 +112,7 @@ public void printSubNodes(int depth)
      * @return an existing window definition from wl, if 'this' is equivalent
      * to a window in wl.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     WindowDefinitionNode findEquivalentWindow(WindowList wl) {
         for (WindowDefinitionNode old : wl) {
             if (isEquivalent(old)) {
@@ -143,6 +146,7 @@ private boolean isEquivalent(WindowDefinitionNode other) {
     /**
      * @return the order by list of this window definition if any, else null.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     OrderByList getOrderByList() {
         return orderByList;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowFunctionNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowFunctionNode.java
index 37805ea584..d3660c731a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowFunctionNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowFunctionNode.java
@@ -51,6 +51,8 @@ public abstract class WindowFunctionNode extends UnaryOperatorNode
      * @param cm context manager
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     WindowFunctionNode(
             ValueNode op, String functionName, WindowNode w, ContextManager cm)
             throws StandardException {
@@ -87,6 +89,7 @@ boolean constantExpression(PredicateList whereClause)
     /**
      * @return window associated with this window function
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     WindowNode getWindow() {
         return window;
     }
@@ -96,6 +99,7 @@ WindowNode getWindow() {
      * Set window associated with this window function call.
      * @param wdn window definition
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     void setWindow(WindowDefinitionNode wdn) {
         this.window = wdn;
     }
@@ -107,6 +111,7 @@ void setWindow(WindowDefinitionNode wdn) {
      */
     @Override
     ValueNode bindExpression(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
         throws StandardException
     {
@@ -134,6 +139,7 @@ ValueNode bindExpression(
      */
     private WindowDefinitionNode definedWindow(WindowList windows,
                                                String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (WindowDefinitionNode wdn : windows) {
             if (wdn.getName().equals(name)) {
                 return wdn;
@@ -172,6 +178,7 @@ public void printSubNodes(int depth)
      *
      * @exception StandardException         Thrown on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     ValueNode replaceCallsWithColumnReferences(ResultColumnList rcl,
                                                       int tableNumber)
         throws StandardException
@@ -185,6 +192,8 @@ ValueNode replaceCallsWithColumnReferences(ResultColumnList rcl,
             String                  generatedColName;
             CompilerContext         cc = getCompilerContext();
             generatedColName ="SQLCol" + cc.getNextColumnNumber();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             generatedRC = new ResultColumn(
                     generatedColName, this, getContextManager());
             generatedRC.markGenerated();
@@ -239,6 +248,7 @@ ValueNode replaceCallsWithColumnReferences(ResultColumnList rcl,
      *
      * @return the column reference
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     ColumnReference getGeneratedRef()
     {
         return generatedRef;
@@ -252,6 +262,7 @@ ColumnReference getGeneratedRef()
      *
      * @exception StandardException on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
     ValueNode getNewNullResultExpression()
         throws StandardException
     {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowList.java
index b8a77bd640..caf0ed5014 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowList.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 class WindowList extends QueryTreeNodeVector<WindowDefinitionNode>
 {
     WindowList(ContextManager cm) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowNode.java
index ea0193c7ec..2d37627c9d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowNode.java
@@ -46,6 +46,8 @@ public abstract class WindowNode extends QueryTreeNode
      *
      * @exception StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     WindowNode(String windowName, ContextManager cm) throws StandardException
     {
         super(cm);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowReferenceNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowReferenceNode.java
index 80ceff56c7..be4d1a98d2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowReferenceNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowReferenceNode.java
@@ -37,6 +37,8 @@ public final class WindowReferenceNode extends WindowNode
      *
      * @exception StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
     WindowReferenceNode(String windowName, ContextManager cm)
         throws StandardException
     {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java
index 7f5f21fca2..71d1175cf9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java
@@ -36,6 +36,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * A WindowResultSetNode represents a result set for a window partitioning on a
  * select. Modeled on the code in GroupByNode.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 class WindowResultSetNode extends SingleChildResultSetNode
 {
     /**
@@ -81,6 +83,7 @@ class WindowResultSetNode extends SingleChildResultSetNode
         ** nodes above it now point to us).  Map our RCL to its columns.
         */
         newBottomRCL = childResult.getResultColumns().copyListAndObjects();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         setResultColumns( childResult.getResultColumns() );
         childResult.setResultColumns(newBottomRCL);
 
@@ -103,7 +106,10 @@ private void addNewPRNode()
         ** Get the new PR, put above the WindowResultSetNode.
         */
         ResultColumnList rclNew = new ResultColumnList(getContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         for (ResultColumn rc : getResultColumns())
         {
             if (!rc.isGenerated()) {
@@ -115,7 +121,10 @@ private void addNewPRNode()
         // remember it in the new RCL as well. After the sort is done it will
         // have to be projected out upstream.
         rclNew.copyOrderBySelect(getResultColumns());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         parent = new ProjectRestrictNode(this, // child
                                          rclNew,
                                          null, // havingClause,
@@ -136,10 +145,12 @@ private void addNewPRNode()
          */
         setResultColumns( new ResultColumnList(getContextManager()) );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         // Add all referenced columns in select list to windowing node's RCL
         // and substitute references in original node to point to the Windowing
         // result set. (modelled on GroupByNode's action for addUnAggColumns)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         CollectNodesVisitor<ColumnReference> getCRVisitor =
             new CollectNodesVisitor<ColumnReference>(ColumnReference.class);
 
@@ -147,6 +158,7 @@ private void addNewPRNode()
 
         // Find all unique columns referenced and add those to windowing result
         // set.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<ValueNode> uniqueCols = new ArrayList<ValueNode>();
         for (ColumnReference cr : getCRVisitor.getList()) {
             if (!colRefAlreadySeen(uniqueCols, cr)) {
@@ -165,10 +177,12 @@ private void addNewPRNode()
 
         // Add any virtual columns to windowing result.
         uniqueCols.addAll(getVCVisitor.getList());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         ResultColumnList bottomRCL  = childResult.getResultColumns();
         ResultColumnList windowingRCL = getResultColumns();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6565
         for (ValueNode crOrVcn : uniqueCols) {
             ResultColumn newRC = new ResultColumn(
                     "##UnWindowingColumn",
@@ -182,6 +196,8 @@ private void addNewPRNode()
             newRC.setVirtualColumnId(bottomRCL.size());
 
             // now add this column to the windowing result column list
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             ResultColumn wRC = new ResultColumn(
                     "##UnWindowingColumn",
                     crOrVcn,
@@ -195,6 +211,8 @@ private void addNewPRNode()
              ** Reset the original node to point to the
              ** Windowing result set.
              */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             VirtualColumnNode vc = new VirtualColumnNode(
                     this, // source result set.
                     wRC,
@@ -219,6 +237,7 @@ private boolean colRefAlreadySeen(List<ValueNode> uniqueColRefs,
                                       ColumnReference cand)
             throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6565
         for (ValueNode uniqueColRef : uniqueColRefs) {
             ColumnReference cr = (ColumnReference) uniqueColRef;
 
@@ -243,6 +262,8 @@ private void addNewColumns() throws StandardException {
          */
         ResultColumnList bottomRCL  = childResult.getResultColumns();
         ResultColumnList windowingRCL = getResultColumns();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         ReplaceWindowFuncCallsWithCRVisitor replaceCallsVisitor =
             new ReplaceWindowFuncCallsWithCRVisitor(
@@ -252,6 +273,7 @@ private void addNewColumns() throws StandardException {
         parent.getResultColumns().accept(replaceCallsVisitor);
 
         for (WindowFunctionNode winFunc : windowFuncCalls) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6565
 
             if (SanityManager.DEBUG) {
                 SanityManager.ASSERT(
@@ -264,6 +286,8 @@ private void addNewColumns() throws StandardException {
                 (WindowDefinitionNode)winFunc.getWindow();
 
             if (funcWindow == wdn) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 ResultColumn newRC = new ResultColumn(
                     "##winFuncResult",
                     winFunc.getNewNullResultExpression(),
@@ -279,6 +303,8 @@ private void addNewColumns() throws StandardException {
                 ** The Windowing Node result was created when we called
                 ** ReplaceWindowFuncCallsWithCRVisitor.
                 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 ColumnReference newColumnRef = new ColumnReference(
                         newRC.getName(), null, getContextManager());
 
@@ -323,6 +349,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
         // Get the final cost estimate from the child.
         setCostEstimate( childResult.getFinalCostEstimate() );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         acb.pushGetResultSetFactoryExpression(mb);
 
@@ -334,6 +361,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
          */
 
         for (int index = rclSize-1; index >= 0; index--) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
             ResultColumn rc = getResultColumns().elementAt(index);
             ValueNode expr = rc.getExpression();
 
@@ -357,6 +385,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
 
         /* row allocator */
         mb.push(acb.addItem(getResultColumns().buildRowTemplate())); // arg 3
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
 
         mb.push(getResultSetNumber()); //arg 4
 
@@ -366,6 +395,7 @@ void generate(ActivationClassBuilder acb, MethodBuilder mb)
         /* There is no restriction at this level, we just want to pass null. */
         mb.pushNull(ClassName.GeneratedMethod); // arg 6
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6464
         mb.push(getCostEstimate().rowCount()); //arg 7
         mb.push(getCostEstimate().getEstimatedCost()); // arg 8
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/XMLOptTrace.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/XMLOptTrace.java
index 5d850f969b..0d75e50d07 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/XMLOptTrace.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/compile/XMLOptTrace.java
@@ -55,6 +55,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Optimizer tracer which produces output in an xml format.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 class   XMLOptTrace implements  OptTrace
 {
     ////////////////////////////////////////////////////////////////////////
@@ -160,6 +161,7 @@ class   XMLOptTrace implements  OptTrace
         "        'FILE_URL',\n" +
         "        'planCost',\n" +
         "        asList( '" + STMT_TEXT + "', '" + STMT_ID + "', '" + QBLOCK_ID + "' ),\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         "        asList( '" + PC_COMPLETE + "', '" + PC_SUMMARY + "', '" + PC_TYPE + "', '" +
         CE_ESTIMATED_COST + "', '" + CE_ROW_COUNT + "' )\n" +
         "     )\n" +
@@ -173,6 +175,7 @@ class   XMLOptTrace implements  OptTrace
 
     public  static  final   class   QueryBlock
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         final   int                 queryBlockID;
         final   OptimizableList optimizableList;
         final   Element         queryBlockElement;
@@ -244,6 +247,7 @@ public  XMLOptTrace()
     public  void    traceStartStatement( String statementText )
     {
         _currentStatementID++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         _maxQueryID = 0;
         _currentQueryBlock = null;
         _queryBlockStack = new Stack<QueryBlock>();
@@ -274,6 +278,7 @@ public  void    traceStartQueryBlock( long timeOptimizationStarted, int optimize
 
                 if ( _cm == null )
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                     _cm = ((QueryTreeNode) opt).getContextManager();
                     _lcc = (LanguageConnectionContext) _cm.getContext( LanguageConnectionContext.CONTEXT_ID );
                 }
@@ -331,10 +336,12 @@ public  void    traceShortCircuiting( boolean timeExceeded, Optimizable thisOpt,
     public  void    traceSkippingJoinOrder( int nextOptimizable, int joinPosition, int[] proposedJoinOrder, JBitSet assignedTableMap )
     {
         Optimizable opt = _currentQueryBlock.optimizableList.getOptimizable( nextOptimizable );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
         Element skip = formatSkip
             (
              _currentQueryBlock.queryBlockElement, QBLOCK_SKIP,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
              "Useless join order. " + getOptimizableName( opt ).getFullSQLName() + " depends on tables after it in the join order"
              );
         formatJoinOrder( skip, proposedJoinOrder );
@@ -345,6 +352,7 @@ public  void    traceUserJoinOrderOptimized() {}
     
     public  void    traceJoinOrderConsideration( int joinPosition, int[] proposedJoinOrder, JBitSet assignedTableMap )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         _currentQueryBlock.currentJoinsElement = createElement( _currentQueryBlock.queryBlockElement, JO, null );
         _currentQueryBlock.currentJoinOrder = proposedJoinOrder;
 
@@ -367,6 +375,7 @@ public  void    traceCostWithSortAvoidance( CostEstimate currentSortAvoidanceCos
     {
         formatPlanCost
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
              _currentQueryBlock.currentJoinsElement, "withSortAvoidance",
              _currentQueryBlock.currentJoinOrder, Optimizer.SORT_AVOIDANCE_PLAN, currentSortAvoidanceCost
              );
@@ -379,6 +388,7 @@ public  void    traceSortNeededForOrdering( int planType, RequiredRowOrdering re
     public  void    traceRememberingBestJoinOrder
         ( int joinPosition, int[] bestJoinOrder, int planType, CostEstimate planCost, JBitSet assignedTableMap )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         if ( _currentQueryBlock.currentBestPlan != null )
         { _currentQueryBlock.queryBlockElement.removeChild( _currentQueryBlock.currentBestPlan ); }
         _currentQueryBlock.currentBestPlan = formatPlanCost
@@ -409,6 +419,7 @@ public  void    traceOptimizingJoinNode() {}
     
     public  void    traceConsideringJoinStrategy( JoinStrategy js, int tableNumber )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         _currentQueryBlock.currentDecorationStrategy = js;
     }
     
@@ -420,6 +431,7 @@ public  void    traceConsideringConglomerate( ConglomerateDescriptor cd, int tab
         Optimizable opt = getOptimizable( tableNumber );
         
         _currentQueryBlock.currentDecoration = createElement( _currentQueryBlock.currentJoinsElement, DECORATION, null );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
         _currentQueryBlock.currentDecoration.setAttribute( DECORATION_CONGLOM_NAME, cd.getConglomerateName() );
         _currentQueryBlock.currentDecoration.setAttribute( DECORATION_TABLE_NAME, getOptimizableName( opt ).toString() );
@@ -434,6 +446,7 @@ public  void    traceConsideringConglomerate( ConglomerateDescriptor cd, int tab
 
             for ( int i = 0; i < keyColumns.length; i++ )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 createElement( _currentQueryBlock.currentDecoration, DECORATION_KEY, columnNames[ keyColumns[ i ] - 1 ] );
             }
 		}
@@ -476,6 +489,7 @@ public  void    traceRememberingBestUnknownAccessPathSubstring( AccessPath ap, i
          double    extraNonQualifierSelectivity
          )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         Element cost = createElement( _currentQueryBlock.currentDecoration, DECORATION_CONGLOM_COST, null );
         cost.setAttribute( "name", cd.getConglomerateName() );
 
@@ -520,6 +534,7 @@ public  void    printToWriter( PrintWriter out )
     /** Get the Optimizable with the given tableNumber */
     private Optimizable getOptimizable( int tableNumber )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         for ( int i = 0; i < _currentQueryBlock.optimizableList.size(); i++ )
         {
             Optimizable candidate = _currentQueryBlock.optimizableList.getOptimizable( i );
@@ -539,19 +554,23 @@ private TableName    getOptimizableName( Optimizable optimizable )
                 ProjectRestrictNode prn = (ProjectRestrictNode) optimizable;
                 TableDescriptor td = 
                     ((FromBaseTable) prn.getChildResult()).getTableDescriptor();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 return makeTableName( td.getSchemaName(), td.getName(), _cm );
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
             else if ( OptimizerImpl.isTableFunction( optimizable ) )
             {
                 ProjectRestrictNode prn = (ProjectRestrictNode) optimizable;
                 AliasDescriptor ad =
                     ((StaticMethodCallNode) ((FromVTI) prn.getChildResult()).
                         getMethodCall() ).ad;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 return makeTableName( ad.getSchemaName(), ad.getName(), _cm );
             }
             else if ( isFromTable( optimizable ) )
             {
                 TableName   retval = ((FromTable) ((ProjectRestrictNode) optimizable).getChildResult()).getTableName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
                 if ( retval !=  null ) { return retval; }
             }
@@ -567,6 +586,7 @@ else if ( isFromTable( optimizable ) )
         String  nodeClass = optimizable.getClass().getName();
         String  unqualifiedName = nodeClass.substring( nodeClass.lastIndexOf( "." ) + 1 );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         return makeTableName( null, unqualifiedName, _cm );
     }
 
@@ -592,6 +612,8 @@ private boolean isFromTable( Optimizable optimizable )
 
     /** Make a TableName */
     private TableName   makeTableName(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             String schemaName, String unqualifiedName, ContextManager cm )
     {
         TableName result = new TableName(schemaName, unqualifiedName, cm);
@@ -641,6 +663,7 @@ private Element formatPlanCost( Element parent, String type, int[] planOrder, in
         if ( isComplete( planOrder ) ) { cost.setAttribute( PC_COMPLETE, "true" ); }
         if ( planType == Optimizer.SORT_AVOIDANCE_PLAN ) { cost.setAttribute( PC_AVOID_SORT, "true" ); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         createElement( cost, PC_SUMMARY, formatPlanSummary( planOrder, planType ) );
         formatCost( cost, raw );
 
@@ -652,6 +675,7 @@ private boolean isComplete( int[] joinOrder )
     {
         if ( joinOrder == null ) { return false; }
         if ( joinOrder.length < _currentQueryBlock.optimizableList.size() ) { return false; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
         for ( int i = 0; i < joinOrder.length; i++ )
         {
@@ -687,7 +711,9 @@ private void    formatJoinOrder( Element parent, int[] proposedJoinOrder )
                 int     optimizableNumber = proposedJoinOrder[ idx ];
                 if ( optimizableNumber >= 0 )
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                     Optimizable optimizable = _currentQueryBlock.optimizableList.getOptimizable( optimizableNumber );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                     createElement( parent, JO_SLOT, getOptimizableName( optimizable ).getFullSQLName() );
                 }
             }
@@ -711,6 +737,7 @@ private void    formatJoinOrder( Element parent, int[] proposedJoinOrder )
      */
     private String  formatPlanSummary( int[] planOrder, int planType )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         try {
             OptimizerPlan   plan = null;
         
@@ -728,6 +755,7 @@ private String  formatPlanSummary( int[] planOrder, int planType )
             {
                 int     listIndex = planOrder[ i ];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 if ( listIndex >= _currentQueryBlock.optimizableList.size() )
                 {
                     // should never happen!
@@ -744,6 +772,7 @@ private String  formatPlanSummary( int[] planOrder, int planType )
                     ((StaticMethodCallNode) ((FromVTI) ((ProjectRestrictNode) optimizable).getChildResult()).getMethodCall()).ad :
                     ap.getConglomerateDescriptor();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
                 OptimizerPlan   current =   (utd == null) ?
                     new OptimizerPlan.DeadEnd( getOptimizableName( optimizable ).toString() ) :
                     OptimizerPlan.makeRowSource( utd, _lcc.getDataDictionary() );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java
index cca8293ba8..e91eb37361 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java
@@ -56,6 +56,7 @@ class GenericAuthorizer implements Authorizer
 
 	private final LanguageConnectionContext lcc;
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
     GenericAuthorizer(LanguageConnectionContext lcc)
 		 throws StandardException
 	{
@@ -77,6 +78,7 @@ private boolean connectionMustRemainReadOnly()
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 	  Used for operations that do not involve tables or routines.
      
 	  @see Authorizer#authorize
@@ -132,9 +134,11 @@ public void authorize( Activation activation, int operation) throws StandardExce
 		}
         if( activation != null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             List<StatementPermission> requiredPermissionsList =
                 activation.getPreparedStatement().getRequiredPermissionsList();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
             authorize( requiredPermissionsList, activation );
         }
     }
@@ -152,6 +156,7 @@ public void authorize( Activation activation, int operation) throws StandardExce
         // requiredPermissionsList for Database Owner
         if( requiredPermissionsList != null    && 
             !requiredPermissionsList.isEmpty() && 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             !lcc.getCurrentUserId(activation).equals(
                                                      dd.getAuthorizationDatabaseOwner()))
         {
@@ -185,6 +190,7 @@ public void authorize( Activation activation, int operation) throws StandardExce
                 try 
                 {
                     // perform the permission checking
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     for (StatementPermission rp : requiredPermissionsList)
                     {
                         rp.check(lcc, false, activation);
@@ -253,6 +259,7 @@ private int getDefaultAccessLevel() throws StandardException
 	{
 		PersistentSet tc = lcc.getTransactionExecute();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         String modeS = PropertyUtil.getServiceProperty(
 									tc,
 									Property.DEFAULT_CONNECTION_MODE_PROPERTY);
@@ -278,7 +285,9 @@ else if(StringUtil.SQLEqualsIgnoreCase(modeS, Property.FULL_ACCESS))
 	private boolean userOnAccessList(String listName) throws StandardException
 	{
 		PersistentSet tc = lcc.getTransactionExecute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         String listS = PropertyUtil.getServiceProperty(tc, listName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         return IdUtil.idOnList(lcc.getSessionUserId(),listS);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
index cf3636fd91..56e3e2e2bf 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
@@ -333,7 +333,9 @@ be more appropriate to have it in a separate context (LanguageTransactionContext
      String dbname)
          throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         super(cm, org.apache.derby.shared.common.reference.ContextId.LANG_CONNECTION);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         acts = new ArrayList<Activation>();
         tran = tranCtrl;
 
@@ -366,6 +368,7 @@ be more appropriate to have it in a separate context (LanguageTransactionContext
                                        Property.MIN_LOCKS_ESCALATION_THRESHOLD,
                                        Integer.MAX_VALUE,
                                        Property.DEFAULT_LOCKS_ESCALATION_THRESHOLD);                                                             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         stmtValidators = new ArrayList<ExecutionStmtValidator>();
         triggerExecutionContexts = new ArrayList<TriggerExecutionContext>();
         triggerTables = new ArrayList<TableDescriptor>();
@@ -381,6 +384,7 @@ be more appropriate to have it in a separate context (LanguageTransactionContext
     public void initialize() throws StandardException
     {
         interruptedException = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         sessionUser = IdUtil.getUserAuthorizationId(userName);
         //
         //Creating the authorizer authorizes the connection.
@@ -393,6 +397,7 @@ public void initialize() throws StandardException
         */
         if (SanityManager.DEBUG)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             if (getSessionUserId() == null)
             {
                 SanityManager.THROWASSERT("User name is null," +
@@ -428,6 +433,7 @@ protected SchemaDescriptor initDefaultSchemaDescriptor()
             SchemaDescriptor sd =
                 dd.getSchemaDescriptor(
                     getSessionUserId(), getTransactionCompile(), false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
             if (sd == null) {
                 sd = new SchemaDescriptor(
@@ -484,6 +490,7 @@ public boolean getLogQueryPlan()
      */
     public boolean usesSqlAuthorization()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
         return getDataDictionary().usesSqlAuthorization();
     }
 
@@ -499,8 +506,11 @@ public int getLockEscalationThreshold()
      * Add the activation to those known about by this connection.
      */
     public void addActivation(Activation a) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-418
+//IC see: https://issues.apache.org/jira/browse/DERBY-1142
         throws StandardException {
         acts.add(a);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2150
 
         if (acts.size() > maxActsSize) {
             maxActsSize = acts.size();
@@ -526,6 +536,7 @@ public void closeUnusedActivations()
                 if (i >= acts.size())
                     continue;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 Activation a1 = acts.get(i);
                 if (!a1.isInUse()) {
                     a1.close();
@@ -547,6 +558,8 @@ public void closeUnusedActivations()
      * Make a note that some activations are marked unused
      */
     public void notifyUnusedActivation() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-418
+//IC see: https://issues.apache.org/jira/browse/DERBY-1142
         unusedActs = true;
     }
 
@@ -584,6 +597,7 @@ public void addDeclaredGlobalTempTable(TableDescriptor td)
 
         if (allDeclaredGlobalTempTables == null)
             allDeclaredGlobalTempTables = new ArrayList<TempTableInfo>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         allDeclaredGlobalTempTables.add(tempTableInfo);
     }
@@ -621,6 +635,7 @@ public boolean dropDeclaredGlobalTempTable(String tableName)
                 allDeclaredGlobalTempTables.remove(
                         allDeclaredGlobalTempTables.indexOf(tempTableInfo));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 if (allDeclaredGlobalTempTables.isEmpty()) {
                     allDeclaredGlobalTempTables = null;
                 }
@@ -662,6 +677,7 @@ private void tempTablesReleaseSavepointLevels()
         {
             TempTableInfo tempTableInfo = 
                 allDeclaredGlobalTempTables.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
             if (tempTableInfo.getDroppedInSavepointLevel() > 
                     currentSavepointLevel)
@@ -713,6 +729,7 @@ private void tempTablesAndCommit(boolean in_xa_transaction)
         {
             TempTableInfo tempTableInfo = 
                 allDeclaredGlobalTempTables.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
             if (tempTableInfo.getDroppedInSavepointLevel() != -1)
             {
@@ -746,6 +763,7 @@ private void tempTablesAndCommit(boolean in_xa_transaction)
         for (int i=0; i<allDeclaredGlobalTempTables.size(); i++)
         {
             TableDescriptor td = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 allDeclaredGlobalTempTables.
                                       get(i).getTableDescriptor();
             if (td.isOnCommitDeleteRows() == false) 
@@ -792,6 +810,7 @@ private void tempTablesXApostCommit()
             // remove all temp tables from this context.
             TableDescriptor td = 
                 allDeclaredGlobalTempTables.get(i).getTableDescriptor();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
             //remove the conglomerate created for this temp table
             tc.dropConglomerate(td.getHeapConglomerateId()); 
@@ -820,13 +839,18 @@ public void resetFromPool()
 
         // Reset the current schema (see DERBY-3690).
         setDefaultSchema(null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3690
 
         // Reset the current role
         getCurrentSQLSessionContext().setRole(null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3859
 
         // Reset the current user
         getCurrentSQLSessionContext().setUser(getSessionUserId());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         referencedColumnMap = new WeakHashMap<TableDescriptor,FormatableBitSet>();
     }
 
@@ -912,6 +936,8 @@ private void dropAllDeclaredGlobalTempTables() throws StandardException
             {
                 try 
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
                     e.initCause(topLevelStandardException);
                     topLevelStandardException = e;
                 } 
@@ -944,6 +970,8 @@ private void tempTablesAndRollback()
         {
             TempTableInfo tempTableInfo = 
                 allDeclaredGlobalTempTables.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
             if (tempTableInfo.getDeclaredInSavepointLevel() >= 
                     currentSavepointLevel)
@@ -1017,6 +1045,7 @@ else if (tempTableInfo.getModifiedInSavepointLevel() >=
             // unit/transaction and not modified
         }
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (allDeclaredGlobalTempTables.isEmpty())
         {
             allDeclaredGlobalTempTables = null;
@@ -1082,6 +1111,7 @@ private TempTableInfo findDeclaredGlobalTempTable(String tableName) {
             return null;
 
         for (int i = 0; i < allDeclaredGlobalTempTables.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             if ((allDeclaredGlobalTempTables.get(i)).matches(tableName))
                 return allDeclaredGlobalTempTables.get(i);
         }
@@ -1100,6 +1130,7 @@ public void markTempTableAsModifiedInUnitOfWork(String tableName) {
      * @see LanguageConnectionContext#prepareInternalStatement
      */
         public PreparedStatement prepareInternalStatement(SchemaDescriptor compilationSchema, String sqlText, boolean isForReadOnly, boolean forMetaData) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
         throws StandardException 
         {
             if (forMetaData) {
@@ -1111,6 +1142,7 @@ public PreparedStatement prepareInternalStatement(SchemaDescriptor compilationSc
                 //to system tables. 
                 compilationSchema = getDataDictionary().getSystemSchemaDescriptor(); 
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
         return connFactory.getStatement(compilationSchema, sqlText, isForReadOnly).prepare(this, forMetaData);
         }
 
@@ -1120,6 +1152,8 @@ public PreparedStatement prepareInternalStatement(SchemaDescriptor compilationSc
         public PreparedStatement prepareInternalStatement(String sqlText) 
         throws StandardException 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
             return connFactory.
                 getStatement(getDefaultSchema(), sqlText, true).prepare(this);
         }      
@@ -1135,6 +1169,7 @@ public void removeActivation(Activation a)
         }
 
         acts.remove(a);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2150
 
         if (maxActsSize > 20 && (maxActsSize > 2 * acts.size())) {
             acts.trimToSize();
@@ -1270,6 +1305,8 @@ public void removeStatement(GenericStatement statement)
     public PreparedStatement lookupStatement(GenericStatement statement)
         throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2772
+//IC see: https://issues.apache.org/jira/browse/DERBY-2772
         CacheManager statementCache =
             getLanguageConnectionFactory().getStatementCache();
             
@@ -1487,6 +1524,9 @@ protected void doCommit(boolean commitStore,
         }
 
         checkIntegrity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
 
         // Log commit to error log, if appropriate
         if (logStatementText)
@@ -1608,6 +1648,7 @@ private TableDescriptor cleanupTempTableOnCommitOrRollback(
         long conglomId = 
             tc.createConglomerate(
                 "heap", // we're requesting a heap conglomerate
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
                 td.getEmptyExecRow().getRowArray(), // row template
                 null, //column sort order - not required for heap
                 td.getColumnCollationIds(),  // same ids as old conglomerate
@@ -1732,6 +1773,9 @@ private void doRollback(boolean xa, boolean requestedByUser) throws StandardExce
         }
 
         clearDeferreds();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
 
         // Log rollback to error log, if appropriate
         if (logStatementText)
@@ -1784,6 +1828,7 @@ private void doRollback(boolean xa, boolean requestedByUser) throws StandardExce
             // reset the savepoints to the new
             // location, since any outer nesting
             // levels expet there to be a savepoint
+//IC see: https://issues.apache.org/jira/browse/DERBY-938
             resetSavepoints();
         }
     }
@@ -1798,6 +1843,7 @@ private void doRollback(boolean xa, boolean requestedByUser) throws StandardExce
     private void resetSavepoints() throws StandardException 
     {
         final ContextManager cm = getContextManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         final List<Context>
                 stmts = cm.getContextStack(ContextId.LANG_STATEMENT);
 
@@ -1979,6 +2025,7 @@ private boolean checkIfAnyActivationHasHoldCursor(String tableName)
             throws StandardException
     {
         for (int i = acts.size() - 1; i >= 0; i--) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             Activation a = acts.get(i);
             if (a.checkIfThisActivationHasHoldCursor(tableName))
                 return true;
@@ -2176,6 +2223,7 @@ public boolean verifyNoOpenResultSets(PreparedStatement pStmt, Provider provider
      */
     public String getSessionUserId()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         return sessionUser;
     }
 
@@ -2184,6 +2232,8 @@ public String getSessionUserId()
      */
     public SchemaDescriptor getDefaultSchema() 
     { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
         return getCurrentSQLSessionContext().getDefaultSchema();
     }
 
@@ -2191,6 +2241,7 @@ public SchemaDescriptor getDefaultSchema()
      * @see LanguageConnectionContext#getDefaultSchema(Activation a)
      */
     public SchemaDescriptor getDefaultSchema(Activation a) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
         return getCurrentSQLSessionContext(a).getDefaultSchema();
     }
 
@@ -2229,6 +2280,7 @@ public String getCurrentSchemaName(Activation a)
      * @see LanguageConnectionContext#isInitialDefaultSchema
      */
     public boolean isInitialDefaultSchema(String schemaName) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-48
         return cachedInitialDefaultSchemaDescr.getSchemaName().
             equals(schemaName);
     }
@@ -2258,6 +2310,7 @@ public void setDefaultSchema(Activation a, SchemaDescriptor sd)
             sd = getInitialDefaultSchemaDescriptor();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
         getCurrentSQLSessionContext(a).setDefaultSchema(sd);
     }
 
@@ -2269,6 +2322,7 @@ public void setDefaultSchema(Activation a, SchemaDescriptor sd)
     public void resetSchemaUsages(Activation activation, String schemaName)
             throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
         Activation parent = activation.getParentActivation();
         SchemaDescriptor defaultSchema = getInitialDefaultSchemaDescriptor();
 
@@ -2284,6 +2338,7 @@ public void resetSchemaUsages(Activation activation, String schemaName)
             if (schemaName.equals(s.getSchemaName())) {
                 ssc.setDefaultSchema(defaultSchema);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
             parent = parent.getParentActivation();
         }
 
@@ -2307,6 +2362,7 @@ public void resetSchemaUsages(Activation activation, String schemaName)
      */
     public Long getIdentityValue()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return identityNotNull ? Long.valueOf(identityVal) : null;
     }
 
@@ -2466,6 +2522,7 @@ public void popCompilerContext(CompilerContext cc)
      *
      */
     public StatementContext pushStatementContext (boolean isAtomic, boolean isForReadOnly, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
                               String stmtText, ParameterValueSet pvs, 
                               boolean rollbackParentContext, 
                               long timeoutMillis)
@@ -2485,6 +2542,8 @@ public StatementContext pushStatementContext (boolean isAtomic, boolean isForRea
         if (statementContext == null)
         {
             statementContext = statementContexts[0] = new GenericStatementContext(this);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
             statementContext.
                 setSQLSessionContext(getTopLevelSQLSessionContext());
         }
@@ -2512,6 +2571,8 @@ else if (statementDepth > 0)
                 statementContext = new GenericStatementContext(this);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
             statementContext.setSQLSessionContext(
                 parentStatementContext.getSQLSessionContext());
 
@@ -2527,6 +2588,7 @@ else if (statementDepth > 0)
 
         incrementStatementDepth();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
         statementContext.setInUse(inTrigger, isAtomic || parentIsAtomic, isForReadOnly, stmtText, pvs, timeoutMillis);
         if (rollbackParentContext)
             statementContext.setParentRollback();
@@ -2608,6 +2670,7 @@ else if (statementDepth == 0)
                     SanityManager.THROWASSERT(
                         "statement depth expected to be >0, was "+statementDepth);
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
                 if (getContextManager().getContext(statementContext.getIdName()) != statementContext)
                 {
                     SanityManager.THROWASSERT("trying to pop statement context from middle of stack");
@@ -2636,6 +2699,7 @@ else if (statementDepth == 0)
      */
     public void pushExecutionStmtValidator(ExecutionStmtValidator validator)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2150
         stmtValidators.add(validator);
     }
 
@@ -2677,11 +2741,13 @@ public void pushTriggerExecutionContext(TriggerExecutionContext tec) throws Stan
         }
 
         /* Maximum 16 nesting levels allowed */
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
         if (triggerExecutionContexts.size() >= Limits.DB2_MAX_TRIGGER_RECURSION)
         {
             throw StandardException.newException(SQLState.LANG_TRIGGER_RECURSION_EXCEEDED);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2150
         triggerExecutionContexts.add(tec);
     }
 
@@ -2718,8 +2784,10 @@ public void popTriggerExecutionContext(TriggerExecutionContext tec)
      */
     public TriggerExecutionContext getTriggerExecutionContext()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return triggerExecutionContexts.isEmpty() ?
                 null :
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 triggerExecutionContexts.get( triggerExecutionContexts.size() - 1 );   
     }
 
@@ -2743,6 +2811,7 @@ public void validateStmtExecution(ConstantAction constantAction)
 
         if (stmtValidators.size() > 0)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             for (Iterator<ExecutionStmtValidator> it = stmtValidators.iterator(); it.hasNext(); )
             {
                 it.next()
@@ -2761,6 +2830,7 @@ public void validateStmtExecution(ConstantAction constantAction)
      */
     public void pushTriggerTable(TableDescriptor td)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2150
         triggerTables.add(td);
     }
 
@@ -2790,8 +2860,10 @@ public void popTriggerTable(TableDescriptor td)
      */
     public TableDescriptor getTriggerTable()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return triggerTables.isEmpty() ?
             (TableDescriptor)null :
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             triggerTables.get(triggerTables.size() - 1);
     }
     /**
@@ -2955,6 +3027,7 @@ public void setIsolationLevel(int isolationLevel) throws StandardException
      */
     public int getCurrentIsolationLevel()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         return (isolationLevel == TransactionControl.UNSPECIFIED_ISOLATION_LEVEL) ? defaultIsolationLevel : isolationLevel;
     }
 
@@ -2963,6 +3036,7 @@ public int getCurrentIsolationLevel()
      */
     public String getCurrentIsolationLevelStr()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         if( isolationLevel >= 0 && isolationLevel < TransactionControl.isolationMapCount() )
         {
             return TransactionControl.isolationTextNames( isolationLevel )[0];
@@ -2986,6 +3060,7 @@ public int getPrepareIsolationLevel()
         if (!isolationLevelExplicitlySet)
             return prepareIsolationLevel;
         else
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
             return TransactionControl.UNSPECIFIED_ISOLATION_LEVEL;
     }
 
@@ -2994,6 +3069,7 @@ public int getPrepareIsolationLevel()
      */
     public StatementContext getStatementContext()
     {   
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return (StatementContext) getContextManager().getContext(org.apache.derby.shared.common.reference.ContextId.LANG_STATEMENT);
     }
 
@@ -3070,6 +3146,7 @@ public void cleanupOnError(Throwable error) throws StandardException {
 
         int severity = (error instanceof StandardException) ?
             ((StandardException) error).getSeverity() :
+//IC see: https://issues.apache.org/jira/browse/DERBY-1732
             ExceptionSeverity.SESSION_SEVERITY;
  
         if (statementContexts[0] != null)
@@ -3080,6 +3157,7 @@ public void cleanupOnError(Throwable error) throws StandardException {
             // left on the stack for optimization to be popped
             // when the session is closed. Ensures full cleanup
             // and no hanging refrences in the ContextManager.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
             if (severity >= ExceptionSeverity.SESSION_SEVERITY)
                 statementContexts[0].popMe();
         }
@@ -3099,6 +3177,10 @@ public void cleanupOnError(Throwable error) throws StandardException {
                 // the end of the array
                 if (i >= acts.size())
                     continue;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 Activation a = acts.get(i);
                 a.reset();
                 a.close();
@@ -3106,6 +3188,7 @@ public void cleanupOnError(Throwable error) throws StandardException {
                        
             popMe();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5152
             InterruptStatus.saveInfoFromLcc(this);
         }
 
@@ -3166,6 +3249,9 @@ private void endTransactionActivationHandling(boolean forRollback) throws Standa
             if (i >= acts.size())
                 continue;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             Activation a = acts.get(i);
             /*
             ** Look for stale activations.  Activations are
@@ -3184,6 +3270,7 @@ private void endTransactionActivationHandling(boolean forRollback) throws Standa
             //below.
             ResultSet activationResultSet = a.getResultSet();
             boolean resultsetReturnsRows =
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                     activationResultSet != null &&
                     activationResultSet.returnsRows();
 
@@ -3278,6 +3365,7 @@ protected   void    resetStatementDepth()
 
     public DataDictionary getDataDictionary()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
         return getDatabase().getDataDictionary();
     }
 
@@ -3334,6 +3422,7 @@ public Long lastAutoincrementValue(String schemaName, String tableName,
         for (int i = size - 1; i >= 0; i--)
         {
             // first loop through triggers.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             TriggerExecutionContext itec = triggerExecutionContexts.get(i);
             Long value = itec.getAutoincrementValue(aiKey);
             if (value == null)
@@ -3343,6 +3432,7 @@ public Long lastAutoincrementValue(String schemaName, String tableName,
         }
         if (autoincrementHT == null)
             return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return autoincrementHT.get(aiKey);
     }   
 
@@ -3373,6 +3463,7 @@ public void autoincrementCreateCounter(String s, String t, String c,
         
         if (autoincrementCacheHashtable == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             autoincrementCacheHashtable = new HashMap<String,AutoincrementCounter>();
         }
 
@@ -3413,6 +3504,7 @@ public long nextAutoincrementValue(String schemaName, String tableName,
         
         AutoincrementCounter aic = 
             autoincrementCacheHashtable.get(key);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         if (aic == null)
         {
@@ -3445,6 +3537,7 @@ public void autoincrementFlushCache(UUID tableUUID)
 
         if (autoincrementHT == null)
             autoincrementHT = new HashMap<String,Long>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         DataDictionary dd = getDataDictionary();
         for (Iterator<String> it = autoincrementCacheHashtable.keySet().iterator();
@@ -3473,6 +3566,7 @@ public void copyHashtableToAIHT(Map<String,Long> from)
         if (from.isEmpty())
             return;
         if (autoincrementHT == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             autoincrementHT = new HashMap<String,Long>();
         
         autoincrementHT.putAll(from);
@@ -3515,6 +3609,7 @@ public String getDbname()
      */
     public Activation getLastActivation()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return acts.get(acts.size() - 1);
     }
 
@@ -3551,6 +3646,7 @@ public StringBuffer appendErrorInfo() {
      * @see LanguageConnectionContext#setCurrentRole(Activation a, String role)
      */
     public void setCurrentRole(Activation a, String role) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
         getCurrentSQLSessionContext(a).setRole(role);
     }
 
@@ -3559,6 +3655,7 @@ public void setCurrentRole(Activation a, String role) {
      * @see LanguageConnectionContext#getCurrentRoleId(Activation a)
      */
     public String getCurrentRoleId(Activation a) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
         return getCurrentSQLSessionContext(a).getRole();
     }
 
@@ -3567,6 +3664,7 @@ public String getCurrentRoleId(Activation a) {
      * @see LanguageConnectionContext#getCurrentUserId(Activation a)
      */
     public String getCurrentUserId(Activation a) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         return getCurrentSQLSessionContext(a).getCurrentUser();
     }
 
@@ -3578,11 +3676,13 @@ public String getCurrentRoleIdDelimited(Activation a)
             throws StandardException {
 
         String role = getCurrentSQLSessionContext(a).getRole();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 
         if (role != null) {
             beginNestedTransaction(true);
 
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 if (!roleIsSettable(a, role)) {
                     // invalid role, so lazily reset it.
                     setCurrentRole(a, null);
@@ -3593,6 +3693,7 @@ public String getCurrentRoleIdDelimited(Activation a)
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         if (role != null) {
             role = IdUtil.normalToDelimited(role);
         }
@@ -3606,10 +3707,12 @@ public String getCurrentRoleIdDelimited(Activation a)
      */
     public boolean roleIsSettable(Activation a, String role)
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
         DataDictionary dd = getDataDictionary();
         String dbo = dd.getAuthorizationDatabaseOwner();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         RoleGrantDescriptor grantDesc;
         String currentUser = getCurrentUserId(a);
 
@@ -3635,10 +3738,14 @@ public boolean roleIsSettable(Activation a, String role)
      */
     public SQLSessionContext getCurrentSQLSessionContext(
         Activation activation) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
 
         SQLSessionContext curr;
 
         Activation parent = activation.getParentActivation();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 
         if (parent == null ) {
             // top level
@@ -3683,6 +3790,7 @@ private SQLSessionContext getCurrentSQLSessionContext() {
      * {@inheritDoc}
      */
     public void pushNestedSessionContext(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         Activation a,
         boolean definersRights,
         String definer) throws StandardException {
@@ -3747,9 +3855,14 @@ private void setupSessionContextMinion(
             sc.setDefaultSchema(getDefaultSchema(a));
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         final SQLSessionContext ssc = getCurrentSQLSessionContext(a);
         sc.setDeferredAll(ssc.getDeferredAll());
         sc.setConstraintModes(ssc.getConstraintModes());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
 
         StatementContext stmctx = getStatementContext();
 
@@ -3792,6 +3905,8 @@ private void compareConstraintModes(
         // Check all constraints that were deferred inside the routine
         // but whose constraint mode is immediate on the outside. If
         // any of these violate the constraints, roll back.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         for (ValidationInfo info : deferredHashTables.values()) {
             info.possiblyValidateOnReturn(this, nested, caller);
         }
@@ -3799,6 +3914,7 @@ private void compareConstraintModes(
 
     public boolean isEffectivelyDeferred(SQLSessionContext sc, UUID constraintId)
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         final Boolean deferred = sc.isDeferred(constraintId);
         final boolean effectivelyDeferred;
@@ -3822,6 +3938,7 @@ public boolean isEffectivelyDeferred(SQLSessionContext sc, UUID constraintId)
      */
     public void setupSubStatementSessionContext(Activation a)
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
         setupSessionContextMinion(a, false, false, null);
     }
@@ -3833,6 +3950,7 @@ public void setupSubStatementSessionContext(Activation a)
     public SQLSessionContext getTopLevelSQLSessionContext() {
         if (topLevelSSC == null) {
             topLevelSSC = new SQLSessionContextImpl(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 getInitialDefaultSchemaDescriptor(),
                 getSessionUserId());
         }
@@ -3846,6 +3964,9 @@ public SQLSessionContext getTopLevelSQLSessionContext() {
     public SQLSessionContext createSQLSessionContext() {
         return new SQLSessionContextImpl(
             getInitialDefaultSchemaDescriptor(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             getSessionUserId()); /* a priori */
     }
 
@@ -3855,11 +3976,13 @@ public SQLSessionContext createSQLSessionContext() {
      * @see org.apache.derby.impl.sql.compile.QueryTreeNode#treePrint(int)
      */
     Map<Object,Object> printedObjectsMap = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
     /**
      * @see org.apache.derby.iapi.sql.conn.LanguageConnectionContext#getPrintedObjectsMap
      */
     public Map<Object,Object> getPrintedObjectsMap() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
         if (printedObjectsMap == null) {
             printedObjectsMap = new IdentityHashMap<Object,Object>();
         }
@@ -3896,6 +4019,7 @@ public Object getXplainStatement(Object key)
     
     public void setASTVisitor( ASTVisitor visitor )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4415
         astWalker = visitor;
     }
     public ASTVisitor getASTVisitor( )
@@ -3908,14 +4032,17 @@ public void setInterruptedException(StandardException e) {
     }
 
     public StandardException getInterruptedException() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         return interruptedException;
     }
 
     public FormatableBitSet getReferencedColumnMap(TableDescriptor td) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         return referencedColumnMap.get(td);
     }
 
     public void setReferencedColumnMap(TableDescriptor td,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4895
                                        FormatableBitSet map) {
         referencedColumnMap.put(td, map);
     }
@@ -3930,6 +4057,8 @@ public void setReferencedColumnMap(TableDescriptor td,
      */
     public void setConstraintDeferred(
             final Activation a,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             ConstraintDescriptor cd,
             final boolean deferred) throws StandardException {
 
@@ -3970,6 +4099,8 @@ public void setDeferredAll(final Activation a, final boolean deferred)
 
     public HashMap<UUID, ValidationInfo> getDeferredHashTables() {
         if (deferredHashTables == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             deferredHashTables = new HashMap<UUID, ValidationInfo>();
         }
         return deferredHashTables;
@@ -3986,6 +4117,8 @@ private void validateDeferredConstraints(final boolean rollbackOnError)
             return;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         for (ValidationInfo info : deferredHashTables.values()) {
             info.validateConstraint(this, null, rollbackOnError);
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
index 7cb1cc4879..f1113a55b5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
@@ -447,6 +447,7 @@ protected synchronized int getNextLCCInstanceNumber()
      */
     static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
index a71085152e..f91fdc7cf7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
@@ -111,6 +111,7 @@ final class GenericStatementContext
 	*/
 	GenericStatementContext(LanguageConnectionContext lcc) 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		super(lcc.getContextManager(), org.apache.derby.shared.common.reference.ContextId.LANG_STATEMENT);
 		this.lcc = lcc;
 
@@ -136,6 +137,7 @@ final class GenericStatementContext
      * a CancelQueryTask is scheduled if a timeout &gt; 0 has been set.
      */
     private static class CancelQueryTask
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
         extends
             TimerTask
     {
@@ -188,6 +190,7 @@ public void forgetContext() {
     }
 
     private static TimerFactory getTimerFactory() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return GenericLanguageConnectionFactory.getMonitor().getTimerFactory();
     }
 
@@ -199,6 +202,7 @@ private static TimerFactory getTimerFactory() {
 		boolean isAtomic, 
                 boolean isForReadOnly,
 		String stmtText,
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
 		ParameterValueSet pvs,
         long timeoutMillis
 	) 
@@ -206,6 +210,7 @@ private static TimerFactory getTimerFactory() {
 		inUse = true;
 
 		this.parentInTrigger = parentInTrigger;
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 		this.isForReadOnly = isForReadOnly;
 		this.isAtomic = isAtomic;
 		this.stmtText = stmtText;
@@ -226,18 +231,23 @@ public void clearInUse() {
 
 		parentInTrigger = false;
 		isAtomic = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 		isForReadOnly = false;
 		this.stmtText = null;
 		sqlAllowed = -1;
 		isSystemCode = false;
 		rollbackParentContext = false;
         statementWasInvalidated = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4849
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
         if (cancelTask != null) {
             cancelTask.forgetContext();
             cancelTask = null;
         }
         cancellationFlag = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
         activation = null;
 		sqlSessionContext = null;
     }
@@ -463,6 +473,7 @@ public void addDependency(Dependency dy)
 		
 		if (dependencies == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			dependencies = new ArrayList<Dependency>();
 		}
 		dependencies.add(dy);
@@ -513,6 +524,7 @@ public void cleanupOnError(Throwable error) throws StandardException
         ** to be of session severity.  
         */
         int severity = ExceptionSeverity.SESSION_SEVERITY;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4849
         if (error instanceof StandardException) {
             StandardException se = (StandardException)error;
             // Update the severity.
@@ -564,6 +576,7 @@ public void cleanupOnError(Throwable error) throws StandardException
 		{
 			DependencyManager dmgr = lcc.getDataDictionary().getDependencyManager();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			for (Iterator<Dependency> iterator = dependencies.iterator(); iterator.hasNext(); ) 
 			{
 				Dependency dy = iterator.next();
@@ -626,6 +639,7 @@ public boolean isLastHandler(int severity)
         // let outer contexts take corrective action for jvm errors, so 
         // return false as this will not be the last handler for such 
         // errors.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1732
 		return inUse && !rollbackParentContext && 
             ( severity == ExceptionSeverity.STATEMENT_SEVERITY );
 	}
@@ -684,6 +698,7 @@ public boolean inUse()
 	}
     public boolean isForReadOnly()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 	return isForReadOnly;
     }
         
@@ -698,6 +713,7 @@ public boolean isForReadOnly()
      */
     public boolean isCancelled()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
         return cancellationFlag;
     }
 
@@ -764,6 +780,7 @@ public StringBuffer appendErrorInfo() {
 
 			sb.append(getStatementText());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2606
 			if ((pvs != null) && pvs.getParameterCount() > 0)
 			{
 				String pvsString = " with " + pvs.getParameterCount() +
@@ -779,6 +796,8 @@ public StringBuffer appendErrorInfo() {
 	 * @see StatementContext#setActivation(Activation a)
 	 */
 	public void setActivation(Activation a) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
 		activation = a;
 	}
 
@@ -804,6 +823,7 @@ public void setSQLSessionContext(SQLSessionContext ctx) {
 	}
 
     public boolean getStatementWasInvalidated() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4849
         return statementWasInvalidated;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/SQLSessionContextImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/SQLSessionContextImpl.java
index 7016490053..23d95e6f65 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/SQLSessionContextImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/SQLSessionContextImpl.java
@@ -63,6 +63,7 @@ public String getRole() {
     }
 
     public void setUser(String user) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         currentUser = user;
     }
 
@@ -82,6 +83,11 @@ public SchemaDescriptor getDefaultSchema() {
      * {@inheritDoc}
      */
     public HashMap<UUID, Boolean> getConstraintModes() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         return constraintModes != null ?
             new HashMap<UUID, Boolean>(constraintModes) :
             null;
@@ -130,6 +136,8 @@ public Boolean isDeferred(UUID constraintId) {
      * {@inheritDoc}
      */
     public void resetConstraintModes() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         if (constraintModes != null) {
             constraintModes.clear();
         }
@@ -144,6 +152,8 @@ public void setDeferredAll(Boolean deferred) {
         deferredAll = deferred;
         // This now overrides any individual constraint setting, so
         // clear those.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         if (constraintModes != null) {
             constraintModes.clear();
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/TempTableInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
index 8ca1740a29..62232c237e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
@@ -142,6 +142,7 @@ start tran ("current savepoint level = 0)
 	  	declare temp table t2("declared in savepoint level" = 0, "dropped in savepoint level"=-1)
 		  rollback tran
         (temp table t2 will be removed from list of tables and conglomerate associated with it will be dropped)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     And if table was dropped in this unit of work ie "dropped in savepoint level" &gt;= "current savepoint level"
       Then we should remove the table from the list of temp tables
 		  eg
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java
index 5ed97d13eb..b8242d968c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java
@@ -142,6 +142,7 @@ public void addDependency(Dependent d, Provider p, ContextManager cm)
      * @throws StandardException if adding the dependency fails
      */
     private void addDependency(Dependent d, Provider p,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4928
                                ContextManager cm, TransactionController tc)
             throws StandardException {
         // Dependencies are either in-memory or stored, but not both.
@@ -173,6 +174,7 @@ private synchronized void addInMemoryDependency(Dependent d, Provider p,
         boolean addedToProvs = false;
         boolean addedToDeps =
                 addDependencyToTable(dependents, d.getObjectID(), dy);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         if (addedToDeps) {
             addedToProvs = addDependencyToTable(providers, p.getObjectID(), dy);
@@ -193,6 +195,7 @@ private synchronized void addInMemoryDependency(Dependent d, Provider p,
         // Add the dependency to the StatementContext, so that
         // it can be cleared on a pre-execution error.
         StatementContext sc = (StatementContext) cm.getContext(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 org.apache.derby.shared.common.reference.ContextId.LANG_STATEMENT);
         sc.addDependency(dy);
     }
@@ -218,6 +221,9 @@ private void addStoredDependency(Dependent d, Provider p,
             throws StandardException {
         LanguageConnectionContext lcc = getLanguageConnectionContext(cm);
         // tc == null means do it in the user transaction
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
         TransactionController tcToUse =
                 (tc == null) ? lcc.getTransactionExecute() : tc;
 
@@ -313,7 +319,9 @@ private void coreInvalidateFor(Provider p, int action, LanguageConnectionContext
 		throws StandardException
 	{
 		List<Dependency> list = getDependents(p);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4947
         if (list.isEmpty()) {
 			return;
 		}
@@ -355,6 +363,7 @@ private void coreInvalidateFor(Provider p, int action, LanguageConnectionContext
 				if (ei >= list.size())
 					continue;
 				Dependency dependency = list.get(ei);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 				Dependent dep = dependency.getDependent();
 
@@ -386,6 +395,8 @@ private void coreInvalidateFor(Provider p, int action, LanguageConnectionContext
 					}	// if providingCols == null
 					else
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
                         subsetCols.copyFrom( affectedCols );
 						subsetCols.and(providingCols);
 						if (subsetCols.anySetBit() == -1)
@@ -399,6 +410,7 @@ private void coreInvalidateFor(Provider p, int action, LanguageConnectionContext
 					dep.prepareToInvalidate(p, action, lcc);
 				} catch (StandardException sqle) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 					if (noInvalidate == null) {
 						noInvalidate = sqle;
 					} else {
@@ -460,6 +472,7 @@ public void clearDependencies(LanguageConnectionContext lcc, Dependent d) throws
 	public void clearDependencies(LanguageConnectionContext lcc, 
 									Dependent d, TransactionController tc) throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4928
         UUID id = d.getObjectID();
         // Remove all the stored dependencies.
         if (d.isPersistent()) {
@@ -492,6 +505,7 @@ public void clearDependencies(LanguageConnectionContext lcc,
 	 * StatementContext.)
 	 */
     public synchronized void clearInMemoryDependency(Dependency dy) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4928
         final UUID deptId = dy.getDependent().getObjectID();
         final UUID provId = dy.getProviderKey();
         List deps = (List) dependents.get(deptId);
@@ -568,12 +582,14 @@ public synchronized void clearInMemoryDependency(Dependency dy) {
     public ProviderInfo[] getPersistentProviderInfos(Dependent dependent)
             throws StandardException {
         List<Provider> provs = getProviders(dependent);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         if (provs.isEmpty()) {
 			return EMPTY_PROVIDER_INFO;
 		}
 
         List<ProviderInfo> pih = new ArrayList<ProviderInfo>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         for (Provider p : provs) {
             if (p.isPersistent()) {
@@ -598,6 +614,7 @@ public ProviderInfo[] getPersistentProviderInfos(Dependent dependent)
 	public ProviderInfo[] getPersistentProviderInfos(ProviderList pl)
 							throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-73
 		Enumeration e = pl.elements();
 		int			numProviders = 0;
 		ProviderInfo[]	retval;
@@ -616,9 +633,11 @@ public ProviderInfo[] getPersistentProviderInfos(ProviderList pl)
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-73
 		e = pl.elements();
 		retval = new ProviderInfo[numProviders];
 		int piCtr = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-73
 		while (e != null && e.hasMoreElements())
 		{
 			Provider prov = (Provider) e.nextElement();
@@ -686,6 +705,7 @@ public void copyDependencies(
 	{
 
 		List list = getProviders(copy_From);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4928
         Iterator depsIter = list.iterator();
         while (depsIter.hasNext()) {
             Provider provider = (Provider)depsIter.next();
@@ -800,6 +820,9 @@ public String getActionString(int action)
 			case DROP_COLUMN:
 				return "DROP COLUMN";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1489
+//IC see: https://issues.apache.org/jira/browse/DERBY-1909
+//IC see: https://issues.apache.org/jira/browse/DERBY-1926
 			case DROP_COLUMN_RESTRICT:
 				return "DROP COLUMN RESTRICT";
 
@@ -815,15 +838,19 @@ public String getActionString(int action)
 		    case DROP_SYNONYM:
 			    return "DROP SYNONYM";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1539
 		    case REVOKE_PRIVILEGE:
 			    return "REVOKE PRIVILEGE";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1643
 		    case REVOKE_PRIVILEGE_RESTRICT:
 			    return "REVOKE PRIVILEGE RESTRICT";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3666
 		    case REVOKE_ROLE:
 				return "REVOKE ROLE";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		    case RECHECK_PRIVILEGES:
 				return "RECHECK PRIVILEGES";
 
@@ -859,6 +886,7 @@ public int countDependencies()
 		throws StandardException
 	{
         // Add the stored dependencies.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         List<?> storedDeps = dd.getAllDependencyDescriptorsList();
         int numDependencies = storedDeps.size();
         synchronized(this) {
@@ -881,6 +909,7 @@ public int countDependencies()
 	// class interface
 	//
 	public BasicDependencyManager(DataDictionary dd) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
         this.dd = dd;
 	}
 
@@ -896,6 +925,7 @@ public BasicDependencyManager(DataDictionary dd) {
 	 */
     private boolean addDependencyToTable(
             Map<UUID, List<Dependency>> table, UUID key, Dependency dy) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         List<Dependency> deps = table.get(key);
 
@@ -909,6 +939,7 @@ private boolean addDependencyToTable(
 			UUID	provKey = dy.getProvider().getObjectID();
 			UUID	depKey = dy.getDependent().getObjectID();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			for (ListIterator<Dependency> depsIT = deps.listIterator();  depsIT.hasNext(); )
 			{
 				Dependency curDY = depsIT.next();
@@ -918,6 +949,7 @@ private boolean addDependencyToTable(
                 // like builtin aggregates which implement
                 // org.apache.derby.agg.Aggregator. those objects have no UUID anyway
                 //
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
                 if ( curDY.getProvider().getObjectID() == null ) { continue; }
                 
                 if (curDY.getProvider().getObjectID().equals(provKey) &&
@@ -952,6 +984,7 @@ private boolean addDependencyToTable(
     //@GuardedBy("this")
     private void clearProviderDependency(UUID p, Dependency d) {
         List<?> deps = providers.get(p);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		if (deps == null)
 			return;
@@ -976,6 +1009,7 @@ private void clearProviderDependency(UUID p, Dependency d) {
 	 * @exception StandardException thrown if something goes wrong
 	 */
     private List<Dependency> getDependencyDescriptorList(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             List<DependencyDescriptor> storedList,
 			Provider providerForList)
 		throws StandardException
@@ -991,13 +1025,16 @@ private List<Dependency> getDependencyDescriptorList(
 			 * back into the same place in the List
 			 * so that the call gets an enumerations of Dependencys.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             for (DependencyDescriptor depDesc : storedList)
 			{
 				Dependent 			tempD;
 				Provider  			tempP;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 DependableFinder    finder = depDesc.getDependentFinder();
                 tempD = (Dependent) finder.getDependable(dd, depDesc.getUUID());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1581
                 if (providerForList != null)
                 {
                     // Use the provider being passed in.
@@ -1015,9 +1052,11 @@ private List<Dependency> getDependencyDescriptorList(
                 {
                     finder = depDesc.getProviderFinder();
                     tempP = (Provider) finder.getDependable(dd, depDesc.getProviderID() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
 
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				retval.add( new BasicDependency( tempD, tempP ) );
 			}
 		}
@@ -1047,6 +1086,7 @@ private LanguageConnectionContext getLanguageConnectionContext(ContextManager cm
      * @throws StandardException thrown if something goes wrong
      */
     private List<Provider> getProviders (Dependent d) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         List<Provider> provs = new ArrayList<Provider>();
         synchronized (this) {
             List deps = (List) dependents.get(d.getObjectID());
@@ -1061,6 +1101,7 @@ private List<Provider> getProviders (Dependent d) throws StandardException {
         // If the dependent is persistent, we have to take stored dependencies
         // into consideration as well.
         if (d.isPersistent()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			List<Dependency> storedList = getDependencyDescriptorList
                 (
                  dd.getDependentsDescriptorList( d.getObjectID().toString() ),
@@ -1085,6 +1126,7 @@ private List<Provider> getProviders (Dependent d) throws StandardException {
 	 */
 	private List<Dependency> getDependents (Provider p) 
 			throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         List<Dependency> deps = new ArrayList<Dependency>();
         synchronized (this) {
             List<Dependency> memDeps = providers.get(p.getObjectID());
@@ -1096,11 +1138,13 @@ private List<Dependency> getDependents (Provider p)
         // If the provider is persistent, then we have to add providers for
         // stored dependencies as well.
         if (p.isPersistent()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			List<Dependency> storedList = getDependencyDescriptorList
                 (
                  dd.getProvidersDescriptorList( p.getObjectID().toString() ),
                  p
                  );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4947
             deps.addAll(storedList);
         }
         return deps;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java
index c9451bc217..668b7b4919 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java
@@ -120,6 +120,7 @@ public DataValueDescriptor[] insertNonDuplicateKey(DataValueDescriptor[] insertR
 			for (int i = 0; i < aggsToInitialize.length; i++)
 			{
 				GenericAggregator aggregator = aggsToInitialize[i];
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 				UserDataValue wrapper = ((UserDataValue)returnRow[aggregator.aggregatorColumnId]);
 				if (SanityManager.DEBUG)
 				{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java
index 490fa751a4..6a2573f76b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java
@@ -67,6 +67,7 @@ public AggregatorInfoList() {}
 	 */
 	public boolean hasDistinct()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (AggregatorInfo aggInfo : this)
 		{
 			if (aggInfo.isDistinct())
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AlterConstraintConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AlterConstraintConstantAction.java
index 0de3e6abca..d28fc7a19b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AlterConstraintConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AlterConstraintConstantAction.java
@@ -156,9 +156,13 @@ public void executeConstantAction(
         }
 
         if (characteristics[2] != ConstraintDefinitionNode.ENFORCED_DEFAULT) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             dd.checkVersion(DataDictionary.DD_VERSION_DERBY_10_11,
                             "DEFERRED CONSTRAINTS");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             if (constraintType == DataDictionary.FOREIGNKEY_CONSTRAINT ||
                 constraintType == DataDictionary.NOTNULL_CONSTRAINT ||
                 !characteristics[2] /* not enforced */) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
index cfaa0288c6..b44e247613 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
@@ -305,6 +305,7 @@ public void executeConstantAction(Activation activation)
 	 * @exception StandardException		Thrown on failure
 	 */
     private void executeConstantActionBody(Activation activation)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
             throws StandardException {
         // Save references to the main structures we need.
         this.activation = activation;
@@ -317,6 +318,7 @@ private void executeConstantActionBody(Activation activation)
         boolean						tableScanned = false;
 
         if (compressTable || truncateTable) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             DeferredConstraintsMemory.compressOrTruncate(
                     lcc, tableId, tableName);
         }
@@ -344,6 +346,7 @@ private void executeConstantActionBody(Activation activation)
 
 	            if (defragment)
                     defragmentRows(tc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
 
 	            if (truncateEndOfTable)
 	                truncateEnd(tc);            
@@ -351,6 +354,7 @@ private void executeConstantActionBody(Activation activation)
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
         if (updateStatistics) {
             updateStatistics();
             return;
@@ -399,6 +403,7 @@ private void executeConstantActionBody(Activation activation)
 				SQLState.LANG_TABLE_NOT_FOUND_DURING_EXECUTION, tableName);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		if (truncateTable)
 			dm.invalidateFor(td, DependencyManager.TRUNCATE_TABLE, lcc);
 		else
@@ -466,6 +471,7 @@ private void executeConstantActionBody(Activation activation)
 				// Don't allow add of non-nullable column to non-empty table
 				if (numRows > 0)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 					throw StandardException.newException(
                         SQLState.LANG_ADDING_NON_NULL_COLUMN_TO_NON_EMPTY_TABLE,
                         td.getQualifiedName());
@@ -482,17 +488,25 @@ private void executeConstantActionBody(Activation activation)
 				
 				if (columnInfo[ix].action == ColumnInfo.CREATE)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
 					addNewColumnToTable(ix);
 				}
 				else if (columnInfo[ix].action == 
 						 ColumnInfo.MODIFY_COLUMN_DEFAULT_RESTART ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-2371
 						 columnInfo[ix].action == 
 						 ColumnInfo.MODIFY_COLUMN_DEFAULT_INCREMENT ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 						 columnInfo[ix].action ==
 						 ColumnInfo.MODIFY_COLUMN_DEFAULT_CYCLE ||
 						 columnInfo[ix].action == 
 						 ColumnInfo.MODIFY_COLUMN_DEFAULT_VALUE)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
                     modifyColumnDefault(ix);
 				}
 				else if (columnInfo[ix].action == 
@@ -530,6 +544,7 @@ else if (columnInfo[ix].action ==
 						 * This is O.K. at this point since we would have
 						 * thrown an exception if any data was null
 						 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
                         modifyColumnConstraint(columnInfo[ix].name, false);
 					}
 				}
@@ -558,6 +573,7 @@ else if (SanityManager.DEBUG)
         /* Create/Drop/alter any constraints */
 		if (constraintActions != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			for (int conIndex = 0; 
                  conIndex < constraintActions.length; 
                  conIndex++)
@@ -567,6 +583,7 @@ else if (SanityManager.DEBUG)
 
 				if (cca instanceof CreateConstraintConstantAction)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     final CreateConstraintConstantAction ccca =
                             (CreateConstraintConstantAction)cca;
 
@@ -586,6 +603,7 @@ else if (SanityManager.DEBUG)
 
 							// Check to see if a constraint of the same type 
                             // already exists
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 							ConstraintDescriptorList cdl = 
                                 dd.getConstraintDescriptors(td);
 
@@ -612,6 +630,7 @@ else if (SanityManager.DEBUG)
 								numRows = getSemiRowCount(tc);
 							}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                             if (isCheckInitiallyDeferred) {
                                 // Need to do this early to get UUID
                                 // assigned
@@ -631,6 +650,7 @@ else if (SanityManager.DEBUG)
 								ConstraintConstantAction.validateConstraint(
                                     cca.getConstraintName(),
                                     ((CreateConstraintConstantAction)cca).getConstraintText(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                     cca.getConstraintId(),
                                     td,
                                     lcc,
@@ -644,9 +664,11 @@ else if (SanityManager.DEBUG)
 				{
 					if (SanityManager.DEBUG)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                         if (!(cca instanceof DropConstraintConstantAction ||
                               cca instanceof AlterConstraintConstantAction))
 						{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 							SanityManager.THROWASSERT(
                                 "constraintActions[" + conIndex + 
                                 "] expected to be instanceof " + 
@@ -656,6 +678,7 @@ else if (SanityManager.DEBUG)
 					}
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 if (!isCheckInitiallyDeferred) {
                     constraintActions[conIndex].
                         executeConstantAction(activation);
@@ -672,6 +695,7 @@ else if (SanityManager.DEBUG)
 					lockGranularity != 'R')
 				{
 					SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 						"lockGranularity expected to be 'T'or 'R', not " + 
                         lockGranularity);
 				}
@@ -686,6 +710,7 @@ else if (SanityManager.DEBUG)
 		// Are we doing a compress table?
 		if (compressTable)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
             compressTable();
 		}
 
@@ -743,11 +768,14 @@ private void dropStatistics()
 	 * @throws StandardException
 	 */
     private void updateStatistics()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4937
         ConglomerateDescriptor[] cds;
         td = dd.getTableDescriptor(tableId);
 
         if (updateStatisticsAll) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
             cds = null;
         } else {
             cds = new ConglomerateDescriptor[1];
@@ -814,6 +842,7 @@ private void truncateEnd(
      *
      **/
     private void defragmentRows(TransactionController tc)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
             throws StandardException {
         GroupFetchScanController base_group_fetch_cc = null;
         int                      num_indexes         = 0;
@@ -843,6 +872,7 @@ private void defragmentRows(TransactionController tc)
             }
 
 			/* Get a row template for the base table */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ExecRow br =
                 lcc.getLanguageConnectionFactory().getExecutionFactory().getValueRow(
                     td.getNumberOfColumns());
@@ -1195,6 +1225,7 @@ private void addNewColumnToTable(int ix)
 		{
 			throw 
 				StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                    SQLState.LANG_OBJECT_ALREADY_EXISTS_IN_OBJECT,
                    columnDescriptor.getDescriptorType(),
                    columnInfo[ix].name,
@@ -1208,6 +1239,7 @@ private void addNewColumnToTable(int ix)
 			storableDV = columnInfo[ix].dataType.getNull();
 
 		// Add the column to the conglomerate.(Column ids in store are 0-based)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		tc.addColumnToConglomerate(
             td.getHeapConglomerateId(), 
             colNumber, 
@@ -1227,6 +1259,7 @@ private void addNewColumnToTable(int ix)
 
 		// Add the column to syscolumns. 
 		// Column ids in system tables are 1-based
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		columnDescriptor = 
             new ColumnDescriptor(
                    columnInfo[ix].name,
@@ -1349,6 +1382,7 @@ private void dropColumnFromTable(String columnName )
         // drop any generated columns which reference this column
         ColumnDescriptorList    generatedColumnList = td.getGeneratedColumns();
         int                                 generatedColumnCount = generatedColumnList.size();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<String>           cascadedDroppedColumns = new ArrayList<String> ();
         for ( int i = 0; i < generatedColumnCount; i++ )
         {
@@ -1391,6 +1425,7 @@ private void dropColumnFromTable(String columnName )
 		// can NOT drop a column if it is the only one in the table
 		if (sizeAfterCascadedDrops == 1)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			throw StandardException.newException(
                     SQLState.LANG_PROVIDER_HAS_DEPENDENT_OBJECT,
                     dm.getActionString(DependencyManager.DROP_COLUMN),
@@ -1402,6 +1437,7 @@ private void dropColumnFromTable(String columnName )
         // now drop dependent generated columns
         for ( int i = 0; i < cascadedDrops; i++ )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             String      generatedColumnName = cascadedDroppedColumns.get( i );
             
             activation.addWarning
@@ -1411,6 +1447,7 @@ private void dropColumnFromTable(String columnName )
             // We can only recurse 2 levels since a generation clause cannot
             // refer to other generated columns.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
             dropColumnFromTable(generatedColumnName);
         }
 
@@ -1427,6 +1464,7 @@ private void dropColumnFromTable(String columnName )
 		{
 			throw 
 				StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                     SQLState.LANG_COLUMN_NOT_FOUND_IN_TABLE, 
                     columnName,
                     td.getQualifiedName());
@@ -1439,6 +1477,9 @@ private void dropColumnFromTable(String columnName )
 		toDrop.set(droppedColumnPosition);
 		td.setReferencedColumnMap(toDrop);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1489
+//IC see: https://issues.apache.org/jira/browse/DERBY-1909
+//IC see: https://issues.apache.org/jira/browse/DERBY-1926
 		dm.invalidateFor(td, 
                         (cascade ? DependencyManager.DROP_COLUMN
                                  : DependencyManager.DROP_COLUMN_RESTRICT),
@@ -1447,6 +1488,7 @@ private void dropColumnFromTable(String columnName )
 		// If column has a default we drop the default and any dependencies
 		if (columnDescriptor.getDefaultInfo() != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			dm.clearDependencies(
                 lcc, columnDescriptor.getDefaultDescriptor(dd));
 		}
@@ -1464,6 +1506,7 @@ private void dropColumnFromTable(String columnName )
 		//Now go through each trigger on this table and see if the column 
 		//being dropped is part of it's trigger columns or trigger action 
 		//columns which are used through REFERENCING clause
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TriggerDescriptor trd : dd.getTriggerDescriptors(td)) {
 			//If we find that the trigger is dependent on the column being 
 			//dropped because column is part of trigger columns list, then
@@ -1474,11 +1517,13 @@ private void dropColumnFromTable(String columnName )
 			boolean triggerDroppedAlready = false;
 
 			int[] referencedCols = trd.getReferencedCols();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4988
 			if (referencedCols != null) {
 				int refColLen = referencedCols.length, j;
 				boolean changed = false;
 				for (j = 0; j < refColLen; j++)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 					if (referencedCols[j] > droppedColumnPosition)
 	                {
 						//Trigger is not defined on the column being dropped
@@ -1521,9 +1566,11 @@ else if (referencedCols[j] == droppedColumnPosition)
 					dd.dropTriggerDescriptor(trd, tc);
 					for (j = 0; j < refColLen; j++)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 						if (referencedCols[j] > droppedColumnPosition)
 							referencedCols[j]--;
 					}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
                     trd.setReferencedCols( referencedCols );
 					dd.addDescriptor(trd, sd,
 									 DataDictionary.SYSTRIGGERS_CATALOG_NUM,
@@ -1592,6 +1639,7 @@ else if (referencedColsInTriggerAction[j] == droppedColumnPosition)
 						if (referencedColsInTriggerAction[j] > droppedColumnPosition)
 							referencedColsInTriggerAction[j]--;
 					}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
                     trd.setReferencedColsInTriggerAction( referencedColsInTriggerAction );
 					dd.addDescriptor(trd, sd,
 							 DataDictionary.SYSTRIGGERS_CATALOG_NUM,
@@ -1604,11 +1652,13 @@ else if (referencedColsInTriggerAction[j] == droppedColumnPosition)
 		int csdl_size = csdl.size();
 
 		ArrayList<ConstantAction> newCongloms = new ArrayList<ConstantAction>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		// we want to remove referenced primary/unique keys in the second
 		// round.  This will ensure that self-referential constraints will
 		// work OK.
 		int tbr_size = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		ConstraintDescriptor[] toBeRemoved = 
             new ConstraintDescriptor[csdl_size];
 
@@ -1621,6 +1671,7 @@ else if (referencedColsInTriggerAction[j] == droppedColumnPosition)
 			boolean changed = false;
 			for (j = 0; j < numRefCols; j++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 				if (referencedColumns[j] > droppedColumnPosition)
 					changed = true;
 				if (referencedColumns[j] == droppedColumnPosition)
@@ -1633,6 +1684,7 @@ else if (referencedColsInTriggerAction[j] == droppedColumnPosition)
 					dd.dropConstraintDescriptor(cd, tc);
 					for (j = 0; j < numRefCols; j++)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 						if (referencedColumns[j] > droppedColumnPosition)
 							referencedColumns[j]--;
 					}
@@ -1647,6 +1699,7 @@ else if (referencedColsInTriggerAction[j] == droppedColumnPosition)
 				// Reject the DROP COLUMN, because there exists a constraint
 				// which references this column.
 				//
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 				throw StandardException.newException(
                         SQLState.LANG_PROVIDER_HAS_DEPENDENT_OBJECT,
                         dm.getActionString(DependencyManager.DROP_COLUMN),
@@ -1684,6 +1737,7 @@ else if (referencedColsInTriggerAction[j] == droppedColumnPosition)
 			{
 				ConstraintDescriptorList fkcdl = dd.getForeignKeys(cd.getUUID());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 for (ConstraintDescriptor fkcd : fkcdl)
                 {
 					dm.invalidateFor(fkcd,
@@ -1715,6 +1769,7 @@ else if (referencedColsInTriggerAction[j] == droppedColumnPosition)
 		 * dropped again as part of another "drop constraint".
 		 */
 		createNewBackingCongloms(newCongloms, (long[])null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
 
         /*
          * The work we've done above, specifically the possible
@@ -1727,13 +1782,18 @@ else if (referencedColsInTriggerAction[j] == droppedColumnPosition)
          * stale table descriptor.
          */
 		td = dd.getTableDescriptor(tableId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1489
+//IC see: https://issues.apache.org/jira/browse/DERBY-1909
+//IC see: https://issues.apache.org/jira/browse/DERBY-1926
 
         compressTable();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
 
 		ColumnDescriptorList tab_cdl = td.getColumnDescriptorList();
 
 		// drop the column from syscolumns 
 		dd.dropColumnDescriptor(td.getUUID(), columnName, tc);		
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		ColumnDescriptor[] cdlArray = 
             new ColumnDescriptor[size - columnDescriptor.getPosition()];
 
@@ -1745,9 +1805,11 @@ else if (referencedColsInTriggerAction[j] == droppedColumnPosition)
 		//
 		for (int i = columnDescriptor.getPosition(), j = 0; i < size; i++, j++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             ColumnDescriptor cd = tab_cdl.elementAt(i);
 			dd.dropColumnDescriptor(td.getUUID(), cd.getColumnName(), tc);
 			cd.setPosition(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3175
 			if (cd.isAutoincrement())
 			{
 				cd.setAutoinc_create_or_modify_Start_Increment(
@@ -1801,6 +1863,7 @@ else if (referencedColsInTriggerAction[j] == droppedColumnPosition)
 		// able to get to the triggers dependent on the table being altered
 		//Following will get all the dependent objects that are using
 		// ALTER TABLE table as provider
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         List<DependencyDescriptor> depsOnAlterTableList =
                 dd.getProvidersDescriptorList(td.getObjectID().toString());
 
@@ -1937,6 +2000,7 @@ private boolean columnDroppedAndTriggerDependencies(TriggerDescriptor trd,
 				trd.getTableDescriptor(),
 				trd.getTriggerEventMask(),
                 true,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
                 null,
                 null);
 
@@ -2054,6 +2118,7 @@ private void modifyColumnType(int ix)
             throws StandardException {
 		ColumnDescriptor columnDescriptor = 
             td.getColumnDescriptor(columnInfo[ix].name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         ColumnDescriptor newColumnDescriptor =
 			new ColumnDescriptor(columnInfo[ix].name,
@@ -2082,8 +2147,11 @@ private void modifyColumnType(int ix)
 	 * constraint.
 	 */
     private void modifyColumnConstraint(String colName, boolean nullability)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
             throws StandardException {
 		ColumnDescriptor columnDescriptor = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             td.getColumnDescriptor(colName);
         
         // Get the type and change the nullability
@@ -2093,6 +2161,7 @@ private void modifyColumnConstraint(String colName, boolean nullability)
         //check if there are any unique constraints to update
         ConstraintDescriptorList cdl = dd.getConstraintDescriptors(td);
         int columnPostion = columnDescriptor.getPosition();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3456
         for (int i = 0; i < cdl.size(); i++) 
         {
             ConstraintDescriptor cd = cdl.elementAt(i);
@@ -2110,6 +2179,7 @@ private void modifyColumnConstraint(String colName, boolean nullability)
 
                     //check if the backing index was created when the column
                     //not null ie is backed by unique index
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     if (! (desc.getIndexDescriptor().isUnique() ||
                            desc.getIndexDescriptor().hasDeferrableChecking())) {
                         break;
@@ -2122,6 +2192,7 @@ private void modifyColumnConstraint(String colName, boolean nullability)
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         ColumnDescriptor newColumnDescriptor =
 			 new ColumnDescriptor(colName,
 									columnDescriptor.getPosition(),
@@ -2131,12 +2202,18 @@ private void modifyColumnConstraint(String colName, boolean nullability)
 									td,
 									columnDescriptor.getDefaultUUID(),
 									columnDescriptor.getAutoincStart(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 									columnDescriptor.getAutoincInc(),
 									columnDescriptor.getAutoincCycle());
         
 		// Update the ColumnDescriptor with new default info
 		dd.dropColumnDescriptor(td.getUUID(), colName, tc);
 		dd.addDescriptor(newColumnDescriptor, td,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3456
 						 DataDictionary.SYSCOLUMNS_CATALOG_NUM, false, tc);		
 	}
 	/**
@@ -2188,7 +2265,22 @@ private void modifyColumnDefault(int ix)
 												   td,
 												   defaultUUID,
 												   columnInfo[ix].autoincStart,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 												   columnInfo[ix].autoincInc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 												   columnInfo[ix].autoinc_create_or_modify_Start_Increment,
 												   columnInfo[ix].autoincCycle
 												   );
@@ -2198,14 +2290,17 @@ private void modifyColumnDefault(int ix)
 		dd.addDescriptor(columnDescriptor, td,
 						 DataDictionary.SYSCOLUMNS_CATALOG_NUM, false, tc);
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 		if (columnInfo[ix].action == ColumnInfo.MODIFY_COLUMN_DEFAULT_INCREMENT)
 		{
 			// adding an autoincrement default-- calculate the maximum value 
 			// of the autoincrement column.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
             long maxValue = getColumnMax(td, columnInfo[ix].name,
                                          columnInfo[ix].autoincInc);
 			dd.setAutoincrementValue(tc, td.getUUID(), columnInfo[ix].name,
 									 maxValue, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 		} else if (columnInfo[ix].action == ColumnInfo.MODIFY_COLUMN_DEFAULT_RESTART)
 		{
 			dd.setAutoincrementValue(tc, td.getUUID(), columnInfo[ix].name,
@@ -2215,6 +2310,11 @@ private void modifyColumnDefault(int ix)
 
 		if (
             (columnInfo[ix].action == ColumnInfo.MODIFY_COLUMN_DEFAULT_INCREMENT) ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
             (columnInfo[ix].action == ColumnInfo.MODIFY_COLUMN_DEFAULT_RESTART) ||
              (columnInfo[ix].action == ColumnInfo.MODIFY_COLUMN_DEFAULT_CYCLE) 
             )
@@ -2229,11 +2329,17 @@ private void modifyColumnDefault(int ix)
                 
                 // don't clobber the current value of the sequence generator if we
                 // are just changing the increment. see DERBY-6579.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
                 if ( (columnInfo[ix].action == ColumnInfo.MODIFY_COLUMN_DEFAULT_INCREMENT) || (columnInfo[ix].action == ColumnInfo.MODIFY_COLUMN_DEFAULT_CYCLE ))
                 {
                     currentValue = dd.peekAtIdentity( td.getSchemaName(), td.getName() );
                 }
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6961
                 if (columnInfo[ix].action == ColumnInfo.MODIFY_COLUMN_DEFAULT_CYCLE)
                 {
                     if (columnInfo[ix].autoincCycle)
@@ -2280,6 +2386,11 @@ private void modifyColumnDefault(int ix)
                 csca.executeConstantAction( activation );
 
                 // reset the current value of the sequence generator as necessary
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
                 if ( (columnInfo[ix].action == ColumnInfo.MODIFY_COLUMN_DEFAULT_INCREMENT) || (columnInfo[ix].action == ColumnInfo.MODIFY_COLUMN_DEFAULT_CYCLE ) )
                 {
                     SequenceDescriptor  sequence = dd.getSequenceDescriptor
@@ -2306,6 +2417,7 @@ private void modifyColumnDefault(int ix)
      * @return the top or bottom of the range
      */
     private long getRangeBound(DataTypeDescriptor dtd, int topOrBottom)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6961
         throws StandardException
     {
         TypeId typeId = dtd.getTypeId();
@@ -2364,6 +2476,11 @@ private void modifyIdentityState(int ix)
            defaultUUID,
            oldColumnDescriptor.getAutoincStart(),
            oldColumnDescriptor.getAutoincInc(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
            ColumnDefinitionNode.MODIFY_AUTOINCREMENT_ALWAYS_VS_DEFAULT,
            oldColumnDescriptor.getAutoincCycle()
            );
@@ -2396,6 +2513,7 @@ private void compressTable()
 			if (lockGranularity != '\0')
 			{
 				SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 					"lockGranularity expected to be '\0', not " + 
                     lockGranularity);
 			}
@@ -2405,9 +2523,11 @@ private void compressTable()
 				"constraintActions expected to be null");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 		ExecRow emptyHeapRow  = td.getEmptyExecRow();
         int[]   collation_ids = td.getColumnCollationIds();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		compressHeapCC = 
             tc.openConglomerate(
                 td.getHeapConglomerateId(),
@@ -2430,14 +2550,17 @@ private void compressTable()
 
 		/* Set up index info */
         getAffectedIndexes();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
 
 		// Get an array of RowLocation template
 		compressRL = new RowLocation[bulkFetchSize];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		indexRows  = new ExecIndexRow[numIndexes];
 		if (!compressTable)
 		{
             // must be a drop column, thus the number of columns in the
             // new template row and the collation template is one less.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			ExecRow newRow = 
                 activation.getExecutionFactory().getValueRow(
                     emptyHeapRow.nColumns() - 1);
@@ -2472,6 +2595,7 @@ private void compressTable()
 		for (int i = 0; i < bulkFetchSize; i++)
 		{
 			// create a base row template
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 			baseRow[i] = td.getEmptyExecRow();
 			baseRowArray[i] = baseRow[i].getRowArray();
 			compressRL[i] = compressHeapGSC.newRowLocationTemplate();
@@ -2483,6 +2607,7 @@ private void compressTable()
                 "heap",
                 emptyHeapRow.getRowArray(),
                 null, //column sort order - not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 collation_ids,
                 properties,
                 TransactionController.IS_DEFAULT,
@@ -2532,6 +2657,7 @@ private void compressTable()
 		 * back the same conglomerate number
 		 */
 		// Get the ConglomerateDescriptor for the heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		long oldHeapConglom       = td.getHeapConglomerateId();
 		ConglomerateDescriptor cd = 
             td.getConglomerateDescriptor(oldHeapConglom);
@@ -2602,6 +2728,7 @@ private void truncateTable()
                     final ForeignKeyConstraintDescriptor fk =
                             (ForeignKeyConstraintDescriptor)fkcd;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6668
                     throw StandardException.newException
                         ( SQLState.LANG_NO_TRUNCATE_ON_FK_REFERENCE_TABLE, td.getName() );
 				}
@@ -2609,6 +2736,7 @@ private void truncateTable()
 		}
 
 		//truncate is not allowed when there are enabled DELETE triggers
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TriggerDescriptor trd : dd.getTriggerDescriptors(td)) {
 			if (trd.listensForEvent(TriggerDescriptor.TRIGGER_EVENT_DELETE) &&
 				trd.isEnabled())
@@ -2620,6 +2748,7 @@ private void truncateTable()
 		}
 
 		//gather information from the existing conglomerate to create new one.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 		emptyHeapRow = td.getEmptyExecRow();
 		compressHeapCC = tc.openConglomerate(
 								td.getHeapConglomerateId(),
@@ -2635,6 +2764,7 @@ private void truncateTable()
 		compressHeapCC = null;
 
 		//create new conglomerate
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		newHeapConglom = 
             tc.createConglomerate(
                 "heap",
@@ -2645,6 +2775,7 @@ private void truncateTable()
                 TransactionController.IS_DEFAULT);
 		
 		/* Set up index info to perform truncate on them*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
         getAffectedIndexes();
 		if(numIndexes > 0)
 		{
@@ -2654,6 +2785,7 @@ private void truncateTable()
 
 			for (int index = 0; index < numIndexes; index++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5530
                 IndexRowGenerator curIndex = compressIRGs[index];
 				// create a single index row template for each index
                 indexRows[index] = curIndex.getIndexRowTemplate();
@@ -2673,6 +2805,7 @@ private void truncateTable()
 				int numColumnOrderings;
 				numColumnOrderings = baseColumnPositions.length + 1;
 				ordering[index]    = new ColumnOrdering[numColumnOrderings];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5530
                 collation[index]   = curIndex.getColumnCollationIds(
                                                 td.getColumnDescriptorList());
 
@@ -2768,6 +2901,7 @@ private void updateAllIndexes(long newHeapConglom,
 	}
 
 	private void updateIndex(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     long            newHeapConglom, 
     DataDictionary  dd,
     int             index, 
@@ -2799,6 +2933,7 @@ private void updateIndex(
 		properties.put("baseConglomerateId", Long.toString(newHeapConglom));
 		if (cd.getIndexDescriptor().isUnique())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			properties.put(
                 "nUniqueColumns", Integer.toString(indexRowLength - 1));
 		}
@@ -2807,6 +2942,7 @@ private void updateIndex(
 			properties.put(
                 "nUniqueColumns", Integer.toString(indexRowLength));
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (  cd.getIndexDescriptor().isUniqueWithDuplicateNulls() &&
              !cd.getIndexDescriptor().hasDeferrableChecking() )
 		{
@@ -2824,11 +2960,13 @@ private void updateIndex(
 		// We can finally drain the sorter and rebuild the index
 		// Populate the index.
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         RowLocationRetRowSource cCount;
 		boolean                 statisticsExist  = false;
 
 		if (!truncateTable)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 			sorters[index].completedInserts();
 			sorters[index] = null;
 
@@ -2876,6 +3014,7 @@ private void updateIndex(
 				for (int i = 0; i < c.length; i++)
 				{
 					StatisticsDescriptor statDesc =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 						new StatisticsDescriptor(
                             dd, 
                             dd.getUUIDFactory().createUUID(), 
@@ -2901,6 +3040,7 @@ private void updateIndex(
                     "BTREE",
                     indexRows[index].getRowArray(),
                     ordering[index],
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                     collation[index],
                     properties,
                     TransactionController.IS_DEFAULT);
@@ -2919,6 +3059,7 @@ private void updateIndex(
 		 * conglomerate.
 		 */
 		dd.updateConglomerateDescriptor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             td.getConglomerateDescriptors(indexConglomerateNumbers[index]),
             newIndexCongloms[index], 
             tc);
@@ -2950,12 +3091,14 @@ private void getAffectedIndexes()
 
 		if (! (compressTable || truncateTable))		// then it's drop column
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		    ArrayList<ConstantAction> newCongloms = new ArrayList<ConstantAction>();
 			for (int i = 0; i < compressIRGs.length; i++)
 			{
 				int[] baseColumnPositions = compressIRGs[i].baseColumnPositions();
 				int j;
 				for (j = 0; j < baseColumnPositions.length; j++)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 					if (baseColumnPositions[j] == droppedColumnPosition) break;
 				if (j == baseColumnPositions.length)	// not related
 					continue;
@@ -3001,10 +3144,12 @@ private void getAffectedIndexes()
 			 * call.
 			 */
             createNewBackingCongloms(newCongloms, indexConglomerateNumbers);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
 
 			IndexRowGenerator[] newIRGs = new IndexRowGenerator[numIndexes];
 			long[] newIndexConglomNumbers = new long[numIndexes];
 			collation = new int[numIndexes][]; 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6890
 
 			for (int i = 0, j = 0; i < numIndexes; i++, j++)
 			{
@@ -3026,9 +3171,11 @@ private void getAffectedIndexes()
 				int size = baseColumnPositions.length;
 				for (int k = 0; k < size; k++)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 					if (baseColumnPositions[k] > droppedColumnPosition)
                     {
 						baseColumnPositions[k]--;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3177
                         rewriteBaseColumnPositions = true;
                     }
 					else if (baseColumnPositions[k] == droppedColumnPosition)
@@ -3055,6 +3202,7 @@ else if (baseColumnPositions[k] == droppedColumnPosition)
 							step++;
 						newBCP[k] = baseColumnPositions[k + step];
 						newIsAscending[k] = isAscending[k + step];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6890
 						newCollation[k] = collation[i][k + step];
 					}
 					IndexDescriptor id = compressIRGs[j].getIndexDescriptor();
@@ -3069,6 +3217,7 @@ else if (baseColumnPositions[k] == droppedColumnPosition)
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3352
 			collation = new int[numIndexes][]; 
 			for (int i = 0; i < numIndexes; i++)
 			{
@@ -3122,6 +3271,7 @@ else if (baseColumnPositions[k] == droppedColumnPosition)
 	 *   physical conglomerate.
 	 */
 	private void createNewBackingCongloms(ArrayList<ConstantAction> newConglomActions,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
                                           long [] ixCongNums)
 		throws StandardException
 	{
@@ -3217,6 +3367,7 @@ private void setUpAllSorts(ExecRow sourceRow,
 			// Get an index row based on the base row
 			// (This call is only necessary here because we need to pass a 
             // template to the sorter.)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			compressIRGs[index].getIndexRow(
                 sourceRow, rl, indexRows[index], (FormatableBitSet) null);
 
@@ -3299,6 +3450,7 @@ public DataValueDescriptor[] getNextRowFromRowSource()
 		{
             int bulkFetched =
                     compressHeapGSC.fetchNextGroup(baseRowArray, compressRL);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 			doneScan = (bulkFetched != bulkFetchSize);
 			currentCompressRow = 0;
@@ -3323,6 +3475,7 @@ public DataValueDescriptor[] getNextRowFromRowSource()
 			{
 				if (currentRow == null)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 					currentRow = 
                         activation.getExecutionFactory().getValueRow(
                             baseRowArray[currentCompressRow].length - 1);
@@ -3389,6 +3542,7 @@ public boolean needsRowLocation()
 
     public boolean needsRowLocationForDeferredCheckConstraints()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         return false;
     }
 
@@ -3436,6 +3590,7 @@ private void objectifyStreamingColumns()
 
 			if (currentRow.getRowArray()[i] instanceof StreamStorable)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 currentRow.getRowArray()[i].getObject();
 			}
 		}
@@ -3448,6 +3603,7 @@ private void insertIntoSorter(int index, RowLocation rl)
 		indexRows[index].getNewObjectArray();
 		// Associate the index row with the source row
 		compressIRGs[index].getIndexRow(currentRow, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
                                         (RowLocation) rl.cloneValue(false),
 										indexRows[index],
 										(FormatableBitSet) null);
@@ -3480,6 +3636,7 @@ private void	cleanUp() throws StandardException
 			{
 				if (sorters[index] != null)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 					sorters[index].completedInserts();
 				}
 				sorters[index] = null;
@@ -3553,6 +3710,7 @@ private int getSemiRowCount(TransactionController tc)
 	 * @exception StandardException if update to default fails
 	 */
     private void updateNewColumnToDefault(ColumnDescriptor columnDescriptor)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
             throws StandardException {
         String  columnName = columnDescriptor.getColumnName();
 
@@ -3574,6 +3732,7 @@ private static void executeUpdate(LanguageConnectionContext lcc, String updateSt
         // This is a substatement; for now, we do not set any timeout
         // for it. We might change this behaviour later, by linking
         // timeout to its parent statement's timeout settings.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 		ResultSet rs = ps.executeSubStatement(lcc, true, 0L);
 		rs.close();
 	}
@@ -3582,9 +3741,11 @@ private static void executeUpdate(LanguageConnectionContext lcc, String updateSt
 	 * computes the minimum/maximum value in a column of a table.
 	 */
     private long getColumnMax(TableDescriptor td, String columnName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4899
                               long increment)
             throws StandardException {
 		String maxStr = (increment > 0) ? "MAX" : "MIN";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5157
         String maxStmt = "SELECT  " + maxStr + "(" +
                 IdUtil.normalToDelimited(columnName) + ") FROM " +
                 IdUtil.mkQualifiedName(td.getSchemaName(), td.getName());
@@ -3593,6 +3754,7 @@ private long getColumnMax(TableDescriptor td, String columnName,
 
         // This is a substatement, for now we do not set any timeout for it
         // We might change this later by linking timeout to parent statement
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 		ResultSet rs = ps.executeSubStatement(lcc, false, 0L);
 		DataValueDescriptor[] rowArray = rs.getNextRow().getRowArray();
 		rs.close();
@@ -3652,6 +3814,7 @@ private void closeBulkFetchScan()
 	{
 		boolean foundNullable = false;
         StringBuilder constraintText = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		/* 
 		 * Check for nullable columns and create a constraint string which can
@@ -3680,6 +3843,7 @@ private void closeBulkFetchScan()
 					// column name uses lower case characters, spaces, or
 					// other unusual characters.
 					constraintText.append(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                         IdUtil.normalToDelimited(columnNames[colCtr]));
                     constraintText.append(" IS NOT NULL ");
 				}
@@ -3694,6 +3858,7 @@ private void closeBulkFetchScan()
 		if (foundNullable && numRows > 0)
 		{
 			if (!ConstraintConstantAction.validateConstraint(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     (String) null,
                     constraintText.toString(),
                     null, /* not used for not nullable constraints yet */
@@ -3702,6 +3867,7 @@ private void closeBulkFetchScan()
                     false,
                     false /* not used for not nullable constraints yet */))
 			{	
+//IC see: https://issues.apache.org/jira/browse/DERBY-3523
 				if (errorMsg.equals(SQLState.LANG_NULL_DATA_IN_PRIMARY_KEY_OR_UNIQUE_CONSTRAINT))
 				{	//alter table add primary key
 					 //soft upgrade mode
@@ -3802,6 +3968,7 @@ private Object[] compressIndexArrays(
 	}
 
     public void offendingRowLocation(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             RowLocation rl, long containdId) throws StandardException {
         if (SanityManager.DEBUG) {
             SanityManager.NOTREACHED();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AnyResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AnyResultSet.java
index aefdc9e345..4a5898bb1b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AnyResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AnyResultSet.java
@@ -155,6 +155,7 @@ public void	finish() throws StandardException
 	 */
 	public ExecRow	getNextRowCore() throws StandardException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java
index c4b661f320..9b7c130bfc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java
@@ -174,6 +174,7 @@ public Long getCurrentValue()
 	{
 		if (initialized == false)
 			return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return counter;
 	}
 	
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AvgAggregator.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AvgAggregator.java
index 6cb1d9f504..fc7d3e079c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AvgAggregator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/AvgAggregator.java
@@ -63,6 +63,8 @@ protected void accumulate(DataValueDescriptor addend)
 			if (   typeName.equals(TypeId.TINYINT_NAME)
 				|| typeName.equals(TypeId.SMALLINT_NAME)
 				|| typeName.equals(TypeId.INTEGER_NAME)
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                 || typeName.equals(TypeId.BIGINT_NAME)) {
 				scale = 0;
 			} else if (   typeName.equals(TypeId.REAL_NAME)
@@ -70,6 +72,7 @@ protected void accumulate(DataValueDescriptor addend)
 				scale = TypeId.DECIMAL_SCALE;
 			} else {
 				// DECIMAL
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				scale = ((SQLDecimal) addend).getDecimalValueScale();
 				if (scale < NumberDataValue.MIN_DECIMAL_DIVIDE_SCALE)
 					scale = NumberDataValue.MIN_DECIMAL_DIVIDE_SCALE;
@@ -115,6 +118,7 @@ protected void accumulate(DataValueDescriptor addend)
 		} else if (typeName.equals(TypeId.REAL_NAME)) {
 			newValue = new org.apache.derby.iapi.types.SQLDouble();
 		} else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             newValue = new SQLDecimal();
 		}
 		
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BaseActivation.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BaseActivation.java
index 36e4460c72..3ceccd1d63 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BaseActivation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BaseActivation.java
@@ -1909,6 +1909,7 @@ public void prepareToInvalidate(Provider p, int action,
      */
     static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java
index d97cfdbd34..cd9d8591e9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java
@@ -93,6 +93,7 @@ public static DataValueDescriptor minValue(DataValueDescriptor v1,
 	{
 		DataValueDescriptor judge;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if (judgeUserJDBCTypeId == -1) {
         	judge = new DataTypeDescriptor(
         			new TypeId(judgeTypeFormatId, null),
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
index 09e9cc7ab9..d4078c469e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
@@ -1104,6 +1104,7 @@ private static  String  stripPackage( String className )
         for ( Field field : fields )
         {
             Object  fieldContents = field.get( outerRS );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
 
             if ( fieldContents != null )
             {
@@ -1149,6 +1150,7 @@ private static  void    findResultSetFields( ArrayList<Field> fieldList, final C
     {
         if ( klass == null ) { return; }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         Field[] fields = AccessController.doPrivileged
             (
              new PrivilegedAction<Field[]>()
@@ -1163,6 +1165,7 @@ public Field[] run()
         for ( Field field : fields )
         {
             if ( ResultSet.class.isAssignableFrom( field.getType() ) ) { fieldList.add( field ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
             else if ( field.getType().isArray() )
             {
                 if ( ResultSet.class.isAssignableFrom( field.getType().getComponentType() ) )
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java
index 83b30e289b..7b2956bc3f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java
@@ -65,6 +65,7 @@ public BasicSortObserver(boolean doClone, boolean distinct, ExecRow	execRow, boo
 		this.distinct = distinct;
 		this.execRow = execRow;
 		this.reuseWrappers = reuseWrappers;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		vector = new Vector<DataValueDescriptor[]>();
 	}
 
@@ -127,6 +128,7 @@ public DataValueDescriptor[] getArrayClone()
 
 		if (lastElement > 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			DataValueDescriptor[] retval = vector.elementAt(lastElement - 1);
 			vector.removeElementAt(lastElement - 1);
 			return retval;
@@ -168,6 +170,7 @@ private DataValueDescriptor[] getClone(DataValueDescriptor[] origArray)
             //          set very early, which causes store streams to fail
             //          because the container handle is closed.
             // Beetle 4896.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
             newArray[i] = origArray[i].cloneValue(true);
 		}
 
@@ -175,6 +178,9 @@ private DataValueDescriptor[] getClone(DataValueDescriptor[] origArray)
 	}
 
     public boolean deferred() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         return false;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
index deaeb8cf61..b435476db0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
@@ -66,6 +66,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * probably be rolled into TableScanResultSet.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class BulkTableScanResultSet extends TableScanResultSet
 	implements CursorResultSet
 {
@@ -86,6 +87,7 @@ class BulkTableScanResultSet extends TableScanResultSet
 	 *
 	 * @exception StandardException thrown on failure to open
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     BulkTableScanResultSet(long conglomId,
 		StaticCompiledOpenConglomInfo scoci, Activation activation, 
 		int resultRowTemplate,
@@ -95,6 +97,7 @@ class BulkTableScanResultSet extends TableScanResultSet
 		boolean sameStartStopPosition,
 		Qualifier[][] qualifiers,
 		String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		String userSuppliedOptimizerOverrides,
 		String indexName,
 		boolean isConstraint,
@@ -114,6 +117,7 @@ class BulkTableScanResultSet extends TableScanResultSet
 		super(conglomId,
 			scoci,
 			activation,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 			resultRowTemplate,
 			resultSetNumber,
 			startKeyGetter,
@@ -123,6 +127,7 @@ class BulkTableScanResultSet extends TableScanResultSet
 			sameStartStopPosition,
 			qualifiers,
 			tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 			userSuppliedOptimizerOverrides,
 			indexName,
 			isConstraint,
@@ -136,6 +141,7 @@ class BulkTableScanResultSet extends TableScanResultSet
 			oneRowScan,
 			optimizerEstimatedRowCount,
 			optimizerEstimatedCost);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 
 		if (SanityManager.DEBUG)
 		{
@@ -342,12 +348,14 @@ public void reopenCore() throws StandardException
 	 */
 	public ExecRow getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
 	    ExecRow result = null;
             
         checkCancellationFlag();
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
 
 		beginTime = getCurrentTimeMillis();
 		if (isOpen && scanControllerOpened)
@@ -454,6 +462,7 @@ public void	close() throws StandardException
 	 */
 	protected boolean canGetInstantaneousLocks()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 		return !forUpdate;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java
index b7603040f4..52bf76b599 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java
@@ -71,7 +71,10 @@ class CallStatementResultSet extends NoRowsResultSetImpl
 	public void open() throws StandardException
 	{
 		setup();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
         methodCall.invoke(activation);
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java
index 452713b877..f1f508adb1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java
@@ -57,6 +57,7 @@ public boolean needsRowLocation()
 
     public boolean needsRowLocationForDeferredCheckConstraints()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         return rowSource.needsRowLocationForDeferredCheckConstraints();
     }
 
@@ -112,6 +113,7 @@ private DataValueDescriptor[] clone(DataValueDescriptor[] clonee)
 		cloned = new DataValueDescriptor[clonee.length];
 		for (int i = 0; i < clonee.length - 1; i++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 			cloned[i] = clonee[i].cloneValue(false);
 		}
 		return cloned;
@@ -133,6 +135,7 @@ public void keepCount(DataValueDescriptor[] currentKey) throws StandardException
 		int i;
 		for (i = 0; i < numKeys; i++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             if (prevKey[i].isNull()) {
 				break;
             }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ColumnInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ColumnInfo.java
index cd7590a2ae..d8a5bd62ad 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ColumnInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ColumnInfo.java
@@ -131,6 +131,7 @@ public	ColumnInfo(
 					   UUID							oldDefaultUUID,
 					   int							action,
 					   long							autoincStart,
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 					   long							autoincInc,
 					   boolean						autoincCycle,
 					   long							autoinc_create_or_modify_Start_Increment)
@@ -139,13 +140,20 @@ public	ColumnInfo(
 		this.dataType = dataType;
 		this.defaultValue = defaultValue;
 		this.defaultInfo = defaultInfo;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.providers = ArrayUtil.copy(providers);
 		this.newDefaultUUID = newDefaultUUID;
 		this.oldDefaultUUID = oldDefaultUUID;
 		this.action = action;
 		this.autoincStart = autoincStart;
 		this.autoincInc = autoincInc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 		this.autoincCycle = autoincCycle;
+//IC see: https://issues.apache.org/jira/browse/DERBY-783
 		this.autoinc_create_or_modify_Start_Increment = autoinc_create_or_modify_Start_Increment;
 	}
 
@@ -187,6 +195,7 @@ public void readExternal( ObjectInput in )
         FormatableArrayHolder   fah = (FormatableArrayHolder) fh.get( "providers" );
         if ( fah != null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6292
             providers = fah.getArray(ProviderInfo[].class);
         }
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java
index 4ba71f71cf..41518e0ba1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java
@@ -48,6 +48,7 @@ protected boolean shouldWeCheckRowCounts() {
     }
 
     protected ResultSet createResultSet() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
         return getResultSetFactory().getDDLResultSet(this);
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java
index 21e7ba819f..1d2bb344c9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java
@@ -121,6 +121,7 @@ public	int getConstraintType()
      * @return constraint id
      */
     public UUID getConstraintId() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         return constraintId;
     }
 
@@ -150,6 +151,7 @@ public UUID getConstraintId() {
 	 */
 	static void validateFKConstraint
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         Activation                          activation,
 		TransactionController				tc,
 		DataDictionary						dd,
@@ -167,6 +169,7 @@ public UUID getConstraintId() {
                 fk.getIndexConglomerateDescriptor(dd).getConglomerateNumber(),
                 false,                       			// hold 
                 0, 										// read only
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 TransactionController.MODE_TABLE,       // already locked
                 TransactionController.ISOLATION_READ_COMMITTED,
                 (FormatableBitSet)null,                 // retrieve all fields
@@ -217,6 +220,7 @@ public UUID getConstraintId() {
 					refcd.getIndexConglomerateDescriptor(dd).getConglomerateNumber(),
                         false,                       	// hold 
                         0, 								// read only
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                         TransactionController.MODE_RECORD,
                         TransactionController.ISOLATION_READ_COMMITTED,
                                               // read committed is good enough
@@ -228,6 +232,7 @@ public UUID getConstraintId() {
                         ScanController.GT             	// stopSearchOp 
                         );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             RIBulkChecker riChecker = new RIBulkChecker(
                     activation,
                     refScan,
@@ -293,6 +298,7 @@ public UUID getConstraintId() {
 	(
 		String							constraintName,
 		String							constraintText,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         UUID                            constraintId,
 		TableDescriptor					td,
 		LanguageConnectionContext		lcc,
@@ -301,6 +307,7 @@ public UUID getConstraintId() {
 	)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         StringBuilder checkStmt = new StringBuilder();
 		/* should not use select sum(not(<check-predicate>) ? 1: 0) because
 		 * that would generate much more complicated code and may exceed Java
@@ -316,10 +323,12 @@ public UUID getConstraintId() {
 		try
 		{
 			PreparedStatement ps = lcc.prepareInternalStatement(checkStmt.toString());
+//IC see: https://issues.apache.org/jira/browse/DERBY-231
 
             // This is a substatement; for now, we do not set any timeout
             // for it. We might change this behaviour later, by linking
             // timeout to its parent statement's timeout settings.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 			rs = ps.executeSubStatement(lcc, false, 0L);
 			ExecRow row = rs.getNextRow();
 			if (SanityManager.DEBUG)
@@ -349,14 +358,18 @@ public UUID getConstraintId() {
                         // violating rows, so for now, just pretend we know one,
                         // then invalidate the row location information forcing
                         // full table check at validation time
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                         CheckInfo newCi[] = new CheckInfo[1];
                         DeferredConstraintsMemory.rememberCheckViolations(
                                 lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                                 td.getObjectID(),
                                 td.getSchemaName(),
                                 td.getName(),
                                 null,
                                 violatingConstraints,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 new HeapRowLocation() /* dummy */,
                                 newCi);
                         newCi[0].setInvalidatedRowLocations();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java
index 2dd3dd5d0d..95c18850ff 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java
@@ -227,6 +227,7 @@ public TableDescriptor getReferencedTableDescriptor(DataDictionary dd)
 		}
 	
 		return dd.getTableDescriptor(tableName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 				getReferencedTableSchemaDescriptor(dd), null);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java
index cd7763e3c6..1892bb1c0d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java
@@ -93,6 +93,7 @@ class CreateAliasConstantAction extends DDLConstantAction
 				nameSpace = AliasInfo.ALIAS_NAME_SPACE_FUNCTION_AS_CHAR;
 				break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 			case AliasInfo.ALIAS_TYPE_SYNONYM_AS_CHAR:
 				nameSpace = AliasInfo.ALIAS_NAME_SPACE_SYNONYM_AS_CHAR;
 				break;
@@ -134,6 +135,7 @@ public	String	toString()
 				type = "CREATE FUNCTION ";
 				break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 			case AliasInfo.ALIAS_TYPE_SYNONYM_AS_CHAR:
 				type = "CREATE SYNONYM ";
 				break;
@@ -198,6 +200,7 @@ public void	executeConstantAction( Activation activation )
 
 		DataDictionary dd = lcc.getDataDictionary();
 		TransactionController tc = lcc.getTransactionExecute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 
 		// For routines no validity checking is made
         // on the Java method, that is checked when the
@@ -244,6 +247,8 @@ public void	executeConstantAction( Activation activation )
             }
 
             // also don't want to collide with 1-arg functions by the same name
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
             List<AliasDescriptor> funcList =
                 dd.getRoutineList(sd.getUUID().toString(),
                                   aliasName,
@@ -295,8 +300,11 @@ public void	executeConstantAction( Activation activation )
             
             break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 		case AliasInfo.ALIAS_TYPE_SYNONYM_AS_CHAR:
 			// If target table/view exists already, error.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 			TableDescriptor targetTD = dd.getTableDescriptor(aliasName, sd, tc);
 			if (targetTD != null)
 			{
@@ -332,6 +340,7 @@ public void	executeConstantAction( Activation activation )
 
 			// If synonym final target is not present, raise a warning
 			if (nextSD != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 				targetTD = dd.getTableDescriptor(nextSynTable, nextSD, tc);
 			if (nextSD == null || targetTD == null)
 				activation.addWarning(
@@ -367,6 +376,8 @@ public void	executeConstantAction( Activation activation )
          )
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
         List<AliasDescriptor> list = dd.getRoutineList(
             sd.getUUID().toString(), aliasName, aliasType);
         
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java
index cb3f70c6b2..0d72333194 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java
@@ -121,9 +121,11 @@ public class CreateConstraintConstantAction extends ConstraintConstantAction
 	{
 		super(constraintName, constraintType, tableName, 
 			  tableId, schemaName, indexAction);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3008
         this.forCreateTable = forCreateTable;
 		this.columnNames = columnNames;
 		this.constraintText = constraintText;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         this.characteristics = characteristics.clone();
 		this.otherConstraintInfo = otherConstraint;
 		this.providerInfo = providerInfo;
@@ -222,6 +224,7 @@ public void	executeConstantAction( Activation activation )
 			}
 			else
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 				td = dd.getTableDescriptor(tableName, sd, tc);
 			}
 
@@ -238,6 +241,8 @@ public void	executeConstantAction( Activation activation )
 		UUIDFactory uuidFactory = dd.getUUIDFactory();
         
         UUID constrId = uuidFactory.createUUID();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
 
 		/* Create the index, if there's one for this constraint */
 		if (indexAction != null)
@@ -251,6 +256,8 @@ public void	executeConstantAction( Activation activation )
 			else { backingIndexName = indexAction.getIndexName(); }
 
             indexAction.setConstraintID( constrId );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
 
 			/* Create the index */
 			indexAction.executeConstantAction(activation);
@@ -286,6 +293,7 @@ public void	executeConstantAction( Activation activation )
 		}
 
         boolean[] defaults = new boolean[]{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             ConstraintDefinitionNode.DEFERRABLE_DEFAULT,
             ConstraintDefinitionNode.INITIALLY_DEFERRED_DEFAULT,
             ConstraintDefinitionNode.ENFORCED_DEFAULT
@@ -296,6 +304,7 @@ public void	executeConstantAction( Activation activation )
                 dd.checkVersion(DataDictionary.DD_VERSION_DERBY_10_11,
                                 "DEFERRED CONSTRAINTS");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 if (constraintType == DataDictionary.NOTNULL_CONSTRAINT ||
                     !characteristics[2] /* not enforced */) {
 
@@ -333,6 +342,8 @@ public void	executeConstantAction( Activation activation )
 			case DataDictionary.UNIQUE_CONSTRAINT:
 				conDesc = ddg.newUniqueConstraintDescriptor(
 								td, constraintName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 characteristics[0], //deferable,
                                 characteristics[1], //initiallyDeferred,
 								genColumnPositions(td, false), //int[],
@@ -348,8 +359,10 @@ public void	executeConstantAction( Activation activation )
 			case DataDictionary.CHECK_CONSTRAINT:
 				conDesc = ddg.newCheckConstraintDescriptor(
 								td, constraintName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 characteristics[0], //deferable,
                                 characteristics[1], //initiallyDeferred,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 constrId,
 								constraintText, 
 								new ReferencedColumnsDescriptorImpl(genColumnPositions(td, false)), //int[],
@@ -358,6 +371,7 @@ public void	executeConstantAction( Activation activation )
 								);
 				dd.addConstraintDescriptor(conDesc, tc);
 				storeConstraintDependenciesOnPrivileges
+//IC see: https://issues.apache.org/jira/browse/DERBY-3743
 					(activation, conDesc, null, providerInfo);
 				break;
 
@@ -368,9 +382,13 @@ public void	executeConstantAction( Activation activation )
 				
 				conDesc = ddg.newForeignKeyConstraintDescriptor(
 								td, constraintName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 characteristics[0], //deferable,
                                 characteristics[1], //initiallyDeferred,
 								genColumnPositions(td, false), //int[],
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 constrId,
 								indexId,
 								sd,
@@ -391,6 +409,7 @@ public void	executeConstantAction( Activation activation )
 				if ( (! forCreateTable) && 
 					 dd.activeConstraint( conDesc ) )
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     validateFKConstraint(activation,
                                          tc,
 										 dd, 
@@ -402,6 +421,7 @@ public void	executeConstantAction( Activation activation )
 				/* Create stored dependency on the referenced constraint */
 				dm.addDependency(conDesc, referencedConstraint, lcc.getContextManager());
 				//store constraint's dependency on REFERENCES privileges in the dependeny system
+//IC see: https://issues.apache.org/jira/browse/DERBY-3743
 				storeConstraintDependenciesOnPrivileges
 					(activation,
 					 conDesc,
@@ -409,6 +429,7 @@ public void	executeConstantAction( Activation activation )
 					 providerInfo);
 				break;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             case DataDictionary.MODIFY_CONSTRAINT:
                 throw StandardException.newException(SQLState.NOT_IMPLEMENTED,
                        "ALTER CONSTRAINT");
@@ -435,6 +456,7 @@ public void	executeConstantAction( Activation activation )
 				/* We should always be able to find the Provider */
 					provider = (Provider) providerInfo[ix].
 											getDependableFinder().
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
 												getDependable(dd, 
 													providerInfo[ix].getObjectId());
 
@@ -471,6 +493,7 @@ public void	executeConstantAction( Activation activation )
 				DependencyManager.CREATE_CONSTRAINT, lcc);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         this.constraintId = constrId;
 	}
 	
@@ -486,6 +509,7 @@ boolean isForeignKeyConstraint()
 
 
     boolean isInitiallyDeferred() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         return characteristics[1];
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
index aebd5a77ae..6e60e9eee3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
@@ -193,10 +193,14 @@ class CreateIndexConstantAction extends IndexConstantAction
 		super(tableId, indexName, tableName, schemaName);
 
         this.forCreateTable             = forCreateTable;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         this.unique                     = unique && !hasDeferrableChecking;
 		this.uniqueWithDuplicateNulls   = uniqueWithDuplicateNulls;
         this.hasDeferrableChecking      = hasDeferrableChecking;
         this.initiallyDeferred          = initiallyDeferred;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         this.constraintType             = constraintType;
         this.uniqueDeferrable           = unique && hasDeferrableChecking;
 		this.indexType                  = indexType;
@@ -248,10 +252,15 @@ class CreateIndexConstantAction extends IndexConstantAction
 		 */
 		IndexRowGenerator irg = srcCD.getIndexDescriptor();
 		this.unique = irg.isUnique();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3502
 		this.uniqueWithDuplicateNulls = irg.isUniqueWithDuplicateNulls();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         this.hasDeferrableChecking = false; // N/A such indexes are not shared
         this.uniqueDeferrable = false;      // N/A
         this.initiallyDeferred = false;     // N/A
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         this.constraintType = -1;           // N/A
 		this.indexType = irg.indexType();
 		this.columnNames = srcCD.getColumnNames();
@@ -372,6 +381,7 @@ public void	executeConstantAction( Activation activation )
 			}
 			else
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 				td = dd.getTableDescriptor(tableName, sd, tc);
 			}
 		}
@@ -506,12 +516,16 @@ public void	executeConstantAction( Activation activation )
              * 4. hasDeferrableChecking is FALSE.
              */
             boolean possibleShare =
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                     (irg.isUnique() || !unique) &&
                     (bcps.length == baseColumnPositions.length) &&
                     !hasDeferrableChecking;
 
 			//check if existing index is non unique and uniqueWithDuplicateNulls
 			//is set to true (backing index for unique constraint)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3502
 			if (possibleShare && !irg.isUnique ())
 			{
 				/* If the existing index has uniqueWithDuplicateNulls set to
@@ -545,6 +559,7 @@ public void	executeConstantAction( Activation activation )
 					activation.addWarning(
 							StandardException.newWarning(
 								SQLState.LANG_INDEX_DUPLICATE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6269
 								indexName,
 								cd.getConglomerateName()));
 
@@ -570,6 +585,7 @@ public void	executeConstantAction( Activation activation )
 				 */
 				indexRowGenerator =
 					new IndexRowGenerator(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3502
 						indexType, unique, uniqueWithDuplicateNulls,
                         false, // uniqueDeferrable
                         false, // deferrable indexes are not shared
@@ -633,10 +649,15 @@ public void	executeConstantAction( Activation activation )
 		indexProperties.put("baseConglomerateId",
 							Long.toString(td.getHeapConglomerateId()));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         if (uniqueWithDuplicateNulls && !hasDeferrableChecking)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
             if (dd.checkVersion(DataDictionary.DD_VERSION_DERBY_10_4, null))
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 				indexProperties.put(
                     "uniqueWithDuplicateNulls", Boolean.toString(true));
 			}
@@ -669,9 +690,12 @@ public void	executeConstantAction( Activation activation )
 		// For now, assume that all index columns are ordered columns
 		if (! shareExisting)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
             if (dd.checkVersion(DataDictionary.DD_VERSION_DERBY_10_4, null))
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
                 indexRowGenerator = new IndexRowGenerator(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                         indexType, 
                         unique, 
                         uniqueWithDuplicateNulls,
@@ -772,6 +796,7 @@ public void	executeConstantAction( Activation activation )
 					continue;
 				}
 				numSet++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 ColumnDescriptor cd = cdl.elementAt(index);
 				DataTypeDescriptor dts = cd.getType();
 
@@ -813,8 +838,13 @@ public void	executeConstantAction( Activation activation )
 			 * sort.
 			 */
 			int             numColumnOrderings;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             SortObserver    sortObserver;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
             Properties      sortProperties = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             if (unique || uniqueWithDuplicateNulls || uniqueDeferrable)
 			{
 				// if the index is a constraint, use constraintname in 
@@ -838,8 +868,11 @@ public void	executeConstantAction( Activation activation )
                     numColumnOrderings = unique ? baseColumnPositions.length :
                             baseColumnPositions.length + 1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     sortObserver = new UniqueIndexSortObserver(
                         lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                         constraintID,
                         true,
                         uniqueDeferrable,
@@ -857,6 +890,7 @@ public void	executeConstantAction( Activation activation )
 
                     // tell transaction controller to use the unique with 
                     // duplicate nulls sorter, when making createSort() call.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 					sortProperties = new Properties();
 					sortProperties.put(
                         AccessFactoryGlobals.IMPL_TYPE, 
@@ -865,8 +899,11 @@ public void	executeConstantAction( Activation activation )
 					sortObserver = 
                         new UniqueWithDuplicateNullsIndexSortObserver(
                             lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                             constraintID,
                             true,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                             (hasDeferrableChecking && 
                             constraintType != DataDictionary.FOREIGNKEY_CONSTRAINT),
                             initiallyDeferred,
@@ -887,6 +924,7 @@ public void	executeConstantAction( Activation activation )
 			ColumnOrdering[]	order = new ColumnOrdering[numColumnOrderings];
 			for (int i=0; i < numColumnOrderings; i++) 
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 				order[i] = 
                     new IndexColumnOrder(
                         i, 
@@ -895,6 +933,7 @@ public void	executeConstantAction( Activation activation )
 			}
 
 			// create the sorter
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             sortId = tc.createSort(sortProperties,
 					indexTemplateRow.getRowArrayClone(),
 					order,
@@ -917,6 +956,7 @@ public void	executeConstantAction( Activation activation )
 					indexType,
 					indexTemplateRow.getRowArray(),	// index row template
 					order, //colums sort order
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                     indexRowGenerator.getColumnCollationIds(
                         td.getColumnDescriptorList()),
 					indexProperties,
@@ -988,6 +1028,7 @@ public void	executeConstantAction( Activation activation )
 
 		CardinalityCounter cCount = (CardinalityCounter)rowSource;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         long numRows = cCount.getRowCount();
         if (addStatistics(dd, indexRowGenerator, numRows))
 		{
@@ -1023,6 +1064,7 @@ public void	executeConstantAction( Activation activation )
      * @throws StandardException if accessing the data dictionary fails
      */
     private boolean addStatistics(DataDictionary dd,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
                                   IndexRowGenerator irg,
                                   long numRows)
             throws StandardException {
@@ -1159,6 +1201,7 @@ private RowLocationRetRowSource loadSorter(ExecRow[] baseRows,
 		}
 		finally
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 			sorter.completedInserts();
 		}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateRoleConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateRoleConstantAction.java
index 0de0fec2b9..b590cbf7fe 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateRoleConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateRoleConstantAction.java
@@ -79,6 +79,7 @@ public void executeConstantAction(Activation activation)
         TransactionController tc = lcc.getTransactionExecute();
         DataDescriptorGenerator ddg = dd.getDataDescriptorGenerator();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3333
         if (roleName.equals(Authorizer.PUBLIC_AUTHORIZATION_ID)) {
             throw StandardException.
                 newException(SQLState.AUTH_PUBLIC_ILLEGAL_AUTHORIZATION_ID);
@@ -89,13 +90,16 @@ public void executeConstantAction(Activation activation)
         // in the future since this SQL is more liberal.
         //
         final String currentAuthId = lcc.getCurrentUserId(activation);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
         dd.startWriting(lcc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3173
 
         //
         // Check if this role already exists. If it does, throw.
         //
         RoleGrantDescriptor rdDef = dd.getRoleDefinitionDescriptor(roleName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
 
         if (rdDef != null) {
             throw StandardException.
@@ -107,13 +111,16 @@ public void executeConstantAction(Activation activation)
         // a privilege grant or as a built-in user ("best effort"; we
         // can't guarantee against collision if users are externally
         // defined or added later).
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
         if (knownUser(roleName, currentAuthId, lcc, dd, tc)) {
             throw StandardException.
                 newException(SQLState.LANG_OBJECT_ALREADY_EXISTS,
                              "User", roleName);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
         rdDef = ddg.newRoleGrantDescriptor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
             dd.getUUIDFactory().createUUID(),
             roleName,
             currentAuthId,// grantee
@@ -121,6 +128,7 @@ public void executeConstantAction(Activation activation)
             true,         // with admin option
             true);        // is definition
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
         dd.addDescriptor(rdDef,
                          null,  // parent
                          DataDictionary.SYSROLES_CATALOG_NUM,
@@ -150,6 +158,7 @@ public String toString()
      * with that name.
      */
     private boolean knownUser(String roleName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
                               String currentUser,
                               LanguageConnectionContext lcc,
                               DataDictionary dd,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java
index dadad13523..289ce9af21 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java
@@ -98,6 +98,7 @@ public	String	toString()
 	public void	executeConstantAction( Activation activation )
 						throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-48
 		TransactionController tc = activation.
 			getLanguageConnectionContext().getTransactionExecute();
 
@@ -149,6 +150,7 @@ private void executeConstantActionMinion(Activation activation,
 		String thisAid = aid;
 		if (thisAid == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             thisAid = lcc.getCurrentUserId(activation);
 		}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateSequenceConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateSequenceConstantAction.java
index 09adf05ccd..613ef2284e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateSequenceConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateSequenceConstantAction.java
@@ -121,6 +121,7 @@ public void executeConstantAction(Activation activation)
                 dd.getUUIDFactory().createUUID(),
                 _sequenceName,
                 _dataType,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 _initialValue,   // current value
                 _initialValue,
                 _minValue,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java
index 0967b568f9..c14f46f3df 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java
@@ -171,6 +171,7 @@ public void	executeConstantAction( Activation activation )
         //     table holds.
         //   o create array of collation id's to tell collation id of each
         //     column in table.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		template            = RowUtil.getEmptyValueRow(columnInfo.length, lcc);
         int[] collation_ids = new int[columnInfo.length];
 
@@ -205,6 +206,7 @@ public void	executeConstantAction( Activation activation )
 				"heap", // we're requesting a heap conglomerate
 				template.getRowArray(), // row template
 				null, //column sort order - not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 collation_ids,
 				properties, // properties
 				tableType == TableDescriptor.GLOBAL_TEMPORARY_TABLE_TYPE ?
@@ -287,6 +289,11 @@ public void	executeConstantAction( Activation activation )
                      defaultUUID,
                      columnInfo[ix].autoincStart,
                      columnInfo[ix].autoincInc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
                      columnInfo[ix].autoinc_create_or_modify_Start_Increment,
                      columnInfo[ix].autoincCycle
                      );
@@ -314,6 +321,11 @@ public void	executeConstantAction( Activation activation )
                      td,
                      defaultUUID,
                      columnInfo[ix].autoincStart,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
                      columnInfo[ix].autoincInc,
                      columnInfo[ix].autoincCycle
                      );
@@ -422,6 +434,11 @@ public void	executeConstantAction( Activation activation )
 
 	boolean cycling=false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 	if(info.autoincCycle)
 		cycling=true;
 	
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
index 34b90702b0..fc1d41a3ba 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
@@ -366,6 +366,7 @@ public void	executeConstantAction(Activation activation)
         }
 
 		//store trigger's dependency on various privileges in the dependeny system
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		storeViewTriggerDependenciesOnPrivileges(activation, triggerd);		
 	}
 
@@ -424,6 +425,9 @@ public void	executeConstantAction(Activation activation)
 
 
 		dd.addSPSDescriptor(spsd, tc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
 
 		return spsd;
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java
index cce3baa77d..b97cf549d7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java
@@ -187,6 +187,11 @@ public void	executeConstantAction( Activation activation )
 								   td,
 								   (UUID) null,
 								   columnInfo[ix].autoincStart,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 								   columnInfo[ix].autoincInc,
 								   columnInfo[ix].autoincCycle
 							   );
@@ -213,12 +218,14 @@ public void	executeConstantAction( Activation activation )
 			/* We should always be able to find the Provider */
 				Provider provider = (Provider) providerInfo[ix].
 										getDependableFinder().
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
 											getDependable(dd,
 												providerInfo[ix].getObjectId());
 				dm.addDependency(vd, provider, lcc.getContextManager());
 		}
 		//store view's dependency on various privileges in the dependeny system
 		storeViewTriggerDependenciesOnPrivileges(activation, vd);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 
 		dd.addDescriptor(vd, sd, DataDictionary.SYSVIEWS_CATALOG_NUM, true, tc);
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
index d104c9d635..56d1db1e54 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
@@ -100,6 +100,7 @@ public void	openCore() throws StandardException {
      */
 	public ExecRow	getNextRowCore() throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -113,6 +114,7 @@ public ExecRow	getNextRowCore() throws StandardException {
 
 				// requalify the current row
 				if (cursorRow == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1361
 					throw StandardException.newException(SQLState.NO_CURRENT_ROW);
 				}
 				// we know it will be requested, may as well get it now.
@@ -127,6 +129,7 @@ public ExecRow	getNextRowCore() throws StandardException {
 				// opened), the cursor result set (scroll insensitive) will 
 				// return the cached row, while the target result set will 
 				// return null (row has been deleted under owr feet).
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 				if (rowLocation == null  || 
 						(cursorRow != null && currentRow == null)) {
 					activation.addWarning(StandardException.
@@ -299,6 +302,7 @@ private void getCursor() throws StandardException {
 			if (cursorActivation != null)
 			{
 				
+//IC see: https://issues.apache.org/jira/browse/DERBY-787
 				cursor = cursorActivation.getCursorResultSet();
 				target = cursorActivation.getTargetResultSet();
 				/* beetle 3865: updateable cursor using index. 2 way communication between
@@ -313,6 +317,7 @@ private void getCursor() throws StandardException {
 		}
 
 		if (cursor == null || cursor.isClosed()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
 			throw StandardException.newException(SQLState.LANG_CURSOR_NOT_FOUND, cursorName);	
 		}
 	}
@@ -321,6 +326,7 @@ private void getCursor() throws StandardException {
 	 * @see NoPutResultSet#updateRow
 	 */
 	public void updateRow (ExecRow row, RowChanger rowChanger)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
 			throws StandardException {
 		((NoPutResultSet)cursor).updateRow(row, rowChanger);
 	}
@@ -329,6 +335,7 @@ public void updateRow (ExecRow row, RowChanger rowChanger)
 	 * @see NoPutResultSet#markRowAsDeleted
 	 */
 	public void markRowAsDeleted() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		((NoPutResultSet)cursor).markRowAsDeleted();
 	}
 	
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CursorActivation.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CursorActivation.java
index a92263b6e7..3b7d691052 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CursorActivation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/CursorActivation.java
@@ -53,6 +53,7 @@ public boolean isCursorActivation()
 	}
 
     /** @see BaseActivation#decorateResultSet */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5947
     ResultSet decorateResultSet() throws StandardException {
         // CursorActivation means it's a query that returns rows. Check that
         // the caller is authorized to run SQL read operations.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
index 646a009741..f5f7778d4d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
@@ -113,6 +113,7 @@ static SchemaDescriptor getSchemaDescriptorForCreate(
 						String schemaName)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-48
 		TransactionController tc = activation.
 			getLanguageConnectionContext().getTransactionExecute();
 
@@ -121,6 +122,7 @@ static SchemaDescriptor getSchemaDescriptorForCreate(
 		if (sd == null || sd.getUUID() == null) {
 			CreateSchemaConstantAction csca
 				= new CreateSchemaConstantAction(schemaName, (String) null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-230
 
 			if (activation.getLanguageConnectionContext().
 					isInitialDefaultSchema(schemaName)) {
@@ -159,6 +161,7 @@ static SchemaDescriptor getSchemaDescriptorForCreate(
 		 TransactionController tc,
 		 Activation activation) throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         TransactionController useTc;
 		TransactionController nestedTc = null;
 
@@ -317,6 +320,7 @@ protected String constructToString(
 	 * @exception StandardException		Thrown on failure
 	 */
 	protected void storeConstraintDependenciesOnPrivileges(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3743
 		Activation activation,
 		Dependent dependent,
 		UUID refTableUUID,
@@ -326,6 +330,7 @@ protected void storeConstraintDependenciesOnPrivileges(
 		LanguageConnectionContext lcc = activation.getLanguageConnectionContext();
 		DataDictionary dd = lcc.getDataDictionary();
 		DependencyManager dm = dd.getDependencyManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         String currentUser = lcc.getCurrentUserId(activation);
 		SettableBoolean roleDepAdded = new SettableBoolean();
 
@@ -340,6 +345,7 @@ protected void storeConstraintDependenciesOnPrivileges(
 			// CHECK constraint, any EXECUTE or USAGE privileges. If the REFERENCES is
 			// revoked from the constraint owner, the constraint will get
 			// dropped automatically.
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             List<StatementPermission> requiredPermissionsList =
                 activation.getPreparedStatement().getRequiredPermissionsList();
 
@@ -369,6 +375,7 @@ protected void storeConstraintDependenciesOnPrivileges(
 						    || statPerm instanceof StatementRolePermission
                                || statPerm instanceof StatementGenericPermission ) {
 						continue;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3743
 					} else {
 						if (SanityManager.DEBUG) {
 							SanityManager.ASSERT(
@@ -395,6 +402,7 @@ protected void storeConstraintDependenciesOnPrivileges(
 					// REFERENCES privilege could be available at the user
 					// level, PUBLIC or role level.  EXECUTE and USAGE privileges could be
 					// available at the user level, PUBLIC or role level.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                     permDesc = statPerm.getPermissionDescriptor(
                         currentUser, dd);
 
@@ -411,8 +419,10 @@ protected void storeConstraintDependenciesOnPrivileges(
 						// allColumnsCoveredByUserOrPUBLIC.
 						boolean roleUsed = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 						if (permDesc == null ||
 							((permDesc instanceof ColPermsDescriptor) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                                  ! ((StatementColumnPermission)statPerm).
                                    allColumnsCoveredByUserOrPUBLIC(
                                        currentUser, dd))) {
@@ -424,6 +434,7 @@ protected void storeConstraintDependenciesOnPrivileges(
 						// that object, then no privilege tracking is needed
 						// for the owner.
                         if (! permDesc.checkOwner(currentUser) ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
                             dm.addDependency(dependent, permDesc,
 											 lcc.getContextManager());
@@ -439,6 +450,7 @@ protected void storeConstraintDependenciesOnPrivileges(
 						//if the object on which permission is required is owned by the
 						//same user as the current user, then no need to keep that
 						//object's privilege dependency in the dependency system
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                     if (! permDesc.checkOwner(currentUser))
 					{
 						dm.addDependency(dependent, permDesc, lcc.getContextManager());
@@ -451,10 +463,12 @@ protected void storeConstraintDependenciesOnPrivileges(
 							// REFERENCES for the remaining columns at PUBLIC
 							// level or at role level.  Get that permission
 							// descriptor and save it in dependency system
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 							StatementColumnPermission
 								statementColumnPermission = (
 									StatementColumnPermission)statPerm;
 							permDesc = statementColumnPermission.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                                 getPUBLIClevelColPermsDescriptor(
                                     currentUser, dd);
 							//Following if checks if some column level privileges
@@ -472,6 +486,7 @@ protected void storeConstraintDependenciesOnPrivileges(
 							// Possibly, the current role has also been relied
 							// upon.
 							if (!statementColumnPermission.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                                     allColumnsCoveredByUserOrPUBLIC(
                                         currentUser, dd)) {
 								// Role has been relied upon, so register a
@@ -631,6 +646,8 @@ protected void storeViewTriggerDependenciesOnPrivileges(
 		DataDictionary dd = lcc.getDataDictionary();
 		DependencyManager dm = dd.getDependencyManager();
 		String dbo = dd.getAuthorizationDatabaseOwner();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         String currentUser = lcc.getCurrentUserId(activation);
 		SettableBoolean roleDepAdded = new SettableBoolean();
 
@@ -640,6 +657,7 @@ protected void storeViewTriggerDependenciesOnPrivileges(
         if (! currentUser.equals(dbo))
 		{
 			PermissionsDescriptor permDesc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             List<StatementPermission> requiredPermissionsList =
                 activation.getPreparedStatement().getRequiredPermissionsList();
 
@@ -655,6 +673,7 @@ protected void storeViewTriggerDependenciesOnPrivileges(
 					//permissions that the object is dependent on once it is 
 					//created.
 					//Also, StatementRolePermission should not occur here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 					if (statPerm instanceof StatementSchemaPermission ||
 						statPerm instanceof StatementRolePermission) {
 
@@ -669,6 +688,7 @@ protected void storeViewTriggerDependenciesOnPrivileges(
 					}
 
 					//See if we can find the required privilege for given authorizer?
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                     permDesc = statPerm.
                         getPermissionDescriptor(currentUser, dd);
 					if (permDesc == null)//privilege not found for given authorizer 
@@ -684,6 +704,7 @@ protected void storeViewTriggerDependenciesOnPrivileges(
 						// .. or at role level
 						if (permDesc == null ||
 								((permDesc instanceof ColPermsDescriptor) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                                  ! ((StatementColumnPermission)statPerm).
                                      allColumnsCoveredByUserOrPUBLIC(
                                          currentUser, dd)) ) {
@@ -695,6 +716,7 @@ protected void storeViewTriggerDependenciesOnPrivileges(
 						//object, then no privilege tracking is needed for the
 						//owner.
                         if (! permDesc.checkOwner(currentUser) ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
 							dm.addDependency(dependent, permDesc, lcc.getContextManager());
 
@@ -710,6 +732,7 @@ protected void storeViewTriggerDependenciesOnPrivileges(
 					//if the object on which permission is required is owned by the
 					//same user as the current user, then no need to keep that
 					//object's privilege dependency in the dependency system
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                     if (! permDesc.checkOwner(currentUser) )
 					{
 						dm.addDependency(dependent, permDesc, lcc.getContextManager());	           							
@@ -735,6 +758,7 @@ protected void storeViewTriggerDependenciesOnPrivileges(
 							//depencies, one for column c11 which exists directly
 							//for user2 and one for column c12 which exists at PUBLIC level.
 							StatementColumnPermission statementColumnPermission = (StatementColumnPermission) statPerm;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                             permDesc = statementColumnPermission.
                                 getPUBLIClevelColPermsDescriptor(
                                     currentUser, dd);
@@ -743,6 +767,7 @@ protected void storeViewTriggerDependenciesOnPrivileges(
 							//level column privilege, if any, dependency of
 							//view is added into dependency system.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 							if (permDesc != null &&
 									permDesc.getObjectID() != null) {
 								// User did not have all required column
@@ -755,6 +780,7 @@ protected void storeViewTriggerDependenciesOnPrivileges(
 							// Has the the current role has also been relied
 							// upon?
 							if (!statementColumnPermission.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                                     allColumnsCoveredByUserOrPUBLIC(
                                         currentUser, dd)) {
 								trackRoleDependency
@@ -768,6 +794,7 @@ protected void storeViewTriggerDependenciesOnPrivileges(
 	}
 
 	private boolean inProviderSet(ProviderInfo[] providers, UUID routineId) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3743
 		if (providers == null) {
 			return false;
 		}
@@ -835,6 +862,7 @@ private boolean inProviderSet(ProviderInfo[] providers, UUID routineId) {
 		TransactionController tc = lcc.getTransactionExecute();
 
         int changedColumnCount = columnInfos == null ? 0 : columnInfos.length;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         HashMap<String,AliasDescriptor> addUdtMap = new HashMap<String,AliasDescriptor>();
         HashMap<String,AliasDescriptor> dropUdtMap = new HashMap<String,AliasDescriptor>();
         HashSet<String> addColumnNames = new HashSet<String>();
@@ -870,6 +898,7 @@ else if ( ci.action == ColumnInfo.DROP )
 
         // nothing to do if there are no changed columns of udt type
         // and this is not a DROP TABLE command
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         if ( !dropWholeTable && addUdtMap.isEmpty() && dropUdtMap.isEmpty() ) {
             return;
         }
@@ -926,6 +955,7 @@ else if ( ci.action == ColumnInfo.DROP )
          LanguageConnectionContext  lcc,
          DataDictionary             dd,
          Dependent                  dependent,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
          HashMap<String, AliasDescriptor> addUdtMap,
          HashMap<String, AliasDescriptor> dropUdtMap
          )
@@ -984,12 +1014,14 @@ else if ( ci.action == ColumnInfo.DROP )
 		case AliasInfo.ALIAS_TYPE_FUNCTION_AS_CHAR:
             routineInfo = (RoutineAliasInfo) ad.getAliasInfo();
             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3743
 
         default: return;
         }
         
 		TransactionController tc = lcc.getTransactionExecute();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         HashMap<String,AliasDescriptor> addUdtMap =
                 new HashMap<String,AliasDescriptor>();
 
@@ -1048,6 +1080,7 @@ else if ( ci.action == ColumnInfo.DROP )
     private static class SettableBoolean {
 		boolean value;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 		SettableBoolean() {
 			value = false;
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
index c45c65f0a1..b8b9ca2d88 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
@@ -105,6 +105,8 @@ void dropConstraint(ConstraintDescriptor consDesc,
 		throws StandardException
 	{
 		dropConstraint(consDesc, skipCreate,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			(List<ConstantAction>)null, activation, lcc, clearDeps);
 	}
 
@@ -122,6 +124,7 @@ void dropConstraint(ConstraintDescriptor consDesc,
 	 *  ex. when dropping a table).
 	 */
 	void dropConstraint(ConstraintDescriptor consDesc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		TableDescriptor skipCreate, List<ConstantAction> newConglomActions,
 		Activation activation, LanguageConnectionContext lcc,
 		boolean clearDeps) throws StandardException
@@ -270,6 +273,7 @@ void dropConglomerate(
      *
      * @throws StandardException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3456
     void recreateUniqueConstraintBackingIndexAsUniqueWhenNotNull(
     ConglomerateDescriptor      cd,
     TableDescriptor             td,
@@ -281,6 +285,7 @@ void recreateUniqueConstraintBackingIndexAsUniqueWhenNotNull(
         Properties prop = new Properties ();
         loadIndexProperties(lcc, cd, prop);
         ArrayList<ConstantAction> list = new ArrayList<ConstantAction>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         // drop the existing index.
         dropConglomerate(cd, td, false, list, activation, lcc);
@@ -306,10 +311,14 @@ void recreateUniqueConstraintBackingIndexAsUniqueWhenNotNull(
                         false,          // not part of create table 
                         false,          // not unique
                         true,           // create as unique when not null index
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                         cd.getIndexDescriptor().hasDeferrableChecking(),
                         false,          // deferred or not: shouldn't matter
                                         // since we know we already have a
                                         // unique index
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                         DataDictionary.UNIQUE_CONSTRAINT,
                         cd.getIndexDescriptor().indexType(), 
                         td.getSchemaName(), 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
index 3832410c18..6bf073f994 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
@@ -46,6 +46,7 @@ abstract class DMLVTIResultSet extends DMLWriteResultSet
 
 	// passed in at construction time
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	NoPutResultSet sourceResultSet;
 	NoPutResultSet savedSource;
 	UpdatableVTIConstantAction	constants;
@@ -58,6 +59,7 @@ abstract class DMLVTIResultSet extends DMLWriteResultSet
 	 *
 	 * @exception StandardException		Thrown on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     DMLVTIResultSet(NoPutResultSet source, 
 						   Activation activation)
 		throws StandardException
@@ -68,6 +70,8 @@ abstract class DMLVTIResultSet extends DMLWriteResultSet
 
         tc = activation.getTransactionController();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
         resultDescription = sourceResultSet.getResultDescription();
 	}
 	
@@ -76,6 +80,7 @@ abstract class DMLVTIResultSet extends DMLWriteResultSet
 	*/
 	public void open() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 		setup();
 		// Remember if this is the 1st execution
 		firstExecute = (numOpens == 0);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLWriteGeneratedColumnsResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLWriteGeneratedColumnsResultSet.java
index b6fb143cc5..a3939a12a1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLWriteGeneratedColumnsResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLWriteGeneratedColumnsResultSet.java
@@ -127,6 +127,7 @@ public void saveAIcacheInformation(String schemaName,
                         schemaName,
                         tableName,
                         columnNames[i]),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         aiCache[i].getLong());
             }
             InternalTriggerExecutionContext itec =
@@ -138,6 +139,8 @@ public void saveAIcacheInformation(String schemaName,
         }	
 
         /* autoGeneratedResultset for JDBC3. Nulled after statement execution 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
         is over (ie after it is saved off in LocalSatement object) */
         if (activation.getAutoGeneratedKeysResultsetMode())
             autoGeneratedKeysResultSet = autoGeneratedKeysRowsHolder.getResultSet();
@@ -188,6 +191,7 @@ private void verifyAutoGeneratedColumnsIndexes(
             {
                 throw StandardException.newException(
                     SQLState.LANG_INVALID_AUTOGEN_COLUMN_POSITION,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     columnIndexes[i], tabDesc.getName());
             }
        }
@@ -394,4 +398,4 @@ public ResultSet getAutoGeneratedKeysResultset()
     {
         return autoGeneratedKeysResultSet;
     }
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java
index b2a9b93d6e..096556ca14 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java
@@ -43,6 +43,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * For INSERT/UPDATE/DELETE impls.  Used to tag them.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 abstract public class DMLWriteResultSet extends NoRowsResultSetImpl
 {
 	protected WriteCursorConstantAction constantAction;
@@ -71,6 +72,7 @@ abstract public class DMLWriteResultSet extends NoRowsResultSetImpl
 	 *
  	 * @exception StandardException on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	DMLWriteResultSet(Activation activation)
 		throws StandardException
 	{
@@ -115,6 +117,7 @@ abstract public class DMLWriteResultSet extends NoRowsResultSetImpl
 		 * which case we do the objectifying in UpdateResultSet.  Beetle 4896.  Related bug entries:
 		 * 2432, 3383.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
         needToObjectifyStream = (this.constantAction.getTriggerInfo() != null);
 	}
 
@@ -174,6 +177,7 @@ private void objectifyStreams(ExecRow row) throws StandardException
 				DataValueDescriptor col = row.getColumn(readIx+1);
 				
 				// Derby-4779
+//IC see: https://issues.apache.org/jira/browse/DERBY-4779
 				if ( col != null ) {
 					InputStream stream = ((StreamStorable)col).returnStream();
 					((StreamStorable)col).loadStream();
@@ -193,6 +197,7 @@ private void objectifyStreams(ExecRow row) throws StandardException
 							DataValueDescriptor c = row.getColumn(i);
 							if (c instanceof StreamStorable)
 								if (((StreamStorable)c).returnStream() == stream)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 									row.setColumn(i, col.cloneValue(false));
 						}
 					}
@@ -274,6 +279,7 @@ protected ExecRow makeDeferredSparseRow(
      */
     int decodeLockMode(int lockMode) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
         if (SanityManager.DEBUG) {
             // we want to decode lock mode when the result set is opened, not
             // in the constructor
@@ -290,6 +296,7 @@ int decodeLockMode(int lockMode) {
 
         int isolationLevel = lcc.getCurrentIsolationLevel();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         if (isolationLevel == TransactionControl.SERIALIZABLE_ISOLATION_LEVEL) {
             return lockMode >>> 16;
         }
@@ -370,6 +377,7 @@ protected   ExecRow normalizeRow( NoPutResultSet sourceResultSet, ExecRow row )
     }
 
     public void rememberConstraint(UUID cid) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (SanityManager.DEBUG) {
             // This method should be overriden by InsertResultSet and
             // UpdateResultSet, other shouldn't need it.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeferredConstraintsMemory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeferredConstraintsMemory.java
index c1dbd05642..3b835dcc5d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeferredConstraintsMemory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeferredConstraintsMemory.java
@@ -87,6 +87,8 @@ final public class DeferredConstraintsMemory
     public static BackingStoreHashtable rememberDuplicate(
             final LanguageConnectionContext lcc,
                   BackingStoreHashtable deferredRowsHashTable,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             UUID constraintId,
             final DataValueDescriptor[] insertRow) throws StandardException {
 
@@ -99,6 +101,8 @@ public static BackingStoreHashtable rememberDuplicate(
             // tables (one per index conglomerate).  Use it if it
             // exists, else make a new one.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             final HashMap<UUID, ValidationInfo> hashTables =
                 lcc.getDeferredHashTables();
             final ValidationInfo vi = hashTables.get(constraintId);
@@ -145,11 +149,14 @@ public static BackingStoreHashtable rememberDuplicate(
      */
     public static BackingStoreHashtable rememberCheckViolations(
             final LanguageConnectionContext lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             UUID  basetableId,
             final String schemaName,
             final String tableName,
                   BackingStoreHashtable deferredCheckViolations,
             final List<UUID> violatingCheckConstraints,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             final RowLocation offendingRow,
             CheckInfo[] result) throws StandardException {
 
@@ -163,6 +170,8 @@ public static BackingStoreHashtable rememberCheckViolations(
             // tables (one per base table conglomerate).  Use it if it
             // exists, else make a new one.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             final HashMap<UUID, ValidationInfo> hashTables =
                     lcc.getDeferredHashTables();
             final CheckInfo vi = (CheckInfo) hashTables.get(basetableId);
@@ -172,10 +181,13 @@ public static BackingStoreHashtable rememberCheckViolations(
                 // offending row
                 deferredCheckViolations =
                         makeDeferredHashTable(lcc.getTransactionExecute(), 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 CheckInfo ci = new CheckInfo(deferredCheckViolations,
                                    schemaName,
                                    tableName,
                                    violatingCheckConstraints);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                 hashTables.put(basetableId, ci);
                 result[0] = ci;
             } else {
@@ -194,8 +206,11 @@ public static BackingStoreHashtable rememberCheckViolations(
 
 
     public static Enumeration<Object> getDeferredCheckConstraintLocations(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             Activation activation,
             UUID validatingBaseTableUUID) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
 
         CheckInfo ci = (DeferredConstraintsMemory.CheckInfo)activation.
                 getLanguageConnectionContext().
@@ -231,6 +246,8 @@ public static BackingStoreHashtable rememberFKViolation(
             // tables (one per index conglomerate).  Use it if it
             // exists, else make a new one.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             final HashMap<UUID, ValidationInfo> hashTables =
                 lcc.getDeferredHashTables();
             final ValidationInfo vi = hashTables.get(fkId);
@@ -287,6 +304,8 @@ public static void compressOrTruncate(
             UUID tableId,
             String tableName) throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         final HashMap<UUID, DeferredConstraintsMemory.ValidationInfo> vis =
                 lcc.getDeferredHashTables();
         final TableDescriptor td =
@@ -322,6 +341,7 @@ public ValidationInfo(final BackingStoreHashtable infoRows) {
         }
 
         public abstract void possiblyValidateOnReturn(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 LanguageConnectionContext lcc,
                 SQLSessionContext nested,
                 SQLSessionContext caller) throws StandardException;
@@ -340,6 +360,8 @@ private static class UniquePkInfo extends ValidationInfo {
 
         public UniquePkInfo(BackingStoreHashtable infoRows, UUID constraintId) {
             super(infoRows);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             this.constraintId = constraintId;
         }
 
@@ -428,6 +450,8 @@ private void validateUniquePK(
                                     LANG_DEFERRED_DUPLICATE_KEY_CONSTRAINT_T :
                                 SQLState.
                                     LANG_DEFERRED_DUPLICATE_KEY_CONSTRAINT_S,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                                 cd.getConstraintName(),
                                 cd.getTableDescriptor().getName());
                         } // else exactly one row contains key: OK
@@ -498,6 +522,7 @@ public List<UUID> getCulprints() {
 
         @Override
         public void possiblyValidateOnReturn(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 LanguageConnectionContext lcc,
                 SQLSessionContext nested,
                 SQLSessionContext caller) throws StandardException {
@@ -527,6 +552,8 @@ public void possiblyValidateOnReturn(
                 return;
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             validateCheck(lcc, null, true);
         }
 
@@ -567,6 +594,8 @@ public final void validateConstraint(
                 UUID constraintId,
                 boolean rollbackOnError) throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             validateCheck(lcc, constraintId, rollbackOnError);
         }
 
@@ -582,6 +611,8 @@ private void validateCheck(
 
             if (sd == null) {
                 // Schema dropped, nothing to do
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                 return;
             }
 
@@ -617,6 +648,8 @@ private void validateCheck(
                                " --DERBY-PROPERTIES joinStrategy=nestedLoop, " +
                                "                    index=null, " +
                                "                    validateCheckConstraint=");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                             checkStmt.append( baseTableUUIDString );
                             checkStmt.append('\n');
                         }
@@ -634,6 +667,7 @@ private void validateCheck(
                                 true,
                                 true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6666
                         StatementContext statementContext = null;
                         
                         try {
@@ -658,6 +692,7 @@ private void validateCheck(
                                    cd.getConstraintText());
                             }
                         } finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6666
                             if (statementContext != null) {
                                 lcc.popStatementContext(statementContext, null);
                             }
@@ -710,6 +745,8 @@ public void possiblyValidateOnReturn(
                 return;
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             validateForeignKey(lcc, true);
         }
 
@@ -734,6 +771,8 @@ private void validateForeignKey(
             TransactionController tc = lcc.getTransactionExecute();
 
             DataDictionary dd = lcc.getDataDictionary();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
 
             ForeignKeyConstraintDescriptor cd =
                 (ForeignKeyConstraintDescriptor)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java
index 3a112c7b94..1590227a5b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java
@@ -47,6 +47,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * it should be done based on whether the resultset has dependent resultsets or not.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 class DeleteCascadeResultSet extends DeleteResultSet
 {
 
@@ -77,6 +78,8 @@ class DeleteCascadeResultSet extends DeleteResultSet
 			  (ConstantAction)activation.getPreparedStatement().getSavedObject(constantActionItem)),
 			  activation);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		ConstantAction passedInConstantAction;
 		if(constantActionItem == -1)
 			passedInConstantAction = activation.getConstantAction(); //root table
@@ -114,6 +117,7 @@ public void open() throws StandardException
 			{
 				setRowHoldersTypeToUniqueStream();
 				//collect until there are no more rows to found
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 while(collectAffectedRows(false)) {};
 			}else
 			{
@@ -126,6 +130,7 @@ public void open() throws StandardException
 								SQLState.LANG_NO_ROW_FOUND));
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
             runFkChecker(true); // check for only RESTRICT referential
                                       // action rule violations
             HashMap<String,String> mntHashTable =
@@ -168,6 +173,7 @@ void  setup() throws StandardException
 
 		super.setup();
 		activation.setParentResultSet(rowHolder, resultSetId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Vector<TemporaryRowHolder> sVector =
                 activation.getParentResultSet(resultSetId);
 		tempRowHolderId = sVector.size() -1;
@@ -210,6 +216,7 @@ boolean  collectAffectedRows(boolean rowsFound) throws StandardException
 		return rowsFound;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
     void fireBeforeTriggers(HashMap<String, String> msht)
             throws StandardException
 	{
@@ -294,6 +301,7 @@ void deleteDeferredRows() throws StandardException
 
 	
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
     void runFkChecker(boolean restrictCheckOnly)
             throws StandardException
 	{
@@ -304,6 +312,7 @@ void runFkChecker(boolean restrictCheckOnly)
 			if(dependentResultSets[i] instanceof UpdateResultSet)
 			{
                 ((UpdateResultSet) dependentResultSets[i]).runChecker(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                     restrictCheckOnly);
 			}
 			else{
@@ -360,6 +369,7 @@ private void rowChangerFinish() throws StandardException
 	//if there is more than one node for the same table, copy the rows
 	// into one node , so that we don't fire trigger more than once.
     private void mergeRowHolders(HashMap<String, String> msht)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
             throws StandardException
 	{
 		if(msht.containsKey(resultSetId) || rowCount ==0)
@@ -393,6 +403,7 @@ private void mergeRowHolders(HashMap<String, String> msht)
     @SuppressWarnings("UseOfObsoleteCollectionType")
 	private void mergeResultSets() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Vector<TemporaryRowHolder>
                 sVector = activation.getParentResultSet(resultSetId);
         int size = sVector.size();
@@ -411,6 +422,7 @@ private void mergeResultSets() throws StandardException
 					rowHolderId++;
 					continue;
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 TemporaryRowHolder
                         currentRowHolder = sVector.elementAt(rowHolderId);
 				CursorResultSet rs = currentRowHolder.getResultSet();
@@ -444,6 +456,7 @@ public void finish() throws StandardException {
     @SuppressWarnings("UseOfObsoleteCollectionType")
 	private boolean isMultipleDeletePathsExist()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Enumeration<String> e = activation.getParentResultSetKeys() ;
              e.hasMoreElements() ;)
 		{
@@ -469,6 +482,7 @@ private boolean isMultipleDeletePathsExist()
     @SuppressWarnings("UseOfObsoleteCollectionType")
 	private void setRowHoldersTypeToUniqueStream()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (Enumeration<String> e = activation.getParentResultSetKeys() ;
              e.hasMoreElements() ;)
 		{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
index ac44b2e918..8589184bd4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
@@ -45,6 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * and triggers to be executed based on the c's and t's
  * compiled into the insert plan.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class DeleteResultSet extends DMLWriteResultSet
 {
 	private TransactionController   	tc;
@@ -100,6 +101,8 @@ class DeleteResultSet extends DMLWriteResultSet
      *
 	 * @exception StandardException		Thrown on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     DeleteResultSet
 	(
 		NoPutResultSet		source,
@@ -113,11 +116,14 @@ class DeleteResultSet extends DMLWriteResultSet
 
 		tc = activation.getTransactionController();
 		constants = (DeleteConstantAction) constantAction;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 		fkInfoArray = constants.getFKInfo();
 		triggerInfo = constants.getTriggerInfo();
 		noTriggersOrFks = ((fkInfoArray == null) && (triggerInfo == null));
 		baseRowReadList = constants.getBaseRowReadList();
 		if(source != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 			resultDescription = source.getResultDescription();
 		else
 			resultDescription = constants.resultDescription;
@@ -147,6 +153,7 @@ public void open() throws StandardException
 		*/
 		if (constants.deferred)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
             runFkChecker(true); // check for only RESTRICT referential
                                       // action rule violations
 			fireBeforeTriggers();
@@ -176,6 +183,7 @@ public void open() throws StandardException
 	void  setup() throws StandardException
 	{
 		super.setup();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 
 		// Remember if this is the 1st execution
 		firstExecute = (rc == null);
@@ -223,6 +231,7 @@ void  setup() throws StandardException
 
 		/* decode the lock mode for the execution isolation level */
 		lockMode = decodeLockMode(constants.lockMode);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 
 		/* Open the RowChanger before the source ResultSet so that
 		 * the store will see the RowChanger's lock as a covering lock
@@ -241,6 +250,7 @@ void  setup() throws StandardException
 			activation.clearIndexScanInfo();
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         rowCount = 0L;
         if(!cascadeDelete)
 			row = getNextRowCore(source);
@@ -290,7 +300,10 @@ void  setup() throws StandardException
 			rlColumnNumber = noTriggersOrFks ? 1: numberOfBaseColumns;
 			if(cascadeDelete)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 				rowHolder = new TemporaryRowHolderImpl(activation, properties, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 						(resultDescription != null) ?
 							resultDescription.truncateColumns(rlColumnNumber) :
 							null, false);
@@ -299,6 +312,7 @@ void  setup() throws StandardException
 			}else
 			{
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 				rowHolder = new TemporaryRowHolderImpl(activation, properties, 
 						(resultDescription != null) ?
 							resultDescription.truncateColumns(rlColumnNumber) :
@@ -313,6 +327,7 @@ void  setup() throws StandardException
 		{
 			if (fkChecker == null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 fkChecker = new RISetChecker(lcc, tc, fkInfoArray);
 			}
 			else
@@ -393,6 +408,7 @@ boolean  collectAffectedRows() throws StandardException
                     // deferred, require at least two rows to be present in the
                     // primary table since we are deleting one of them below,
                     // and we need at least one to fulfill the constraint.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                     fkChecker.doPKCheck(activation, row, false, 2);
 				}
 
@@ -406,6 +422,7 @@ boolean  collectAffectedRows() throws StandardException
 				}
 
 				rc.deleteRow(row,baseRowLocation);
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 				source.markRowAsDeleted();
 			}
 
@@ -483,6 +500,7 @@ void deleteDeferredRows() throws StandardException
 		DataValueDescriptor		rlColumn;
  		RowLocation	baseRowLocation;
         ExecRow     defRLRow;
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
         deferredBaseCC = tc.openCompiledConglomerate(
                 false,
@@ -505,6 +523,7 @@ void deleteDeferredRows() throws StandardException
 			FormatableBitSet readBitSet = RowUtil.shift(baseRowReadList, 1);
 
 			rs.open();
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             while ((defRLRow = rs.getNextRow()) != null)
 			{
                 rlColumn = defRLRow.getColumn(rlColumnNumber);
@@ -531,6 +550,7 @@ void deleteDeferredRows() throws StandardException
 				}
 	
 				rc.deleteRow(deferredBaseRow, baseRowLocation);
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 				source.markRowAsDeleted();
 			}
 		} finally
@@ -543,6 +563,7 @@ void deleteDeferredRows() throws StandardException
     /**
      * Make sure foreign key constraints are not violated
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
     void runFkChecker(boolean restrictCheckOnly)
             throws StandardException
 	{
@@ -571,12 +592,14 @@ void runFkChecker(boolean restrictCheckOnly)
                     // the actual checking, and we need at least one to fulfill
                     // the constraint.
                     fkChecker.doPKCheck(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                             activation,
                             defRLRow,
                             restrictCheckOnly,
                             1);
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                 if (restrictCheckOnly) {
                     fkChecker.postCheck();
                 }
@@ -649,6 +672,7 @@ public void	cleanUp() throws StandardException
     @Override
     public void close() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
         super.close( constants.underMerge() );
     }
                                
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java
index 2fe23bbdfc..0bf5aa8704 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java
@@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * and triggers to be executed based on the c's and t's
  * compiled into the insert plan.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class DeleteVTIResultSet extends DMLVTIResultSet
 {
 
@@ -76,6 +77,7 @@ class DeleteVTIResultSet extends DMLVTIResultSet
 	protected void openCore() throws StandardException
 	{
 		ExecRow row = getNextRowCore(sourceResultSet);
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 		if (row != null)
 		{
@@ -99,7 +101,10 @@ protected void openCore() throws StandardException
 		{
 			activation.clearIndexScanInfo();
             if( null == rowHolder)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
                 rowHolder =
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
                     new TemporaryRowHolderImpl(activation, new Properties(),
                                                (ResultDescription) null);
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DependentResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
index 8165a942cd..74254e4c21 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
@@ -79,6 +79,7 @@ class DependentResultSet extends ScanResultSet implements CursorResultSet
 	int    sArrayIndex;
     Vector<TemporaryRowHolder> sVector;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
     protected ScanController scanController;
 	protected boolean		scanControllerOpened;
@@ -112,6 +113,7 @@ class DependentResultSet extends ScanResultSet implements CursorResultSet
 	//
     // class interface
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 	DependentResultSet(
 		long conglomId,
 		StaticCompiledOpenConglomInfo scoci, 
@@ -123,6 +125,7 @@ class DependentResultSet extends ScanResultSet implements CursorResultSet
 		boolean sameStartStopPosition,
 		Qualifier[][] qualifiers,
 		String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		String userSuppliedOptimizerOverrides,
 		String indexName,
 		boolean isConstraint,
@@ -141,6 +144,7 @@ class DependentResultSet extends ScanResultSet implements CursorResultSet
 		int rltItem
 		)	throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 		super(activation, resultSetNumber, resultRowTemplate,
 			  lockMode, tableLocked,
 			  //Because the scan for the tables in this result set are done
@@ -164,6 +168,7 @@ class DependentResultSet extends ScanResultSet implements CursorResultSet
 		if (SanityManager.DEBUG) {
             // This ResultSet doesn't use start or stop keys, so expect them
             // to be null.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
             SanityManager.ASSERT(startKeyGetter == null, "start key not null");
             SanityManager.ASSERT(stopKeyGetter == null, "stop key not null");
 		}
@@ -172,6 +177,7 @@ class DependentResultSet extends ScanResultSet implements CursorResultSet
 		this.stopSearchOperator = stopSearchOperator;
 		this.qualifiers = qualifiers;
 		this.tableName = tableName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		this.userSuppliedOptimizerOverrides = userSuppliedOptimizerOverrides;
 		this.indexName = "On Foreign Key";  // RESOLVE , get actual indexName;
 		this.isConstraint = isConstraint;
@@ -180,6 +186,7 @@ class DependentResultSet extends ScanResultSet implements CursorResultSet
 		this.oneRowScan = oneRowScan;
 		
         runTimeStatisticsOn = (activation.getLanguageConnectionContext().getRunTimeStatisticsMode());
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
 		tc = activation.getTransactionController();
 		//values required to scan the forein key index.
@@ -272,6 +279,7 @@ private void  openIndexScan(ExecRow searchRow) throws StandardException
 			//create a template for the index row
 			indexRow = indexQualifierRow.getClone();
 			indexRow.setColumn(numFkColumns + 1, rowLocation.cloneValue(false));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 
 		}else
 		{
@@ -335,6 +343,7 @@ private ExecRow fetchBaseRow()
 	public ExecRow	getNextRowCore() throws StandardException 
 	{
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -516,6 +525,7 @@ public void openCore() throws StandardException
 		sourceResultSets = new TemporaryRowHolderResultSet[size];
 		for(int i = 0 ; i < size ; i++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             sourceRowHolders[i] = sVector.elementAt(i);
 			sourceOpened[i] = 0;
 		}
@@ -542,6 +552,7 @@ private void addNewSources()
 		//copy the new sources
 		for(int i = sourceRowHolders.length; i < size ; i++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             tsourceRowHolders[i] = sVector.elementAt(i);
 			tsourceOpened[i] = 0;
 		}
@@ -629,6 +640,7 @@ private String printPosition(int searchOperator, ExecIndexRow positioner)
 	{
 		String output = "";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         String searchOp;
 		switch (searchOperator)
 		{
@@ -672,6 +684,7 @@ private String printPosition(int searchOperator, ExecIndexRow positioner)
 				if (positioner.areNullsOrdered(position))
 				{
 					output = output + position + " ";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 					colSeen = true;
 				}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java
index 9794295375..a0d8cab7d5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java
@@ -37,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * multiple distinct aggregates.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class DistinctGroupedAggregateResultSet extends GroupedAggregateResultSet
 {
 
@@ -58,6 +59,7 @@ class DistinctGroupedAggregateResultSet extends GroupedAggregateResultSet
 	 *
 	 * @exception StandardException Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     DistinctGroupedAggregateResultSet(NoPutResultSet s,
 					boolean isInSortedOrder,
 					int	aggregateItem,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
index 3bc1a87e89..3f2b8b2c2d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
@@ -50,6 +50,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * first call to next().
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class DistinctScalarAggregateResultSet extends ScalarAggregateResultSet
 {
 	private ColumnOrdering[] order;
@@ -79,6 +80,7 @@ class DistinctScalarAggregateResultSet extends ScalarAggregateResultSet
 	 *
 	 * @exception StandardException Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     DistinctScalarAggregateResultSet(NoPutResultSet s,
 					boolean isInSortedOrder,
 					int	aggregateItem,
@@ -96,7 +98,9 @@ class DistinctScalarAggregateResultSet extends ScalarAggregateResultSet
 			  singleInputRow,
 			  optimizerEstimatedRowCount,
 			  optimizerEstimatedCost);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6292
         order = ((FormatableArrayHolder)
                     (a.getPreparedStatement().getSavedObject(orderingItem)))
                         .getArray(ColumnOrdering[].class);
@@ -128,11 +132,13 @@ public void	openCore() throws StandardException
 		if (SanityManager.DEBUG)
 	    	SanityManager.ASSERT( ! isOpen, "DistinctScalarResultSet already open");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         sortResultRow = (ExecIndexRow) getRowTemplate().getClone();
         sourceExecIndexRow = (ExecIndexRow) getRowTemplate().getClone();
 
         source.openCore();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4330
 		try {
 			/*
 			** Load up the sorter because we have something to sort.
@@ -169,6 +175,7 @@ public void	openCore() throws StandardException
 	 */
 	public ExecRow	getNextRowCore() throws StandardException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -267,6 +274,7 @@ public void	reopenCore() throws StandardException
          */
         public void close() throws StandardException
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-756
             super.close();
             closeSource();
         }
@@ -351,6 +359,7 @@ private ScanController loadSorter()
 	{
 		SortController 			sorter;
 		ExecRow 				sourceRow;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         ExecIndexRow            sortTemplateRow = getRowTemplate();
 		int						inputRowCountEstimate = (int) optimizerEstimatedRowCount;
 
@@ -389,6 +398,7 @@ private ScanController loadSorter()
 		** End the sort and open up the result set
 		*/
 		sorter.completedInserts();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 
 		scanController = 
             tc.openSortScan(sortId, activation.getResultSetHoldability());
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
index 6d609df8ca..18c88a24d8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
@@ -40,6 +40,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * (Assumes no predicates, for now.)
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class DistinctScanResultSet extends HashScanResultSet
 {
 
@@ -49,12 +50,14 @@ class DistinctScanResultSet extends HashScanResultSet
     //
     // class interface
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     DistinctScanResultSet(long conglomId, 
 		StaticCompiledOpenConglomInfo scoci, Activation activation, 
 		int resultRowTemplate,
 		int resultSetNumber,
 		int hashKeyItem,
 		String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		String userSuppliedOptimizerOverrides,
 		String indexName,
 		boolean isConstraint,
@@ -66,6 +69,7 @@ class DistinctScanResultSet extends HashScanResultSet
 		double optimizerEstimatedCost)
 			throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 		super(conglomId, scoci, activation, resultRowTemplate, resultSetNumber,
 			  (GeneratedMethod) null, // startKeyGetter
 			  0,					  // startSearchOperator
@@ -75,11 +79,13 @@ class DistinctScanResultSet extends HashScanResultSet
 			  (Qualifier[][]) null,	  // scanQualifiers
 			  (Qualifier[][]) null,	  // nextQualifiers
 			  DEFAULT_INITIAL_CAPACITY, DEFAULT_LOADFACTOR, DEFAULT_MAX_CAPACITY,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 			  hashKeyItem, tableName, userSuppliedOptimizerOverrides, indexName, isConstraint, 
 			  false,				  // forUpdate
 			  colRefItem, lockMode, tableLocked, isolationLevel,
 			  false,
 			  optimizerEstimatedRowCount, optimizerEstimatedCost);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 
 		// Tell super class to eliminate duplicates
 		eliminateDuplicates = true;
@@ -96,6 +102,7 @@ class DistinctScanResultSet extends HashScanResultSet
 	 */
 	public ExecRow getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java
index 45a862fd32..897d1d4040 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java
@@ -106,6 +106,7 @@ public void	executeConstantAction( Activation activation )
 		// RESOLVE - fix error message
 		if (ad == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5055
 			throw StandardException.newException(SQLState.LANG_OBJECT_NOT_FOUND, AliasDescriptor.getAliasType(nameSpace),  aliasName);
 		}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java
index 4f4104b132..5bdc2d360e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java
@@ -188,6 +188,7 @@ public void	executeConstantAction( Activation activation )
 			String errorName = constraintName == null ? "PRIMARY KEY" :
 								(constraintSd.getSchemaName() + "."+ constraintName);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             throw StandardException.newException(SQLState.LANG_DROP_OR_ALTER_NON_EXISTING_CONSTRAINT,
 						errorName,
 						td.getQualifiedName());
@@ -252,6 +253,7 @@ public void	executeConstantAction( Activation activation )
 			** and drop the dependencies.
 			*/
 			dm.invalidateFor(conDesc, DependencyManager.DROP_CONSTRAINT, lcc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1612
 			dm.clearDependencies(lcc, conDesc);
 		}
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropRoleConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropRoleConstantAction.java
index 59dfcfec3d..dce3ea6ca2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropRoleConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropRoleConstantAction.java
@@ -98,6 +98,7 @@ public void executeConstantAction( Activation activation )
         dd.startWriting(lcc);
 
         RoleGrantDescriptor rdDef = dd.getRoleDefinitionDescriptor(roleName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
 
         if (rdDef == null) {
             throw StandardException.newException(
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java
index 35ca792776..a625f27615 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java
@@ -84,6 +84,7 @@ public void	executeConstantAction( Activation activation )
 		LanguageConnectionContext lcc = activation.getLanguageConnectionContext();
 		DataDictionary dd = lcc.getDataDictionary();
 		TransactionController tc = lcc.getTransactionExecute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4822
 
 		/*
 		** Inform the data dictionary that we are about to write to it.
@@ -97,8 +98,11 @@ public void	executeConstantAction( Activation activation )
 		dd.startWriting(lcc);
 
         SchemaDescriptor sd = dd.getSchemaDescriptor(schemaName, tc, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4822
 
         sd.drop(lcc, activation);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
 
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java
index ea7c380953..da7366f28d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java
@@ -73,6 +73,7 @@ public void executeConstantAction(Activation activation)
 
 		if (forTable)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 			td = dd.getTableDescriptor(objectName, sd, tc);
 		}
 		
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java
index 5a8fb17071..992ed9a780 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java
@@ -140,6 +140,7 @@ public void	executeConstantAction( Activation activation )
 
 			if (td == null) //td null here means it is not a temporary table. Look for table in physical SESSION schema
 				td = dd.getTableDescriptor(tableName, sd, tc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 
 			if (td == null) //td null means tableName is not a temp table and it is not a physical table in SESSION schema
 			{
@@ -187,6 +188,7 @@ public void	executeConstantAction( Activation activation )
 		lockTableForDDL(tc, heapId, true);
 
 		/* Drop the triggers */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (TriggerDescriptor trd : dd.getTriggerDescriptors(td)) {
             trd.drop(lcc);
 		}
@@ -223,6 +225,7 @@ public void	executeConstantAction( Activation activation )
 
 		/* Drop all table and column permission descriptors */
 		dd.dropAllTableAndColPermDescriptors(tableId, tc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1543
 
 		/* Drop the constraints */
 		dropAllConstraintDescriptors(td, activation);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java
index 2d457cf747..49c033e152 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java
@@ -115,6 +115,7 @@ public void	executeConstantAction( Activation activation )
 		/* Get the table descriptor.  We're responsible for raising
 		 * the error if it isn't found 
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 		td = dd.getTableDescriptor(tableName, sd,
                 lcc.getTransactionExecute());
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/FKInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/FKInfo.java
index f3c062eba9..ac59ad3306 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/FKInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/FKInfo.java
@@ -67,11 +67,14 @@ public class FKInfo implements Formatable
 	/*
 	** See the constructor for the meaning of these fields
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     String              schemaName;
     String              tableName;
     int                 type;
     UUID                refUUID; // index index conglomerate uuid
     long                refConglomNumber;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
     UUID                refConstraintID;
     boolean             refConstraintIsDeferrable;
     int                 stmtType;
@@ -126,12 +129,15 @@ public FKInfo() {}
 	 */
 	public FKInfo(
 					String[]			fkConstraintNames,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     String              schemaName,
                     String              tableName,
 					int					stmtType,
 					int					type,
 					UUID				refUUID,
 					long				refConglomNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                     UUID                refConstraintID,
                     boolean             refConstraintIsDeferrable,
 					UUID[]				fkUUIDs,
@@ -141,6 +147,7 @@ public FKInfo(
 					RowLocation			rowLocation,
                     int[]               raRules,
                     boolean[]           deferrable,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     UUID[]              fkIds
 					)
 	{
@@ -151,14 +158,19 @@ public FKInfo(
 		this.type = type;
 		this.refUUID = refUUID;
 		this.refConglomNumber = refConglomNumber;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         this.refConstraintID = refConstraintID;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6559
         this.refConstraintIsDeferrable = refConstraintIsDeferrable;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.fkUUIDs = ArrayUtil.copy(fkUUIDs);
         this.fkConglomNumbers = ArrayUtil.copy(fkConglomNumbers);
         this.fkIsSelfReferencing = ArrayUtil.copy(fkIsSelfReferencing);
         this.colArray = ArrayUtil.copy(colArray);
 		this.rowLocation = rowLocation;
         this.raRules = ArrayUtil.copy(raRules);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         this.deferrable = ArrayUtil.copy(deferrable);
         this.fkIds = ArrayUtil.copy(fkIds);
 
@@ -207,6 +219,7 @@ else if (type == REFERENCED_KEY)
 			return (FKInfo[])null;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Vector<FKInfo> newfksVector = new Vector<FKInfo>();
 		FKInfo[] newfks = null;
 
@@ -253,6 +266,7 @@ else if (type == REFERENCED_KEY)
 			newfks = new FKInfo[size];
 			for (int i = 0; i < size; i++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 newfks[i] = newfksVector.elementAt(i);
 			}
 		}
@@ -287,8 +301,11 @@ public void writeExternal(ObjectOutput out) throws IOException
 		out.writeInt(stmtType);
 		out.writeObject(refUUID);
 		out.writeLong(refConglomNumber);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         out.writeObject(refConstraintID);
         out.writeBoolean(refConstraintIsDeferrable);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
 
 		ArrayUtil.writeArray(out, fkConstraintNames);
 		ArrayUtil.writeArray(out, fkUUIDs);
@@ -296,6 +313,7 @@ public void writeExternal(ObjectOutput out) throws IOException
 		ArrayUtil.writeBooleanArray(out, fkIsSelfReferencing);
 		ArrayUtil.writeIntArray(out, colArray);
 		ArrayUtil.writeIntArray(out, raRules);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         ArrayUtil.writeBooleanArray(out, deferrable);
         ArrayUtil.writeArray(out, fkIds);
 	}
@@ -329,8 +347,11 @@ public void readExternal(ObjectInput in)
 			stmtType = in.readInt();
 			refUUID = (UUID)in.readObject();
 			refConglomNumber = in.readLong();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             refConstraintID = (UUID)in.readObject();
             refConstraintIsDeferrable = in.readBoolean();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
 
 			fkConstraintNames = new String[ArrayUtil.readArrayLength(in)];
 			ArrayUtil.readArrayItems(in, fkConstraintNames);
@@ -342,6 +363,7 @@ public void readExternal(ObjectInput in)
 			fkIsSelfReferencing = ArrayUtil.readBooleanArray(in);
 			colArray = ArrayUtil.readIntArray(in);
 			raRules = ArrayUtil.readIntArray(in);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             deferrable = ArrayUtil.readBooleanArray(in);
             fkIds = new UUID[ArrayUtil.readArrayLength(in)];
             ArrayUtil.readArrayItems(in, fkIds);
@@ -368,6 +390,7 @@ public String toString()
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             StringBuilder str = new StringBuilder();
 			str.append("\nTableName:\t\t\t");
 			str.append(tableName);
@@ -375,6 +398,7 @@ public String toString()
 			str.append("\ntype:\t\t\t\t");
 			str.append((type == FOREIGN_KEY) ? "FOREIGN_KEY" : "REFERENCED_KEY");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
             str.append("\nReferenced Key Index UUID:\t\t"+refUUID);
 			str.append("\nReferenced Key ConglomNum:\t"+refConglomNumber);
             str.append("\nReferenced Key Constraint is deferrable:\t" +
@@ -430,6 +454,7 @@ public String toString()
 			}
 			str.append(")\n");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             str.append("\nDeferrable array:\t\t\t(");
             for (int i = 0; i < deferrable.length; i++)
             {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java
index c4bd57a445..8193f5c692 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java
@@ -48,6 +48,7 @@ public class ForeignKeyRIChecker extends GenericRIChecker
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     ForeignKeyRIChecker(
         LanguageConnectionContext lcc,
         TransactionController tc,
@@ -83,6 +84,7 @@ public class ForeignKeyRIChecker extends GenericRIChecker
      * @exception StandardException on unexpected error, or
 	 *		on a foreign key violation
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     void doCheck(Activation a,
                  ExecRow row,
                  boolean restrictCheckOnly,
@@ -108,6 +110,7 @@ void doCheck(Activation a,
 		ScanController scan = getScanController(fkInfo.refConglomNumber, refScoci, refDcoci, row);
 		if (!scan.next())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             final UUID fkId = fkInfo.fkIds[0];
             close();
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java
index 8e590f50dd..f20c4f460c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java
@@ -77,6 +77,7 @@ abstract class GenericAggregateResultSet extends NoPutResultSetImpl
 		source = s;
 		originalSource = s;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         ExecPreparedStatement ps = a.getPreparedStatement();
         ExecutionFactory ef = a.getExecutionFactory();
 
@@ -125,6 +126,7 @@ ExecIndexRow getRowTemplate() {
 	) throws StandardException
 	{
 		GenericAggregator 	aggregators[]; 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Vector<GenericAggregator>
                 tmpAggregators = new Vector<GenericAggregator>();
 		ClassFactory		cf = lcc.getLanguageConnectionFactory().getClassFactory();
@@ -178,6 +180,7 @@ protected final ExecIndexRow finishAggregation(ExecIndexRow row)
 		*/ 
 		if (row == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 			row = getRowTemplate();
 		}
 
@@ -192,6 +195,7 @@ protected final ExecIndexRow finishAggregation(ExecIndexRow row)
 		}
 
 		if (eliminatedNulls)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3461
 			addWarning(SQLWarningFactory.newSQLWarning(SQLState.LANG_NULL_ELIMINATED_IN_SET_FUNCTION));
 	
 		return row;
@@ -207,6 +211,7 @@ public Element toXML( Element parentNode, String tag ) throws Exception
     {
         // don't report the redundant originalSource node
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         Element result = super.toXML( parentNode, tag );
         NodeList    children = result.getChildNodes();
         for ( int i = 0; i < children.getLength(); i++ )
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericAggregator.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericAggregator.java
index 2859942dc6..d5290ecbcd 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericAggregator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericAggregator.java
@@ -86,6 +86,7 @@ void initialize(ExecRow row)
 		}
 
 		UserDataValue aggregatorColumn = (UserDataValue) row.getColumn(aggregatorColumnId + 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-776
 
 		ExecAggregator ua = (ExecAggregator) aggregatorColumn.getObject();
 		if (ua == null)
@@ -305,6 +306,7 @@ ExecAggregator getAggregatorInstance()
 		{
 			try
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				Class<?> aggregatorClass = cf.loadApplicationClass(aggInfo.getAggregatorClassName());
                 Constructor<?> constructor = aggregatorClass.getConstructor();
 				Object agg = constructor.newInstance();
@@ -315,6 +317,7 @@ ExecAggregator getAggregatorInstance()
                     (
                      cf,
                      aggInfo.getAggregateName(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
                      aggInfo.getResultDescription().getColumnInfo( 0 ).getType()
                      );
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
index 6fc8592bca..822aa86c1f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
@@ -93,6 +93,7 @@ public	GenericConstantActionFactory()
      *  @param initiallyDeferred   ncodes IMMEDIATE (false), DEFERRED (true)
 	 */
     public  ConstantAction getSetConstraintsConstantAction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             List<TableName> constraints,
             boolean         initiallyDeferred) {
         return new SetConstraintsConstantAction(constraints, initiallyDeferred);
@@ -202,6 +203,7 @@ public  ConstantAction getSetConstraintsConstantAction(
 		ProviderInfo[]		providerInfo
 	)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         return new CreateConstraintConstantAction(
                 constraintName,
                 constraintType,
@@ -265,12 +267,16 @@ public  ConstantAction getSetConstraintsConstantAction(
 		Properties		properties
     )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         return new CreateIndexConstantAction(
             forCreateTable,
             unique,
             uniqueWithDuplicateNulls,
             hasDeferrableChecking,
             initiallyDeferred,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             constraintType,
             indexType,
             schemaName,
@@ -327,6 +333,7 @@ public  ConstantAction getSetConstraintsConstantAction(
 	 */
 	public	ConstantAction	getCreateRoleConstantAction(String roleName)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 		return new CreateRoleConstantAction(roleName);
 	}
 
@@ -589,6 +596,7 @@ public ConstantAction getSetRoleConstantAction(String roleName,
      */
     public  ConstraintConstantAction    getAlterConstraintConstantAction
     (
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         String                  constraintName,
         String                  constraintSchemaName,
         boolean[]               characteristics,
@@ -657,6 +665,7 @@ public	ConstantAction	getDropAliasConstantAction(SchemaDescriptor	sd, String ali
 	 */
 	public ConstantAction getDropRoleConstantAction(String roleName)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 		return new DropRoleConstantAction(roleName);
 	}
 
@@ -831,6 +840,7 @@ public	ConstantAction getInsertConstantAction(
 										indexSCOCIs,
 										indexNames,
 										deferred,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                         hasDeferrableChecks,
 										targetProperties,
 										tableID,
@@ -945,6 +955,9 @@ public ConstantAction getSetTransactionIsolationConstantAction(int isolationLeve
 	 *	@param positionedUpdate		is this a positioned update
 	 *  @param singleRowSource		Whether or not source is a single row source
 	 *  @param autoincRowLocation array of row locations into syscolumns for
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 	                              autoincrement columns
 	 *  @param underMerge   True if this is an action of a MERGE statement.
 	 *  @param identitySequenceUUIDString   For 10.11 and higher, the handle on the sequence for the identity column
@@ -953,6 +966,7 @@ public ConstantAction getSetTransactionIsolationConstantAction(int isolationLeve
 	 *  @exception StandardException Thrown on failure
 	 */
 	public	UpdateConstantAction	getUpdateConstantAction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 TableDescriptor     targetTableDesc,
 								StaticCompiledOpenConglomInfo heapSCOCI,
 								IndexRowGenerator[]	irgs,
@@ -968,12 +982,16 @@ public	UpdateConstantAction	getUpdateConstantAction(
 								Object         		updateToken,
 								FKInfo[]			fkInfo,
 								TriggerInfo			triggerInfo,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 FormatableBitSet    baseRowReadList,
 								int[]				baseRowReadMap,
 								int[]				streamStorableHeapColIds,
 								int					numColumns,
 								boolean				positionedUpdate,
 								boolean				singleRowSource,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 								RowLocation[]		autoincRowLocation,
 								boolean				underMerge,
 								String		identitySequenceUUIDString
@@ -981,6 +999,7 @@ public	UpdateConstantAction	getUpdateConstantAction(
 			throws StandardException
 	{
 		return new UpdateConstantAction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                         targetTableDesc,
 										heapSCOCI,
 										irgs,
@@ -999,6 +1018,9 @@ public	UpdateConstantAction	getUpdateConstantAction(
 										numColumns,
 										positionedUpdate,
 										singleRowSource,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 										autoincRowLocation,
 										underMerge,
 										identitySequenceUUIDString
@@ -1008,6 +1030,7 @@ public	UpdateConstantAction	getUpdateConstantAction(
 	static protected Authorizer getAuthorizer()
 	{
 		LanguageConnectionContext lcc = (LanguageConnectionContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			getContext(LanguageConnectionContext.CONTEXT_ID);
 		return lcc.getAuthorizer();
 	}
@@ -1116,6 +1139,7 @@ static protected Authorizer getAuthorizer()
 	 * @param grantees The list of grantees
 	 */
 	public ConstantAction getGrantConstantAction( PrivilegeInfo privileges,
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 								List grantees)
 	{
 		return new GrantRevokeConstantAction( true, privileges, grantees);
@@ -1130,6 +1154,7 @@ public ConstantAction getGrantConstantAction( PrivilegeInfo privileges,
 	 *                  which roles(s) are to be granted
 	 */
 	public ConstantAction getGrantRoleConstantAction(List roleNames,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 													 List grantees)
 	{
 		return new GrantRoleConstantAction(roleNames, grantees);
@@ -1157,6 +1182,7 @@ public ConstantAction getRevokeConstantAction( PrivilegeInfo privileges,
 	 *                  roles are to be revoked
 	 */
 	public ConstantAction getRevokeRoleConstantAction(List roleNames,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 													  List grantees)
 	{
 		return new RevokeRoleConstantAction(roleNames, grantees);
@@ -1205,6 +1231,7 @@ public ConstantAction getRevokeRoleConstantAction(List roleNames,
      */
     private  static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java
index 2dba0a2e6a..b3b6043ca9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java
@@ -36,6 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * duration of the connection.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class GenericExecutionContext
 	extends ContextImpl 
 	implements ExecutionContext {
@@ -65,6 +66,7 @@ public void cleanupOnError(Throwable error) throws StandardException {
 
 			StandardException se = (StandardException) error;
             int severity = se.getSeverity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1095
             if (severity >= ExceptionSeverity.SESSION_SEVERITY)
             {
                popMe();
@@ -82,6 +84,7 @@ public void cleanupOnError(Throwable error) throws StandardException {
 	//
 	// class interface
 	//
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	GenericExecutionContext(
 			ContextManager cm,
 			ExecutionFactory ef)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java
index d80d6ba201..f26581413b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java
@@ -82,6 +82,7 @@ public class GenericExecutionFactory
 	//
 	public boolean canSupport(Properties startParams)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2164
         return Monitor.isDesiredType(startParams,
                 EngineType.STANDALONE_DB | EngineType.STORELESS_ENGINE);
 	}
@@ -154,9 +155,11 @@ public	GenericConstantActionFactory	getConstantActionFactory()
      * @exception StandardException     Thrown on error
      */
     public ResultSetStatisticsFactory getResultSetStatisticsFactory()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
                     throws StandardException {
         if (rssFactory == null) {
             rssFactory = (ResultSetStatisticsFactory)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 bootServiceModule(
                                     false,
                                     this,
@@ -318,6 +321,7 @@ public RowChanger getRowChanger(
 		int 						dmlType,
 		UUID						targetTableId,
 		String						targetTableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Vector<AutoincrementCounter> aiCounters
 	) throws StandardException
 	{
@@ -373,6 +377,7 @@ public XPLAINFactoryIF getXPLAINFactory()
                    throws StandardException {
        if (xplainFactory == null) {
            xplainFactory = (XPLAINFactoryIF)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                bootServiceModule(
                                    false,
                                    this,
@@ -389,6 +394,7 @@ public XPLAINFactoryIF getXPLAINFactory()
      */
     private  static  Object bootServiceModule
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
          final boolean create, final Object serviceModule,
          final String factoryInterface, final Properties properties
          )
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericPrivilegeInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericPrivilegeInfo.java
index e813aed195..914390994e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericPrivilegeInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericPrivilegeInfo.java
@@ -99,6 +99,7 @@ public void executeGrantRevoke( Activation activation,
 		// Check that the current user has permission to grant the privileges.
 		LanguageConnectionContext lcc = activation.getLanguageConnectionContext();
 		DataDictionary dd = lcc.getDataDictionary();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         String currentUser = lcc.getCurrentUserId(activation);
 		TransactionController tc = lcc.getTransactionExecute();
         SchemaDescriptor sd = _tupleDescriptor.getSchemaDescriptor();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java
index 433131b70b..7ef29e2802 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java
@@ -60,6 +60,7 @@ public abstract class GenericRIChecker
     protected int[] identityMap;
 
     final IndexRow indexQualifierRow;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
 	/**
      * @param lcc       the language connection context
@@ -75,6 +76,7 @@ public abstract class GenericRIChecker
         this.lcc = lcc;
 		this.fkInfo = fkinfo;
 		this.tc = tc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		scanControllers = new Hashtable<Long,ScanController>();
 		numColumns = fkInfo.colArray.length;
 		indexQualifierRow = new IndexRow(numColumns);
@@ -144,11 +146,13 @@ protected ScanController getScanController(long conglomNumber,
 		int				isoLevel = getRICheckIsolationLevel();
 		ScanController 	scan;
         Long            hashKey = Long.valueOf(conglomNumber);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
 		/*
 		** If we haven't already opened this scan controller,
 		** we'll open it now and stick it in the hash table.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		if ((scan = scanControllers.get(hashKey)) == null)
 		{
 			setupQualifierRow(searchRow);
@@ -239,6 +243,7 @@ boolean isAnyFieldNull(ExecRow baseRow)
 	void close()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Enumeration<ScanController> e = scanControllers.elements();
 		while (e.hasMoreElements())
 		{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
index e037199dfc..ea815afac7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
@@ -68,6 +68,7 @@ public GenericResultSetFactory()
 		@exception StandardException thrown on error
 	 */
     public ResultSet getInsertResultSet(NoPutResultSet source,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                         GeneratedMethod generationClauses,
                                         GeneratedMethod checkGM,
                                         int fullTemplate,
@@ -97,6 +98,7 @@ public ResultSet getInsertVTIResultSet(NoPutResultSet source,
 		throws StandardException
 	{
 		Activation activation = source.getActivation();
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getAuthorizer(activation).authorize(activation, Authorizer.SQL_WRITE_OP);
 		return new InsertVTIResultSet(source, vtiRS, activation );
 	}
@@ -109,6 +111,7 @@ public ResultSet getDeleteVTIResultSet(NoPutResultSet source)
 		throws StandardException
 	{
 		Activation activation = source.getActivation();
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getAuthorizer(activation).authorize(activation, Authorizer.SQL_WRITE_OP);
 		return new DeleteVTIResultSet(source, activation);
 	}
@@ -121,6 +124,7 @@ public ResultSet getDeleteResultSet(NoPutResultSet source)
 			throws StandardException
 	{
 		Activation activation = source.getActivation();
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getAuthorizer(activation).authorize(activation, Authorizer.SQL_WRITE_OP);
 		return new DeleteResultSet(source, activation );
 	}
@@ -148,6 +152,7 @@ public ResultSet getDeleteCascadeResultSet(NoPutResultSet source,
 		throws StandardException
 	{
 		Activation activation = source.getActivation();
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getAuthorizer(activation).authorize(activation, Authorizer.SQL_WRITE_OP);
 		return new DeleteCascadeResultSet(source, activation, 
 										  constantActionItem,
@@ -189,6 +194,7 @@ public ResultSet getUpdateVTIResultSet(NoPutResultSet source)
 			throws StandardException
 	{
 		Activation activation = source.getActivation();
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getAuthorizer(activation).authorize(activation, Authorizer.SQL_WRITE_OP);
 		return new UpdateVTIResultSet(source, activation);
 	}
@@ -207,6 +213,9 @@ public ResultSet getDeleteCascadeUpdateResultSet(NoPutResultSet source,
 			throws StandardException
 	{
 		Activation activation = source.getActivation();
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getAuthorizer(activation).authorize(activation, Authorizer.SQL_WRITE_OP);
 		return new UpdateResultSet(source, generationClauses, checkGM, activation,
 								   constantActionItem, rsdItem);
@@ -221,6 +230,7 @@ public ResultSet getCallStatementResultSet(GeneratedMethod methodCall,
 				Activation activation)
 			throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getAuthorizer(activation).authorize(activation, Authorizer.SQL_CALL_OP);
 		return new CallStatementResultSet(methodCall, activation);
 	}
@@ -238,6 +248,8 @@ public NoPutResultSet getProjectRestrictResultSet(NoPutResultSet source,
 		boolean reuseResult,
 		boolean doesProjection,
         boolean validatingCheckConstraint,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         String validatingBaseTableUUIDString,
 		double optimizerEstimatedRowCount,
 		double optimizerEstimatedCost)
@@ -253,6 +265,10 @@ public NoPutResultSet getProjectRestrictResultSet(NoPutResultSet source,
 
 		return new ProjectRestrictResultSet(source, source.getActivation(), 
 			restriction, projection, resultSetNumber, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
             constantRestriction, mapRefItem, cloneMapItem,
 			reuseResult,
 			doesProjection,
@@ -487,6 +503,7 @@ public NoPutResultSet getVTIResultSet(Activation activation, int row,
                                      int returnTypeNumber,
                                      int vtiProjectionNumber,
                                      int vtiRestrictionNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
                                      String vtiSchema,
                                      String vtiName
                                           )
@@ -506,6 +523,7 @@ public NoPutResultSet getVTIResultSet(Activation activation, int row,
 								isDerbyStyleTableFunction,
                                 returnTypeNumber,
                                 vtiProjectionNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
                                 vtiRestrictionNumber,
                                 vtiSchema,
                                 vtiName
@@ -612,6 +630,7 @@ public NoPutResultSet getDistinctScanResultSet(
 								conglomId,
 								scoci,
 								activation,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 								resultRowTemplate,
 								resultSetNumber,
 								hashKeyColumn,
@@ -690,6 +709,7 @@ public NoPutResultSet getTableScanResultSet(
 	}
 
     public NoPutResultSet getValidateCheckConstraintResultSet(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                     Activation activation,
                                     long conglomId,
                                     int scociItem,
@@ -923,6 +943,7 @@ public NoPutResultSet getIndexRowToBaseRowResultSet(
 								resultSetNumber,
 								indexName,
 								heapColRefItem,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2226
 								allColRefItem,
 								heapOnlyColRefItem,
 								indexColMapItem,
@@ -938,6 +959,9 @@ public NoPutResultSet getIndexRowToBaseRowResultSet(
 		@exception StandardException	Thrown on error
 	 */
 	public NoPutResultSet getWindowResultSet(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2998
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 								Activation activation,
 								NoPutResultSet source,
 								int rowAllocator,
@@ -975,6 +999,7 @@ public NoPutResultSet getNestedLoopJoinResultSet(NoPutResultSet leftResultSet,
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 								   String userSuppliedOptimizerOverrides)
 			throws StandardException
 	{
@@ -1004,6 +1029,7 @@ public NoPutResultSet getHashJoinResultSet(NoPutResultSet leftResultSet,
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 								   String userSuppliedOptimizerOverrides)
 			throws StandardException
 	{
@@ -1035,6 +1061,7 @@ public NoPutResultSet getNestedLoopLeftOuterJoinResultSet(NoPutResultSet leftRes
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 								   String userSuppliedOptimizerOverrides)
 			throws StandardException
 	{
@@ -1068,6 +1095,7 @@ public NoPutResultSet getHashLeftOuterJoinResultSet(NoPutResultSet leftResultSet
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 								   String userSuppliedOptimizerOverrides)
 			throws StandardException
 	{
@@ -1081,6 +1109,10 @@ public NoPutResultSet getHashLeftOuterJoinResultSet(NoPutResultSet leftResultSet
 										   notExistsRightSide,
 										   optimizerEstimatedRowCount,
 										   optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 										   userSuppliedOptimizerOverrides);
 	}
 
@@ -1092,6 +1124,7 @@ public NoPutResultSet getHashLeftOuterJoinResultSet(NoPutResultSet leftResultSet
 	public ResultSet getSetTransactionResultSet(Activation activation) 
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getAuthorizer(activation).authorize(activation, Authorizer.SQL_ARBITARY_OP);		
 		return new SetTransactionResultSet(activation);
 	}
@@ -1134,6 +1167,7 @@ public NoPutResultSet getScrollInsensitiveResultSet(NoPutResultSet source,
 									  resultSetNumber, 
 									  sourceRowWidth,
 									  optimizerEstimatedRowCount,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 									  optimizerEstimatedCost);
 		}
 		else
@@ -1157,6 +1191,7 @@ public NoPutResultSet getNormalizeResultSet(NoPutResultSet source,
 		return new NormalizeResultSet(source, source.getActivation(), 
 									  resultSetNumber, erdNumber, 
 									  optimizerEstimatedRowCount,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 									  optimizerEstimatedCost, forUpdate);
 	}
 
@@ -1176,6 +1211,7 @@ public NoPutResultSet getCurrentOfResultSet(String cursorName,
 	public ResultSet getDDLResultSet(Activation activation)
 					throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getAuthorizer(activation).authorize(activation, Authorizer.SQL_DDL_OP);
 		return getMiscResultSet( activation);
 	}
@@ -1187,6 +1223,7 @@ public ResultSet getDDLResultSet(Activation activation)
 	public ResultSet getMiscResultSet(Activation activation)
 					throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		getAuthorizer(activation).authorize(activation, Authorizer.SQL_ARBITARY_OP);
 		return new MiscResultSet(activation);
 	}
@@ -1207,6 +1244,7 @@ public NoPutResultSet getUnionResultSet(NoPutResultSet leftResultSet,
 				                  leftResultSet.getActivation(),
 								  resultSetNumber, 
 								  optimizerEstimatedRowCount,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 								  optimizerEstimatedCost);
 	}
 
@@ -1272,6 +1310,7 @@ public NoPutResultSet getSetOpResultSet( NoPutResultSet leftSource,
         int                 resultRowTemplate,
 		long 				conglomId,
 		String 				tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		String 				userSuppliedOptimizerOverrides,
 		String 				indexName,
 		int 				colRefItem,
@@ -1285,6 +1324,7 @@ public NoPutResultSet getSetOpResultSet( NoPutResultSet leftSource,
 		return new LastIndexKeyResultSet(
 					activation,
 					resultSetNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 					resultRowTemplate,
 					conglomId,
 					tableName,
@@ -1295,6 +1335,20 @@ public NoPutResultSet getSetOpResultSet( NoPutResultSet leftSource,
 					tableLocked,
 					isolationLevel,
 					optimizerEstimatedRowCount,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 					optimizerEstimatedCost);
 	}
 
@@ -1318,6 +1372,15 @@ public NoPutResultSet getRaDependentTableScanResultSet(
 									boolean sameStartStopPosition,
 									Qualifier[][] qualifiers,
 									String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 									String userSuppliedOptimizerOverrides,
 									String indexName,
 									boolean isConstraint,
@@ -1342,6 +1405,11 @@ public NoPutResultSet getRaDependentTableScanResultSet(
 								conglomId,
 								scoci,
 								activation,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 								resultRowTemplate,
 								resultSetNumber,
 								startKeyGetter,
@@ -1351,6 +1419,16 @@ public NoPutResultSet getRaDependentTableScanResultSet(
 								sameStartStopPosition,
 								qualifiers,
 								tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 								userSuppliedOptimizerOverrides,
 								indexName,
 								isConstraint,
@@ -1373,9 +1451,11 @@ public NoPutResultSet getRaDependentTableScanResultSet(
 	 * @see ResultSetFactory#getRowCountResultSet
 	 */
 	public NoPutResultSet getRowCountResultSet(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4079
 		NoPutResultSet source,
 		Activation activation,
 		int resultSetNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4208
 		GeneratedMethod offsetMethod,
 		GeneratedMethod fetchFirstMethod,
         boolean hasJDBClimitClause,
@@ -1386,10 +1466,13 @@ public NoPutResultSet getRowCountResultSet(
 		return new RowCountResultSet(source,
 									 activation,
 									 resultSetNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4208
 									 offsetMethod,
 									 fetchFirstMethod,
 									 hasJDBClimitClause,
 									 optimizerEstimatedRowCount,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 									 optimizerEstimatedCost);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java
index 090173bf1f..19d6af9335 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java
@@ -104,6 +104,8 @@ abstract class GenericTriggerExecutor
 
     private SPSDescriptor getWhenClause() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		if (!whenClauseRetrieved)
 		{
 			whenClauseRetrieved = true;
@@ -195,6 +197,7 @@ private boolean executeSPS(SPSDescriptor sps, boolean isWhen)
 			}
 
 			// save the active statement context for exception handling purpose
+//IC see: https://issues.apache.org/jira/browse/DERBY-2195
 			StatementContext active_sc = lcc.getStatementContext();
 			
 			/*
@@ -212,6 +215,7 @@ private boolean executeSPS(SPSDescriptor sps, boolean isWhen)
                 // This is a substatement; for now, we do not set any timeout
                 // for it. We might change this behaviour later, by linking
                 // timeout to its parent statement's timeout settings.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
 				ResultSet rs = ps.executeSubStatement
 					(activation, spsActivation, false, 0L);
 
@@ -284,6 +288,7 @@ else if (rs.returnsRows())
 				StatementContext sc = lcc.getStatementContext();
 				
 				/* make sure that the cleanup is on the new SC */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5736
 				if (sc != null && active_sc != sc)
 				{
 					sc.cleanupOnError(e);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GrantRoleConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GrantRoleConstantAction.java
index 65ee20f91f..4e20594a9e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GrantRoleConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GrantRoleConstantAction.java
@@ -83,12 +83,14 @@ public void executeConstantAction(Activation activation)
         DataDescriptorGenerator ddg = dd.getDataDescriptorGenerator();
 
         final String grantor = lcc.getCurrentUserId(activation);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
         dd.startWriting(lcc);
 
         for (Iterator rIter = roleNames.iterator(); rIter.hasNext();) {
             String role = (String)rIter.next();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3333
             if (role.equals(Authorizer.PUBLIC_AUTHORIZATION_ID)) {
                 throw StandardException.
                     newException(SQLState.AUTH_PUBLIC_ILLEGAL_AUTHORIZATION_ID);
@@ -98,6 +100,7 @@ public void executeConstantAction(Activation activation)
                 String grantee = (String)gIter.next();
 
                 // check that role exists
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
                 RoleGrantDescriptor rdDef =
                     dd.getRoleDefinitionDescriptor(role);
 
@@ -123,6 +126,7 @@ public void executeConstantAction(Activation activation)
                     // All ok, we are database owner
                     if (SanityManager.DEBUG) {
                         SanityManager.ASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
                             rdDef.getGrantee().equals(grantor),
                             "expected database owner in role grant descriptor");
                         SanityManager.ASSERT(
@@ -135,6 +139,7 @@ public void executeConstantAction(Activation activation)
                 }
 
                 // Has it already been granted?
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
                 RoleGrantDescriptor rgd =
                     dd.getRoleGrantDescriptor(role, grantee, grantor);
 
@@ -163,6 +168,7 @@ public void executeConstantAction(Activation activation)
                     }
 
                     rgd = ddg.newRoleGrantDescriptor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
                         dd.getUUIDFactory().createUUID(),
                         role,
                         grantee,
@@ -170,6 +176,7 @@ public void executeConstantAction(Activation activation)
                         withAdminOption,
                         false);  // not definition
                     dd.addDescriptor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
                         rgd,
                         null,  // parent
                         DataDictionary.SYSROLES_CATALOG_NUM,
@@ -208,6 +215,7 @@ private void checkCircularity(String role,
         RoleClosureIterator rci =
             dd.createRoleClosureIterator(tc, grantee, false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         String r;
         while ((r = rci.next()) != null) {
             if (role.equals(r)) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java
index b54e4e161a..80f3bb65d3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java
@@ -75,6 +75,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * in the ROLLUP case.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class GroupedAggregateResultSet extends GenericAggregateResultSet
 	implements CursorResultSet {
 
@@ -150,6 +151,7 @@ class GroupedAggregateResultSet extends GenericAggregateResultSet
 	 *
 	 * @exception StandardException Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     GroupedAggregateResultSet(NoPutResultSet s,
 					boolean isInSortedOrder,
 					int	aggregateItem,
@@ -165,7 +167,9 @@ class GroupedAggregateResultSet extends GenericAggregateResultSet
 		super(s, aggregateItem, a, ra, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost);
 		this.isInSortedOrder = isInSortedOrder;
 		rollup = isRollup;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		finishedResults = new ArrayList<ExecRow>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6292
         order = ((FormatableArrayHolder)
                     (a.getPreparedStatement().getSavedObject(orderingItem)))
                         .getArray(ColumnOrdering[].class);
@@ -209,6 +213,7 @@ public void	openCore() throws StandardException
 		if (SanityManager.DEBUG)
 	    	SanityManager.ASSERT( ! isOpen, "GroupedAggregateResultSet already open");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         sortResultRow = (ExecIndexRow) getRowTemplate().getClone();
         sourceExecIndexRow = (ExecIndexRow) getRowTemplate().getClone();
 
@@ -287,6 +292,7 @@ private ScanController loadSorter()
 		ExecRow 				inputRow;
 		int						inputRowCountEstimate = (int) optimizerEstimatedRowCount;
         ExecIndexRow            sortTemplateRow = getRowTemplate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
 		tc = getTransactionController();
 
@@ -314,6 +320,8 @@ private ScanController loadSorter()
 			sorter.insert(inputRow.getRowArray());
 		}
 		source.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 		sorter.completedInserts();
 		sortProperties = sorter.getSortInfo().
 			getAllSortInfo(sortProperties);
@@ -358,6 +366,7 @@ private ScanController loadSorter()
 	 */
 	public ExecRow	getNextRowCore() throws StandardException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -399,6 +408,7 @@ else if (resultsComplete)
 			 */
 			ExecIndexRow currSortedRow =
 				    resultRows[resultRows.length-1];
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                         ExecRow origRow = nextRow.getClone();
                         initializeVectorAggregation(nextRow);
 			int distinguisherCol = 
@@ -759,6 +769,7 @@ private void mergeVectorAggregates(ExecRow newRow, ExecRow currRow,
 		for (int i = 0; i < aggregates.length; i++)
 		{
 			GenericAggregator currAggregate = aggregates[i];
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             AggregatorInfo aInfo = aggInfoList.elementAt(i);
 			if (aInfo.isDistinct())
 			{
@@ -798,6 +809,7 @@ private void initializeDistinctMaps(int r, boolean allocate)
 		for (int a = 0; a < aggregates.length; a++)
 		{
             AggregatorInfo aInfo = aggInfoList.elementAt(a);
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
 
             if (allocate) {
                 // Allocate an empty set if the aggregate is distinct.
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java
index 7266822c42..a1c8131a24 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java
@@ -31,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Simple subclass of nested loop, differentiated
  * to ease RunTimeStatistics output generation.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class HashJoinResultSet extends NestedLoopJoinResultSet
 {
     HashJoinResultSet(NoPutResultSet leftResultSet,
@@ -44,6 +45,7 @@ class HashJoinResultSet extends NestedLoopJoinResultSet
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 								   String userSuppliedOptimizerOverrides)
     {
 		super(leftResultSet, leftNumCols, rightResultSet, rightNumCols,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java
index a9ed3b3d86..7efb503f47 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java
@@ -31,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Simple subclass of nested loop left outer join, differentiated
  * to ease RunTimeStatistics output generation.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class HashLeftOuterJoinResultSet extends NestedLoopLeftOuterJoinResultSet
 {
     HashLeftOuterJoinResultSet(
@@ -47,6 +48,7 @@ class HashLeftOuterJoinResultSet extends NestedLoopLeftOuterJoinResultSet
 					    boolean notExistsRightSide,
  					    double optimizerEstimatedRowCount,
 						double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 						String userSuppliedOptimizerOverrides)
     {
 		super(leftResultSet, leftNumCols, rightResultSet, rightNumCols,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
index 40dc14bdd1..e8bdd6c8c3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
@@ -108,6 +108,7 @@ public class HashScanResultSet extends ScanResultSet
     //
     // class interface
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     HashScanResultSet(long conglomId,
 		StaticCompiledOpenConglomInfo scoci, Activation activation, 
 		int resultRowTemplate,
@@ -122,6 +123,7 @@ public class HashScanResultSet extends ScanResultSet
 		int maxCapacity,
 		int hashKeyItem,
 		String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		String userSuppliedOptimizerOverrides,
 		String indexName,
 		boolean isConstraint,
@@ -137,7 +139,9 @@ public class HashScanResultSet extends ScanResultSet
     {
 		super(activation,
 				resultSetNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 				resultRowTemplate,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 				lockMode, tableLocked, isolationLevel,
                 colRefItem,
 				optimizerEstimatedRowCount,
@@ -165,17 +169,20 @@ public class HashScanResultSet extends ScanResultSet
 		this.loadFactor = loadFactor;
 		this.maxCapacity = maxCapacity;
         this.tableName = tableName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
         this.userSuppliedOptimizerOverrides = userSuppliedOptimizerOverrides;
         this.indexName = indexName;
 		this.isConstraint = isConstraint;
 		this.forUpdate = forUpdate;
 		this.skipNullKeyColumns = skipNullKeyColumns;
 		this.keepAfterCommit = activation.getResultSetHoldability();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2462
 
 		/* Retrieve the hash key columns */
 		FormatableArrayHolder fah = (FormatableArrayHolder)
 										(activation.getPreparedStatement().
 											getSavedObject(hashKeyItem));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6292
         FormatableIntHolder[] fihArray =
                 fah.getArray(FormatableIntHolder[].class);
 		keyColumns = new int[fihArray.length];
@@ -204,6 +211,7 @@ public class HashScanResultSet extends ScanResultSet
 	 * locks at READ COMMITTED.
 	 */
 	boolean canGetInstantaneousLocks() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 		return true;
 	}
 
@@ -226,6 +234,7 @@ public void	openCore() throws StandardException
         tc = activation.getTransactionController();
 
 		initIsolationLevel();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 
 		if (startKeyGetter != null)
 		{
@@ -271,6 +280,7 @@ else if (! hashtableBuilt)
                     keyColumns,      
                     eliminateDuplicates,// remove duplicates?
                     -1,                 // RESOLVE - is there a row estimate?
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
                     maxCapacity,
                     initialCapacity,    // in memory Hashtable initial capacity
                     loadFactor,         // in memory Hashtable load factor
@@ -364,6 +374,7 @@ private void resetProbeVariables() throws StandardException
 	 */
 	public ExecRow getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -742,6 +753,7 @@ private String printPosition(int searchOperator,
 			if (positioner.areNullsOrdered(position))
 			{
 				output = output + position + " ";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				colSeen = true;
 			}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java
index e15eb1d9a8..236877405b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java
@@ -58,6 +58,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Builds a hash table on the underlying result set tree.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class HashTableResultSet extends NoPutResultSetImpl
 	implements CursorResultSet 
 {
@@ -101,6 +102,7 @@ class HashTableResultSet extends NoPutResultSetImpl
     //
     // class interface
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     HashTableResultSet(NoPutResultSet s,
 					Activation a,
 					GeneratedMethod str,
@@ -133,6 +135,7 @@ class HashTableResultSet extends NoPutResultSetImpl
         projection = p;
 		projectMapping = ((ReferencedColumnsDescriptorImpl) a.getPreparedStatement().getSavedObject(mapRefItem)).getReferencedColumnPositions();
 		FormatableArrayHolder fah = (FormatableArrayHolder) a.getPreparedStatement().getSavedObject(keyColItem);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6292
         FormatableIntHolder[] fihArray = fah.getArray(FormatableIntHolder[].class);
 		keyColumns = new int[fihArray.length];
 		for (int index = 0; index < fihArray.length; index++)
@@ -211,6 +214,7 @@ public void	openCore() throws StandardException
 										   maxInMemoryRowCount,
 										   (int) initialCapacity,
 										   loadFactor,
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
 										   skipNullKeyColumns,
                                            false /* Not kept after a commit */);
 
@@ -298,6 +302,7 @@ private void resetProbeVariables() throws StandardException
 	 * @return the next row in the result
 	 */
 	public ExecRow	getNextRowCore() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -342,6 +347,7 @@ public ExecRow	getNextRowCore() throws StandardException {
 						hashEntry = ht.get(mh);
 					}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
 					if (hashEntry instanceof List)
 					{
 						entryVector = (List) hashEntry;
@@ -360,6 +366,7 @@ else if (numFetchedOnNext < entryVectorSize)
 				{
 					// We are walking a list and there are more rows left.
 					columns = (DataValueDescriptor[]) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
                         entryVector.get(numFetchedOnNext);
 				}
 
@@ -370,6 +377,7 @@ else if (numFetchedOnNext < entryVectorSize)
 						// Columns is really a Storable[]
 						for (int i = 0; i < columns.length; i++)
 						{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6133
                            if (! (columns[i] instanceof Storable))
 							{
 								SanityManager.THROWASSERT(
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexChanger.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexChanger.java
index 96ff63f547..c560676912 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexChanger.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexChanger.java
@@ -56,6 +56,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   */
 class IndexChanger
 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
     final private IndexRowGenerator irg;
 	//Index Conglomerate ID
     final private long indexCID;
@@ -118,6 +121,9 @@ class IndexChanger
 		 throws StandardException
 	{
 		this.irg = irg;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         this.deferrable = irg.hasDeferrableChecking(); // cache value
                                                        // for speed..
 		this.indexCID = indexCID;
@@ -132,6 +138,9 @@ class IndexChanger
 		this.activation = activation;
 		this.indexName = indexName;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         this.lcc = (activation != null) ?
                 activation.getLanguageConnectionContext() : null;
         // activation will be null when called from DataDictionary
@@ -366,7 +375,9 @@ private void doDelete()
                 Object[] args = new Object[2];
                 args[0] = ourIndexRow.getRowArray()[ourIndexRow.getRowArray().length - 1];
                 args[1] = indexCID;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                 Monitor.getStream().println(MessageService.getTextMessage(
                     SQLState.LANG_IGNORE_MISSING_INDEX_ROW_DURING_DELETE, 
                     args));
@@ -418,6 +429,9 @@ private void doDeferredInsert()
 			** row holder (the description is needed when the row
 			** holder is going to be handed to users for triggers).
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 			rowHolder = new TemporaryRowHolderImpl(activation, properties,
 												   (ResultDescription) null);
 		}
@@ -441,6 +455,8 @@ private void doDeferredInsert()
     // do not share an index with other constraints and explicit indexes, so the
     // mapping back from index conglomerate to constraint is one-to-one.
     private UUID getUniqueConstraintId() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         if (uniqueConstraintId == null) {
             DataDictionary dd = lcc.getDataDictionary();
             ConglomerateDescriptor cd = dd.getConglomerateDescriptor(indexCID);
@@ -472,6 +488,9 @@ private void insertAndCheckDups(ExecIndexRow row)
         int insertStatus;
 
         final DataValueDescriptor[] rowArray = row.getRowArray();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
 
         if (deferrable) {
             insertStatus = indexCC.insert(row.getRowArray());
@@ -490,6 +509,8 @@ private void insertAndCheckDups(ExecIndexRow row)
             // constitute duplicates (not always the case), and check those keys
             // again at commit time.
             final boolean deferred = lcc.isEffectivelyDeferred(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                     lcc.getCurrentSQLSessionContext(activation),
                     getUniqueConstraintId());
             // TODO add assert getUniqueConstraintId() != null
@@ -497,6 +518,8 @@ private void insertAndCheckDups(ExecIndexRow row)
             ScanController idxScan = tc.openScan(
                     indexCID,
                     false,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     (deferred ?
                      TransactionController.OPENMODE_LOCK_ROW_NOWAIT :
                      0),
@@ -524,6 +547,8 @@ private void insertAndCheckDups(ExecIndexRow row)
             } catch (StandardException e) {
                 if ((e.getSQLState().equals(SQLState.LOCK_TIMEOUT) ||
                      e.getSQLState().equals(SQLState.DEADLOCK)) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                      deferred)  {
                     // Assume there is a duplicate, so we'll check again at
                     // commit time.
@@ -546,6 +571,8 @@ private void insertAndCheckDups(ExecIndexRow row)
             }
 
             if (duplicate) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                 if (deferred) {
                     // Save duplicate row so we can check at commit time there is
                     // no longer any duplicate.
@@ -554,6 +581,8 @@ private void insertAndCheckDups(ExecIndexRow row)
                         DeferredConstraintsMemory.rememberDuplicate(
                             lcc,
                             deferredDuplicates,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                             getUniqueConstraintId(),
                             row.getRowArray());
                 } else { // the constraint is not deferred, so throw
@@ -593,6 +622,9 @@ private void insertAndCheckDups(ExecIndexRow row)
 				StandardException.newException(
 				SQLState.LANG_DUPLICATE_KEY_CONSTRAINT, indexOrConstraintName, tableName);
 			throw se;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         } else {
             if (SanityManager.DEBUG) {
                 if (insertStatus != 0) {
@@ -731,6 +763,9 @@ void insertForUpdate(ExecRow newRow, RowLocation baseRowLocation)
 	{
 		setOurIndexRow(newRow, baseRowLocation);
 		//defer inserts if its on unique or UniqueWhereNotNull index
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         if (irg.isUnique() ||
             irg.isUniqueWithDuplicateNulls() ||
             irg.hasDeferrableChecking())
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java
index 4bbe57135b..eb17f5525b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java
@@ -81,6 +81,7 @@ public IndexColumnOrder()
 	public IndexColumnOrder(int colNum) {
 		 this.colNum = colNum;
 		 this.ascending = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
                  this.nullsOrderedLow = false;
 	}
 
@@ -132,6 +133,7 @@ public boolean getIsAscending() {
          * @return whether nulls should sort low
          */
 	public boolean getIsNullsOrderedLow() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
 		return nullsOrderedLow;
 	}
 
@@ -176,6 +178,7 @@ public void readExternal(ObjectInput in)
 	public	int	getTypeFormatId()	{ return StoredFormatIds.INDEX_COLUMN_ORDER_V01_ID; }
 
 	public String toString() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 		if (SanityManager.DEBUG) {
 			return
 				"IndexColumnOrder.colNum: " + colNum + "\n" +
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java
index 44acd4fb9f..c4a486798d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java
@@ -94,6 +94,8 @@ public void setIndexName(String indexName)
      * @param constraintID The id of the constraint
      */
     public void setConstraintID(UUID constraintID) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         this.constraintID = constraintID;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
index 5f298df14e..2a46a596ab 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
@@ -47,6 +47,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * index conglomerate.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class IndexRowToBaseRowResultSet extends NoPutResultSetImpl
 	implements CursorResultSet {
 
@@ -90,6 +91,7 @@ class IndexRowToBaseRowResultSet extends NoPutResultSetImpl
     //
     // class interface
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     IndexRowToBaseRowResultSet(
 					long conglomId,
 					int scociItem,
@@ -128,6 +130,7 @@ class IndexRowToBaseRowResultSet extends NoPutResultSetImpl
 
 		// retrieve the valid column list from
 		// the saved objects, if it exists
+//IC see: https://issues.apache.org/jira/browse/DERBY-2226
 		if (heapColRefItem != -1) {
             this.accessedHeapCols =
                     (FormatableBitSet) gp.getSavedObject(heapColRefItem);
@@ -322,6 +325,7 @@ public void	reopenCore() throws StandardException {
 	 * @return the next row in the result
 	 */
 	public ExecRow	getNextRowCore() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -534,6 +538,7 @@ public RowLocation getRowLocation() throws StandardException {
 	 * location base row, but reuse the saved row location.
 	 */
 	public void positionScanAtRowLocation(RowLocation rl) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		throws StandardException 
 	{
 		baseRowLocation = rl;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java
index c0a69baef0..74602d7107 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java
@@ -92,6 +92,7 @@ public class InsertConstantAction extends WriteCursorConstantAction
     /** Position of autogenerated column */
     private transient   int firstAutoGenColumn = -1;
     final public boolean hasDeferrableChecks;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
     String  identitySequenceUUIDString;
 
@@ -180,6 +181,7 @@ public  InsertConstantAction() {
 		this.columnNames = tableDescriptor.getColumnNamesArray();
 		this.autoincIncrement = tableDescriptor.getAutoincIncrementArray();
 		this.indexNames = indexNames;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         this.hasDeferrableChecks = hasDeferrableChecks;
         this.identitySequenceUUIDString = identitySequenceUUIDString;
 	}
@@ -302,6 +304,8 @@ public  int     getAutoGenColumn()
 	 */
 	public boolean hasAutoincrement()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5687
+//IC see: https://issues.apache.org/jira/browse/DERBY-4437
 		return (autoincRowLocation != null);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
index 2eda48a3d5..1ef2a3cb69 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
@@ -85,6 +85,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * and triggers to be executed based on the c's and t's
  * compiled into the insert plan.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 class InsertResultSet extends DMLWriteGeneratedColumnsResultSet implements TargetResultSet
 {
 	// RESOLVE. Embarrassingly large public state. If we could move the 
@@ -177,6 +180,7 @@ public void changedRow(ExecRow execRow, RowLocation rowLocation)
 		if (constants.irgs.length > 0)
 		{
            RowLocation rlClone = (RowLocation) rowLocation.cloneValue(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 
 			// Objectify any the streaming columns that are indexed.
 			for (int i = 0; i < execRow.getRowArray().length; i++)
@@ -244,6 +248,7 @@ public ExecRow preprocessSourceRow(ExecRow execRow)
 
         if (checkGM != null) {
             boolean allOk = evaluateCheckConstraints();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             if (!allOk) {
                 if (SanityManager.DEBUG) {
                     SanityManager.ASSERT(
@@ -269,6 +274,7 @@ public ExecRow preprocessSourceRow(ExecRow execRow)
 
 
     public void offendingRowLocation(RowLocation rl, long constainerId)
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             throws StandardException {
         if (violatingCheckConstraints != null) {
             deferredChecks =
@@ -279,6 +285,7 @@ public void offendingRowLocation(RowLocation rl, long constainerId)
                             tableName,
                             deferredChecks,
                             violatingCheckConstraints,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                             rl,
                             new CheckInfo[1] /* dummy */);
             violatingCheckConstraints.clear();
@@ -316,10 +323,12 @@ private boolean evaluateCheckConstraints() throws StandardException {
 	 *
 	 * @exception StandardException		Thrown on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     InsertResultSet(NoPutResultSet source, 
 						   GeneratedMethod generationClauses,
 						   GeneratedMethod checkGM,
                            int fullTemplate,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                            String schemaName,
                            String tableName,
 						   Activation activation)
@@ -330,13 +339,16 @@ private boolean evaluateCheckConstraints() throws StandardException {
 		constants = (InsertConstantAction) constantAction;
         this.generationClauses = generationClauses;
 		this.checkGM = checkGM;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         this.fullTemplateId = fullTemplate;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         this.schemaName = schemaName;
         this.tableName = tableName;
 		heapConglom = constants.conglomId;
         identitySequenceUUIDString = constants.identitySequenceUUIDString;
 
         tc = activation.getTransactionController();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 		fkInfoArray = constants.getFKInfo();
 		triggerInfo = constants.getTriggerInfo();
 		
@@ -344,12 +356,17 @@ private boolean evaluateCheckConstraints() throws StandardException {
 				triggerInfo.hasTrigger(true, true) :
 				false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
         resultDescription = sourceResultSet.getResultDescription();
         
 		// Is this a bulkInsert or regular insert?
 		String insertMode = constants.getProperty("insertMode");
 
 		initializeAIcache(constants.getAutoincRowLocation());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 
 		if (insertMode != null)
 		{
@@ -369,6 +386,7 @@ else if (StringUtil.SQLEqualsIgnoreCase(insertMode,"REPLACE"))
 				*/
 				if (triggerInfo != null)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     TriggerDescriptor trD = triggerInfo.getTriggerArray()[0];
                     throw StandardException.newException(
                         SQLState.LANG_NO_BULK_INSERT_REPLACE_WITH_TRIGGER_DURING_EXECUTION,
@@ -384,6 +402,7 @@ else if (StringUtil.SQLEqualsIgnoreCase(insertMode,"REPLACE"))
 	*/
 	public void open() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 		setup();
 		// Remember if this is the 1st execution
 		firstExecute = (rowChanger == null);
@@ -393,8 +412,11 @@ public void open() throws StandardException
 		dd = lcc.getDataDictionary();
 
 		verifyAutoGeneratedRScolumnsList(constants.targetUUID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
 
 		rowCount = 0L;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
 		if (numOpens++ == 0)
 		{
@@ -428,6 +450,7 @@ public void open() throws StandardException
 			// Notify the source that we are the target
 			sourceResultSet.setTargetResultSet(this);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
             ExecRow fullTemplate =
                 ((ExecRowBuilder) activation.getPreparedStatement().
                     getSavedObject(fullTemplateId)).build(
@@ -442,6 +465,7 @@ public void open() throws StandardException
                 }
 			}
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
             bulkValidateForeignKeys(tc, lcc.getContextManager(), fullTemplate);
 	
 			bulkInsertPerformed = true;
@@ -461,6 +485,9 @@ public void open() throws StandardException
 
 		cleanUp();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 		saveAIcacheInformation(constants.getSchemaName(), 
 			constants.getTableName(), constants.getColumnNames());
 
@@ -485,6 +512,7 @@ public void close() throws StandardException {
 	private int[] generatedColumnPositionsArray()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         TableDescriptor tabDesb = dd.getTableDescriptor(constants.targetUUID);
 		ColumnDescriptor cd;
         int size = tabDesb.getMaxColumnID();
@@ -601,6 +629,7 @@ private void    getOldStyleBulkInsertValue( int index, long increment )
          //			System.out.println("in bulk insert");
          if (aiCache[index].isNull())
          {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
              long startValue;
  
              if (bulkInsertReplace)
@@ -617,6 +646,7 @@ private void    getOldStyleBulkInsertValue( int index, long increment )
              lcc.autoincrementCreateCounter(td.getSchemaName(),
                                             td.getName(),
                                             cd.getColumnName(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                             Long.valueOf(startValue),
                                             increment,
                                             columnPosition);
@@ -636,7 +666,10 @@ private void    getOldStyleBulkInsertValue( int index, long increment )
      private NumberDataValue getOldStyleIdentityValue( int index )
          throws StandardException
      {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5687
+//IC see: https://issues.apache.org/jira/browse/DERBY-4437
          NumberDataValue newValue;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
          TransactionController nestedTC = null;
          TransactionController tcToUse;
  
@@ -680,6 +713,7 @@ private NumberDataValue getOldStyleIdentityValue( int index )
                  throw se;
              }
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-6692
              if ( se.getMessageId().equals(SQLState.LOCK_TIMEOUT) || se.isSelfDeadlock() )
              {
                  // if we couldn't do this with a nested xaction, retry with
@@ -741,6 +775,7 @@ private boolean isSingleRowResultSet()
     {
         boolean isRow = false;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1554
         if (sourceResultSet instanceof RowResultSet)
         	isRow = true;
         else if (sourceResultSet instanceof NormalizeResultSet)
@@ -754,7 +789,9 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
 		throws StandardException
 	{
 		boolean setUserIdentity = constants.hasAutoincrement() && isSingleRowResultSet();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         ExecRow deferredRowBuffer;
+//IC see: https://issues.apache.org/jira/browse/DERBY-353
         long user_autoinc=0;
                         
 		/* Get or re-use the row changer.
@@ -799,6 +836,7 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
 		{
 			if (fkChecker == null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 fkChecker = new RISetChecker(lcc, tc, fkInfoArray);
 			}
 			else
@@ -817,12 +855,15 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
 			/*
 			** If deferred we save a copy of the entire row.
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 			rowHolder = new TemporaryRowHolderImpl(activation, properties,
 												   resultDescription);
 			rowChanger.setRowHolder(rowHolder);
 		}
 
 		firstExecuteSpecialHandlingAutoGen(firstExecute, rowChanger, constants.targetUUID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
 
 		while ( row != null )
 		{
@@ -856,6 +897,7 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
 
 				if (fkChecker != null)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     fkChecker.doFKCheck(activation, row);
 				}
 
@@ -877,6 +919,7 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
 					}
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 if (allOk) {
                     rowChanger.insertRow(row, false);
                 } else {
@@ -889,6 +932,7 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
                             tableName,
                             deferredChecks,
                             violatingCheckConstraints,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                             offendingRow,
                             new CheckInfo[1] /* dummy */);
                 }
@@ -896,8 +940,10 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
 
             rowCount++;
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-1554
             if(setUserIdentity )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-353
                         dd = lcc.getDataDictionary();
                         td = dd.getTableDescriptor(constants.targetUUID);
                        
@@ -939,6 +985,7 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
 		{
 			if (triggerInfo != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				Vector<AutoincrementCounter> v = null;
 				if (aiCache != null)
 				{
@@ -998,6 +1045,7 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
 					sourceResultSet.setCurrentRow(deferredRowBuffer);
                     boolean allOk = evaluateCheckConstraints();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     if (allOk) {
                         rowChanger.insertRow(deferredRowBuffer, false);
                     } else {
@@ -1006,11 +1054,18 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
                         deferredChecks =
                             DeferredConstraintsMemory.rememberCheckViolations(
                                 lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                                 constants.targetUUID,
                                 schemaName,
                                 tableName,
                                 deferredChecks,
                                 violatingCheckConstraints,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 offendingRow,
                                 new CheckInfo[1]);
                     }
@@ -1035,6 +1090,7 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
 					rs.open();
 					while ((deferredRowBuffer = rs.getNextRow()) != null)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                         fkChecker.doFKCheck(activation, deferredRowBuffer);
 					}
 				} finally
@@ -1069,8 +1125,10 @@ private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecut
                  * find the value of the identity column from the user inserted value
                  * and do a lcc.setIdentityValue(<user_value>);
                  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1554
                 else if(setUserIdentity )
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-353
                         lcc.setIdentityValue(user_autoinc);
                 } 
  }
@@ -1080,6 +1138,7 @@ protected ExecRow getNextRowCore( NoPutResultSet source )
 		throws StandardException
 	{
         ExecRow nextRow = super.getNextRowCore( source );
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         if ( (nextRow != null) && constants.underMerge() ) {
             nextRow = processMergeRow( source, nextRow );
@@ -1133,6 +1192,7 @@ private ExecRow processMergeRow( NoPutResultSet sourceRS, ExecRow row )
 
 	// Do the work for a bulk insert
     private void bulkInsertCore(LanguageConnectionContext lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
                                 ExecRow fullTemplate,
 								long oldHeapConglom)
 		throws StandardException
@@ -1166,7 +1226,10 @@ private void bulkInsertCore(LanguageConnectionContext lcc,
 		*/
 		if (hasBeforeRowTrigger && rowHolder != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 			rowHolder =
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 				new TemporaryRowHolderImpl(activation, properties,
 										   resultDescription);
 		}
@@ -1187,6 +1250,7 @@ private void bulkInsertCore(LanguageConnectionContext lcc,
 			sourceResultSet.setNeedsRowLocation(true);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (constants.hasDeferrableChecks) {
             sourceResultSet.setHasDeferrableChecks();
         }
@@ -1201,6 +1265,7 @@ private void bulkInsertCore(LanguageConnectionContext lcc,
 		long[] loadedRowCount = new long[1];
 		if (bulkInsertReplace)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			newHeapConglom = 
                 tc.createAndLoadConglomerate(
                     "heap",
@@ -1238,6 +1303,7 @@ private void bulkInsertCore(LanguageConnectionContext lcc,
 
 		// Find out how many rows were inserted
 		rowCount = loadedRowCount[0];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
 		// Set the "estimated" row count
 		setEstimatedRowCount(newHeapConglom);
@@ -1309,6 +1375,7 @@ private void bulkInsertCore(LanguageConnectionContext lcc,
 	** Bulk Referential Integrity Checker
 	*/
     private void bulkValidateForeignKeys(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
             TransactionController tc, ContextManager cm, ExecRow fullTemplate)
 		throws StandardException
 	{
@@ -1325,6 +1392,7 @@ private void bulkValidateForeignKeys(
 			return;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         for (FKInfo fkInfo : fkInfoArray)
 		{
 
@@ -1366,7 +1434,9 @@ private void bulkValidateForeignKeys(
 						/* Self-referencing foreign key.  Both conglomerate
 						 * #s have changed.
 						 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 						pkConglom = (indexConversionTable.get(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                             Long.valueOf(fkInfo.refConglomNumber))).longValue();
 						fkConglom = (indexConversionTable.get(
                             Long.valueOf(fkInfo.fkConglomNumbers[index]))).
@@ -1382,7 +1452,9 @@ private void bulkValidateForeignKeys(
 						 * we use the compile time conglomerate #.  This
 						 * is very simple, though not very elegant.
 						 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 						Long pkConglomLong = indexConversionTable.get(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                             Long.valueOf(fkInfo.refConglomNumber));
 						Long fkConglomLong = indexConversionTable.get(
                             Long.valueOf(fkInfo.fkConglomNumbers[index]));
@@ -1405,7 +1477,9 @@ private void bulkValidateForeignKeys(
 						}
 					}
 					bulkValidateForeignKeysCore(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                             tc, cm, fkInfo, fkConglom, pkConglom,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 							fkInfo.fkConstraintNames[index], fullTemplate);
 				}
 			}
@@ -1422,9 +1496,12 @@ private void bulkValidateForeignKeys(
 					SanityManager.ASSERT(fkInfo.type == FKInfo.FOREIGN_KEY, 
 						"error, expected to only check foreign keys on insert");
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				Long fkConglom = indexConversionTable.get(fkInfo.fkConglomNumbers[0]);
 				bulkValidateForeignKeysCore(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                         tc, cm, fkInfo, fkConglom.longValue(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 						fkInfo.refConglomNumber, fkInfo.fkConstraintNames[0],
                         fullTemplate);
 			}
@@ -1434,6 +1511,7 @@ private void bulkValidateForeignKeys(
 	private void bulkValidateForeignKeysCore(
 						TransactionController tc, ContextManager cm, 
 						FKInfo fkInfo, long fkConglom, long pkConglom,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
                         String fkConstraintName, ExecRow fullTemplate)
 		throws StandardException
 	{
@@ -1456,6 +1534,7 @@ private void bulkValidateForeignKeysCore(
                         false,                       // hold 
                         0, 							 // read only
                         // doesn't matter, already locked
+//IC see: https://issues.apache.org/jira/browse/DERBY-6063
                         TransactionController.MODE_TABLE,
                         // doesn't matter, already locked
                         TransactionController.ISOLATION_READ_COMMITTED,
@@ -1508,6 +1587,7 @@ private void bulkValidateForeignKeysCore(
 						false,                       	// hold 
 						0, 								// read only
                         (fkConglom == pkConglom) ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-6063
                                 TransactionController.MODE_TABLE :
                                 TransactionController.MODE_RECORD,
                         // read committed is good enough
@@ -1525,6 +1605,7 @@ private void bulkValidateForeignKeysCore(
 				** magic.  It will do a merge on the two indexes. 
 				*/	
 				ExecRow firstFailedRow = template.getClone();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 RIBulkChecker riChecker = new RIBulkChecker(activation,
                                             refScan,
 											fkScan, 
@@ -1569,6 +1650,7 @@ private ExecRow makeIndexTemplate(FKInfo fkInfo, ExecRow fullTemplate, ContextMa
 		throws StandardException
 	{
 		ExecRow newRow = RowUtil.getEmptyIndexRow(fkInfo.colArray.length+1, lcc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 
 		DataValueDescriptor[] templateColArray = fullTemplate.getRowArray();
 		DataValueDescriptor[] newRowColArray   = newRow.getRowArray();
@@ -1577,6 +1659,7 @@ private ExecRow makeIndexTemplate(FKInfo fkInfo, ExecRow fullTemplate, ContextMa
 		for (i = 0; i < fkInfo.colArray.length; i++)
 		{
 			newRowColArray[i] = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
                 templateColArray[fkInfo.colArray[i] - 1].cloneValue(false);
 		}
 
@@ -1598,6 +1681,7 @@ private void setUpAllSorts(ExecRow sourceRow,
 		int					numIndexes = constants.irgs.length;
 		int					numColumns = td.getNumberOfColumns();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		ordering        = new ColumnOrdering[numIndexes][];
         collation       = new int[numIndexes][];
 		needToDropSort  = new boolean[numIndexes];
@@ -1638,6 +1722,7 @@ private void setUpAllSorts(ExecRow sourceRow,
 			 */
 
 			// Get the ConglomerateDescriptor for the index
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			ConglomerateDescriptor cd = 
                 td.getConglomerateDescriptor(constants.indexCIDS[index]);
 
@@ -1647,6 +1732,7 @@ private void setUpAllSorts(ExecRow sourceRow,
            
 			int numColumnOrderings;
             SortObserver sortObserver;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
 			/* We can only reuse the wrappers when doing an
 			 * external sort if there is only 1 index.  Otherwise,
@@ -1654,6 +1740,9 @@ private void setUpAllSorts(ExecRow sourceRow,
 			 * wrapper that is still in use in another sort.
 			 */
 			boolean reuseWrappers = (numIndexes == 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             final IndexRowGenerator indDes = cd.getIndexDescriptor();
             Properties sortProperties = null;
             String indexOrConstraintName = cd.getConglomerateName();
@@ -1661,6 +1750,8 @@ private void setUpAllSorts(ExecRow sourceRow,
             boolean deferrable = false;
 
             UUID uniqueDeferrableConstraintId = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             if (cd.isConstraint())
             {
                 // so, the index is backing up a constraint
@@ -1671,6 +1762,8 @@ private void setUpAllSorts(ExecRow sourceRow,
                 indexOrConstraintName = conDesc.getConstraintName();
                 deferred = lcc.isEffectivelyDeferred(
                         lcc.getCurrentSQLSessionContext(activation),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                         conDesc.getUUID());
                 deferrable = conDesc.deferrable();
                 uniqueDeferrableConstraintId = conDesc.getUUID();
@@ -1685,6 +1778,8 @@ private void setUpAllSorts(ExecRow sourceRow,
 				sortObserver = 
                     new UniqueIndexSortObserver(
                             lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                             uniqueDeferrableConstraintId,
                             false, // don't clone rows
                             deferrable,
@@ -1707,6 +1802,8 @@ private void setUpAllSorts(ExecRow sourceRow,
                 sortObserver =
                         new UniqueWithDuplicateNullsIndexSortObserver(
                         lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                         uniqueDeferrableConstraintId,
                         true,
                         deferrable,
@@ -1731,6 +1828,8 @@ private void setUpAllSorts(ExecRow sourceRow,
 			}
 			if (numColumnOrderings > isAscending.length)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 				ordering[index][isAscending.length] = 
                     new IndexColumnOrder(isAscending.length);
             }
@@ -1744,6 +1843,9 @@ private void setUpAllSorts(ExecRow sourceRow,
 			// create the sorters
 			sortIds[index] = 
                 tc.createSort(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                     sortProperties,
                     indexRows[index].getRowArrayClone(),
                     ordering[index],
@@ -1761,6 +1863,7 @@ private void setUpAllSorts(ExecRow sourceRow,
 		// Open the sorts
 		for (int index = 0; index < numIndexes; index++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			sorters[index]        = tc.openSort(sortIds[index]);
 			needToDropSort[index] = true;
 		}
@@ -1798,6 +1901,7 @@ private void updateAllIndexes(long newHeapConglom,
 		dd.dropStatisticsDescriptors(td.getUUID(), null, tc);
 		long[] newIndexCongloms = new long[numIndexes];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		indexConversionTable = new Hashtable<Long,Long>(numIndexes);
 		// Populate each index
 		for (int index = 0; index < numIndexes; index++)
@@ -1837,6 +1941,7 @@ private void updateAllIndexes(long newHeapConglom,
 							   Integer.toString(indexRowLength));
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             if ( cd.getIndexDescriptor().isUniqueWithDuplicateNulls() &&
                 !cd.getIndexDescriptor().hasDeferrableChecking() )
 			{
@@ -1855,9 +1960,12 @@ private void updateAllIndexes(long newHeapConglom,
 			// Populate the index.
 			sorters[index].completedInserts();
 			sorters[index] = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			rowSources[index] = 
                 new CardinalityCounter(tc.openSortRowSource(sortIds[index]));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			newIndexCongloms[index] = 
                 tc.createAndLoadConglomerate(
                     "BTREE",
@@ -1906,6 +2014,7 @@ private void updateAllIndexes(long newHeapConglom,
 			// Drop the old conglomerate
 			tc.dropConglomerate(constants.indexCIDS[index]);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			indexConversionTable.put(constants.indexCIDS[index], newIndexCongloms[index]);
 		}
 	}
@@ -1973,6 +2082,9 @@ public void	cleanUp() throws StandardException
 			{
 				if (sorters[index] != null)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 					sorters[index].completedInserts();
 				}
 				sorters[index] = null;
@@ -2137,6 +2249,7 @@ private void emptyIndexes(long newHeapConglom,
 		throws StandardException
 	{
 		int					numIndexes = constants.irgs.length;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         ExecIndexRow[]      idxRows = new ExecIndexRow[numIndexes];
         ExecRow             baseRows;
         ColumnOrdering[][]  order = new ColumnOrdering[numIndexes][];
@@ -2161,6 +2274,7 @@ private void emptyIndexes(long newHeapConglom,
 		}
 
 		// We can finally create the partial base row
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		baseRows = 
             activation.getExecutionFactory().getValueRow(numReferencedColumns);
 
@@ -2174,6 +2288,7 @@ private void emptyIndexes(long newHeapConglom,
 				// NOTE: 1-based column numbers
 				baseRows.setColumn(
 						colNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 						fullTemplate.getColumn(index + 1).cloneValue(false));
 			}
 		}
@@ -2188,6 +2303,7 @@ private void emptyIndexes(long newHeapConglom,
 		{
 			// create a single index row template for each index
             idxRows[index] = constants.irgs[index].getIndexRowTemplate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
 			// Get an index row based on the base row
 			// (This call is only necessary here because we need to pass a 
@@ -2208,6 +2324,7 @@ private void emptyIndexes(long newHeapConglom,
 			int[] baseColumnPositions = constants.irgs[index].baseColumnPositions();
 			boolean[] isAscending = constants.irgs[index].isAscending();
 			int numColumnOrderings;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             SortObserver sortObserver;
             final IndexRowGenerator indDes = cd.getIndexDescriptor();
 
@@ -2221,6 +2338,10 @@ private void emptyIndexes(long newHeapConglom,
                 boolean deferred = false;
                 boolean uniqueDeferrable = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                 UUID uniqueDeferrableConstraintId = null;
 				if (cd.isConstraint()) 
 				{
@@ -2228,8 +2349,11 @@ private void emptyIndexes(long newHeapConglom,
 					ConstraintDescriptor conDesc = 
                         dd.getConstraintDescriptor(td, cd.getUUID());
 					indexOrConstraintName = conDesc.getConstraintName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     deferred = lcc.isEffectivelyDeferred(
                             lcc.getCurrentSQLSessionContext(activation),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                             conDesc.getUUID());
                     uniqueDeferrable = conDesc.deferrable();
                     uniqueDeferrableConstraintId = conDesc.getUUID();
@@ -2242,6 +2366,7 @@ private void emptyIndexes(long newHeapConglom,
                             uniqueDeferrable,
                             deferred,
                             indexOrConstraintName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                             idxRows[index],
                             true,
                             td.getName());
@@ -2250,6 +2375,7 @@ private void emptyIndexes(long newHeapConglom,
 			{
 				numColumnOrderings = baseColumnPositions.length + 1;
 				sortObserver       = new BasicSortObserver(false, false, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                                      idxRows[index],
 													 true);
 			}
@@ -2268,6 +2394,7 @@ private void emptyIndexes(long newHeapConglom,
 			sortIds[index] = 
                 tc.createSort(
                     (Properties)null, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     idxRows[index].getRowArrayClone(),
                     order[index],
                     sortObserver,
@@ -2284,6 +2411,7 @@ private void emptyIndexes(long newHeapConglom,
 		// are in the correct order. 
 		rowSources = new RowLocationRetRowSource[numIndexes];
 		// Fill in the RowSources
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         SortController[]    sorter = new SortController[numIndexes];
 		for (int index = 0; index < numIndexes; index++)
 		{
@@ -2331,6 +2459,7 @@ private void emptyIndexes(long newHeapConglom,
 				properties.put("nUniqueColumns", 
 							   Integer.toString(indexRowLength));
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             if( cd.getIndexDescriptor().isUniqueWithDuplicateNulls() &&
                !cd.getIndexDescriptor().hasDeferrableChecking() )
 			{
@@ -2353,8 +2482,10 @@ private void emptyIndexes(long newHeapConglom,
 			newIndexCongloms[index] = 
                 tc.createAndLoadConglomerate(
                     "BTREE",
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     idxRows[index].getRowArray(),
                     null, //default column sort order 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                     collation[index],
                     properties,
                     TransactionController.IS_DEFAULT,
@@ -2368,6 +2499,7 @@ private void emptyIndexes(long newHeapConglom,
 			 * for those indexes need to be updated with the new number.
 			 */
 			dd.updateConglomerateDescriptor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 td.getConglomerateDescriptors(constants.indexCIDS[index]),
                 newIndexCongloms[index], tc);
 
@@ -2387,11 +2519,13 @@ private void emptyIndexes(long newHeapConglom,
 	{
 		if (tableScan == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 			tableScan = 
                 new BulkTableScanResultSet(
                     conglomId,
                     tc.getStaticCompiledConglomInfo(conglomId),
                     activation,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
                     fullTemplateId,
                     0,						// result set number
                     (GeneratedMethod)null, 	// start key getter
@@ -2401,12 +2535,14 @@ private void emptyIndexes(long newHeapConglom,
                     false,
                     (Qualifier[][])null,	// qualifiers
                     "tableName",
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
                     (String)null,
                     (String)null,			// index name
                     false,					// is constraint
                     false,					// for update
                     -1,						// saved object for referenced bitImpl
                     -1,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6063
                     TransactionController.MODE_TABLE,
                     true,					// table locked
                     TransactionController.ISOLATION_READ_COMMITTED,
@@ -2414,6 +2550,7 @@ private void emptyIndexes(long newHeapConglom,
                     false,                  // never disable bulk fetch
                     false,					// not a 1 row per scan
                     0d,						// estimated rows
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
                     0d 					// estimated cost
                     );
 			tableScan.openCore();
@@ -2444,6 +2581,7 @@ public void finish() throws StandardException {
 
     @Override
     public void rememberConstraint(UUID cid) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (violatingCheckConstraints == null) {
             violatingCheckConstraints = new ArrayList<UUID>();
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java
index 58d6970432..c1781b521e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java
@@ -49,6 +49,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * and triggers to be executed based on the c's and t's
  * compiled into the insert plan.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class InsertVTIResultSet extends DMLVTIResultSet
 {
 
@@ -97,6 +98,7 @@ protected void openCore() throws StandardException
         }
 
 		ExecRow row = getNextRowCore(sourceResultSet);
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 		try
 		{
@@ -125,7 +127,10 @@ protected void openCore() throws StandardException
 			/*
 			** If deferred we save a copy of the entire row.
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 			rowHolder =
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 				new TemporaryRowHolderImpl(activation, properties,
 										   resultDescription);
 		}
@@ -143,6 +148,7 @@ protected void openCore() throws StandardException
 			}
 			else
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 				insertIntoVTI(rs, row);
 			}
 
@@ -169,6 +175,7 @@ protected void openCore() throws StandardException
 			try
 			{
 				tempRS.open();
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 				while ((row = tempRS.getNextRow()) != null)
 				{
 					insertIntoVTI(rs, row);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
index 412d4b2721..f52ad7bbb8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
@@ -143,6 +143,7 @@ class InternalTriggerExecutionContext
 		int 						dmlType,
 		UUID						targetTableId,
 		String						targetTableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Vector<AutoincrementCounter> aiCounters
 	) throws StandardException
 	{
@@ -152,6 +153,7 @@ class InternalTriggerExecutionContext
 		this.lcc = lcc;
 		this.targetTableId = targetTableId;
 		this.targetTableName = targetTableName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		this.resultSetVector = new Vector<java.sql.ResultSet>();
 		this.aiCounters = aiCounters;
 
@@ -312,7 +314,9 @@ public void validateStatement(ConstantAction constantAction) throws StandardExce
 		// statements in a trigger's action statement is disallowed by the
 		// parser. However, this runtime check is needed to prevent execution
 		// of DDL statements by procedures within a trigger context. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-551
  		if (constantAction instanceof DDLConstantAction) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5885
 			throw StandardException.newException(SQLState.LANG_NO_DDL_IN_TRIGGER, triggerd.getName());
 		}
 		
@@ -505,6 +509,7 @@ public Long getAutoincrementValue(String identity)
 		// by this trigger.
 		if (aiHT != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 Long value = aiHT.get(identity);
 				if (value != null)
 					return value;
@@ -515,6 +520,7 @@ public Long getAutoincrementValue(String identity)
 		// represent values inherited by trigger from insert statements.
 		if (aiCounters != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             for (AutoincrementCounter aic : aiCounters)
 			{
 				if (identity.equals(aic.getIdentity()))
@@ -538,6 +544,7 @@ public void copyHashtableToAIHT(Map<String,Long> from)
 			return;
 		if (aiHT == null)
 			aiHT = new Hashtable<String,Long>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		aiHT.putAll(from);
 	}
@@ -558,6 +565,7 @@ public void resetAICounters(boolean begin)
 
 		afterRow = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (AutoincrementCounter aic : aiCounters)
 		{
 			aic.reset(begin);
@@ -573,6 +581,7 @@ public void updateAICounters() throws StandardException
 		if (aiCounters == null)
 			return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         for (AutoincrementCounter aic : aiCounters)
 		{
 			DataValueDescriptor dvd = afterRow.getColumn(aic.getColumnPosition());
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JarUtil.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JarUtil.java
index ad8411d7ed..b0deeb14d0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JarUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JarUtil.java
@@ -103,6 +103,7 @@ private JarUtil(LanguageConnectionContext lcc,
 	{
         // make sure that application code doesn't bypass security checks
         // by calling this public entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         SecurityUtil.authorize( Securable.INSTALL_JAR );
             
 		JarUtil jutil = new JarUtil(lcc, schemaName, sqlName);
@@ -144,6 +145,7 @@ private long add(final InputStream is) throws StandardException
         try {
             notifyLoader(false);
             dd.invalidateAllSPSPlans();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             UUID id = BaseActivation.getMonitor().getUUIDFactory().createUUID();
             final String jarExternalName = JarUtil.mkExternalName(
                 id, schemaName, sqlName, fr.getSeparatorChar());
@@ -176,6 +178,7 @@ private long add(final InputStream is) throws StandardException
 	{
         // make sure that application code doesn't bypass security checks
         // by calling this public entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         SecurityUtil.authorize( Securable.REMOVE_JAR );
             
 		JarUtil jutil = new JarUtil(lcc, schemaName,sqlName);
@@ -203,6 +206,7 @@ private void drop() throws StandardException
 		String dbcp_s = PropertyUtil.getServiceProperty(lcc.getTransactionExecute(),Property.DATABASE_CLASSPATH);
 		if (dbcp_s != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 			String[][]dbcp= IdUtil.parseDbClassPath(dbcp_s);
 			boolean found = false;
 			//
@@ -227,6 +231,7 @@ private void drop() throws StandardException
 			DependencyManager dm = dd.getDependencyManager();
 			dm.invalidateFor(fid, DependencyManager.DROP_JAR, lcc);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
             UUID id = fid.getUUID();
 			dd.dropFileInfoDescriptor(fid);
             fr.remove(
@@ -257,6 +262,7 @@ private void drop() throws StandardException
 	{
         // make sure that application code doesn't bypass security checks
         // by calling this public entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         SecurityUtil.authorize( Securable.REPLACE_JAR );
             
 		JarUtil jutil = new JarUtil(lcc, schemaName,sqlName);
@@ -304,6 +310,7 @@ private long replace(InputStream is) throws StandardException
 			dd.invalidateAllSPSPlans();
 			dd.dropFileInfoDescriptor(fid);
             final String jarExternalName =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
                 JarUtil.mkExternalName(
                     fid.getUUID(), schemaName, sqlName, fr.getSeparatorChar());
 
@@ -361,6 +368,7 @@ private static InputStream openJarURL(final String externalPath)
         throws IOException
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             return AccessController.doPrivileged
             (new java.security.PrivilegedExceptionAction<InputStream>(){
                 
@@ -392,6 +400,7 @@ private long setJar(final String jarExternalName,
             final long currentGenerationId)
             throws StandardException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             return (AccessController
                     .doPrivileged(new java.security.PrivilegedExceptionAction<Long>() {
 
@@ -403,6 +412,7 @@ public Long run() throws StandardException {
                             else
                                 generationId =  fr.replace(jarExternalName,
                                         currentGenerationId, contents);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                             return generationId;
                         }
                     })).longValue();
@@ -415,6 +425,7 @@ public Long run() throws StandardException {
       Make an external name for a jar file stored in the database.
       */
     public static String mkExternalName(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
             UUID id, 
             String schemaName, 
             String sqlName, 
@@ -440,6 +451,7 @@ private static String mkExternalNameInternal(
 
         if (!upgrading) {
             LanguageConnectionContext lcc =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 (LanguageConnectionContext)getContextOrNull(
                     LanguageConnectionContext.CONTEXT_ID);
 
@@ -508,6 +520,7 @@ public static void upgradeJar(
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContextOrNull( contextID );
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JoinResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JoinResultSet.java
index 8957b2e2c6..9867b40ceb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JoinResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JoinResultSet.java
@@ -41,6 +41,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * the join's rows satisfying the filter as a result set.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 abstract class JoinResultSet extends NoPutResultSetImpl
 	implements CursorResultSet
 {
@@ -66,11 +67,13 @@ abstract class JoinResultSet extends NoPutResultSetImpl
 	public	  boolean notExistsRightSide;  //right side is NOT EXISTS
 	
 	String userSuppliedOptimizerOverrides;
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 
     /*
      * class interface
      *
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     JoinResultSet(NoPutResultSet leftResultSet,
 								   int leftNumCols,
 								   NoPutResultSet rightResultSet,
@@ -82,6 +85,7 @@ abstract class JoinResultSet extends NoPutResultSetImpl
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 								   String userSuppliedOptimizerOverrides)
     {
 		super(activation, resultSetNumber, optimizerEstimatedRowCount, 
@@ -94,6 +98,7 @@ abstract class JoinResultSet extends NoPutResultSetImpl
 		this.oneRowRightSide = oneRowRightSide;
 		this.notExistsRightSide = notExistsRightSide;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		this.userSuppliedOptimizerOverrides = userSuppliedOptimizerOverrides;
 		
 		recordConstructorTime();
@@ -145,6 +150,7 @@ public void	openCore() throws StandardException
 
 		leftResultSet.openCore();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4330
 		try {
 			leftRow = leftResultSet.getNextRowCore();
 			if (leftRow != null)
@@ -224,6 +230,8 @@ public void	close() throws StandardException
 			if (SanityManager.DEBUG)
 				SanityManager.DEBUG("CloseRepeatInfo","Close of JoinResultSet repeated");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3261
+//IC see: https://issues.apache.org/jira/browse/DERBY-3037
 		clearScanState();
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
index 04aa92e8b0..57fa62987f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
@@ -35,6 +35,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * max().
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 class LastIndexKeyResultSet extends ScanResultSet
 {
 	// set in constructor and not altered during
@@ -85,6 +86,7 @@ class LastIndexKeyResultSet extends ScanResultSet
 		int resultRowTemplate,
 		long conglomId, 
 		String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		String userSuppliedOptimizerOverrides,
 		String indexName,
 		int colRefItem,
@@ -97,7 +99,9 @@ class LastIndexKeyResultSet extends ScanResultSet
 	{
 		super(activation,
 				resultSetNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 				resultRowTemplate,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 				lockMode, tableLocked, isolationLevel,
                 colRefItem,
 				optimizerEstimatedRowCount,
@@ -111,6 +115,7 @@ class LastIndexKeyResultSet extends ScanResultSet
 		}
 
 		this.tableName = tableName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		this.userSuppliedOptimizerOverrides = userSuppliedOptimizerOverrides;
 		this.indexName = indexName;
 
@@ -144,6 +149,7 @@ class LastIndexKeyResultSet extends ScanResultSet
 	 * locks at READ COMMITTED.
 	 */
 	boolean canGetInstantaneousLocks() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 		return true;
 	}
 
@@ -168,6 +174,7 @@ public void	openCore() throws StandardException
 		TransactionController tc = activation.getTransactionController();
 
 		initIsolationLevel();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 
 		/*
 		** Grab the last row.  Note that if there are deletes
@@ -201,6 +208,7 @@ public void	openCore() throws StandardException
 	 */
 	public ExecRow getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java
index 3538ff88e5..236f486767 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Return rows from temp table on subsequent scans.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class MaterializedResultSet extends NoPutResultSetImpl
 	implements CursorResultSet
 {
@@ -176,6 +177,7 @@ public void	reopenCore() throws StandardException
 	 */
 	public ExecRow	getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -234,6 +236,7 @@ private ExecRow getNextRowFromSource() throws StandardException
 
 				tc = activation.getTransactionController();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 				materializedCID = 
                     tc.createConglomerate(
                         "heap",	
@@ -254,6 +257,9 @@ private ExecRow getNextRowFromSource() throws StandardException
                         TransactionController.ISOLATION_SERIALIZABLE);
 			}
             materializedCC.insert(sourceRow.getRowArray());
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
 
 			createTCTime += getElapsedMillis(beginTCTime);
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java
index 01641c5ddf..88f4880958 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java
@@ -72,6 +72,7 @@ protected void accumulate(DataValueDescriptor addend)
 			/* NOTE: We need to call cloneValue since value gets
 			 * reused underneath us
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 			value = addend.cloneValue(false);
 		}
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java
index b8da1159b0..453ae0c3f3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java
@@ -49,6 +49,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * result set) MUST be unique for this to work correctly.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class MergeJoinResultSet extends JoinResultSet
 {
 	private static final int GREATER_THAN = 1;
@@ -76,6 +77,7 @@ class MergeJoinResultSet extends JoinResultSet
 	 * @param optimizerEstimatedRowCount	self-explanatory
 	 * @param optimizerEstimatedCost		self-explanatory
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     MergeJoinResultSet(NoPutResultSet leftResultSet,
 								   int leftNumCols,
 								   NoPutResultSet rightResultSet,
@@ -93,6 +95,7 @@ class MergeJoinResultSet extends JoinResultSet
 			  activation, restriction, resultSetNumber, 
 			  oneRowRightSide, notExistsRightSide, optimizerEstimatedRowCount, 
 			  optimizerEstimatedCost, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 
 		this.leftGreaterThanRight = leftGreaterThanRight;
     }
@@ -116,6 +119,7 @@ class MergeJoinResultSet extends JoinResultSet
 	 */
 	public ExecRow	getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -257,6 +261,7 @@ private ExecRow getReturnRow(ExecRow leftRow, ExecRow rightRow)
 		for (colInCtr = 1, colOutCtr = 1; colInCtr <= leftNumCols;
 			 colInCtr++, colOutCtr++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
             DataValueDescriptor src_col = leftRow.getColumn(colInCtr);
             // Clone the value if it is represented by a stream (DERBY-3650).
             if (src_col != null && src_col.hasStream()) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MiscResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MiscResultSet.java
index aea2cec268..a8fb3731b7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MiscResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MiscResultSet.java
@@ -57,6 +57,7 @@ class MiscResultSet extends NoRowsResultSetImpl
 	 */
 	public void open() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 		setup();
 		activation.getConstantAction().executeConstantAction(activation);
 		close();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java
index f4d823d08b..0c63e70967 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java
@@ -135,6 +135,7 @@ class MultiProbeTableScanResultSet extends TableScanResultSet
         super(conglomId,
             scoci,
             activation,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
             resultRowTemplate,
             resultSetNumber,
             startKeyGetter,
@@ -205,6 +206,7 @@ public void openCore() throws StandardException
 
             for (int i = 0; i < pVals.length; i++)
                 pVals[i] = origProbeValues[i].cloneValue(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 
             if (sortRequired == RowOrdering.ASCENDING)
                 java.util.Arrays.sort(pVals);
@@ -416,6 +418,7 @@ protected boolean skipScan(
      */
     public ExecRow getNextRowCore() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java
index 408b004af9..9bc9b5692d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java
@@ -34,6 +34,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Takes 2 NoPutResultSets and a join filter and returns
  * the join's rows satisfying the filter as a result set.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class NestedLoopJoinResultSet extends JoinResultSet
 {
 	private boolean returnedRowMatchingRightSide = false;
@@ -74,6 +75,7 @@ void clearScanState()
 	 */
 	public ExecRow	getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -183,6 +185,7 @@ public ExecRow	getNextRowCore() throws StandardException
 				for (colInCtr = 1, colOutCtr = 1; colInCtr <= leftNumCols;
 					 colInCtr++, colOutCtr++)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
                     DataValueDescriptor src_col = leftRow.getColumn(colInCtr);
                     // Clone the value if it is represented by a stream
                     // (DERBY-3650).
@@ -283,6 +286,7 @@ public long getTimeSpent(int type)
      * class interface
      *
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     NestedLoopJoinResultSet(NoPutResultSet leftResultSet,
 								   int leftNumCols,
 								   NoPutResultSet rightResultSet,
@@ -294,6 +298,7 @@ public long getTimeSpent(int type)
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 								   String userSuppliedOptimizerOverrides)
     {
 		super(leftResultSet, leftNumCols, rightResultSet, rightNumCols,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java
index a00e02b1f3..c0ca1ac468 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java
@@ -37,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * the right when there is no matching row in the right
  * result set.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class NestedLoopLeftOuterJoinResultSet extends NestedLoopJoinResultSet
 {
 	protected GeneratedMethod emptyRowFun;
@@ -68,6 +69,7 @@ class NestedLoopLeftOuterJoinResultSet extends NestedLoopJoinResultSet
 	 */
 	public ExecRow	getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -226,6 +228,7 @@ protected void getMergedRow(ExecRow leftRow, ExecRow rightRow)
 		for (colInCtr = 1, colOutCtr = 1; colInCtr <= leftNumCols;
 			 colInCtr++, colOutCtr++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
             DataValueDescriptor src_col = leftRow.getColumn(colInCtr);
             // Clone the value if it is represented by a stream (DERBY-3650).
             if (src_col != null && src_col.hasStream()) {
@@ -272,6 +275,7 @@ void clearScanState()
      * class interface
      *
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     NestedLoopLeftOuterJoinResultSet(
 						NoPutResultSet leftResultSet,
 						int leftNumCols,
@@ -286,6 +290,7 @@ void clearScanState()
 					    boolean notExistsRightSide,
  					    double optimizerEstimatedRowCount,
 						double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 						String userSuppliedOptimizerOverrides)
     {
 		super(leftResultSet, leftNumCols, rightResultSet, rightNumCols,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java
index 8b563f54f1..2612af1464 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java
@@ -95,6 +95,8 @@ abstract class NoPutResultSetImpl
 						double optimizerEstimatedRowCount,
 						double optimizerEstimatedCost)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		super(null,
 				activation,
 				optimizerEstimatedRowCount,
@@ -113,6 +115,8 @@ abstract class NoPutResultSetImpl
      * Returns the description of the table's rows
 	 */
 	public ResultDescription getResultDescription() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 	    return activation.getResultDescription();
 	}
 
@@ -160,6 +164,7 @@ public void close() throws StandardException
 			LanguageConnectionContext lcc = getLanguageConnectionContext();
 			
                 // only if statistics is switched on, collect & derive them
+//IC see: https://issues.apache.org/jira/browse/DERBY-4849
                 if (lcc.getRunTimeStatisticsMode() &&
                     !lcc.getStatementContext().getStatementWasInvalidated())
 				{   
@@ -216,6 +221,7 @@ public void setNeedsRowLocation(boolean needsRowLocation)
 	}
 
     public void setHasDeferrableChecks() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         this.needsRowLocationForDeferredCheckConstraints = true;
     }
 
@@ -283,6 +289,7 @@ public boolean needsRowLocation()
 
     public boolean needsRowLocationForDeferredCheckConstraints()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         return needsRowLocationForDeferredCheckConstraints;
     }
 
@@ -298,6 +305,7 @@ public void rowLocation(RowLocation rl)
 
     public void offendingRowLocation(
             RowLocation rl, long containdId) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         targetResultSet.offendingRowLocation(rl, containdId);
     }
@@ -341,6 +349,7 @@ protected void clearOrderableCache(Qualifier[][] qualifiers) throws StandardExce
 	public final void setCurrentRow(ExecRow row)
 	{
 		activation.setCurrentRow(row, resultSetNumber);
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		currentRow = row;
 	}
 
@@ -350,6 +359,7 @@ public final void setCurrentRow(ExecRow row)
 	 */
 	public void clearCurrentRow()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1361
 		currentRow = null;
 		activation.clearCurrentRow(resultSetNumber);
 	}
@@ -538,6 +548,7 @@ public static String printQualifiers(Qualifier[][] qualifiers)
 	 * result sets for other result set it is a no-op.
 	 */
 	public void updateRow(ExecRow row, RowChanger rowChanger)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
 			throws StandardException {
 		// Only ResultSets of type Scroll Insensitive implement
 		// detectability, so for other result sets this method
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
index 4ec14f0d33..47e30760f9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
@@ -69,6 +69,7 @@ abstract class NoRowsResultSetImpl implements ResultSet
 	private boolean isOpen;
 
 	/* Run time statistics variables */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	final LanguageConnectionContext lcc;
 	protected long beginTime;
 	protected long endTime;
@@ -109,6 +110,7 @@ abstract class NoRowsResultSetImpl implements ResultSet
 	 *
 	 * @exception StandardException thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 	void setup() throws StandardException {
 		isOpen = true;
 
@@ -136,6 +138,8 @@ void setup() throws StandardException {
 	 */
 	public ResultDescription	getResultDescription()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 	    return (ResultDescription)null;
 	}
 	
@@ -351,6 +355,7 @@ public final int getRowNumber()
 	 */
 	public void	close( boolean underMerge ) throws StandardException
 	{ 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3037
 		if (!isOpen)
 			return;
 
@@ -371,11 +376,13 @@ public void	close( boolean underMerge ) throws StandardException
             ** to skip printing it.
 			*/
 			if (lcc.getRunTimeStatisticsMode() &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-4849
                 !doesCommit() && !activation.isClosed() &&
                 !lcc.getStatementContext().getStatementWasInvalidated())
 			{
 				endExecutionTime = getCurrentTimeMillis();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 				ResultSetStatisticsFactory rssf =
                     lcc.getLanguageConnectionFactory().
                          getExecutionFactory().getResultSetStatisticsFactory();
@@ -414,6 +421,8 @@ public void	close( boolean underMerge ) throws StandardException
 		}
 
 		isOpen = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
+//IC see: https://issues.apache.org/jira/browse/DERBY-3037
 
 		if (activation.isSingleExecution() && !underMerge)
 			activation.close();
@@ -425,6 +434,7 @@ public void	close( boolean underMerge ) throws StandardException
 	 * @return <code>true</code> if closed, <code>false</code> otherwise
 	 */
 	public boolean isClosed() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 		return !isOpen;
 	}
 
@@ -698,6 +708,7 @@ public SQLWarning getWarnings() {
 
     public Element toXML( Element parentNode, String tag ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6266
         return BasicNoPutResultSetImpl.childrenToXML( BasicNoPutResultSetImpl.toXML( parentNode, tag, this ), this );
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java
index c3f32031d9..8207b8bc12 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java
@@ -40,6 +40,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * result set for the entire statement.
  */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class NormalizeResultSet extends NoPutResultSetImpl
 	implements CursorResultSet
 {
@@ -175,6 +176,7 @@ public void	reopenCore() throws StandardException
 	 */
 	public ExecRow	getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -443,6 +445,7 @@ private DataTypeDescriptor[] fetchResultTypes(ResultDescription desc)
 	 * @see NoPutResultSet#updateRow
 	 */
 	public void updateRow (ExecRow row, RowChanger rowChanger)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
 			throws StandardException {
 		source.updateRow(row, rowChanger);
 	}
@@ -451,6 +454,7 @@ public void updateRow (ExecRow row, RowChanger rowChanger)
 	 * @see NoPutResultSet#markRowAsDeleted
 	 */
 	public void markRowAsDeleted() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		source.markRowAsDeleted();
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/OnceResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/OnceResultSet.java
index 29cd7bc0fa..838fdafdf3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/OnceResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/OnceResultSet.java
@@ -161,6 +161,7 @@ public void	reopenCore() throws StandardException
 	 */
 	public ExecRow	getNextRowCore() throws StandardException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/PrivilegeInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/PrivilegeInfo.java
index e7e700942c..8369e2ac52 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/PrivilegeInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/PrivilegeInfo.java
@@ -69,6 +69,7 @@ protected void checkOwnership( String user,
 		throws StandardException
 	{
 		if (!user.equals(sd.getAuthorizationId()) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-1787
 				!user.equals(dd.getAuthorizationDatabaseOwner()))
 			throw StandardException.newException(SQLState.AUTH_NOT_OWNER,
 									  user,
@@ -90,6 +91,7 @@ protected void checkOwnership( String user,
 	protected void addWarningIfPrivilegeNotRevoked( Activation activation,
 													boolean grant,
 													boolean privileges_revoked,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1582
 													String grantee) 
 	{
 		if(!grant && !privileges_revoked)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java
index 19aab14b51..bc56cfe893 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java
@@ -43,6 +43,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * the table's rows satisfying the filter as a result set.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class ProjectRestrictResultSet extends NoPutResultSetImpl
 	implements CursorResultSet 
 {
@@ -78,6 +79,7 @@ class ProjectRestrictResultSet extends NoPutResultSetImpl
 
     // class interface
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     ProjectRestrictResultSet(NoPutResultSet s,
 					Activation a,
 					GeneratedMethod r,
@@ -89,6 +91,8 @@ class ProjectRestrictResultSet extends NoPutResultSetImpl
 					boolean reuseResult,
 					boolean doesProjection,
                     boolean validatingCheckConstraint,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                     UUID validatingBaseTableUUID,
 				    double optimizerEstimatedRowCount,
 					double optimizerEstimatedCost) 
@@ -111,6 +115,8 @@ class ProjectRestrictResultSet extends NoPutResultSetImpl
 		this.doesProjection = doesProjection;
         this.validatingCheckConstraint = validatingCheckConstraint;
         this.validatingBaseTableUUID = validatingBaseTableUUID;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
 
 		// Allocate a result row if all of the columns are mapped from the source
 		if (projection == null)
@@ -118,6 +124,10 @@ class ProjectRestrictResultSet extends NoPutResultSetImpl
 			mappedResultRow = activation.getExecutionFactory().getValueRow(projectMapping.length);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
         cloneMap =
             ((boolean[])a.getPreparedStatement().getSavedObject(cloneMapItem));
 
@@ -173,6 +183,8 @@ public void	openCore() throws StandardException
         if (validatingCheckConstraint) {
             rowLocations = DeferredConstraintsMemory.
                 getDeferredCheckConstraintLocations(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                         activation, validatingBaseTableUUID);
         }
 
@@ -250,6 +262,7 @@ public void	reopenCore() throws StandardException
 	 * @return the next row in the result
 	 */
 	public ExecRow	getNextRowCore() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -269,6 +282,7 @@ public ExecRow	getNextRowCore() throws StandardException {
 	    do 
 		{
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             if (validatingCheckConstraint) {
                 candidateRow = null;
 
@@ -545,7 +559,9 @@ private ExecRow doProjection(ExecRow sourceRow)
 
                 // See if the column has been marked for cloning.
                 // If the value isn't a stream, don't bother cloning it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4563
                 if (cloneMap[index] && dvd.hasStream()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
                     dvd = dvd.cloneValue(false);
                 }
 
@@ -576,6 +592,7 @@ private ExecRow doProjection(ExecRow sourceRow)
 	 * @exception StandardException thrown on failure.
 	 */
 	public ExecRow doBaseRowProjection(ExecRow sourceRow)
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		throws StandardException
 	{
 		final ExecRow result;
@@ -627,6 +644,7 @@ public boolean isForUpdate()
 	 * @see NoPutResultSet#updateRow
 	 */
 	public void updateRow (ExecRow row, RowChanger rowChanger)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
 			throws StandardException {
 		source.updateRow(row, rowChanger);
 	}
@@ -635,6 +653,7 @@ public void updateRow (ExecRow row, RowChanger rowChanger)
 	 * @see NoPutResultSet#markRowAsDeleted
 	 */
 	public void markRowAsDeleted() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		source.markRowAsDeleted();
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
index 07751c5fad..7304ee7356 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
@@ -108,6 +108,7 @@ public class RIBulkChecker
      */
     public RIBulkChecker
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             Activation                  a,
 			GroupFetchScanController    referencedKeyScan,
 			GroupFetchScanController	foreignKeyScan,
@@ -142,6 +143,7 @@ public class RIBulkChecker
 		currFKRowIndex = -1; 
 		currRefRowIndex = -1; 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         this.lcc = a.getLanguageConnectionContext();
         this.deferred = deferrable && lcc.isEffectivelyDeferred(
                 lcc.getCurrentSQLSessionContext(a), constraintId);
@@ -210,6 +212,8 @@ public int doCheck()
 						failure(foreignKey);
 						if (quitOnFirstFailure)
 						{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                             return failedCounter;
 						}
 					} while ((foreignKey = getNextFK()) != null);
@@ -226,6 +230,7 @@ public int doCheck()
 				}
 			}	
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 		return failedCounter;
 	}
 
@@ -285,6 +290,7 @@ private DataValueDescriptor[] getNextRef()
 	private void failure(DataValueDescriptor[] foreignKeyRow)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (deferred) {
             deferredRowsHashTable =
                     DeferredConstraintsMemory.rememberFKViolation(
@@ -310,6 +316,9 @@ private void failure(DataValueDescriptor[] foreignKeyRow)
             failedCounter++;
             if (unreferencedCC != null)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                 unreferencedCC.insert(foreignKeyRow);
             }
         }
@@ -364,6 +373,7 @@ private int greaterThan(DataValueDescriptor[] fkRowArray, DataValueDescriptor[]
 
 			result = fkCol.compare(refCol);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6587
 			if (result > 0)
 			{
 				return GREATER_THAN;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RISetChecker.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RISetChecker.java
index 836096febc..186dd693c7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RISetChecker.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RISetChecker.java
@@ -37,6 +37,7 @@ public class RISetChecker
 {
 	private GenericRIChecker[] 	checkers;
     LanguageConnectionContext lcc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
 	/**
      * @param lcc       the language connection context
@@ -56,6 +57,7 @@ public RISetChecker(LanguageConnectionContext lcc,
 
 		checkers = new GenericRIChecker[fkInfo.length];
         this.lcc = lcc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
 		for (int i = 0; i < fkInfo.length; i++)
 		{
@@ -106,6 +108,7 @@ public void doPKCheck(Activation a,
 		if (checkers == null)
 			return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
         for (GenericRIChecker checker : checkers) {
             if (checker instanceof ReferencedKeyRIChecker) {
                 checker.doCheck(a,
@@ -158,6 +161,7 @@ public void doFKCheck(Activation a, ExecRow row) throws StandardException
 		{
 			if (checkers[i] instanceof ForeignKeyRIChecker)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                 checkers[i].doCheck(a, row, false, 0);
 			}
 		}
@@ -181,6 +185,7 @@ public void doFKCheck(Activation a, ExecRow row) throws StandardException
 	 */
     public void doRICheck(Activation a,
                           int index,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                           ExecRow row,
                           boolean restrictCheckOnly,
                           int deferredRowReq) throws StandardException
@@ -200,6 +205,7 @@ public void doRICheck(Activation a,
 		}
 
         checkers[index].doCheck(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
             a, row, restrictCheckOnly, deferredRowReq);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java
index 2aead7a275..eb37ef7b94 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java
@@ -243,6 +243,7 @@ public ResultSetStatistics getNoRowsResultSetStatistics(ResultSet rs)
 			InsertResultSet irs = (InsertResultSet) rs;
 
 			retval = new RealInsertResultSetStatistics(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                                     (int) irs.rowCount,
 									irs.constants.deferred,
 									irs.constants.irgs.length,
@@ -261,6 +262,7 @@ else if( rs instanceof InsertVTIResultSet)
 			InsertVTIResultSet iVTIrs = (InsertVTIResultSet) rs;
 
 			retval = new RealInsertVTIResultSetStatistics(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                                     (int) iVTIrs.rowCount,
 									iVTIrs.constants.deferred,
 									iVTIrs.getExecuteTime(), 
@@ -274,6 +276,7 @@ else if( rs instanceof UpdateResultSet)
 			UpdateResultSet urs = (UpdateResultSet) rs;
 
 			retval = new RealUpdateResultSetStatistics(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                                     (int) urs.rowCount,
 									urs.constants.deferred,
 									urs.constants.irgs.length,
@@ -310,6 +313,7 @@ else if( rs instanceof DeleteCascadeResultSet)
 			}
 
 			retval = new RealDeleteCascadeResultSetStatistics(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                                     (int) dcrs.rowCount,
 									dcrs.constants.deferred,
 									dcrs.constants.irgs.length,
@@ -327,6 +331,7 @@ else if( rs instanceof DeleteResultSet)
 			DeleteResultSet drs = (DeleteResultSet) rs;
 
 			retval = new RealDeleteResultSetStatistics(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 									(int) drs.rowCount,
 									drs.constants.deferred,
 									drs.constants.irgs.length,
@@ -343,6 +348,7 @@ else if( rs instanceof DeleteVTIResultSet)
 			DeleteVTIResultSet dVTIrs = (DeleteVTIResultSet) rs;
 
 			retval = new RealDeleteVTIResultSetStatistics(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 									(int) dVTIrs.rowCount,
 									dVTIrs.getExecuteTime(), 
 									getResultSetStatistics(dVTIrs.savedSource)
@@ -408,6 +414,7 @@ public ResultSetStatistics getResultSetStatistics(NoPutResultSet rs)
 											getResultSetStatistics(prrs.source)
 											);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-4079
 		else if (rs instanceof RowCountResultSet)
 		{
 			RowCountResultSet rcrs = (RowCountResultSet) rs;
@@ -617,6 +624,7 @@ else if (rs instanceof TableScanResultSet)
                     tsrs.closeTime,
                     tsrs.resultSetNumber,
                     tsrs.tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 					tsrs.userSuppliedOptimizerOverrides,
                     tsrs.indexName,
                     tsrs.isConstraint,
@@ -711,6 +719,7 @@ else if (rs instanceof HashLeftOuterJoinResultSet)
 											hlojrs.restrictionTime,
 											hlojrs.optimizerEstimatedRowCount,
 											hlojrs.optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 											hlojrs.userSuppliedOptimizerOverrides,
 											getResultSetStatistics(
 												hlojrs.leftResultSet),
@@ -738,6 +747,7 @@ else if (rs instanceof NestedLoopLeftOuterJoinResultSet)
 											nllojrs.restrictionTime,
 											nllojrs.optimizerEstimatedRowCount,
 											nllojrs.optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 											nllojrs.userSuppliedOptimizerOverrides,
 											getResultSetStatistics(
 												nllojrs.leftResultSet),
@@ -765,6 +775,7 @@ else if (rs instanceof HashJoinResultSet)
 											hjrs.oneRowRightSide,
 											hjrs.optimizerEstimatedRowCount,
 											hjrs.optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 											hjrs.userSuppliedOptimizerOverrides,
 											getResultSetStatistics(
 												hjrs.leftResultSet),
@@ -792,6 +803,7 @@ else if (rs instanceof NestedLoopJoinResultSet)
 											nljrs.oneRowRightSide,
 											nljrs.optimizerEstimatedRowCount,
 											nljrs.optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 											nljrs.userSuppliedOptimizerOverrides,
 											getResultSetStatistics(
 												nljrs.leftResultSet),
@@ -838,6 +850,9 @@ else if (rs instanceof RowResultSet)
 											rrs.optimizerEstimatedRowCount,
 											rrs.optimizerEstimatedCost);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-2998
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		else if (rs instanceof WindowResultSet)
 		{
 			WindowResultSet wrs = (WindowResultSet) rs;
@@ -856,6 +871,7 @@ else if (rs instanceof WindowResultSet)
 											getResultSetStatistics(wrs.source)
 											);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-939
 		else if (rs instanceof SetOpResultSet)
 		{
 			SetOpResultSet srs = (SetOpResultSet) rs;
@@ -1337,6 +1353,7 @@ else if (rs instanceof DependentResultSet)
                     dsrs.closeTime,
                     dsrs.resultSetNumber,
                     dsrs.tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 					null,
                     dsrs.indexName,
                     dsrs.isConstraint,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java
index 82e3756f76..39ddab2016 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java
@@ -57,6 +57,7 @@ public class ReferencedKeyRIChecker extends GenericRIChecker
      */
     private final DataValueDescriptor[] refKey =
             new DataValueDescriptor[numColumns];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
 
     /**
      * We save away keys with a counter in this hash table, so we know how many
@@ -72,6 +73,7 @@ public class ReferencedKeyRIChecker extends GenericRIChecker
 	 *
 	 * @exception StandardException		Thrown on failure
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     ReferencedKeyRIChecker(LanguageConnectionContext lcc,
                            TransactionController tc,
                            FKInfo fkinfo) throws StandardException
@@ -128,8 +130,12 @@ void doCheck(Activation a,
             // violated. DERBY-6559
             if (lcc.isEffectivelyDeferred(
                     lcc.getCurrentSQLSessionContext(a),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                     fkInfo.refConstraintID)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                 if (restrictCheckOnly) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                     rememberKey(row);
                     return;
                 } else {
@@ -163,6 +169,7 @@ void doCheck(Activation a,
 				close();
 
                 final UUID fkId = fkInfo.fkIds[i];
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
                 // Only considering deferring if we don't have RESTRICT, i.e.
                 // NO ACTION. CASCADE and SET NULL handled elsewhere.
@@ -205,6 +212,7 @@ void doCheck(Activation a,
      * @throws StandardException
      */
     private void rememberKey(ExecRow rememberRow) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
         if (deletedKeys == null) {
             // key: all columns (these are index rows, or a row containing a
             // row location)
@@ -267,6 +275,7 @@ public void postCheck() throws StandardException
 
         int indexOfFirstRestrict = -1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
         for (int i = 0; i < fkInfo.fkConglomNumbers.length; i++) {
             if (fkInfo.raRules[i] == StatementType.RA_RESTRICT) {
                 indexOfFirstRestrict = i;
@@ -304,6 +313,7 @@ public void postCheck() throws StandardException
 
                     StandardException se = StandardException.newException(
                             SQLState.LANG_FK_VIOLATION,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                             fkInfo.fkConstraintNames[indexOfFirstRestrict],
                             fkInfo.tableName,
                             StatementUtil.typeName(fkInfo.stmtType),
@@ -343,6 +353,7 @@ private boolean isDuplicated(DataValueDescriptor[] key, long deferredRowReq)
                     // present till we commit if we accept this row as being
                     // the one the upholds the constraint when we delete ours.
                     TransactionController.ISOLATION_REPEATABLE_READ,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
 
                     (FormatableBitSet)null, // retrieve all fields
                     key,                    // startKeyValue
@@ -387,6 +398,7 @@ void close()
             refKeyIndexScan = null;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
         if (deletedKeys != null) {
             deletedKeys.close();
             deletedKeys = null;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RevokeRoleConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RevokeRoleConstantAction.java
index 6a4b15d9e7..657a2f4c15 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RevokeRoleConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RevokeRoleConstantAction.java
@@ -76,12 +76,14 @@ public void executeConstantAction(Activation activation)
         TransactionController tc = lcc.getTransactionExecute();
 
         final String grantor = lcc.getCurrentUserId(activation);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
         dd.startWriting(lcc);
 
         for (Iterator rIter = roleNames.iterator(); rIter.hasNext();) {
             String role = (String)rIter.next();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3333
             if (role.equals(Authorizer.PUBLIC_AUTHORIZATION_ID)) {
                 throw StandardException.
                     newException(SQLState.AUTH_PUBLIC_ILLEGAL_AUTHORIZATION_ID);
@@ -91,6 +93,7 @@ public void executeConstantAction(Activation activation)
                 String grantee = (String)gIter.next();
 
                 // check that role exists
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
                 RoleGrantDescriptor rdDef =
                     dd.getRoleDefinitionDescriptor(role);
 
@@ -116,6 +119,7 @@ public void executeConstantAction(Activation activation)
                     // All ok, we are database owner
                     if (SanityManager.DEBUG) {
                         SanityManager.ASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
                             rdDef.getGrantee().equals(grantor),
                             "expected database owner in role grant descriptor");
                         SanityManager.ASSERT(
@@ -127,6 +131,7 @@ public void executeConstantAction(Activation activation)
                         (SQLState.AUTH_ROLE_DBO_ONLY, "REVOKE role");
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
                 RoleGrantDescriptor rd =
                     dd.getRoleGrantDescriptor(role, grantee, grantor);
 
@@ -134,6 +139,8 @@ public void executeConstantAction(Activation activation)
                     // NOTE: Never called yet, withAdminOption not yet
                     // implemented.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                     if (SanityManager.DEBUG) {
                         SanityManager.NOTREACHED();
                     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RoutinePrivilegeInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RoutinePrivilegeInfo.java
index 87a86d9e55..0dc3449cca 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RoutinePrivilegeInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RoutinePrivilegeInfo.java
@@ -62,12 +62,14 @@ public void executeGrantRevoke( Activation activation,
 		// Check that the current user has permission to grant the privileges.
 		LanguageConnectionContext lcc = activation.getLanguageConnectionContext();
 		DataDictionary dd = lcc.getDataDictionary();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         String currentUser = lcc.getCurrentUserId(activation);
 		TransactionController tc = lcc.getTransactionExecute();
 
 		// Check that the current user has permission to grant the privileges.
 		checkOwnership( currentUser,
 						aliasDescriptor,
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 						dd.getSchemaDescriptor( aliasDescriptor.getSchemaUUID(), tc),
 						dd);
 		
@@ -83,12 +85,15 @@ public void executeGrantRevoke( Activation activation,
 			// warning.
 			boolean privileges_revoked = false;
 			String grantee = (String) itr.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1643
+//IC see: https://issues.apache.org/jira/browse/DERBY-1582
 			if (dd.addRemovePermissionsDescriptor( grant, routinePermsDesc, grantee, tc)) 
 			{
 				privileges_revoked = true;	
 				//Derby currently supports only restrict form of revoke execute
 				//privilege and that is why, we are sending invalidation action 
 				//as REVOKE_PRIVILEGE_RESTRICT rather than REVOKE_PRIVILEGE
+//IC see: https://issues.apache.org/jira/browse/DERBY-2594
 				dd.getDependencyManager().invalidateFor
 					(routinePermsDesc,
 					 DependencyManager.REVOKE_PRIVILEGE_RESTRICT, lcc);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
index 19034cc74c..6aaa296b1c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
@@ -52,6 +52,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
   Perform row at a time DML operations of tables and maintain indexes.
   */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class RowChangerImpl	implements	RowChanger
 {
 	boolean isOpen = false;
@@ -301,6 +302,7 @@ public void openForUpdate(
 		int isolationLevel;
 		if (lcc == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 			isolationLevel = TransactionControl.READ_COMMITTED_ISOLATION_LEVEL;
 		}
 		else
@@ -313,6 +315,7 @@ public void openForUpdate(
 		{
 			// Even though we preserve the isolation level at READ UNCOMMITTED,
 			// Store will overwrite it to READ COMMITTED for update.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 			case TransactionControl.READ_UNCOMMITTED_ISOLATION_LEVEL:
 				isolationLevel = 
                     TransactionController.ISOLATION_READ_UNCOMMITTED;
@@ -447,6 +450,7 @@ public RowLocation insertRow(ExecRow baseRow, boolean getRL)
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             if (isc != null || getRL)
 			{
                 if (baseRowLocation == null) {
@@ -460,6 +464,9 @@ public RowLocation insertRow(ExecRow baseRow, boolean getRL)
 			}
 			else
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                 baseCC.insert(baseRow.getRowArray());
 			}
 		}
@@ -604,6 +611,7 @@ private int[] sortArray(int[] input)
 
 
 	public int findSelectedCol(int selectedCol) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
 		if (selectedCol == -1) {
 			// This is not a base column
 			return -1;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowCountResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowCountResultSet.java
index e3d67d89fa..5123a1b351 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowCountResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowCountResultSet.java
@@ -54,6 +54,7 @@ class RowCountResultSet extends NoPutResultSetImpl
     final private boolean runTimeStatsOn;
     private long offset;
     private long fetchFirst;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4208
     final private GeneratedMethod offsetMethod;
     final private GeneratedMethod fetchFirstMethod;
     final private boolean hasJDBClimitClause;
@@ -91,6 +92,7 @@ class RowCountResultSet extends NoPutResultSetImpl
         (NoPutResultSet s,
          Activation a,
          int resultSetNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4208
          GeneratedMethod offsetMethod,
          GeneratedMethod fetchFirstMethod,
          boolean hasJDBClimitClause,
@@ -162,6 +164,7 @@ public void reopenCore() throws StandardException {
 
         source.reopenCore();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
         virginal = true;
         rowsFetched = 0;
         isOpen = true;
@@ -180,6 +183,7 @@ public void reopenCore() throws StandardException {
      * @return the next row in the result
      */
     public ExecRow  getNextRowCore() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 	if( isXplainOnlyMode() )
 		return null;
 
@@ -187,6 +191,7 @@ public ExecRow  getNextRowCore() throws StandardException {
 
         beginTime = getCurrentTimeMillis();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4208
         if (virginal) {
             if (offsetMethod != null) {
                 DataValueDescriptor offVal
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowResultSet.java
index c1db283220..23596c5df2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowResultSet.java
@@ -51,6 +51,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * reasonable answers.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class RowResultSet extends NoPutResultSetImpl
 	implements CursorResultSet {
 
@@ -131,6 +132,7 @@ public void	openCore() throws StandardException
 	 * @exception StandardException thrown on failure.
      */
 	public ExecRow	getNextRowCore() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java
index 4fa8688d5a..7f6fc2512b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * a row trigger.  It is instantiated at execution time.
  * There is one per row trigger.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 class RowTriggerExecutor extends GenericTriggerExecutor
 {
 	/**
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowUtil.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowUtil.java
index 2a901a4428..871e0e9489 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/RowUtil.java
@@ -45,6 +45,7 @@ public class RowUtil
      */
     public  static  void    setRowCountBase( long newBase )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         if (SanityManager.DEBUG)    { rowCountBase = newBase; }
     }
 
@@ -59,6 +60,7 @@ public  static  void    setRowCountBase( long newBase )
 	  */
 	public static ExecRow getEmptyValueRow(int columnCount, LanguageConnectionContext lcc)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 		return lcc.getLanguageConnectionFactory().getExecutionFactory().getValueRow(columnCount);
 	}
 
@@ -70,6 +72,7 @@ public static ExecRow getEmptyValueRow(int columnCount, LanguageConnectionContex
 	  */
 	public static ExecIndexRow getEmptyIndexRow(int columnCount, LanguageConnectionContext lcc)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 		return lcc.getLanguageConnectionFactory().
             getExecutionFactory().getIndexableRow(columnCount);
 	}
@@ -170,6 +173,7 @@ public static void copyRefColumns(ExecRow to, ExecRow from, int[] positions)
 	  For copying from a compact array to a reconstituted array.
 	  E.g. if positions = {2, 4}, and from = {666, 777} then
 	  to =&gt; {null, 666, null, 777}.  Will only go as far as to.getArray().length.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 	  @param to Place the column references here.  Sparse array
 	  @param from Get the column references from here. Compact array
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
index 4487f7b0a7..7fdce89059 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
@@ -37,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * first call to next().
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class ScalarAggregateResultSet extends GenericAggregateResultSet
 	implements CursorResultSet 
 {
@@ -69,6 +70,7 @@ class ScalarAggregateResultSet extends GenericAggregateResultSet
 	 *
 	 * @exception StandardException Thrown on error
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     ScalarAggregateResultSet(NoPutResultSet s,
 					boolean isInSortedOrder,
 					int	aggregateItem,
@@ -79,6 +81,7 @@ class ScalarAggregateResultSet extends GenericAggregateResultSet
 				    double optimizerEstimatedRowCount,
 				    double optimizerEstimatedCost) throws StandardException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 		super(s, aggregateItem, a, ra, resultSetNumber, optimizerEstimatedRowCount, optimizerEstimatedCost);
 		this.isInSortedOrder = isInSortedOrder;
 		// source expected to be non-null, mystery stress test bug
@@ -125,6 +128,7 @@ public void	openCore() throws StandardException
 		}
 
 		sourceExecIndexRow = (ExecIndexRow) getRowTemplate().getClone();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
         source.openCore();
 
@@ -152,6 +156,7 @@ public void	openCore() throws StandardException
 	 */
 	public ExecRow	getNextRowCore() throws StandardException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScanResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
index deea36620e..0b32ed7b05 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScanResultSet.java
@@ -78,6 +78,7 @@ abstract class ScanResultSet extends NoPutResultSetImpl {
 
     /** Object used to create and reset the candidate row. */
     final ExecRowBuilder resultRowBuilder;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
     /** The candidate row, matches the shape of the rows in
      * the underlying object to be scanned.
@@ -124,6 +125,7 @@ abstract class ScanResultSet extends NoPutResultSetImpl {
         this.tableLocked = tableLocked;
         suppliedLockMode = lockMode;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         if (isolationLevel == TransactionControl.UNSPECIFIED_ISOLATION_LEVEL) {
             unspecifiedIsolationLevel = true;
             isolationLevel = getLanguageConnectionContext().getCurrentIsolationLevel();
@@ -136,6 +138,7 @@ abstract class ScanResultSet extends NoPutResultSetImpl {
             translateLanguageIsolationLevel(isolationLevel);
 
         ExecPreparedStatement ps = activation.getPreparedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
         // Create a candidate row.
         resultRowBuilder =
@@ -186,6 +189,7 @@ private int getLockMode(int languageLevel) {
          */
         if (tableLocked ||
                 (languageLevel ==
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
                      TransactionControl.SERIALIZABLE_ISOLATION_LEVEL)) {
             return suppliedLockMode;
         } else {
@@ -214,6 +218,7 @@ protected   void    setRowLocationsState()
     private int translateLanguageIsolationLevel(int languageLevel) {
 
         switch (languageLevel) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         case TransactionControl.READ_UNCOMMITTED_ISOLATION_LEVEL:
             return TransactionController.ISOLATION_READ_UNCOMMITTED;
         case TransactionControl.READ_COMMITTED_ISOLATION_LEVEL:
@@ -227,6 +232,7 @@ private int translateLanguageIsolationLevel(int languageLevel) {
                 return TransactionController.ISOLATION_READ_COMMITTED;
             }
             return TransactionController.ISOLATION_READ_COMMITTED_NOHOLDLOCK;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         case TransactionControl.REPEATABLE_READ_ISOLATION_LEVEL:
             return TransactionController.ISOLATION_REPEATABLE_READ;
         case TransactionControl.SERIALIZABLE_ISOLATION_LEVEL:
@@ -269,6 +275,7 @@ public void close() throws StandardException {
     
     public Element toXML( Element parentNode, String tag ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6266
         Element myNode = super.toXML( parentNode, tag );
         if ( tableName != null ) { myNode.setAttribute( "tableName", tableName ); }
         if ( indexName != null ) { myNode.setAttribute( "indexName", indexName ); }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java
index bc1bccb1a5..9596c9285b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java
@@ -166,6 +166,7 @@ public ScrollInsensitiveResultSet(NoPutResultSet source,
 			  optimizerEstimatedRowCount, optimizerEstimatedCost);
 		this.source = source;
 		this.sourceRowWidth = sourceRowWidth;
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
         keepAfterCommit = activation.getResultSetHoldability();
 		maxRows = activation.getMaxRows();
 		if (SanityManager.DEBUG)
@@ -174,6 +175,7 @@ public ScrollInsensitiveResultSet(NoPutResultSet source,
 				"maxRows not expected to be -1");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		positionInHashTable = new SQLInteger();
 		needsRepositioning = false;
 		if (isForUpdate()) {
@@ -225,6 +227,7 @@ public void	openCore() throws StandardException
 		 * We need BackingStoreHashtable to actually go to disk when it doesn't fit.
 		 * This is a known limitation.
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
 		ht = new BackingStoreHashtable(getTransactionController(),
 									   null,
 									   keyCols,
@@ -235,6 +238,7 @@ public void	openCore() throws StandardException
 									   HashScanResultSet.DEFAULT_MAX_CAPACITY,
 									   false,
                                        keepAfterCommit);
+//IC see: https://issues.apache.org/jira/browse/DERBY-106
 
 		// When re-using language result sets (DERBY-827) we need to
 		// reset some member variables to the value they would have
@@ -247,6 +251,7 @@ public void	openCore() throws StandardException
 		seenFirst = false;
 		seenLast = false;
 		maxRows = activation.getMaxRows();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3397
 
 		openTime += getElapsedMillis(beginTime);
 		setBeforeFirstRow();
@@ -310,6 +315,7 @@ public ExecRow	getAbsoluteRow(int row) throws StandardException
                 // Absolute 0 is defined to be before first!
 		if (row == 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-276
                     setBeforeFirstRow();
                     return null;
 		}
@@ -343,6 +349,7 @@ public ExecRow	getAbsoluteRow(int row) throws StandardException
 					break;
 				}
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1277
 			if (result != null) {
 				result = getRowFromHashTable(row);
 			}
@@ -416,6 +423,9 @@ public ExecRow	getRelativeRow(int row) throws StandardException
 		// Return the current row for 0
 		if (row == 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-918
+//IC see: https://issues.apache.org/jira/browse/DERBY-934
+//IC see: https://issues.apache.org/jira/browse/DERBY-797
                     if (beforeFirst || afterLast || currentPosition==0) {
                         return null;
                     } else {
@@ -499,6 +509,7 @@ public ExecRow	getFirstRow()
 	 */
 	public ExecRow	getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -519,6 +530,7 @@ public ExecRow	getNextRowCore() throws StandardException
 			 * Get row from the source.
 			 */
 			result = getNextRowFromSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1277
 			if (result !=null) {
 				result = getRowFromHashTable(currentPosition);
 			}
@@ -563,6 +575,7 @@ public ExecRow	getPreviousRow()
 	{
 	    if ( ! isOpen ) 
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4776
 			throw StandardException.newException(SQLState.LANG_RESULT_SET_NOT_OPEN, "previous");
 		}
 
@@ -628,6 +641,7 @@ public ExecRow	getLastRow()
 			throw StandardException.newException(SQLState.LANG_RESULT_SET_NOT_OPEN, "next");
 		}
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-1277
 		if (!seenLast) 
 		{
 			attachStatementContext();
@@ -739,6 +753,7 @@ public boolean checkRowPosition(int isType) throws StandardException
 		case ISFIRST:
 			return (currentPosition == 1);
 		case ISLAST:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1276
 			if (beforeFirst || afterLast || currentPosition==0 ||
 				currentPosition<positionInSource)
 			{
@@ -797,6 +812,7 @@ private ExecRow getNextRowFromSource() throws StandardException
 		}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		if (needsRepositioning) {
 			positionInLastFetchedRow();
 			needsRepositioning = false;
@@ -820,6 +836,7 @@ private ExecRow getNextRowFromSource() throws StandardException
 			positionInSource++;
 			currentPosition = positionInSource;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 			RowLocation rowLoc = null;
 			if (source.isForUpdate()) {
 				rowLoc = ((CursorResultSet)source).getRowLocation();
@@ -844,6 +861,7 @@ private ExecRow getNextRowFromSource() throws StandardException
 			else
 			{
 				afterLast = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-186
 				currentPosition = positionInSource + 1;
 			}
 		}
@@ -943,6 +961,7 @@ public RowLocation getRowLocation() throws StandardException
 	 */
 	public ExecRow getCurrentRow() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		if (isForUpdate() && isDeleted()) {
 			return null;
 		} else {
@@ -970,6 +989,7 @@ public ExecRow getCurrentRow() throws StandardException
 	 *
 	 */
 	private void addRowToHashTable(ExecRow sourceRow, int position,
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 			RowLocation rowLoc, boolean rowUpdated)
 		throws StandardException
 	{
@@ -978,6 +998,7 @@ private void addRowToHashTable(ExecRow sourceRow, int position,
 		// 1st element is the key
 		hashRowArray[0] = new SQLInteger(position);
 		if (isForUpdate()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 			hashRowArray[POS_ROWLOCATION] = rowLoc.cloneValue(false);
 			hashRowArray[POS_ROWDELETED] = new SQLBoolean(false);
 			hashRowArray[POS_ROWUPDATED] = new SQLBoolean(rowUpdated);
@@ -990,6 +1011,7 @@ private void addRowToHashTable(ExecRow sourceRow, int position,
 		 */
 		DataValueDescriptor[] sourceRowArray = sourceRow.getRowArray();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		System.arraycopy(sourceRowArray, 0, hashRowArray, extraColumns, 
 				sourceRowArray.length);
 
@@ -1022,6 +1044,7 @@ private ExecRow getRowFromHashTable(int position)
 				"hashRowArray expected to be non-null");
 		}
 		// Copy out the Object[] without the position.
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		DataValueDescriptor[] resultRowArray = new 
 				DataValueDescriptor[hashRowArray.length - extraColumns];
 		System.arraycopy(hashRowArray, extraColumns, resultRowArray, 0, 
@@ -1040,6 +1063,7 @@ private ExecRow getRowFromHashTable(int position)
 			afterLast = false;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		if (isForUpdate()) {
 			RowLocation rowLoc = (RowLocation) hashRowArray[POS_ROWLOCATION];
 			// Keep source and target with the same currentRow
@@ -1101,8 +1125,10 @@ private void positionInLastFetchedRow() throws StandardException {
 	 */
 	public void updateRow(ExecRow row, RowChanger rowChanger)
 			throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
 
 		ProjectRestrictResultSet prRS = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4079
 
 		if (source instanceof ProjectRestrictResultSet) {
 			prRS = (ProjectRestrictResultSet)source;
@@ -1122,6 +1148,7 @@ public void updateRow(ExecRow row, RowChanger rowChanger)
 		// modified column will need to go (we do our own projection).
 		int[] map;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
 		if (prRS != null) {
 			map = prRS.getBaseProjectMapping();
 		} else {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
index 38f12a4195..97cf890847 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
@@ -47,6 +47,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 class SetConstraintsConstantAction extends DDLConstantAction
 {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
     final private boolean   deferred;
     final private List<TableName> constraints;
 
@@ -88,6 +91,7 @@ public void executeConstantAction(
 
         final DataDictionary dd = lcc.getDataDictionary();
         final List<String> boundConstraints = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         if (constraints != null) {
             for (TableName c : constraints) {
@@ -107,6 +111,7 @@ public void executeConstantAction(
                             c.getFullSQLName());
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 final String bound =
                         IdUtil.normalToDelimited(sd.getSchemaName()) + "." +
                         IdUtil.normalToDelimited(cd.getConstraintName());
@@ -126,6 +131,8 @@ public void executeConstantAction(
                             cd.getConstraintName());
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                 lcc.setConstraintDeferred(
                     activation,
                     cd,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetOpResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetOpResultSet.java
index 6cef836423..f3669bf125 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetOpResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetOpResultSet.java
@@ -43,6 +43,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * the INTERSECT or EXCEPT of the two input result sets. This also projects out the tag, the last column
  * of the input rows.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class SetOpResultSet extends NoPutResultSetImpl
     implements CursorResultSet
 {
@@ -104,9 +105,11 @@ public void	openCore() throws StandardException
 		beginTime = getCurrentTimeMillis();
 		if (SanityManager.DEBUG)
 	    	SanityManager.ASSERT( ! isOpen, "SetOpResultSet already open");
+//IC see: https://issues.apache.org/jira/browse/DERBY-939
 
         leftSource.openCore();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4330
         try {
             rightSource.openCore();
             rightInputRow = rightSource.getNextRowCore();
@@ -135,6 +138,7 @@ public void	openCore() throws StandardException
 	 */
 	public ExecRow	getNextRowCore() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -144,6 +148,7 @@ public ExecRow	getNextRowCore() throws StandardException
             while( (leftInputRow = leftSource.getNextRowCore()) != null)
             {
                 rowsSeenLeft++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-939
 
                 DataValueDescriptor[] leftColumns = leftInputRow.getRowArray();
                 if( !all)
@@ -154,6 +159,7 @@ public ExecRow	getNextRowCore() throws StandardException
                 }
                 int compare = 0;
                 // Advance the right until there are no more right rows or leftRow <= rightRow
+//IC see: https://issues.apache.org/jira/browse/DERBY-939
                 while ( rightInputRow != null && (compare = compare(leftColumns, rightInputRow.getRowArray())) > 0)
                 {
                     rightInputRow = rightSource.getNextRowCore();
@@ -175,6 +181,7 @@ public ExecRow	getNextRowCore() throws StandardException
                     // The left and right rows are the same
                     if( SanityManager.DEBUG)
                         SanityManager.ASSERT( rightInputRow != null && compare == 0,
+//IC see: https://issues.apache.org/jira/browse/DERBY-939
                                               "Intersect/Except execution has gotten confused.");
                     if ( all)
                     {
@@ -199,6 +206,7 @@ public ExecRow	getNextRowCore() throws StandardException
 
         setCurrentRow(leftInputRow);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-939
         if (currentRow != null) {
            rowsReturned++;
         }
@@ -210,6 +218,7 @@ public ExecRow	getNextRowCore() throws StandardException
     private void advanceRightPastDuplicates( DataValueDescriptor[] leftColumns)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-939
         while ((rightInputRow = rightSource.getNextRowCore()) != null)
         {
             rowsSeenRight++;
@@ -227,6 +236,7 @@ private int compare( DataValueDescriptor[] leftCols, DataValueDescriptor[] right
             int colIdx = intermediateOrderByColumns[i];
             if( leftCols[colIdx].compare( Orderable.ORDER_OP_LESSTHAN,
                                           rightCols[colIdx],
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
                                           true, // nulls should be ordered
                                           intermediateOrderByNullsLow[i],
                                           false))
@@ -283,6 +293,7 @@ public void	close() throws StandardException
 		else
 			if (SanityManager.DEBUG)
 				SanityManager.DEBUG("CloseRepeatInfo","Close of SetOpResultSet repeated");
+//IC see: https://issues.apache.org/jira/browse/DERBY-939
 
 		closeTime += getElapsedMillis(beginTime);
 	} // end of close
@@ -342,6 +353,7 @@ public RowLocation getRowLocation() throws StandardException
      */
     public int getOpType()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-939
         return opType;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetRoleConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetRoleConstantAction.java
index 06b6017d14..ae8d83127b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetRoleConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetRoleConstantAction.java
@@ -101,6 +101,7 @@ public void executeConstantAction( Activation activation )
         dd = lcc.getDataDictionary();
         String thisRoleName = roleName;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         final String currentAuthId = lcc.getCurrentUserId(activation);
         final String dbo = lcc.getDataDictionary().
             getAuthorizationDatabaseOwner();
@@ -120,6 +121,7 @@ public void executeConstantAction( Activation activation )
             // interpret as identifier, then we convert it to case normal form
             // here.
             String roleId = dvs.getString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
             if (roleId == null) {
                 throw StandardException.newException(SQLState.ID_PARSE_ERROR);
@@ -129,7 +131,9 @@ public void executeConstantAction( Activation activation )
         }
 
         RoleGrantDescriptor rdDef = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         try {
             String oldRole = lcc.getCurrentRoleId(activation);
 
@@ -139,6 +143,7 @@ public void executeConstantAction( Activation activation )
                 if (rdDef != null) {
                     dd.getDependencyManager().invalidateFor(
                         rdDef,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                         DependencyManager.RECHECK_PRIVILEGES,
                         lcc);
                 } // else: old role else no longer exists, so ignore.
@@ -153,17 +158,20 @@ public void executeConstantAction( Activation activation )
                         (SQLState.ROLE_INVALID_SPECIFICATION, thisRoleName);
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                 if (!lcc.roleIsSettable(activation, thisRoleName)) {
                     throw StandardException.newException
                               (SQLState. ROLE_INVALID_SPECIFICATION_NOT_GRANTED,
                                thisRoleName);
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         } finally {
             // reading above changes idle state, so reestablish it
             lcc.userCommit();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
         lcc.setCurrentRole(activation, rdDef != null ? thisRoleName : null);
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java
index 53a81a3269..3c6fc9a016 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java
@@ -111,16 +111,20 @@ public void	executeConstantAction( Activation activation )
 			DataValueDescriptor dvs = pvs.getParameter(0);
 			thisSchemaName = dvs.getString();
 			//null parameter is not allowed
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			if (thisSchemaName == null || thisSchemaName.length() > Limits.MAX_IDENTIFIER_LENGTH)
 				throw StandardException.newException(SQLState.LANG_DB2_REPLACEMENT_ERROR, "CURRENT SCHEMA");
 		}
 		else if (type == StatementType.SET_SCHEMA_USER)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             thisSchemaName = lcc.getCurrentUserId(activation);
 		}
 
                 SchemaDescriptor sd = dd.getSchemaDescriptor(thisSchemaName,
                         lcc.getTransactionExecute(), true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
 		lcc.setDefaultSchema(activation, sd);
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SortResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SortResultSet.java
index 31cfbda8f0..33eb1db681 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SortResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SortResultSet.java
@@ -98,6 +98,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * anyway.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class SortResultSet extends NoPutResultSetImpl
 	implements CursorResultSet 
 {
@@ -176,10 +177,12 @@ public SortResultSet(NoPutResultSet s,
 		this.maxRowSize = maxRowSize;
 
         ExecPreparedStatement ps = a.getPreparedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
 		sortTemplateRow = ((ExecRowBuilder) ps.getSavedObject(ra))
                                 .build(a.getExecutionFactory());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6292
         order = ((FormatableArrayHolder) ps.getSavedObject(orderingItem))
                 .getArray(ColumnOrdering[].class);
 
@@ -215,6 +218,7 @@ public SortResultSet(NoPutResultSet s,
      */
 	public void	openCore() throws StandardException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-466
 		nextCalled = false;
 		beginTime = getCurrentTimeMillis();
 		// REVISIT: through the direct DB API, this needs to be an
@@ -235,6 +239,7 @@ public void	openCore() throws StandardException
 
         source.openCore();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4330
 		try {
 			/* If this is an in-order distinct then we do not need the sorter.
 			 * (We filter out the duplicate rows ourselves.)  We save a clone
@@ -316,6 +321,7 @@ private ScanController loadSorter()
 		source.close();
 		sortProperties = sorter.getSortInfo().getAllSortInfo(sortProperties);
 		sorter.completedInserts();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 
 		return tc.openSortScan(sortId, activation.getResultSetHoldability());
 	}
@@ -331,6 +337,7 @@ private ScanController loadSorter()
 	 */
 	public ExecRow	getNextRowCore() throws StandardException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java
index a13426b4a3..23360bc6e1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java
@@ -33,6 +33,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * a statement trigger.  It is instantiated at execution
  * time.  There is one per statement trigger.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 class StatementTriggerExecutor extends GenericTriggerExecutor
 {
 	/**
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SumAggregator.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SumAggregator.java
index bb5826583e..c41f84e550 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SumAggregator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/SumAggregator.java
@@ -59,6 +59,7 @@ protected void accumulate(DataValueDescriptor addend)
 			/* NOTE: We need to call cloneValue since value gets
 			 * reused underneath us
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 			value = addend.cloneValue(false);
 		}
 		else
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TablePrivilegeInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TablePrivilegeInfo.java
index 7e27d6a699..5a2dbff8ab 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TablePrivilegeInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TablePrivilegeInfo.java
@@ -142,6 +142,7 @@ private void checkPrivileges( String user,
 								   LanguageConnectionContext lcc)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1787
 		if (user.equals(dd.getAuthorizationDatabaseOwner())) return;
 		
 		//  check view specific
@@ -206,6 +207,7 @@ public void executeGrantRevoke( Activation activation,
 	{
 		LanguageConnectionContext lcc = activation.getLanguageConnectionContext();
 		DataDictionary dd = lcc.getDataDictionary();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         String currentUser = lcc.getCurrentUserId(activation);
 		TransactionController tc = lcc.getTransactionExecute();
 		SchemaDescriptor sd = td.getSchemaDescriptor();
@@ -260,9 +262,12 @@ public void executeGrantRevoke( Activation activation,
 			String grantee = (String) itr.next();
 			if( tablePermsDesc != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1539
 				if (dd.addRemovePermissionsDescriptor( grant, tablePermsDesc, grantee, tc))
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1582
 					privileges_revoked = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2594
 					dd.getDependencyManager().invalidateFor
 						(tablePermsDesc,
 						 DependencyManager.REVOKE_PRIVILEGE, lcc);
@@ -291,6 +296,7 @@ public void executeGrantRevoke( Activation activation,
 						// TableDescriptor itself, so we must send
 						// INTERNAL_RECOMPILE_REQUEST to the TableDescriptor's
 						// Dependents.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3736
 						dd.getDependencyManager().invalidateFor
 							(td,
 							 DependencyManager.INTERNAL_RECOMPILE_REQUEST,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
index 23974f6e47..6796622b36 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
@@ -52,6 +52,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * improve performance.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 class TableScanResultSet extends ScanResultSet
 	implements CursorResultSet, Cloneable
 {
@@ -120,6 +121,7 @@ class TableScanResultSet extends ScanResultSet
     //
     // class interface
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     TableScanResultSet(long conglomId,
 		StaticCompiledOpenConglomInfo scoci, 
 		Activation activation, 
@@ -130,6 +132,7 @@ class TableScanResultSet extends ScanResultSet
 		boolean sameStartStopPosition,
 		Qualifier[][] qualifiers,
 		String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		String userSuppliedOptimizerOverrides,
 		String indexName,
 		boolean isConstraint,
@@ -147,7 +150,9 @@ class TableScanResultSet extends ScanResultSet
     {
 		super(activation,
 				resultSetNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 				resultRowTemplate,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 				lockMode, tableLocked, isolationLevel,
                 colRefItem,
 				optimizerEstimatedRowCount,
@@ -178,6 +183,7 @@ class TableScanResultSet extends ScanResultSet
 		this.sameStartStopPosition = sameStartStopPosition;
 		this.qualifiers = qualifiers;
 		this.tableName = tableName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		this.userSuppliedOptimizerOverrides = userSuppliedOptimizerOverrides;
 		this.indexName = indexName;
 		this.isConstraint = isConstraint;
@@ -197,6 +203,7 @@ class TableScanResultSet extends ScanResultSet
 							   activation.getLanguageConnectionContext().getRunTimeStatisticsMode());
 		
 		/* Always qualify the first time a row is being read */
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		qualify = true;
 		currentRowIsValid = false;
 		scanRepositioned = false;
@@ -224,6 +231,7 @@ public void	openCore() throws StandardException
         TransactionController tc = activation.getTransactionController();
 
 		initIsolationLevel();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 
 		if (dcoci == null)
 			dcoci = tc.getDynamicCompiledConglomInfo(conglomId);
@@ -448,6 +456,7 @@ public void	reopenCore() throws StandardException
 
 
     boolean loopControl(boolean moreRows) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6674
         return scanController.fetchNext(candidate.getRowArray());
     }
 
@@ -458,11 +467,14 @@ boolean loopControl(boolean moreRows) throws StandardException {
 	 */
 	public ExecRow getNextRowCore() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-31
         checkCancellationFlag();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		if (currentRow == null || scanRepositioned)
 		{
 			currentRow =
@@ -484,6 +496,7 @@ public ExecRow getNextRowCore() throws StandardException
 			{
                 boolean moreRows = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6674
                 while (true)
 				{
                     // loop control overriden by subclass
@@ -517,6 +530,7 @@ public ExecRow getNextRowCore() throws StandardException
 					if (past2FutureTbl != null)
 					{
 						RowLocation rowLoc = (RowLocation) currentRow.getColumn(currentRow.nColumns());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3798
 						if (past2FutureTbl.remove(rowLoc) != null){
 						    continue;
 						}
@@ -548,6 +562,7 @@ public ExecRow getNextRowCore() throws StandardException
 	    }
 
 		setCurrentRow(result);
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		currentRowIsValid = true;
 		scanRepositioned = false;
 		qualify = true;
@@ -625,6 +640,7 @@ public void	close() throws StandardException
             if (past2FutureTbl != null)
             {
                 past2FutureTbl.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6981
                 past2FutureTbl = null;
             }
 	    }
@@ -700,11 +716,13 @@ public RowLocation getRowLocation() throws StandardException
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 			if (currentRowIsValid) {
 				// we reuse the same rowlocation object across several calls.
 				if (rlTemplate == null)
 					rlTemplate = scanController.newRowLocationTemplate();
 				rl = rlTemplate;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1172
 				try {
 					scanController.fetchLocation(rl);
 				} catch (StandardException se) {
@@ -753,6 +771,7 @@ public ExecRow getCurrentRow() throws StandardException
 		try
 		{
 			if ((currentRow == null)                        ||
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 			(!currentRowIsValid)                            ||
 			(!scanControllerOpened)                         ||
 			(qualify && scanController.isCurrentPositionDeleted())     ||
@@ -771,6 +790,7 @@ public ExecRow getCurrentRow() throws StandardException
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         resultRowBuilder.reset(candidate);
         currentRow = getCompactRow(candidate, accessedCols, isKeyed);
 
@@ -793,6 +813,7 @@ public ExecRow getCurrentRow() throws StandardException
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
         setCurrentRow(candidate);
 	    return currentRow;
 	}
@@ -804,6 +825,7 @@ public ExecRow getCurrentRow() throws StandardException
 	 * will not attempt to re-qualify the current row. 
 	 */
 	public void positionScanAtRowLocation(RowLocation rl) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		throws StandardException 
 	{
 		// Check if the scanController is a B-tree scan controller. Do not
@@ -1148,6 +1170,7 @@ private String printPosition(int searchOperator,
 			if (positioner.areNullsOrdered(position))
 			{
 				output = output + position + " ";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				colSeen = true;
 			}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java
index 1edfd569a1..f757ecd494 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java
@@ -50,6 +50,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * It is used for deferred DML processing.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 class TemporaryRowHolderImpl implements TemporaryRowHolder
 {
 	public static final int DEFAULT_OVERFLOWTHRESHOLD = 5;
@@ -72,6 +73,7 @@ class TemporaryRowHolderImpl implements TemporaryRowHolder
 	private	ResultDescription		resultDescription;
 	/** Activation object with local state information. */
 	Activation						activation;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 
 	private boolean     isUniqueStream;
 
@@ -105,7 +107,10 @@ class TemporaryRowHolderImpl implements TemporaryRowHolder
 	 */
 	public TemporaryRowHolderImpl
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 		Activation				activation, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		Properties 				properties, 
 		ResultDescription		resultDescription
 	) 
@@ -127,8 +132,11 @@ class TemporaryRowHolderImpl implements TemporaryRowHolder
 	 */
 	public TemporaryRowHolderImpl
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 		Activation				activation, 
 		Properties 				properties, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		ResultDescription		resultDescription,
 		boolean                 isUniqueStream
 	) 
@@ -152,8 +160,11 @@ class TemporaryRowHolderImpl implements TemporaryRowHolder
 	 */
 	public TemporaryRowHolderImpl
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 		Activation			 	activation, 
 		Properties				properties,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		ResultDescription		resultDescription,
 		int 					overflowToConglomThreshold,
 		boolean                 isUniqueStream,
@@ -171,8 +182,11 @@ class TemporaryRowHolderImpl implements TemporaryRowHolder
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 		this.activation = activation;
 		this.properties = properties;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		this.resultDescription = resultDescription;
 		this.isUniqueStream = isUniqueStream;
 		this.isVirtualMemHeap = isVirtualMemHeap;
@@ -209,6 +223,7 @@ private ExecRow cloneRow(ExecRow inputRow)
 			if (cols[i] != null)
 			{
 				/* Rows are 1-based, cols[] is 0-based */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
                 cloned.setColumn(i + 1, cols[i].cloneHolder());
 			}
 		}
@@ -252,6 +267,7 @@ public void insert(ExecRow inputRow)
 			//In case of unique stream we push every thing into the
 			// conglomerates for time being, we keep one row in the array for
 			// the template.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3221
             if (!isUniqueStream) {
 				return;  
             }
@@ -260,6 +276,7 @@ public void insert(ExecRow inputRow)
 		if (!conglomCreated)
 		{
 			TransactionController tc = activation.getTransactionController();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 
             // TODO-COLLATE, I think collation needs to get set always correctly
             // but did see what to get collate id when there was no result
@@ -278,6 +295,7 @@ public void insert(ExecRow inputRow)
             int collation_ids[] = null;
 
             /*
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             TODO-COLLATE - if we could count on resultDescription I think the
             following would work.
 
@@ -332,6 +350,9 @@ public void insert(ExecRow inputRow)
 
 		}else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             status = cc.insert(inputRow.getRowArray());
 			if (isVirtualMemHeap)
 				state = STATE_INSERT;
@@ -370,6 +391,7 @@ private boolean isRowAlreadyExist(ExecRow inputRow) throws  StandardException
 		
 			if(!uniqueIndexCreated)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 				TransactionController tc =
 					activation.getTransactionController();
 				int numKeys = 2;
@@ -378,6 +400,7 @@ private boolean isRowAlreadyExist(ExecRow inputRow) throws  StandardException
 				uniqueIndexRow[1] = baseRowLocation;
 				Properties props = makeIndexProperties(uniqueIndexRow, CID);
 				uniqueIndexConglomId =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 					tc.createConglomerate(
                         "BTREE",
                         uniqueIndexRow, 
@@ -400,6 +423,9 @@ private boolean isRowAlreadyExist(ExecRow inputRow) throws  StandardException
 			uniqueIndexRow[1] = baseRowLocation;
 			// Insert the row into the secondary index.
 			int status;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             if ((status = uniqueIndex_cc.insert(uniqueIndexRow))!= 0)
 			{
 				if(status == ConglomerateController.ROWISDUPLICATE)
@@ -436,6 +462,7 @@ private void insertToPositionIndex(int position, RowLocation rl ) throws  Standa
 	{
 		if(!positionIndexCreated)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 			TransactionController tc = activation.getTransactionController();
 			int numKeys = 2;
 			position_sqllong = new SQLLongint();
@@ -444,6 +471,7 @@ private void insertToPositionIndex(int position, RowLocation rl ) throws  Standa
 			positionIndexRow[1] = rl;				
 			Properties props = makeIndexProperties(positionIndexRow, CID);
 			positionIndexConglomId =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 tc.createConglomerate(
                     "BTREE",
                     positionIndexRow, 
@@ -468,6 +496,9 @@ private void insertToPositionIndex(int position, RowLocation rl ) throws  Standa
 		positionIndexRow[0] = position_sqllong;
 		positionIndexRow[1] = rl;
 		//insert the row location to position index
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         positionIndex_cc.insert(positionIndexRow);
 	}
 
@@ -480,10 +511,13 @@ private void insertToPositionIndex(int position, RowLocation rl ) throws  Standa
 	public CursorResultSet getResultSet()
 	{
 		state = STATE_DRAIN;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 		TransactionController tc = activation.getTransactionController();
 		if(isUniqueStream)
 		{
 			return new TemporaryRowHolderResultSet(tc, rowArray,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 												   resultDescription, isVirtualMemHeap,
 												   true, positionIndexConglomId, this);
 		}
@@ -505,6 +539,7 @@ public CursorResultSet getResultSet()
 	public void truncate() throws StandardException
 	{
 		close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3221
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(lastArraySlot == -1);
             SanityManager.ASSERT(state == STATE_UNINIT);
@@ -591,6 +626,7 @@ public void close() throws StandardException
 		}
 
 		TransactionController tc = activation.getTransactionController();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 
 		if (uniqueIndexCreated)
 		{
@@ -608,6 +644,7 @@ public void close() throws StandardException
 		{
 			tc.dropConglomerate(CID);
 			conglomCreated = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3221
             CID = 0;
 		} 
         else 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
index 2ec7226a70..0867881fdb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
@@ -52,6 +52,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * interface.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 class TemporaryRowHolderResultSet implements CursorResultSet, NoPutResultSet, Cloneable
 {
 	private ExecRow[] 				rowArray;
@@ -83,6 +84,8 @@ class TemporaryRowHolderResultSet implements CursorResultSet, NoPutResultSet, Cl
 	(
 		TransactionController		tc,
 		ExecRow[]					rowArray,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		ResultDescription			resultDescription,
 		boolean						isVirtualMemHeap,
 		TemporaryRowHolderImpl		holder
@@ -108,6 +111,8 @@ class TemporaryRowHolderResultSet implements CursorResultSet, NoPutResultSet, Cl
 	(
 		TransactionController		tc,
 		ExecRow[]					rowArray,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		ResultDescription			resultDescription,
 		boolean						isVirtualMemHeap,
 		boolean                     isAppendable,
@@ -117,6 +122,8 @@ class TemporaryRowHolderResultSet implements CursorResultSet, NoPutResultSet, Cl
 	{
 		this.tc = tc;
 		this.rowArray = rowArray;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		this.resultDescription = resultDescription;
 		this.numRowsOut = 0;
 		isOpen = false;
@@ -161,6 +168,7 @@ public void reStartScan(long currentConglomId, long pconglomId) throws  Standard
 	{
 		if(isAppendable)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3221
             if (SanityManager.DEBUG) {
                 SanityManager.ASSERT(currentConglomId == holder.getTemporaryConglomId(),
                         "currentConglomId(" + currentConglomId + 
@@ -361,6 +369,8 @@ private static int[] justTheRequiredColumnsPositions(int[] columnsArrary) {
 			singleRow.insert(row);
 	    } else {
 	    	singleRow =
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 	    		new TemporaryRowHolderImpl(activation, null,
 						   rs.getResultDescription());
 			singleRow.insert(rs.getCurrentRow());
@@ -458,6 +468,7 @@ else if (numRowsOut++ <= holder.lastArraySlot)
 			return currentRow;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3221
 		if (holder.getTemporaryConglomId() == 0)
 		{
 			return (ExecRow)null;
@@ -470,6 +481,7 @@ else if (numRowsOut++ <= holder.lastArraySlot)
 		{
 			scan = 
                 tc.openScan(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3221
                     holder.getTemporaryConglomId(),
                     false,					// hold
                     0, 		// open read only
@@ -523,6 +535,7 @@ public void deleteCurrentRow()
 			scan.fetchLocation(baseRowLocation);
 			if(heapCC == null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3221
                 heapCC = tc.openConglomerate(holder.getTemporaryConglomId(),
 											  false,
 											  TransactionController.OPENMODE_FORUPDATE,
@@ -543,6 +556,7 @@ private void setupPositionBasedScan(long position) throws StandardException
 	{
 
 		//incase nothing is inserted yet into the temporary row holder
+//IC see: https://issues.apache.org/jira/browse/DERBY-3221
         if (holder.getTemporaryConglomId() == 0)
 			return;
 		if(heapCC == null)
@@ -783,6 +797,8 @@ public boolean	returnsRows()
 	 */
 	public ResultDescription	getResultDescription()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		return resultDescription;
 	}
 
@@ -1193,6 +1209,7 @@ preceeding getNextRowFromRowSource() call.  Column N maps to
 	  not in the partial row if validColumns.get(N) returns false.  Column N is
 	  in the partial row if validColumns.get(N) returns true.  If column N is
 	  in the partial row then it maps to DataValueDescriptor[M] where M is the
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
       count of calls to validColumns.get(i) that return true where i &lt; N.  If
 	  DataValueDescriptor.length is greater than the number of columns 
       indicated by validColumns the extra entries are ignored.  
@@ -1232,6 +1249,7 @@ public boolean needsRowLocation()
 	}
 
     public void setHasDeferrableChecks() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (SanityManager.DEBUG) {
             SanityManager.NOTREACHED();
         }
@@ -1283,6 +1301,7 @@ public void rowLocation(RowLocation rl) throws StandardException
 	{ }
 
     public void offendingRowLocation(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             RowLocation rl, long containdId) throws StandardException {
         if (SanityManager.DEBUG) {
             SanityManager.NOTREACHED();
@@ -1296,6 +1315,7 @@ public void offendingRowLocation(
 	 * result sets for other result set it is a no-op.
 	 */
 	public void positionScanAtRowLocation(RowLocation rl) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		throws StandardException 
 	{
 		// Only used for Scrollable insensitive result sets otherwise no-op
@@ -1333,6 +1353,7 @@ public void addWarning(SQLWarning w) {
     }
 
 	public SQLWarning getWarnings() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 		return null;
 	}
 
@@ -1343,6 +1364,7 @@ public SQLWarning getWarnings() {
 	 * result sets for other result set it is a no-op.
 	 */
 	public void updateRow(ExecRow row, RowChanger rowChanger)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
 			throws StandardException {
 		// Only ResultSets of type Scroll Insensitive implement
 		// detectability, so for other result sets this method
@@ -1367,11 +1389,13 @@ public void markRowAsDeleted() throws StandardException {
 	 * @return activation
 	 */
 	public final Activation getActivation() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 		return holder.activation;
 	}
     
     public Element toXML( Element parentNode, String tag ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6266
         return BasicNoPutResultSetImpl.childrenToXML( BasicNoPutResultSetImpl.toXML( parentNode, tag, this ), this );
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java
index 1fe56a228d..108702cb8f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java
@@ -74,6 +74,7 @@ public class TriggerEventActivator
 		TriggerInfo 				triggerInfo,
 		int							dmlType,
 		Activation					activation,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         Vector<AutoincrementCounter> aiCounters
 	) throws StandardException
 	{
@@ -126,6 +127,7 @@ void reopen() throws StandardException
 								statementText,
 								dmlType,
 								tableId,	
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                                 tableName,
                                 null);
 		setupExecutors(triggerInfo);
@@ -134,6 +136,7 @@ void reopen() throws StandardException
 	private void setupExecutors(TriggerInfo triggerInfo) throws StandardException
 	{
 		executors = new GenericTriggerExecutor[TriggerEvent.MAX_EVENTS][];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<List<TriggerDescriptor>> executorLists =
             new ArrayList<List<TriggerDescriptor>>(TriggerEvent.MAX_EVENTS);
 		for (int i = 0; i < TriggerEvent.MAX_EVENTS; i++)
@@ -149,6 +152,7 @@ private void setupExecutors(TriggerInfo triggerInfo) throws StandardException
 				case TriggerDescriptor.TRIGGER_EVENT_INSERT:
 					if (td.isBeforeTrigger())
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                         executorLists.get(TriggerEvent.BEFORE_INSERT).add(td);
 					}
 					else
@@ -161,6 +165,7 @@ private void setupExecutors(TriggerInfo triggerInfo) throws StandardException
 				case TriggerDescriptor.TRIGGER_EVENT_DELETE:
 					if (td.isBeforeTrigger())
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                         executorLists.get(TriggerEvent.BEFORE_DELETE).add(td);
 					}
 					else
@@ -187,6 +192,7 @@ private void setupExecutors(TriggerInfo triggerInfo) throws StandardException
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (int i = 0; i < executorLists.size(); i++)
 		{
             List<TriggerDescriptor> descriptors = executorLists.get(i);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TriggerInfo.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TriggerInfo.java
index 5d0c6a7d7b..6f43154b08 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TriggerInfo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/TriggerInfo.java
@@ -74,6 +74,7 @@ public TriggerInfo() {}
 	 */
 	public TriggerInfo
 	(
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         TriggerDescriptorList   triggers
 	)
 	{
@@ -86,6 +87,7 @@ public TriggerInfo() {}
 		/*
 		** Copy the trigger descriptors into an array of the right type
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         triggerArray = triggers.toArray(new TriggerDescriptor[triggers.size()]);
 	}
 
@@ -171,6 +173,7 @@ public String toString()
 	{
 		if (SanityManager.DEBUG)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             StringBuilder str = new StringBuilder();
 			str.append("\nTriggers:");
 			for (int i = 0; i < triggerArray.length; i++)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UnionResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UnionResultSet.java
index bc8e1027b2..9adb64885b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UnionResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UnionResultSet.java
@@ -41,6 +41,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * (Any duplicate elimination is performed above this ResultSet.)
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class UnionResultSet extends NoPutResultSetImpl
 	implements CursorResultSet {
 
@@ -88,6 +89,8 @@ public UnionResultSet(NoPutResultSet source1, NoPutResultSet source2,
      * had the same description.
 	 */
 	public ResultDescription getResultDescription() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 	    return source1.getResultDescription();
 	}
 
@@ -102,6 +105,7 @@ public void	openCore() throws StandardException
 	    	SanityManager.ASSERT( ! isOpen, "UnionResultSet already open");
 
         source1.openCore();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4330
         isOpen = true;
 		numOpens++;
 
@@ -115,6 +119,7 @@ public void	openCore() throws StandardException
  	 *	@exception StandardException thrown on failure
 	 */
 	public ExecRow	getNextRowCore() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java
index be9e491b92..5017181c84 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java
@@ -47,6 +47,8 @@ class UniqueIndexSortObserver extends BasicSortObserver
 
     public UniqueIndexSortObserver(
             LanguageConnectionContext lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             UUID constraintId,
             boolean doClone,
             boolean deferrable,
@@ -58,6 +60,8 @@ public UniqueIndexSortObserver(
 	{
         super(doClone, !deferred, execRow, reuseWrappers);
         this.lcc = lcc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         this.constraintId = constraintId;
         this.deferrable = deferrable;
         this.deferred = deferred;
@@ -79,6 +83,9 @@ public DataValueDescriptor[] insertDuplicateKey(
 
     @Override
     public boolean deferred() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         return deferred;
     }
 
@@ -90,9 +97,12 @@ public boolean deferrable() {
     @Override
     public void rememberDuplicate(DataValueDescriptor[] row)
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         deferredDuplicates = DeferredConstraintsMemory.rememberDuplicate(
                 lcc,
                 deferredDuplicates,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                 constraintId,
                 row);
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UniqueWithDuplicateNullsIndexSortObserver.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UniqueWithDuplicateNullsIndexSortObserver.java
index 9cf78cad58..3529379953 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UniqueWithDuplicateNullsIndexSortObserver.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UniqueWithDuplicateNullsIndexSortObserver.java
@@ -49,6 +49,8 @@ public class UniqueWithDuplicateNullsIndexSortObserver extends BasicSortObserver
      * 
      * @param lcc     Language Connection context
      * @param constraintId Id of the constraint (only used for
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                       deferrable constraints)
      * @param doClone If true, then rows that are retained
      * 		by the sorter will be cloned.  This is needed
@@ -62,6 +64,8 @@ public class UniqueWithDuplicateNullsIndexSortObserver extends BasicSortObserver
      */
     public UniqueWithDuplicateNullsIndexSortObserver(
             LanguageConnectionContext lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
             UUID constraintId,
             boolean doClone,
             boolean deferrable,
@@ -72,6 +76,8 @@ public UniqueWithDuplicateNullsIndexSortObserver(
             String  tableName) {
         super(doClone, false, execRow, reuseWrappers);
         this.lcc = lcc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         this.constraintId = constraintId;
         this.deferrable = deferrable;
         this.deferred = deferred;
@@ -105,6 +111,9 @@ public DataValueDescriptor[] insertDuplicateKey(DataValueDescriptor[] in,
 
     @Override
     public boolean deferred() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         return deferred;
     }
 
@@ -116,9 +125,12 @@ public boolean deferrable() {
     @Override
     public void rememberDuplicate(DataValueDescriptor[] row)
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         deferredDuplicates = DeferredConstraintsMemory.rememberDuplicate(
                 lcc,
                 deferredDuplicates,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                 constraintId,
                 row);
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
index 26aac77fce..b29bdd6632 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
@@ -73,6 +73,9 @@ public class UpdateConstantAction extends WriteCursorConstantAction
     private String columnNames[];
 
     String  identitySequenceUUIDString;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 
     /**
      * An array of row location objects (0 based), one for each
@@ -122,7 +125,11 @@ public class UpdateConstantAction extends WriteCursorConstantAction
 	 *  @param identitySequenceUUIDString   For 10.11 and higher, the handle on the sequence for the identity column
 	 */
     UpdateConstantAction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 TableDescriptor     targetTableDesc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
                                 StaticCompiledOpenConglomInfo heapSCOCI,
                                 IndexRowGenerator[]	irgs,
                                 long[]				indexCIDS,
@@ -168,8 +175,12 @@ public class UpdateConstantAction extends WriteCursorConstantAction
 		this.changedColumnIds = changedColumnIds;
 		this.positionedUpdate = positionedUpdate;
 		this.numColumns = numColumns;
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         this.schemaName = targetTableDesc.getSchemaName();
         this.tableName = targetTableDesc.getName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
         this.columnNames = targetTableDesc.getColumnNamesArray();
         this.autoincIncrement = targetTableDesc.getAutoincIncrementArray();
         this.identitySequenceUUIDString = identitySequenceUUIDString;
@@ -211,6 +222,9 @@ public void readExternal( ObjectInput in )
 		changedColumnIds = ArrayUtil.readIntArray(in);
 		positionedUpdate = in.readBoolean();
 		numColumns = in.readInt();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 		autoincIncrement = ArrayUtil.readLongArray(in);
 		identitySequenceUUIDString = (String) in.readObject();
 	}
@@ -227,6 +241,9 @@ public void writeExternal( ObjectOutput out )
 		ArrayUtil.writeIntArray(out,changedColumnIds);
 		out.writeBoolean(positionedUpdate);
 		out.writeInt(numColumns);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 		ArrayUtil.writeLongArray(out, autoincIncrement);
 		out.writeObject( identitySequenceUUIDString );
 	}
@@ -240,6 +257,7 @@ public void writeExternal( ObjectOutput out )
 
 	// CLASS METHODS
     public String getSchemaName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         return schemaName;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
index c59283df85..8d20373c32 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
@@ -64,12 +64,16 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * compiled into the update plan.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 class UpdateResultSet extends DMLWriteGeneratedColumnsResultSet
 {
 	private TransactionController 	tc;
 	private ExecRow					newBaseRow;
 	private ExecRow 					row;
 	private ExecRow 					deferredSparseRow;
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	UpdateConstantAction		constants;
 	
 	NoPutResultSet			savedSource;
@@ -121,6 +125,7 @@ class UpdateResultSet extends DMLWriteGeneratedColumnsResultSet
      * @param activation The activation
 	 * @exception StandardException thrown on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     UpdateResultSet(NoPutResultSet source,
 						   GeneratedMethod generationClauses,
 						   GeneratedMethod checkGM,
@@ -143,6 +148,7 @@ class UpdateResultSet extends DMLWriteGeneratedColumnsResultSet
 	 * @param rsdItem  id of the Result Description saved object
 	 * @exception StandardException thrown on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     UpdateResultSet(NoPutResultSet source,
 						   GeneratedMethod generationClauses,
 						   GeneratedMethod checkGM,
@@ -173,6 +179,7 @@ class UpdateResultSet extends DMLWriteGeneratedColumnsResultSet
      * @param passedInRsd
 	 * @exception StandardException thrown on error
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     UpdateResultSet(NoPutResultSet source,
 						   GeneratedMethod generationClauses,
 						   GeneratedMethod checkGM,
@@ -185,11 +192,15 @@ class UpdateResultSet extends DMLWriteGeneratedColumnsResultSet
 
 		// Get the current transaction controller
         tc = activation.getTransactionController();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
         this.sourceResultSet = source;
         this.generationClauses = generationClauses;
 		this.checkGM = checkGM;
 
 		constants = (UpdateConstantAction) constantAction;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 		fkInfoArray = constants.getFKInfo();
 		triggerInfo = constants.getTriggerInfo();
 
@@ -197,6 +208,8 @@ class UpdateResultSet extends DMLWriteGeneratedColumnsResultSet
 
 		baseRowReadList = constants.getBaseRowReadList();
 		if(passedInRsd ==null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 			resultDescription = source.getResultDescription();
 		else
 			resultDescription = passedInRsd;
@@ -217,6 +230,7 @@ class UpdateResultSet extends DMLWriteGeneratedColumnsResultSet
 
 		if (fkInfoArray != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
             for (FKInfo fkInfo : fkInfoArray) {
                 if (fkInfo.type == FKInfo.REFERENCED_KEY) {
                     updatingReferencedKey = true;
@@ -257,6 +271,9 @@ class UpdateResultSet extends DMLWriteGeneratedColumnsResultSet
 			beforeUpdateCopyRequired = true;
 		}
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
         identitySequenceUUIDString = constants.identitySequenceUUIDString;
         initializeAIcache(constants.getAutoincRowLocation());
 	}
@@ -268,6 +285,8 @@ public void open() throws StandardException
 	{
 
 		setup();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
 		autoincrementGenerated = false;
 		collectAffectedRows();
 
@@ -279,6 +298,7 @@ public void open() throws StandardException
 		if (deferred)
 		{
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
             runChecker(true); // check for only RESTRICT referential
                                     // action rule violations
 			fireBeforeTriggers();
@@ -294,6 +314,9 @@ public void open() throws StandardException
 		rowChanger.finish();
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 		saveAIcacheInformation(constants.getSchemaName(), 
 			constants.getTableName(), constants.getColumnNames());
 		cleanUp();
@@ -307,18 +330,23 @@ public void open() throws StandardException
 	void setup() throws StandardException
 	{
 		super.setup();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
 
 		/* decode lock mode */
 		lockMode = decodeLockMode(constants.lockMode);
 
 		boolean firstOpen = (rowChanger == null);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 		rowCount = 0L;
 		
 		/* Cache query plan text for source, before it gets blown away */
 		if (lcc.getRunTimeStatisticsMode())
 		{
 			/* savedSource nulled after run time statistics generation */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 			savedSource = sourceResultSet;
 		}
 
@@ -345,6 +373,8 @@ void setup() throws StandardException
 		}
 
 		verifyAutoGeneratedRScolumnsList(constants.targetUUID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
 
 		/* Open the RowChanger before the source ResultSet so that
 		 * the store will see the RowChanger's lock as a covering lock
@@ -354,6 +384,9 @@ void setup() throws StandardException
 
 		if (numOpens++ == 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 			sourceResultSet.openCore();
 		}
 		else
@@ -376,6 +409,7 @@ void setup() throws StandardException
 		{
 			if (riChecker == null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 riChecker = new RISetChecker(lcc, tc, fkInfoArray);
 			}
 			else
@@ -393,6 +427,8 @@ void setup() throws StandardException
 			{
 				deferredTempRow = RowUtil.getEmptyValueRow(numberOfBaseColumns+1, lcc);
 				oldDeletedRow = RowUtil.getEmptyValueRow(numberOfBaseColumns, lcc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 				triggerResultDescription = (resultDescription != null) ?
 									resultDescription.truncateColumns(numberOfBaseColumns+1) :
 									null;
@@ -403,7 +439,10 @@ void setup() throws StandardException
 			// Get the properties on the heap
 			rowChanger.getHeapConglomerateController().getInternalTablePropertySet(properties);
 			if(beforeUpdateCopyRequired){
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 				deletedRowHolder =
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 					new TemporaryRowHolderImpl(activation, properties,
 											   triggerResultDescription);
 			}
@@ -414,6 +453,8 @@ void setup() throws StandardException
 			rowChanger.setRowHolder(insertedRowHolder);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
 		firstExecuteSpecialHandlingAutoGen(firstOpen, rowChanger, constants.targetUUID);
 	}	
 
@@ -459,6 +500,7 @@ private void objectifyStream(ExecRow tempRow, FormatableBitSet streamCols) throw
     private boolean evaluateCheckConstraints() throws StandardException     {
         boolean result = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (checkGM != null) {
             // Evaluate the check constraints. If all check constraint modes are
             // immediate, a check error will throw rather than return a false
@@ -477,6 +519,9 @@ public boolean collectAffectedRows() throws StandardException
 
 		boolean rowsFound = false;
 		row = getNextRowCore(sourceResultSet);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 
 		if (row!=null)
 			rowsFound = true;
@@ -497,6 +542,9 @@ public boolean collectAffectedRows() throws StandardException
         while ( row != null )
         {
             evaluateGenerationClauses( generationClauses, activation, sourceResultSet, row, true );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 
 			/* By convention, the last column in the result set for an
 			 * update contains a SQLRef containing the RowLocation of
@@ -522,6 +570,7 @@ public boolean collectAffectedRows() throws StandardException
 				if (triggerInfo == null)
 				{
                     boolean allOk = evaluateCheckConstraints();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     if (!allOk) {
                         DataValueDescriptor[] rw = row.getRowArray();
                         SQLRef r = (SQLRef)rw[rw.length - 1];
@@ -604,6 +653,7 @@ public boolean collectAffectedRows() throws StandardException
 				RowLocation baseRowLocation = (RowLocation)
 					(row.getColumn(resultWidth)).getObject();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 if (!allOk) {
                     deferredChecks =
                         DeferredConstraintsMemory.rememberCheckViolations(
@@ -632,11 +682,16 @@ public boolean collectAffectedRows() throws StandardException
 					** a referenced key, we'll be updating in deferred
 					** mode, so we wont get here.
 					*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     riChecker.doFKCheck(activation, newBaseRow);
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 				sourceResultSet.updateRow(newBaseRow, rowChanger);
 				rowChanger.updateRow(row,newBaseRow,baseRowLocation);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1421
 
 				//beetle 3865, update cursor use index.
 				if (notifyCursor)
@@ -653,10 +708,15 @@ public boolean collectAffectedRows() throws StandardException
 			}
 			else
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 				row = getNextRowCore(sourceResultSet);
 			}
 		}
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
         if(rowCount==1 && constants.hasAutoincrement()) 
 			lcc.setIdentityValue(identityVal);
 
@@ -668,6 +728,7 @@ protected ExecRow getNextRowCore( NoPutResultSet source )
 		throws StandardException
 	{
         ExecRow nextRow = super.getNextRowCore( source );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
 
         if ( (nextRow != null) && constants.underMerge() ) {
             nextRow = processMergeRow( source, nextRow );
@@ -778,6 +839,7 @@ else if (key.equals(newBaseRow[k], key).equals(true))
 			{
                 double rowCnt = tableScan.getEstimatedRowCount();
 				int initCapacity = 32 * 1024;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                 if (rowCnt > 0.0)
 				{
                     rowCnt = rowCnt / 0.75 + 1.0;   // load factor
@@ -813,6 +875,9 @@ void fireBeforeTriggers() throws StandardException
 		{
 			if (triggerInfo != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 				Vector<AutoincrementCounter> v = null;
 				if (aiCache != null)
 				{
@@ -885,6 +950,7 @@ void updateDeferredRows() throws StandardException
 			deferredBaseCC = 
                 tc.openCompiledConglomerate(
                     false,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                     (TransactionController.OPENMODE_SECONDARY_LOCKED |
                      TransactionController.OPENMODE_FORUPDATE),
                     lockMode,
@@ -916,7 +982,11 @@ void updateDeferredRows() throws StandardException
 
 					if (triggerInfo != null)
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 						sourceResultSet.setCurrentRow(deferredTempRow);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                         allOk = evaluateCheckConstraints();
 					}
 
@@ -928,15 +998,25 @@ void updateDeferredRows() throws StandardException
 					RowLocation baseRowLocation = 
 							(RowLocation) (rlColumn).getObject();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     if (!allOk) {
                         deferredChecks =
                             DeferredConstraintsMemory.rememberCheckViolations(
                                 lcc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                                 constants.targetUUID,
                                 constants.getSchemaName(),
                                 constants.getTableName(),
                                 deferredChecks,
                                 violatingCheckConstraints,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                                 baseRowLocation,
                                 new CheckInfo[1]);
                     }
@@ -967,6 +1047,9 @@ void updateDeferredRows() throws StandardException
 				}
 			} finally
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 				sourceResultSet.clearCurrentRow();
 				rs.close();
 			}
@@ -975,6 +1058,7 @@ void updateDeferredRows() throws StandardException
 
 
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
     void runChecker(boolean restrictCheckOnly)
             throws StandardException
 	{
@@ -1020,6 +1104,7 @@ void runChecker(boolean restrictCheckOnly)
                             // call to postChecks does the actual checking, and
                             // we need at least one row intact to fulfill the
                             // constraint.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                            riChecker.doRICheck(
                                     activation,
                                     i,
@@ -1029,6 +1114,7 @@ void runChecker(boolean restrictCheckOnly)
 						}
 					}	
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                     if (restrictCheckOnly) {
                         riChecker.postCheck(i);
                     }
@@ -1074,6 +1160,7 @@ void runChecker(boolean restrictCheckOnly)
 										deletedRowHolder))
 						{
                             riChecker.doRICheck(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                                 activation,
                                 i,
                                 insertedRow,
@@ -1155,6 +1242,9 @@ public void	cleanUp() throws StandardException
 		numOpens = 0;
 
 		/* Close down the source ResultSet tree */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 		if (sourceResultSet != null)
 		{
 			sourceResultSet.close();
@@ -1198,6 +1288,7 @@ public void	cleanUp() throws StandardException
     @Override
     public void close() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
         super.close( constants.underMerge() );
     }
                                
@@ -1208,6 +1299,7 @@ void rowChangerFinish() throws StandardException
 
     @Override
     public void rememberConstraint(UUID cid) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (violatingCheckConstraints == null) {
             violatingCheckConstraints = new ArrayList<UUID>();
         }
@@ -1226,9 +1318,14 @@ public void rememberConstraint(UUID cid) throws StandardException {
      * @exception StandardException if anything goes wrong.
      */
     public NumberDataValue
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
     	getSetAutoincrementValue(int columnPosition, long increment)
     	throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
         autoincrementGenerated = true;
         int index = columnPosition - 1;	// all our indices are 0 based.
         NumberDataValue newValue;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java
index 75d51f8bdf..ae8d2687ae 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java
@@ -45,6 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Update the rows from the source into the specified
  * base table.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class UpdateVTIResultSet extends DMLVTIResultSet
 {
 	private java.sql.ResultSet		rs;
@@ -73,6 +74,7 @@ protected void openCore() throws StandardException
         
         rs = activation.getTargetVTI();
 		ExecRow row = getNextRowCore(sourceResultSet);
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
         if( null != row)
             rowLocationColumn = row.nColumns();
@@ -95,7 +97,10 @@ protected void openCore() throws StandardException
 			/*
 			** If deferred we save a copy of the entire row.
 			*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-1112
 			rowHolder =
+//IC see: https://issues.apache.org/jira/browse/DERBY-4610
+//IC see: https://issues.apache.org/jira/browse/DERBY-3049
 				new TemporaryRowHolderImpl(activation, properties,
 										   resultDescription);
 		}
@@ -121,6 +126,7 @@ protected void openCore() throws StandardException
                     rowHolder.insert(row);
                 }
                 else
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
                     updateVTI(rs, row);
                 rowCount++;
 
@@ -154,6 +160,7 @@ protected void openCore() throws StandardException
 			try
 			{
 				tempRS.open();
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 				while ((row = tempRS.getNextRow()) != null)
 				{
                     int rowNumber = row.getColumn( rowLocationColumn).getInt();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UserDefinedAggregator.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UserDefinedAggregator.java
index 8bc3795199..6e5512da37 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UserDefinedAggregator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/UserDefinedAggregator.java
@@ -95,6 +95,7 @@ private void    setup( Class<?> udaClass, DataTypeDescriptor resultType )
         String  aggregateName = udaClass.getName();
         
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             _aggregator = (Aggregator) udaClass.getConstructor().newInstance();
             _aggregator.init();
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/VTIResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/VTIResultSet.java
index c67082901e..68ec0fd5b3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/VTIResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/VTIResultSet.java
@@ -68,6 +68,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
 class VTIResultSet extends NoPutResultSetImpl
 	implements CursorResultSet, VTIEnvironment {
 
@@ -106,6 +107,7 @@ class VTIResultSet extends NoPutResultSetImpl
 
 	/**
 		Specified isolation level of SELECT (scan). If not set or
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 		not application, it will be set to TransactionControl.UNSPECIFIED_ISOLATION_LEVEL
 	*/
 	private int scanIsolationLevel = TransactionControl.UNSPECIFIED_ISOLATION_LEVEL;
@@ -113,6 +115,7 @@ Specified isolation level of SELECT (scan). If not set or
     //
     // class interface
     //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
     VTIResultSet(Activation activation, int row, int resultSetNumber,
 				 GeneratedMethod constructor,
 				 String javaClassName,
@@ -128,6 +131,7 @@ Specified isolation level of SELECT (scan). If not set or
                  int returnTypeNumber,
                  int vtiProjectionNumber,
                  int vtiRestrictionNumber,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
                  String vtiSchema,
                  String vtiName
                  ) 
@@ -143,14 +147,17 @@ Specified isolation level of SELECT (scan). If not set or
 		this.pushedQualifiers = pushedQualifiers;
 		this.scanIsolationLevel = scanIsolationLevel;
 		this.isDerbyStyleTableFunction = isDerbyStyleTableFunction;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
         this.vtiSchema = vtiSchema;
         this.vtiName = vtiName;
 
         ExecPreparedStatement ps = activation.getPreparedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
         this.allocatedRow = ((ExecRowBuilder) ps.getSavedObject(row))
                 .build(activation.getExecutionFactory());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3616
         this.returnType = returnTypeNumber == -1 ? null :
             (TypeDescriptor)
             activation.getPreparedStatement().getSavedObject(returnTypeNumber);
@@ -257,6 +264,7 @@ public void	openCore() throws StandardException
                     restrictedVTI.initScan( vtiProjection, cloneRestriction( activation ) );
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
                 if ( userVTI instanceof AwareVTI )
                 {
                     AwareVTI awareVTI = (AwareVTI) userVTI;
@@ -424,6 +432,7 @@ public void reopenCore() throws StandardException
      */
 	public ExecRow	getNextRowCore() throws StandardException 
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
@@ -461,6 +470,7 @@ else if (action == IFastPath.NEED_RS) {
                         populateFromResultSet(result);
                         if (fastPath != null)
                         { fastPath.currentRow(userVTI, result.getRowArray()); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6151
 
                         SQLWarning  warnings = userVTI.getWarnings();
                         if ( warnings != null ) { addWarning( warnings ); }
@@ -731,6 +741,7 @@ public final String getOriginalSQL() {
 	}
 
 	public final int getStatementIsolationLevel() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 		return TransactionControl.jdbcIsolationLevel( getScanIsolationLevel() );
 	}
 
@@ -764,6 +775,7 @@ private DataTypeDescriptor[]    getReturnColumnTypes()
     {
         if ( returnColumnTypes == null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3616
             TypeDescriptor[] columnTypes = returnType.getRowTypes();
             int                         count = columnTypes.length;
 
@@ -792,6 +804,7 @@ private void    cast( DataTypeDescriptor dtd, DataValueDescriptor dvd )
         {
             if ( typeID.isLongVarcharTypeId() ) { castLongvarchar( dtd, dvd ); }
             else if ( typeID.isLongVarbinaryTypeId() ) { castLongvarbinary( dtd, dvd ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3536
             else if ( typeID.isDecimalTypeId() ) { castDecimal( dtd, dvd ); }
             else
             {
@@ -853,6 +866,7 @@ private void    castLongvarbinary( DataTypeDescriptor dtd, DataValueDescriptor d
      * </p>
      */
     private void    castDecimal( DataTypeDescriptor dtd, DataValueDescriptor dvd )
+//IC see: https://issues.apache.org/jira/browse/DERBY-3536
         throws StandardException
     {
         VariableSizeDataValue   vsdv = (VariableSizeDataValue) dvd;
@@ -862,6 +876,7 @@ private void    castDecimal( DataTypeDescriptor dtd, DataValueDescriptor dvd )
     
     public Element toXML( Element parentNode, String tag ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         Element myNode = super.toXML( parentNode, tag );
         myNode.setAttribute( "javaClassName", javaClassName );
         
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ValidateCheckConstraintResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ValidateCheckConstraintResultSet.java
index d2b0aa251d..a7a0dcf12e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ValidateCheckConstraintResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ValidateCheckConstraintResultSet.java
@@ -96,6 +96,7 @@ final class ValidateCheckConstraintResultSet extends TableScanResultSet
 
     @Override
     boolean loopControl(boolean moreRows) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6674
          try {
              scanController.fetch(candidate.getRowArray());
          } catch (StandardException e) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ValueRow.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ValueRow.java
index 6bc17952a3..32764e3e1f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ValueRow.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/ValueRow.java
@@ -119,6 +119,7 @@ public ExecRow getClone(FormatableBitSet clonedCols)
 			if (clonedCols != null && !(clonedCols.get(colCtr + 1)))
 			{
 				/* Rows are 1-based, column[] is 0-based */
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
                 rowClone.setColumn(colCtr + 1, column[colCtr]);
 				continue;
 			}
@@ -126,6 +127,7 @@ public ExecRow getClone(FormatableBitSet clonedCols)
 			if (column[colCtr] != null)
 			{
 				/* Rows are 1-based, column[] is 0-based */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
                 rowClone.setColumn(colCtr +1, column[colCtr].cloneValue(false));
 			}
 		}
@@ -144,6 +146,7 @@ public ExecRow getNewNullRow()
 			if (column[colCtr] != null)
 			{
 				/* Rows are 1-based, column[] is 0-based */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
                 rowClone.setColumn(colCtr + 1, column[colCtr].getNewNull());
 			}
 		}
@@ -168,6 +171,7 @@ public void resetRowArray() {
 	// position is 1-based
 	public final DataValueDescriptor cloneColumn(int columnPosition)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
         return column[columnPosition -1].cloneValue(false);
 	}
 
@@ -215,6 +219,7 @@ public DataValueDescriptor[] getRowArrayClone()
 		{
 			if (column[colCtr] != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
                 columnClones[colCtr] = column[colCtr].cloneValue(false);
 			}
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/WindowResultSet.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/WindowResultSet.java
index 13f87c82b4..3f05d2e63a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/WindowResultSet.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/WindowResultSet.java
@@ -87,6 +87,7 @@ class WindowResultSet extends NoPutResultSetImpl
         GeneratedMethod        restriction,
         double                 optimizerEstimatedRowCount,
         double                 optimizerEstimatedCost)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
       throws StandardException
     {
 
@@ -107,6 +108,7 @@ class WindowResultSet extends NoPutResultSetImpl
         this.rownumber = 0;
 
         ExecPreparedStatement ps = activation.getPreparedStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
 
         this.allocatedRow = ((ExecRowBuilder) ps.getSavedObject(rowAllocator))
                 .build(activation.getExecutionFactory());
@@ -175,6 +177,7 @@ public void reopenCore() throws StandardException {
      */
     public ExecRow getNextRowCore() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 		if( isXplainOnlyMode() )
 			return null;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
index a56dcb01cf..cd2edaa61c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
@@ -177,6 +177,7 @@ public	WriteCursorConstantAction(
 	  *	@return	the list of foreign keys to enforce for this action
 	  *
 	  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 	final FKInfo[] getFKInfo()
 	{
 		return fkInfo;
@@ -188,6 +189,7 @@ final FKInfo[] getFKInfo()
 	 * @return	the triggers that should be fired
 	 *
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 	TriggerInfo getTriggerInfo()
 	{
 		return triggerInfo;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java
index 7e3e151fe7..d59f5769c9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java
@@ -154,6 +154,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
     return children;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
index 030b18ec46..838492edda 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
@@ -131,6 +131,7 @@ protected final String dumpEstimatedCosts(String subIndent)
 	{
 		return	subIndent +
             MessageService.getTextMessage(SQLState.RTS_OPT_EST_RC,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 optimizerEstimatedRowCount) + "\n" +
 				subIndent +
             MessageService.getTextMessage(SQLState.RTS_OPT_EST_COST,
@@ -145,6 +146,7 @@ protected final String dumpEstimatedCosts(String subIndent)
 	 * @return java.util.Vector	A vector of objects.
 	 */
   public Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     return new Vector<ResultSetStatistics>();
   }
 	/**
@@ -165,6 +167,7 @@ public long getTotalTime(){
 	 */
   public long getChildrenTime(){
     long childrenTime = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-73
     java.util.Enumeration e = getChildren().elements();
     while (e.hasMoreElements()){
       childrenTime = childrenTime + ((RealBasicNoPutResultSetStatistics)e.nextElement()).getTotalTime();
@@ -218,6 +221,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                              // the number of index updates 
            null,                           // lock mode
@@ -243,6 +247,7 @@ public Object getResultSetTimingsDescriptor(Object timingID)
     {
         return new XPLAINResultSetTimingsDescriptor(
            (UUID)timingID,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.constructorTime,
            this.openTime,
            this.nextTime,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java
index 0cd70715e8..56872aef02 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java
@@ -56,6 +56,7 @@ public	RealDeleteCascadeResultSetStatistics(
 								)
 	{
 		super(rowCount, deferred, indexesUpdated, tableLock, executeTime, sourceResultSetStatistics);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.dependentTrackingArray = ArrayUtil.copy(dependentTrackingArray);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java
index de6c2fdbe8..9c36fe486d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java
@@ -162,6 +162,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            getRSXplainType(),
            getRSXplainDetails(),
            null,                              // the number of opens
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.indexesUpdated,
            null,                           // lock mode
            this.tableLock?"T":"R",
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java
index bd562c1f86..a7c22e448c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java
@@ -150,6 +150,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)parentID,
            null,                             // estimated row count
            null,                             // estimated cost
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.rowCount,
            null,                              // the deferred rows.
            null,                              // the input rows
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java
index d2fdfa43e0..3041d3f1f1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java
@@ -125,6 +125,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
     return children;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
index 34cf1d8791..2fb92f848d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
@@ -125,6 +125,7 @@ public String getStatementExecutionPlanText(int depth)
 			  indent + MessageService.getTextMessage(
 				SQLState.RTS_DISTINCT_SCAN_RS_USING,
 				tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
 				isConstraint ? "constraint" : "index",
 				indexName);
 		}
@@ -195,6 +196,8 @@ public String getStatementExecutionPlanText(int depth)
 			scanInfo +
 			subIndent + MessageService.getTextMessage(
 												SQLState.RTS_START_POSITION) +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 			":\n" + StringUtil.ensureIndent(startPosition, depth + 2) + "\n" +
 			subIndent + MessageService.getTextMessage(
 												SQLState.RTS_STOP_POSITION) +
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java
index 8842658ad4..f7451d7c10 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java
@@ -164,6 +164,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
     return children;
@@ -205,6 +206,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                              // the number of index updates 
            null,                           // lock mode
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java
index 94fd25e114..83ab2186dd 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java
@@ -57,6 +57,7 @@ public	RealHashJoinStatistics(
 								boolean oneRowRightSide,
 								double optimizerEstimatedRowCount,
 								double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 								String userSuppliedOptimizerOverrides,
 								ResultSetStatistics leftResultSetStatistics,
 								ResultSetStatistics rightResultSetStatistics
@@ -78,6 +79,7 @@ public	RealHashJoinStatistics(
 			oneRowRightSide,
 			optimizerEstimatedRowCount,
 			optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 			userSuppliedOptimizerOverrides,
 			leftResultSetStatistics,
 			rightResultSetStatistics
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java
index fb435ce4dc..45dc565fae 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java
@@ -62,6 +62,7 @@ public	RealHashLeftOuterJoinStatistics(
 								long restrictionTime,
 								double optimizerEstimatedRowCount,
 								double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 								String userSuppliedOptimizerOverrides,
 								ResultSetStatistics leftResultSetStatistics,
 								ResultSetStatistics rightResultSetStatistics,
@@ -83,6 +84,7 @@ public	RealHashLeftOuterJoinStatistics(
 			restrictionTime,
 			optimizerEstimatedRowCount,
 			optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 			userSuppliedOptimizerOverrides,
 			leftResultSetStatistics,
 			rightResultSetStatistics,
@@ -116,6 +118,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                           // index updates
            null,                           // lock mode
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
index b4c45f8180..f18de18d67 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
@@ -117,6 +117,7 @@ public	RealHashScanStatistics(
 		this.indexName = indexName;
 		this.isConstraint = isConstraint;
 		this.hashtableSize = hashtableSize;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6201
 		this.hashKeyColumns = ArrayUtil.copy( hashKeyColumns );
 		this.scanQualifiers = scanQualifiers;
 		this.nextQualifiers = nextQualifiers;
@@ -160,6 +161,7 @@ public String getStatementExecutionPlanText(int depth)
 					MessageService.getTextMessage(
 										SQLState.RTS_HASH_SCAN_RS_USING,
 										tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
                                         isConstraint ? "constraint" : "index",
 										indexName);
 		}
@@ -226,6 +228,7 @@ public String getStatementExecutionPlanText(int depth)
 					"") + "\n" +
 			scanInfo +
 			subIndent + MessageService.getTextMessage(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 				SQLState.RTS_START_POSITION) +
 			":\n" + StringUtil.ensureIndent(startPosition, depth + 2) + "\n" +
 			subIndent + MessageService.getTextMessage(
@@ -351,6 +354,7 @@ public Object getScanPropsDescriptor(Object scanPropsID)
               this.scanQualifiers,
               this.nextQualifiers,
               hashkey_columns,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
               this.hashtableSize
             );
         
@@ -368,6 +372,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,            // the number of opens
            null,                           // the number of index updates 
            lockMode,                       // lock mode
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java
index 076d837d1d..407217f0e7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java
@@ -99,6 +99,7 @@ public	RealHashTableStatistics(
 			optimizerEstimatedCost
 			);
 		this.hashtableSize = hashtableSize;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6201
 		this.hashKeyColumns = ArrayUtil.copy( hashKeyColumns );
 		this.nextQualifiers = nextQualifiers;
 		this.scanProperties = new FormatableProperties();
@@ -110,6 +111,7 @@ public	RealHashTableStatistics(
 				this.scanProperties.put(key, scanProperties.get(key));
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.subqueryTrackingArray = ArrayUtil.copy(subqueryTrackingArray);
 		this.childResultSetStatistics = childResultSetStatistics;
 	}
@@ -329,6 +331,7 @@ public Object getScanPropsDescriptor(Object scanPropsID)
               null,                          // the scan qualifiers
               this.nextQualifiers,     // the next qualifiers
               hashkey_columns,               // the hash key column numbers
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
               this.hashtableSize // the hash table size
             );
         
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java
index 955ca0c01d..de3c8ccc67 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java
@@ -154,6 +154,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
     return children;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java
index 7bbe90c970..631919d68d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java
@@ -208,6 +208,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            getRSXplainType(),
            getRSXplainDetails(),
            null,                              // the number of opens
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.indexesUpdated,
            null,                           // lock mode
            this.tableLock?"T":"R",
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java
index ce3ecc9978..fcab1c4192 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java
@@ -165,6 +165,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)parentID,
            null,                             // estimated row count
            null,                             // estimated cost
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.rowCount,
            XPLAINUtil.getYesNoCharFromBoolean(this.deferred),
            null,                              // the input rows
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java
index 573f064b3e..636c6ff5c9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java
@@ -75,6 +75,7 @@ public	RealJoinResultSetStatistics(
 										long restrictionTime,
 										double optimizerEstimatedRowCount,
 										double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 										String userSuppliedOptimizerOverrides
 										)
 	{
@@ -94,6 +95,7 @@ public	RealJoinResultSetStatistics(
 		this.rowsSeenRight = rowsSeenRight;
 		this.rowsReturned = rowsReturned;
 		this.restrictionTime = restrictionTime;
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		this.userSuppliedOptimizerOverrides = userSuppliedOptimizerOverrides;	
 	}
 
@@ -113,6 +115,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                           // index updates
            null,                           // lock mode
@@ -138,6 +141,7 @@ public Object getResultSetTimingsDescriptor(Object timingID)
     {
         return new XPLAINResultSetTimingsDescriptor(
            (UUID)timingID,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.constructorTime,
            this.openTime,
            this.nextTime,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java
index 6d228ed999..a30799fb34 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java
@@ -253,6 +253,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                           // the number of index updates 
            lockMode,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java
index f26035a804..78834a85c2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java
@@ -149,6 +149,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
     return children;
@@ -187,6 +188,7 @@ public Object getResultSetTimingsDescriptor(Object timingID)
     {
         return new XPLAINResultSetTimingsDescriptor(
            (UUID)timingID,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.constructorTime,
            this.openTime,
            this.nextTime,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java
index e420b8ae8f..dcc114a48a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java
@@ -77,6 +77,7 @@ public	RealNestedLoopJoinStatistics(
 								boolean oneRowRightSide,
 								double optimizerEstimatedRowCount,
 								double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 								String userSuppliedOptimizerOverrides,
 								ResultSetStatistics leftResultSetStatistics,
 								ResultSetStatistics rightResultSetStatistics
@@ -96,6 +97,7 @@ public	RealNestedLoopJoinStatistics(
 			rowsReturned,
 			restrictionTime,
 			optimizerEstimatedRowCount,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 			optimizerEstimatedCost,
 			userSuppliedOptimizerOverrides
 			);
@@ -119,6 +121,7 @@ public String getStatementExecutionPlanText(int depth)
 	{
 		initFormatInfo(depth);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		String header = "";
 		if (userSuppliedOptimizerOverrides != null)
 		{ 
@@ -185,6 +188,7 @@ public String toString()
 
 	public java.util.Vector<ResultSetStatistics> getChildren()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
 	    children.addElement(leftResultSetStatistics);
 		children.addElement(rightResultSetStatistics);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java
index e099237661..81dff90a8b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java
@@ -71,6 +71,7 @@ public	RealNestedLoopLeftOuterJoinStatistics(
 								long restrictionTime,
 								double optimizerEstimatedRowCount,
 								double optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 								String userSuppliedOptimizerOverrides,
 								ResultSetStatistics leftResultSetStatistics,
 								ResultSetStatistics rightResultSetStatistics,
@@ -93,6 +94,7 @@ public	RealNestedLoopLeftOuterJoinStatistics(
 			false,		// We never do an EXISTS join for an outer join
 			optimizerEstimatedRowCount,
 			optimizerEstimatedCost,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 			userSuppliedOptimizerOverrides,
 			leftResultSetStatistics,
 			rightResultSetStatistics
@@ -194,6 +196,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                           // index updates
            null,                           // lock mode
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java
index 696ddf9bb3..e205cf5fd3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java
@@ -119,6 +119,7 @@ protected String dumpTimeStats(String indent)
 	 * @return java.util.Vector	A vector of objects.
 	 */
   public Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     Vector<ResultSetStatistics> children = new Vector<ResultSetStatistics>();
     children.addElement(sourceResultSetStatistics);
     return children;
@@ -178,6 +179,7 @@ public Object getResultSetTimingsDescriptor(Object timingID)
            null,                                   // the open time
            null,                                   // the next time
            null,                                   // the close time
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.executeTime,             // the execute time
            null,                                   // the avg next time/row
            null,                                   // the projection time
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java
index 265e6d5840..71f410188f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java
@@ -134,6 +134,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
     return children;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java
index b8d2b1b1d9..18215e74a1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java
@@ -152,6 +152,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
     return children;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java
index d555d2908d..cfc69d9a4e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java
@@ -97,6 +97,7 @@ public	RealProjectRestrictStatistics(
 		this.doesProjection = doesProjection;
 		this.restrictionTime = restrictionTime;
 		this.projectionTime = projectionTime;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.subqueryTrackingArray = ArrayUtil.copy(subqueryTrackingArray);
 		this.childResultSetStatistics = childResultSetStatistics;
 	}
@@ -229,6 +230,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
 
@@ -318,6 +320,7 @@ public Object getResultSetTimingsDescriptor(Object timingID)
     {
         return new XPLAINResultSetTimingsDescriptor(
            (UUID)timingID,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.constructorTime,
            this.openTime,
            this.nextTime,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealRowCountStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealRowCountStatistics.java
index 17159392f6..7b3bd6ead6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealRowCountStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealRowCountStatistics.java
@@ -130,6 +130,7 @@ public String toString() {
      * @see RealBasicNoPutResultSetStatistics#getChildren
      */
     public Vector<ResultSetStatistics> getChildren() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Vector<ResultSetStatistics> children = new Vector<ResultSetStatistics>();
         children.addElement(childResultSetStatistics);
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java
index 2d22a8a51a..c4093bc8b7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java
@@ -163,6 +163,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                              // the number of index updates 
            null,                           // lock mode
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java
index 2987ee1340..57f0c4c8a1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java
@@ -146,6 +146,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
     return children;
@@ -186,6 +187,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                              // the number of index updates 
            null,                           // lock mode
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java
index 428d37f431..b3178aa8d8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java
@@ -146,6 +146,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
     return children;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java
index 65ac8306a6..7dab108f31 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealSetOpResultSetStatistics.java
@@ -127,6 +127,7 @@ public String getStatementExecutionPlanText(int depth) {
         initFormatInfo(depth);
 
         String rs = (opType == IntersectOrExceptNode.INTERSECT_OP) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
                 ? "INTERSECT ResultSet" : "EXCEPT ResultSet";
          
         return
@@ -193,6 +194,7 @@ public String toString() {
      *         
      */
     public java.util.Vector<ResultSetStatistics> getChildren() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
         children.addElement(leftResultSetStatistics);
         children.addElement(rightResultSetStatistics);
@@ -207,6 +209,7 @@ public java.util.Vector<ResultSetStatistics> getChildren() {
     public String getNodeName() {
         String nodeName = 
             (opType == IntersectOrExceptNode.INTERSECT_OP) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
                 ? "INTERSECT" : "EXCEPT";
 		
         return MessageService.getTextMessage(nodeName);
@@ -253,6 +256,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                              // the number of index updates 
            null,                           // lock mode
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java
index 096d8378d0..b4b652ff91 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java
@@ -177,6 +177,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(childResultSetStatistics);
     return children;
@@ -217,6 +218,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                              // the number of index updates 
            null,                           // lock mode
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
index 0c734dc9af..4980546a05 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
@@ -83,6 +83,7 @@ public	RealTableScanStatistics(int numOpens,
 									long closeTime,
 									int resultSetNumber,
 									String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 									String userSuppliedOptimizerOverrides,
 									String indexName,
 									boolean isConstraint,
@@ -111,6 +112,7 @@ public	RealTableScanStatistics(int numOpens,
 			optimizerEstimatedCost
 			);
 		this.tableName = tableName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		this.userSuppliedOptimizerOverrides = userSuppliedOptimizerOverrides;
 		this.indexName = indexName;
 		this.isConstraint = isConstraint;
@@ -140,6 +142,7 @@ public	RealTableScanStatistics(int numOpens,
 	 */
 	public String getStatementExecutionPlanText(int depth)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 		String header = "";
 		String isolationString = null;
 
@@ -160,12 +163,14 @@ public String getStatementExecutionPlanText(int depth)
 				indent + MessageService.getTextMessage(
 											SQLState.RTS_IS_RS_USING,
 											tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
                                             isConstraint ? "constraint" : "index",
 											indexName);
 				
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-573
 			header = header +
 				indent + MessageService.getTextMessage(
 											SQLState.RTS_TS_RS_FOR,
@@ -192,6 +197,7 @@ public String getStatementExecutionPlanText(int depth)
 
 		String scanInfo =
 			indent + MessageService.getTextMessage(SQLState.RTS_SCAN_INFO) +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 						":\n" +
 						PropertyUtil.sortProperties(scanProperties, subIndent);
 
@@ -217,6 +223,7 @@ public String getStatementExecutionPlanText(int depth)
 			scanInfo +
 			subIndent + MessageService.getTextMessage(
 												SQLState.RTS_START_POSITION) +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 			":\n" + StringUtil.ensureIndent(startPosition, depth + 2) + "\n" +
 			subIndent + MessageService.getTextMessage(
 												SQLState.RTS_STOP_POSITION) +
@@ -347,6 +354,7 @@ public Object getScanPropsDescriptor(Object scanPropsID)
               null,             // the number of fetched columns
               null,             // the bitset of fetched columns
               null,             // the btree height
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
               this.fetchSize,
               this.startPosition,
               this.stopPosition,
@@ -370,6 +378,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                           // the number of index updates 
            lockMode,                       // lock mode
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
index 7e41559681..64f30f2df9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
@@ -161,6 +161,7 @@ public String toString()
 		return getStatementExecutionPlanText(0);
 	}
   public java.util.Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
     children.addElement(leftResultSetStatistics);
     children.addElement(rightResultSetStatistics);
@@ -172,6 +173,7 @@ public java.util.Vector<ResultSetStatistics> getChildren(){
 	 *
 	 */
   public String getNodeName(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
       return "Union";
   }
   
@@ -211,6 +213,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            (UUID)rsID,
            getRSXplainType(),
            getRSXplainDetails(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.numOpens,
            null,                           // index updates
            null,                           // lock mode
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
index ace78221c9..57e53d7638 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
@@ -147,6 +147,7 @@ public String toString()
 	 *
 	 */
   public String getNodeName(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
     return "Update";
   }
   
@@ -178,6 +179,7 @@ public Object getResultSetDescriptor(Object rsID, Object parentID,
            getRSXplainType(),
            getRSXplainDetails(),
            null,                              // the number of opens
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            this.indexesUpdated,
            null,                           // lock mode
            this.tableLock?"T":"R",
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealWindowResultSetStatistics.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealWindowResultSetStatistics.java
index a52fc2be0e..7662f5c34b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealWindowResultSetStatistics.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RealWindowResultSetStatistics.java
@@ -131,6 +131,7 @@ public String toString()
      */
     public java.util.Vector<ResultSetStatistics> getChildren()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         java.util.Vector<ResultSetStatistics> children = new java.util.Vector<ResultSetStatistics>();
         children.addElement(childResultSetStatistics);
         return children;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java
index 6effaba253..b5a42bca92 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java
@@ -99,10 +99,12 @@ public	RunTimeStatisticsImpl(
 		this.optimizeTime = optimizeTime;
 		this.generateTime = generateTime;
 		this.executeTime = executeTime;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		this.beginCompilationTimestamp = DataTypeUtilities.clone( beginCompilationTimestamp );
 		this.endCompilationTimestamp = DataTypeUtilities.clone( endCompilationTimestamp );
 		this.beginExecutionTimestamp = DataTypeUtilities.clone( beginExecutionTimestamp );
 		this.endExecutionTimestamp = DataTypeUtilities.clone( endExecutionTimestamp );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.subqueryTrackingArray = ArrayUtil.copy(subqueryTrackingArray);
 		this.topResultSetStatistics = topResultSetStatistics;
 	}
@@ -176,6 +178,7 @@ public long getExecuteTimeInMillis()
 	 */
 	public Timestamp getBeginCompilationTimestamp()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return DataTypeUtilities.clone( beginCompilationTimestamp );
 	}
 
@@ -186,6 +189,7 @@ public Timestamp getBeginCompilationTimestamp()
 	 */
 	public Timestamp getEndCompilationTimestamp()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return DataTypeUtilities.clone( endCompilationTimestamp );
 	}
 
@@ -196,6 +200,7 @@ public Timestamp getEndCompilationTimestamp()
 	 */
 	public Timestamp getBeginExecutionTimestamp()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return DataTypeUtilities.clone( beginExecutionTimestamp );
 	}
 
@@ -206,6 +211,7 @@ public Timestamp getBeginExecutionTimestamp()
 	 */
 	public Timestamp getEndExecutionTimestamp()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6202
 		return DataTypeUtilities.clone( endExecutionTimestamp );
 	}
 
@@ -380,6 +386,7 @@ public String toString()
 	 * @return java.util.Vector	A vector of objects.
 	 */
   public Vector<ResultSetStatistics> getChildren(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     Vector<ResultSetStatistics> children = new Vector<ResultSetStatistics>();
     children.addElement(topResultSetStatistics);
     return children;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/xplain/XPLAINSystemTableVisitor.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/xplain/XPLAINSystemTableVisitor.java
index 75d4d89caf..9ef7e5a620 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/xplain/XPLAINSystemTableVisitor.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/xplain/XPLAINSystemTableVisitor.java
@@ -98,6 +98,7 @@ public class XPLAINSystemTableVisitor implements XPLAINVisitor {
     public XPLAINSystemTableVisitor(){
         // System.out.println("System Table Visitor created...");
         // initialize lists
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         rsets        = new ArrayList<XPLAINResultSetDescriptor>();
         rsetsTimings = new ArrayList<Object>();
         sortrsets    = new ArrayList<XPLAINSortPropsDescriptor>();
@@ -143,6 +144,7 @@ public void visit(ResultSetStatistics statistics)
         
         if(considerTimingInformation){
             timingID = dd.getUUIDFactory().createUUID();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             rsetsTimings.add(
                     statistics.getResultSetTimingsDescriptor(timingID));
         }
@@ -210,6 +212,7 @@ public void doXPLAIN(RunTimeStatistics rss, Activation activation)
              
              stmtTimings = new XPLAINStatementTimingsDescriptor(
                  stmtTimingsUUID,                    // the Timing UUID
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                  rss.getParseTimeInMillis(),         // the Parse Time
                  rss.getBindTimeInMillis(),          // the Bind Time
                  rss.getOptimizeTimeInMillis(),      // the Optimize Time
@@ -370,6 +373,7 @@ private void addArraysToSystemCatalogs()
 
         PreparedStatement ps = conn.prepareStatement(
             (String)lcc.getXplainStatement("SYSXPLAIN_RESULTSETS"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Iterator<XPLAINResultSetDescriptor> rsetsiter = rsets.iterator();
         while (rsetsiter.hasNext())
         {
@@ -385,6 +389,7 @@ private void addArraysToSystemCatalogs()
         {
             ps = conn.prepareStatement(
                 (String)lcc.getXplainStatement("SYSXPLAIN_RESULTSET_TIMINGS"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             Iterator<Object> timingsiter = rsetsTimings.iterator();
             while (timingsiter.hasNext())
             {
@@ -397,6 +402,7 @@ private void addArraysToSystemCatalogs()
         }
         ps = conn.prepareStatement(
             (String)lcc.getXplainStatement("SYSXPLAIN_SCAN_PROPS"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Iterator<XPLAINScanPropsDescriptor> scaniter = scanrsets.iterator();
         while (scaniter.hasNext())
         {
@@ -409,6 +415,7 @@ private void addArraysToSystemCatalogs()
 
         ps = conn.prepareStatement(
             (String)lcc.getXplainStatement("SYSXPLAIN_SORT_PROPS"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Iterator<XPLAINSortPropsDescriptor> sortiter = sortrsets.iterator();
         while (sortiter.hasNext())
         {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/xplain/XPLAINUtil.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/xplain/XPLAINUtil.java
index c6df7f74e4..fd0e5f5982 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/xplain/XPLAINUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/xplain/XPLAINUtil.java
@@ -302,6 +302,7 @@ public static XPLAINScanPropsDescriptor extractScanProps(
          String vp_property = scanProps.getProperty(
             MessageService.getTextMessage(SQLState.STORE_RTS_NUM_PAGES_VISITED));
          if(vp_property!=null){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              descriptor.setNo_visited_pages(Integer.parseInt(vp_property));
          }
          
@@ -384,6 +385,7 @@ public static XPLAINSortPropsDescriptor extractSortProps(
          String ir_property = sortProps.getProperty(
                  MessageService.getTextMessage(SQLState.STORE_RTS_NUM_ROWS_INPUT));
          if(ir_property!=null){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              descriptor.setNo_input_rows(Integer.parseInt(ir_property));
          }
 
@@ -398,6 +400,7 @@ public static XPLAINSortPropsDescriptor extractSortProps(
               MessageService.getTextMessage(SQLState.STORE_RTS_NUM_MERGE_RUNS));
               
               if(nomr_property!=null){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                   descriptor.setNo_merge_runs(Integer.parseInt(nomr_property));
               }
              
@@ -421,6 +424,7 @@ public static XPLAINSortPropsDescriptor extractSortProps(
       */
      public static Long getAVGNextTime(long dividend, long divisor){
          if(divisor==0) return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
          if(dividend==0) return (long) 0;
          return dividend/divisor;
      }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java
index fe8772d246..9a13b2c194 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java
@@ -100,6 +100,7 @@ public BackingStoreHashTableFromScan(
             initialCapacity,
             loadFactor,
 			skipNullKeyColumns,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2462
             keepAfterCommit);
         this.includeRowLocations = includeRowLocations;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/CacheableConglomerate.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/CacheableConglomerate.java
index 45a737cedc..54fc5e1576 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/CacheableConglomerate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/CacheableConglomerate.java
@@ -50,6 +50,7 @@ class CacheableConglomerate implements Cacheable
     private Conglomerate    conglom;
 
     /* Constructor */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5632
     CacheableConglomerate(RAMAccessManager parent)
     {
         this.accessManager = parent;
@@ -102,6 +103,7 @@ If the class of the object needs to change (e.g. to support a different
 	public Cacheable setIdentity(Object key) throws StandardException
     {
         conglomid = (Long) key;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5632
 
         long id = conglomid.longValue();
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/PropertyConglomerate.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/PropertyConglomerate.java
index 91e5efb3b7..8cab2a8e77 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/PropertyConglomerate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/PropertyConglomerate.java
@@ -146,6 +146,7 @@ class PropertyConglomerate
                     AccessFactoryGlobals.HEAP,
                     template, 
                     null, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                     (int[]) null, // use default collation for property conglom.
                     conglomProperties, 
                     TransactionController.IS_DEFAULT);
@@ -274,6 +275,7 @@ void setPropertyDefault(TransactionController tc, String key, Serializable value
 		else
 		{
 			synchronized (this) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 Hashtable<Object, Object> defaults = new Hashtable<Object, Object>();
 				getProperties(tc,defaults,false/*!stringsOnly*/,true/*defaultsOnly*/);
 				validate(key,value,defaults);
@@ -368,6 +370,7 @@ void savePropertyDefault(TransactionController tc, String key, Serializable valu
 	{
 		if (saveServiceProperty(key,value)) return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         FormatableHashtable defaults = (FormatableHashtable)
             readProperty(tc,AccessFactoryGlobals.DEFAULT_PROPERTY_NAME);
 		if (defaults == null) defaults = new FormatableHashtable();
@@ -383,6 +386,7 @@ private Serializable validateApplyAndMap(TransactionController tc,
 											 String key, Serializable value, boolean dbOnlyProperty)
 		 throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Dictionary<Object, Object> d = new Hashtable<Object, Object>();
 		getProperties(tc,d,false/*!stringsOnly*/,false/*!defaultsOnly*/);
 		Serializable mappedValue = pf.doValidateApplyAndMap(tc, key,
@@ -454,6 +458,7 @@ private boolean bootPasswordChange(TransactionController tc,
 
 			RawStoreFactory rsf = (RawStoreFactory)
 				findServiceModule(af, RawStoreFactory.MODULE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			// remove secret key from properties list if possible
 			serviceProperties.remove(Attribute.BOOT_PASSWORD);
@@ -660,6 +665,7 @@ Serializable getPropertyDefault(TransactionController tc, String key)
 	}
 
     private <K, V> Dictionary<? super K, ? super V> copyValues(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Dictionary<? super K, ? super V> to,
             Dictionary<K, V> from, boolean stringsOnly)
 	{
@@ -684,6 +690,7 @@ Properties getProperties(TransactionController tc) throws StandardException {
 	}
 
 	public void getProperties(TransactionController tc,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                                Dictionary<Object, Object> d,
 							   boolean stringsOnly,
 							   boolean defaultsOnly) throws StandardException
@@ -715,6 +722,7 @@ private Dictionary<String,Object> readDbProperties(TransactionController tc)
 		 throws StandardException
 	{
 		Dictionary<String,Object> set = new Hashtable<String,Object>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         // scan the table for a row with no matching "key"
 		ScanController scan = openScan(tc, (String) null, 0);
@@ -730,11 +738,13 @@ private Dictionary<String,Object> readDbProperties(TransactionController tc)
                     SanityManager.THROWASSERT(
                         "Key is not a string " + key.getClass().getName());
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			set.put((String)key, value);
 		}
 		scan.close();
 
 		// add the known properties from the service properties set
+//IC see: https://issues.apache.org/jira/browse/DERBY-6166
         String[]    servicePropertyList = PropertyUtil.getServicePropertyList();
 		for (int i = 0; i < servicePropertyList.length; i++) {
 			String value =
@@ -745,6 +755,7 @@ private Dictionary<String,Object> readDbProperties(TransactionController tc)
 	}
 
     private Dictionary<String, Object>
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             getCachedDbProperties(TransactionController tc)
 		 throws StandardException
 	{
@@ -768,6 +779,7 @@ void lockProperties(TransactionController tc) throws StandardException
 		// it. Thus readers see the old uncommited values. When this
 		// thread releases its exclusive lock the cached is cleared
 		// and the next reader will re-populate the cache.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		CompatibilitySpace cs = tc.getLockSpace();
 		Object csGroup = cs.getOwner();
 		lf.lockObject(cs, csGroup, cachedLock, ShExQual.EX,
@@ -780,6 +792,7 @@ void lockProperties(TransactionController tc) throws StandardException
 	  */
 	private boolean iHoldTheUpdateLock(TransactionController tc) throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		CompatibilitySpace cs = tc.getLockSpace();
 		Object csGroup = cs.getOwner();
 		return lf.isLockHeld(cs, csGroup, cachedLock, ShExQual.EX);
@@ -789,6 +802,7 @@ private boolean iHoldTheUpdateLock(TransactionController tc) throws StandardExce
      * can't call this entry point.
      */
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMAccessManager.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMAccessManager.java
index ec1f89311d..b6d57c04d8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMAccessManager.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMAccessManager.java
@@ -528,8 +528,10 @@ private void conglomCacheInit()
     /* package */ void conglomCacheRemoveEntry(long conglomid)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5632
         CacheableConglomerate conglom_entry = (CacheableConglomerate)
             conglom_cache.findCached(conglomid);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         if (conglom_entry != null) {
             conglom_cache.remove(conglom_entry);
@@ -552,6 +554,7 @@ private void conglomCacheInit()
      */
     RAMTransactionContext getCurrentTransactionContext() {
         RAMTransactionContext rtc =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             (RAMTransactionContext) getContext(
                 AccessFactoryGlobals.RAMXACT_INTERNAL_CONTEXT_ID);
 
@@ -592,6 +595,7 @@ public MethodFactory findMethodFactoryByFormat(UUID format)
         
         // See if there's an access method that supports the desired
         // format type as its primary format type.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         factory = formathash.get(format);
         if (factory != null)
             return factory;
@@ -619,6 +623,7 @@ public MethodFactory findMethodFactoryByImpl(String impltype)
     {
         // See if there's an access method that supports the desired
         // implementation type as its primary implementation type.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         MethodFactory factory = implhash.get(impltype);
         if (factory != null)
 				return factory;
@@ -643,6 +648,7 @@ public MethodFactory findMethodFactoryByImpl(String impltype)
 
 		try {
 			factory = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                (MethodFactory) bootServiceModule(
                     false, this, MethodFactory.MODULE, 
                     impltype, conglomProperties);
@@ -867,6 +873,7 @@ public void createReadMeFiles()
         rawstore.createDataWarningFile();
 
         //creating readme in log directory
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         LogFactory logFactory =(LogFactory) findServiceModule(this, rawstore.getLogFactoryModule());
         logFactory.createDataWarningFile();
 
@@ -883,6 +890,7 @@ private void addPropertySetNotification(PropertySetCallback who, TransactionCont
 		// set up the initial values by calling the validate and apply methods.
 		// the map methods are not called as they will have been called
 		// at runtime when the user set the property.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Dictionary<Object, Object> d = new Hashtable<Object, Object>();
 		try {
 			xactProperties.getProperties(tc,d,false/*!stringsOnly*/,false/*!defaultsOnly*/);
@@ -912,8 +920,10 @@ public TransactionInfo[] getTransactionInfo()
      * thrown on error.
      */
     public void startReplicationMaster(String dbmaster, String host, int port,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
                                        String replicationMode)
         throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3189
         rawstore.startReplicationMaster(dbmaster, host, port, replicationMode);
     }
     
@@ -931,6 +941,7 @@ public void failover(String dbname) throws StandardException {
      * thrown on error.
      */
     public void stopReplicationMaster() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3189
         rawstore.stopReplicationMaster();
     }
 
@@ -938,6 +949,7 @@ public void freeze() throws StandardException
 	{
         // make sure that application code doesn't bypass security checks
         // by calling this public entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         SecurityUtil.authorize( Securable.FREEZE_DATABASE );
             
 		rawstore.freeze();
@@ -953,12 +965,15 @@ public void unfreeze() throws StandardException
 	}
 
     public void backup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-523
     String  backupDir, 
     boolean wait) 
         throws StandardException
 	{
         // make sure that application code doesn't bypass security checks
         // by calling this public entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         SecurityUtil.authorize
             (
              wait ?
@@ -977,6 +992,7 @@ public void backupAndEnableLogArchiveMode(
 	{
         // make sure that application code doesn't bypass security checks
         // by calling this public entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         SecurityUtil.authorize
             (
              wait ?
@@ -993,6 +1009,7 @@ public void disableLogArchiveMode(boolean deleteOnlineArchivedLogFiles)
 	{
         // make sure that application code doesn't bypass security checks
         // by calling this public entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         SecurityUtil.authorize( Securable.DISABLE_LOG_ARCHIVE_MODE );
             
 		rawstore.disableLogArchiveMode(deleteOnlineArchivedLogFiles);
@@ -1004,6 +1021,7 @@ public void checkpoint() throws StandardException
 	{
         // make sure that application code doesn't bypass security checks
         // by calling this public entry point
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         SecurityUtil.authorize( Securable.CHECKPOINT_DATABASE );
             
 		rawstore.checkpoint();
@@ -1036,6 +1054,7 @@ public void boot(boolean create, Properties startParams)
 
         // Access depends on a Raw Store implementations.  Load it.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         rawstore = (RawStoreFactory) bootServiceModule(
             create, this, RawStoreFactory.MODULE, serviceProperties);
 
@@ -1050,7 +1069,9 @@ public void boot(boolean create, Properties startParams)
 		// /protocol/Database/Storage/Access/Interface/T_AccessFactory.java)
 		// If this module has already been booted by the JDBC layer, this will 
 		// have no effect at all.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		bootServiceModule(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             create, this, org.apache.derby.shared.common.reference.Module.PropertyFactory, 
             startParams);
 
@@ -1062,6 +1083,7 @@ public void boot(boolean create, Properties startParams)
         // Create the conglom conglom from within a separate system xact
         RAMTransaction tc =
             (RAMTransaction) getAndNameTransaction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 getContextService().getCurrentContextManager(),
                 AccessFactoryGlobals.USER_TRANS_NAME);
 
@@ -1166,8 +1188,10 @@ public void boot(boolean create, Properties startParams)
 
         // set up the property validation
         pf = (PropertyFactory) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             findServiceModule(
                 this, org.apache.derby.shared.common.reference.Module.PropertyFactory);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         // set up the transaction properties.  On J9, over NFS, runing on a
         // power PC coprossor, the directories were created fine, but create
@@ -1278,6 +1302,7 @@ public Serializable map(String key, Serializable value, Dictionary p)
 	*/
 
 	public Cacheable newCacheable(CacheManager cm) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5632
 		return new CacheableConglomerate(this);
 	}
 
@@ -1289,6 +1314,7 @@ public Cacheable newCacheable(CacheManager cm) {
      */
     private static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getFactory();
@@ -1314,6 +1340,7 @@ public ContextService run()
      */
     private  static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<Context>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMTransaction.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMTransaction.java
index e2ef9b2650..b4f838dd01 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMTransaction.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMTransaction.java
@@ -157,6 +157,7 @@ private final void init(
 		this.rawtran            = theRawTran;
         this.parent_tran        = parent_tran;
 		accessmanager           = myaccessmanager;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		scanControllers         = new ArrayList<ScanManager>();
 		conglomerateControllers = new ArrayList<ConglomerateController>();
 
@@ -238,6 +239,7 @@ protected void closeControllers(boolean closeHeldControllers)
             for (int i = scanControllers.size() - 1; i >= 0; i--)
             {
                 ScanManager sc = scanControllers.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
                 if (sc.closeForEndTransaction(closeHeldControllers))
                 {
@@ -254,6 +256,7 @@ protected void closeControllers(boolean closeHeldControllers)
                     SanityManager.ASSERT(scanControllers.isEmpty());
                 }
                 // just to make sure everything has been closed and removed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
                 scanControllers.clear();
             }
         }
@@ -264,6 +267,7 @@ protected void closeControllers(boolean closeHeldControllers)
             for (int i = conglomerateControllers.size() - 1; i >= 0; i--)
             {
                 ConglomerateController cc = conglomerateControllers.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
                 if (cc.closeForEndTransaction(closeHeldControllers))
                 {
@@ -280,6 +284,7 @@ protected void closeControllers(boolean closeHeldControllers)
                     SanityManager.ASSERT(scanControllers.isEmpty());
                 }
                 // just to make sure everything has been closed and removed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
                 conglomerateControllers.clear();
             }
         }
@@ -290,9 +295,12 @@ protected void closeControllers(boolean closeHeldControllers)
             {
                 // Loop from the end since the call to close() will remove the
                 // element from the list.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
                 for (int i = sortControllers.size() - 1; i >= 0; i--)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     SortController sc = sortControllers.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
                     sc.completedInserts();
                 }
                 sortControllers.clear();
@@ -305,6 +313,7 @@ protected void closeControllers(boolean closeHeldControllers)
             {
                 // Loop from the end since the call to drop() will remove the
                 // element from the list.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
                 for (int i = sorts.size() - 1; i >= 0; i--)
                 {
                     Sort sort = sorts.get(i);
@@ -383,6 +392,7 @@ private Conglomerate findExistingConglomerate(long conglomId)
         {
 			throw StandardException.newException(
                 SQLState.STORE_CONGLOMERATE_DOES_NOT_EXIST, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 conglomId);
         }
         else
@@ -403,6 +413,7 @@ private Conglomerate findConglomerate(long conglomId)
         else
 		{
 			if (tempCongloms != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				conglom = (Conglomerate) tempCongloms.get(conglomId);
 		}
 
@@ -435,6 +446,7 @@ private ConglomerateController openConglomerate(
                       ContainerHandle.MODE_DROP_ON_COMMIT           |
                       ContainerHandle.MODE_OPEN_FOR_LOCK_ONLY       |
                       ContainerHandle.MODE_LOCK_NOWAIT              |
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                       ContainerHandle.MODE_LOCK_ROW_NOWAIT          |
                       ContainerHandle.MODE_TRUNCATE_ON_ROLLBACK     |
                       ContainerHandle.MODE_FLUSH_ON_COMMIT          |
@@ -469,6 +481,7 @@ private ConglomerateController openConglomerate(
 
 		// Keep track of it so we can release on close.
 		conglomerateControllers.add(cc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
 
 		return cc;
     }
@@ -496,6 +509,7 @@ private ScanController openScan(
                    TransactionController.OPENMODE_USE_UPDATE_LOCKS |
                    TransactionController.OPENMODE_FOR_LOCK_ONLY |
                    TransactionController.OPENMODE_LOCK_NOWAIT |
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                    TransactionController.OPENMODE_LOCK_ROW_NOWAIT |
                    TransactionController.OPENMODE_SECONDARY_LOCKED)) != 0)
             {
@@ -579,16 +593,19 @@ protected void invalidateConglomerateCache()
     public void addColumnToConglomerate(
     long        conglomId,
     int         column_id,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     Storable    template_column,
     int         collation_id)
 		throws StandardException
     {
         boolean is_temporary = (conglomId < 0);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5632
 		Conglomerate conglom = findConglomerate(conglomId);
 		if (conglom == null)
         {
 			throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 SQLState.AM_NO_SUCH_CONGLOMERATE_DROP, conglomId);
         }
 
@@ -603,11 +620,13 @@ public void addColumnToConglomerate(
                 (DynamicCompiledOpenConglomInfo) null);
 
 		conglom.addColumn(this, column_id, template_column, collation_id);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
         // Set an indication that ALTER TABLE has been called so that the
         // conglomerate will be invalidated if an error happens. Only needed
         // for non-temporary conglomerates, since they are the only ones that
         // live in the conglomerate cache.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5632
         if (!is_temporary)
 		{
             alterTableCallMade = true;
@@ -670,6 +689,7 @@ public DynamicCompiledOpenConglomInfo getDynamicCompiledConglomInfo(
     {
         return(
             findExistingConglomerate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                 conglomId).getDynamicCompiledConglomInfo());
     }
 
@@ -681,6 +701,7 @@ private final int countCreatedSorts()
         {
             for (int i = 0; i < sorts.size(); i++)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
                 if (sorts.get(i) != null)
                     ret_val++;
             }
@@ -803,6 +824,7 @@ public long createConglomerate(
             cfactory.createConglomerate(
                 this, segment, conglomid, template, 
                 columnOrder, collationIds, properties, temporaryFlag);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
 		long conglomId;
 		if ((temporaryFlag & TransactionController.IS_TEMPORARY)
@@ -810,7 +832,9 @@ public long createConglomerate(
 		{
 			conglomId = nextTempConglomId--;
 			if (tempCongloms == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				tempCongloms = new HashMap<Long,Conglomerate>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			tempCongloms.put(conglomId, conglom);
 		}
 		else
@@ -846,6 +870,7 @@ public long createAndLoadConglomerate(
                 true,
                 template,
 				columnOrder,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 collationIds,
                 properties,
                 temporaryFlag,
@@ -878,6 +903,7 @@ public long recreateAndLoadConglomerate(
 		// necessary although still correct.
 		long conglomId = 
 			createConglomerate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 implementation, template, columnOrder, collationIds, 
                 properties, temporaryFlag);
 
@@ -921,7 +947,9 @@ public String debugOpened() throws StandardException
         {
 
             str = "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             for (Iterator<ScanManager> it = scanControllers.iterator(); it.hasNext(); )
             {
                 ScanController sc = it.next();
@@ -949,6 +977,8 @@ public String debugOpened() throws StandardException
                 for (int i = 0; i < sorts.size(); i++)
                 {
                     Sort sort = sorts.get(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
                     if (sort != null)
                     {
@@ -961,6 +991,7 @@ public String debugOpened() throws StandardException
 
 			if (tempCongloms != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 for (Iterator<Long> it = tempCongloms.keySet().iterator();
                      it.hasNext(); )
                 {
@@ -994,6 +1025,7 @@ public void dropConglomerate(long conglomId)
 		if (conglomId < 0)
 		{
 			if (tempCongloms != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				tempCongloms.remove(conglomId);
 		}
 		else
@@ -1425,9 +1457,11 @@ public GroupFetchScanController openGroupFetchScan(
 	 * @exception  StandardException  Standard exception policy.
      **/
     public void purgeConglomerate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     long    conglomId)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
         findExistingConglomerate(conglomId).purgeConglomerate
             ( this, rawtran );
 
@@ -1534,6 +1568,9 @@ public GroupFetchScanController defragmentConglomerate(
 
 		// Keep track of it so we can release on close.
 		scanControllers.add(sm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
 
 		return(sm);
 	}
@@ -1691,6 +1728,7 @@ public long createSort(
 
 		// Add the sort to the sorts vector
 		if (sorts == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			sorts = new ArrayList<Sort>();
             freeSortIds = new ArrayList<Integer>();
         }
@@ -1699,9 +1737,11 @@ public long createSort(
         if (freeSortIds.isEmpty()) {
             // no free identifiers, add sort at the end
             sortid = sorts.size();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
             sorts.add(sort);
         } else {
             // reuse a sort identifier
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             sortid = (freeSortIds.remove(freeSortIds.size() - 1))
                 .intValue();
             sorts.set(sortid, sort);
@@ -1728,11 +1768,13 @@ public void dropSort(long sortid)
     {
         // should call close on the sort.
         Sort sort = sorts.get((int) sortid);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         if (sort != null)
         {
             sort.drop(this);
             sorts.set((int) sortid, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
             freeSortIds.add((int) sortid);
         }
     }
@@ -1822,6 +1864,7 @@ public SortController openSort(long id)
 			|| (sort = (sorts.get((int) id))) == null)
 		{
 			throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     SQLState.AM_NO_SUCH_SORT, id);
 		}
 
@@ -1830,6 +1873,7 @@ public SortController openSort(long id)
 
 		// Keep track of it so we can release on close.
 		if (sortControllers == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			sortControllers = new ArrayList<SortController>();
 		sortControllers.add(sc);
 
@@ -1888,17 +1932,23 @@ public ScanController openSortScan(
 		// Find the sort in the sorts list, throw an error
 		// if it doesn't exist.
 		if (sorts == null || id >= sorts.size()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
 			|| (sort = ((Sort) sorts.get((int) id))) == null)
 		{
 			throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     SQLState.AM_NO_SUCH_SORT, id);
 		}
 
 		// Open a scan on it.
 		ScanManager sc = sort.openSortScan(this, hold);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		// Keep track of it so we can release on close.
 		scanControllers.add(sc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
 
 		return sc;
 	}
@@ -1915,9 +1965,12 @@ public RowLocationRetRowSource openSortRowSource(long id)
 		// Find the sort in the sorts list, throw an error
 		// if it doesn't exist.
 		if (sorts == null || id >= sorts.size()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			|| (sort = (sorts.get((int) id))) == null)
 		{
 			throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     SQLState.AM_NO_SUCH_SORT, id);
 		}
 
@@ -1926,6 +1979,7 @@ public RowLocationRetRowSource openSortRowSource(long id)
 
 		// Keep track of it so we can release on close.
 		scanControllers.add( (ScanManager) sc );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		return sc;
 	}
@@ -1953,6 +2007,7 @@ public DatabaseInstant commitNoSync(int commitflag)
 	public void abort()
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5632
         invalidateConglomerateCache();
 		this.closeControllers(true /* close all controllers */ );
 		rawtran.abort();
@@ -2154,6 +2209,7 @@ public void addPostCommitWork(Serviceable work)
 	public boolean checkVersion(
     int     requiredMajorVersion, 
     int     requiredMinorVersion, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     String  feature) 
         throws StandardException
     {
@@ -2174,6 +2230,7 @@ public boolean checkVersion(
      **/
     public void closeMe(ConglomerateController conglom_control)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
         conglomerateControllers.remove(conglom_control);
     }
 
@@ -2187,6 +2244,7 @@ public void closeMe(ConglomerateController conglom_control)
      **/
     public void closeMe(SortController sort_control)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
         sortControllers.remove(sort_control);
     }
 
@@ -2200,6 +2258,7 @@ public void closeMe(SortController sort_control)
      **/
     public void closeMe(ScanManager scan)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2149
         scanControllers.remove(scan);
     }
 
@@ -2337,6 +2396,7 @@ public TransactionController startNestedUserTransaction(
         Transaction child_rawtran = 
             ((readOnly) ?
                 accessmanager.getRawStore().startNestedReadOnlyUserTransaction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                     rawtran, 
                     getLockSpace(), 
                     cm,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTree.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTree.java
index 03ecb65d85..0206c4cb10 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTree.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTree.java
@@ -152,6 +152,7 @@ Property name for the maximum number of rows to place in a btree page (leaf
 	boolean maintainParentLinks;
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 	Attribute to indicate the index allows duplicate only in
 	case of keys with no part null.  This attribute has no effect if unique
     is true. If unique is false and isUniqueWithDuplicateNulls is set 
@@ -188,6 +189,7 @@ Property name for the maximum number of rows to place in a btree page (leaf
 	protected boolean[]	ascDescInfo;
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     The array of collation id's for each column in the template.
     **/
     protected int[]   collation_ids;
@@ -273,6 +275,7 @@ abstract public ConglomerateController lockTable(
 	 * @exception  StandardException  Standard exception policy.
      **/
     final DataValueDescriptor[] createBranchTemplate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     Transaction         rawtran,
     DataValueDescriptor page_ptr)
         throws StandardException
@@ -301,6 +304,7 @@ final DataValueDescriptor[] createBranchTemplate(
      *
 	 * @exception  StandardException  Standard exception policy.
      **/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     final public DataValueDescriptor[] createTemplate(
     Transaction rawtran)
         throws StandardException
@@ -330,6 +334,7 @@ final public boolean isUnique()
      */
     public void setUniqueWithDuplicateNulls (boolean uniqueWithDuplicateNulls) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
         this.uniqueWithDuplicateNulls = uniqueWithDuplicateNulls;
     }
 
@@ -362,6 +367,7 @@ public boolean isUniqueWithDuplicateNulls()
 	public void addColumn(
     TransactionManager  xact_manager,
     int                 column_id,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     Storable            template_column,
     int                 collation_id)
         throws StandardException
@@ -447,6 +453,7 @@ public void create(
         }
 
         // Check input arguments
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
         allowDuplicates = 
             (Boolean.valueOf(properties.getProperty(
                 PROPERTY_ALLOWDUPLICATES, "false"))).booleanValue();
@@ -474,11 +481,13 @@ public void create(
             nUniqueColumns = Integer.parseInt(result_string);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
         result_string = 
             properties.getProperty(
                 PROPERTY_UNIQUE_WITH_DUPLICATE_NULLS, "false");
         uniqueWithDuplicateNulls = Boolean.parseBoolean(result_string);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         if (SanityManager.DEBUG)
         {
@@ -590,6 +599,7 @@ public long getContainerid()
     public DynamicCompiledOpenConglomInfo getDynamicCompiledConglomInfo()
 		throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
         return(new OpenConglomerateScratchSpace(
                 format_ids, collation_ids, hasCollatedTypes));
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeController.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeController.java
index cb88401151..bed8f0dc85 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeController.java
@@ -130,6 +130,7 @@ private boolean reclaim_deleted_rows(
         try
         {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
             if ((controlRow = ControlRow.get(open_btree, pageno)) == null)
                 return(false);
 
@@ -190,6 +191,7 @@ private boolean reclaim_deleted_rows(
         }
         finally
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5284
             if (controlRow != null) 
             {
                 if (purged_at_least_one_row) 
@@ -361,6 +363,7 @@ private boolean reclaim_deleted_rows(
             // Get the root page back, and perform a split following the
             // to-be-inserted key.  The split releases the root page latch.
             root = ControlRow.get(split_open_btree, BTree.ROOTPAGEID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             if (SanityManager.DEBUG)
                 SanityManager.ASSERT(root.page.isLatched());
@@ -393,6 +396,7 @@ private boolean reclaim_deleted_rows(
      * @throws StandardException
      */
     private int comparePreviousRecord (int slot, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
                                     LeafControlRow  leaf, 
                                     DataValueDescriptor [] rows,
                                     DataValueDescriptor [] oldRows) 
@@ -593,6 +597,7 @@ private int compareRowsForInsert (DataValueDescriptor [] originalRow,
         RowLocation lock_row_loc = 
             (RowLocation) scratch_template[scratch_template.length - 1];
         boolean latch_released = !getLockingPolicy().lockNonScanRowOnPage(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6041
                 leaf, slot, lock_fetch_desc, template,
                 lock_row_loc, ConglomerateController.LOCK_UPD);
         //if latch was released some other transaction was operating on this
@@ -672,6 +677,7 @@ private int doIns(DataValueDescriptor[] rowToInsert)
 
         if (scratch_template == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             scratch_template = runtime_mem.get_template(getRawTran());
         }
 
@@ -721,6 +727,7 @@ private int doIns(DataValueDescriptor[] rowToInsert)
             targetleaf = (LeafControlRow)
                 ControlRow.get(this, BTree.ROOTPAGEID).search(sp);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             // Row locking - first lock row previous to row being inserted:
             //     o if (sp.resultExact) then the row must be deleted and
@@ -791,6 +798,7 @@ private int doIns(DataValueDescriptor[] rowToInsert)
 
                     latch_released = 
                         !this.getLockingPolicy().lockNonScanRowOnPage(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6041
                             targetleaf, insert_slot,
                             lock_fetch_desc, scratch_template, lock_row_loc,
                             ConglomerateController.LOCK_UPD);
@@ -845,6 +853,7 @@ else if (this.getConglomerate().nUniqueColumns ==
                         boolean update_succeeded = true;
                         try 
                         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
                             if (runtime_mem.hasCollatedTypes())
                             {
                                 // See DERBY-5367.
@@ -913,6 +922,7 @@ else if (this.getConglomerate().nUniqueColumns ==
                     }
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5604
             else if (targetleaf.page.recordCount() - 1 < BTree.maxRowsPerPage)
             {
                 // The row wasn't there, so try to insert it
@@ -960,6 +970,8 @@ else if (targetleaf.page.recordCount() - 1 < BTree.maxRowsPerPage)
 
                 // start splitting ...
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
             if (getConglomerate().isUniqueWithDuplicateNulls()) 
             {
                 int ret = compareLeftAndRightSiblings(rowToInsert, 
@@ -1071,6 +1083,7 @@ private boolean do_load_insert(
             this.isIndexableRowConsistent(rowToInsert);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5604
         if (num_rows_on_page < BTree.maxRowsPerPage)
         {
             // By default maxRowsPerPage is set to MAXINT, some tests
@@ -1085,6 +1098,7 @@ private boolean do_load_insert(
                 {
                     // verify that the row inserted is >= than previous row.
                     int compare_result =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                         ControlRow.compareIndexRowFromPageToKey(
                             leaf,
                             insert_slot - 1,
@@ -1181,6 +1195,7 @@ private LeafControlRow do_load_split(
                     ControlRow.SPLIT_FLAG_LAST_IN_TABLE));
 
         new_leaf = (LeafControlRow) ControlRow.get(this, new_leaf_pageno);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
         // The leaf must be the rightmost leaf in the table, the first time
         // the root grows from leaf to branch it will be a leaf with many
@@ -1248,6 +1263,7 @@ public void init(
 
 		super.init(
             xact_manager, xact_manager, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1058
             container, rawtran, hold, open_mode,
             lock_level, btree_locking_policy,
             conglomerate, undo, dynamic_info);
@@ -1350,6 +1366,7 @@ public int insert(DataValueDescriptor[] row)
          throws StandardException
     {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 		if (isClosed())
         {
             if (getHold())
@@ -1419,6 +1436,8 @@ public void getTableProperties(Properties prop)
         {
             throw StandardException.newException(
                         SQLState.BTREE_IS_CLOSED,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         err_containerid);
         }
 
@@ -1504,6 +1523,7 @@ public long load(
 
         if (scratch_template == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             scratch_template = runtime_mem.get_template(getRawTran());
         }
 
@@ -1514,6 +1534,7 @@ public long load(
             // Btree must just have been created and empty, so there must
             // be one root leaf page which is empty except for the control row.
             current_leaf = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                 (LeafControlRow) ControlRow.get(this, BTree.ROOTPAGEID);
             int current_insert_slot = 1;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java
index 6d3b266742..2e0e3b9fa2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java
@@ -565,6 +565,8 @@ public void getScanCost(
 
                 control_row =
                     ControlRow.get(this, BTree.ROOTPAGEID).search(sp);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
                 control_row.release();
                 control_row = null;
@@ -588,6 +590,7 @@ public void getScanCost(
             // Never return estimate of more rows than exist, sometimes 
             // the recursive estimation through the btree may return a number
             // like 1.00001.
+//IC see: https://issues.apache.org/jira/browse/DERBY-741
             if (ret_fraction > 1)
                 ret_fraction = 1;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java
index cbed22420f..a9619e6d4a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java
@@ -242,6 +242,7 @@ else if (this.scan_state == SCAN_HOLD_INIT)
                         if (row_array[ret_row_count] == null)
                         {
                             row_array[ret_row_count] = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                                 runtime_mem.get_row_for_export(getRawTran());
                         }
 
@@ -250,6 +251,7 @@ else if (this.scan_state == SCAN_HOLD_INIT)
                     else
                     {
                         // get a brand new row.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                         fetch_row = 
                             runtime_mem.get_row_for_export(getRawTran()); 
                     }
@@ -311,6 +313,7 @@ else if (this.scan_state == SCAN_HOLD_INIT)
                 // row was marked deleted - the key value cannot change.
                 boolean latch_released =
                     !this.getLockingPolicy().lockScanRow(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6041
                         this, pos,
                         init_lock_fetch_desc,
                         pos.current_lock_template,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
index 9d67c9e922..1f725ea9bb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
@@ -43,6 +43,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 <p>
 There are 2 types of lock interfaces, lockScan*() and lockNonScan*().
 <p>
+//IC see: https://issues.apache.org/jira/browse/DERBY-4177
+//IC see: https://issues.apache.org/jira/browse/DERBY-2991
 The lockScan*() interfaces save the key for the current scan position before
 giving up the latch on the page if they have to wait for a row lock. The
 callers can reposition the scan using the saved key by calling
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java
index 25aaa930ef..db83f42754 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java
@@ -202,6 +202,7 @@ protected void positionAtStartPosition(
             // Find the starting page and row slot, must start at root and
             // search for rightmost leaf.
             ControlRow root = ControlRow.get(this, BTree.ROOTPAGEID); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             // include search of tree in page visited stats.
             stat_numpages_visited += root.getLevel() + 1;
@@ -460,6 +461,8 @@ else if (!reposition(pos, false))
                 // lock current row in max scan, no previous key lock necessary.
                 boolean latch_released =
                     !this.getLockingPolicy().lockScanRow(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6041
+//IC see: https://issues.apache.org/jira/browse/DERBY-6041
                         this, pos,
                         init_lock_fetch_desc,
                         pos.current_lock_template,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java
index 30fad8a84c..0752564f4e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java
@@ -121,6 +121,7 @@ private final void doShrink(
         // Get the root page back, and perform a split following the
         // to-be-inserted key.  The split releases the root page latch.
         root = ControlRow.get(open_btree, BTree.ROOTPAGEID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
         root.shrinkFor(open_btree, shrink_row);
 
@@ -144,6 +145,7 @@ private final void doShrink(
      * @exception  StandardException  Standard exception policy.
      **/
     private final OpenBTree openIndex(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3216
     TransactionManager internal_xact,
     int                lock_level,
     int                lock_mode)
@@ -208,6 +210,8 @@ public int performWork(ContextManager contextMgr)
                 contextMgr, AccessFactoryGlobals.SYS_TRANS_NAME);
 
         TransactionManager  internal_xact  = tc.getInternalTransaction();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5258
+//IC see: https://issues.apache.org/jira/browse/DERBY-5248
 
         if (SanityManager.DEBUG)
         {
@@ -216,6 +220,8 @@ public int performWork(ContextManager contextMgr)
         }
 
         OpenBTree           open_btree = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5258
+//IC see: https://issues.apache.org/jira/browse/DERBY-5248
 
         try
         {
@@ -235,6 +241,7 @@ public int performWork(ContextManager contextMgr)
             // 2) if all rows from page are reclaimed then a structure shrink
             //    which requires table level lock can be executed.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-3216
             open_btree = 
                 openIndex(
                     internal_xact, 
@@ -263,6 +270,7 @@ public int performWork(ContextManager contextMgr)
                 // reclaim of just the rows on this page.  No merge is 
                 // attempted.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3216
                 try
                 {
                     open_btree = 
@@ -288,6 +296,8 @@ public int performWork(ContextManager contextMgr)
         }
         finally
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5258
+//IC see: https://issues.apache.org/jira/browse/DERBY-5248
             if (open_btree != null)
                 open_btree.close();
 
@@ -311,6 +321,7 @@ private final DataValueDescriptor[] getShrinkKey(
         throws StandardException
     {
         DataValueDescriptor[] shrink_key = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             open_btree.getConglomerate().createTemplate(
                     open_btree.getRawTran());
 
@@ -355,6 +366,7 @@ private final DataValueDescriptor[] purgeCommittedDeletes(
             // somehow the page requested no longer exists.  In either case
             // the post commit work will just skip it.
             control_row = ControlRow.getNoWait(open_btree, pageno);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             if (control_row != null)
             {
@@ -468,10 +480,13 @@ private final void purgeRowLevelCommittedDeletes(
         throws StandardException
     {
         LeafControlRow leaf = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3362
 
         // The following can fail, returning null, either if it can't get
         // the latch or somehow the page requested no longer exists.  In 
         // either case the post commit work will just skip it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5258
+//IC see: https://issues.apache.org/jira/browse/DERBY-5248
         leaf = (LeafControlRow) 
             ControlRow.getNoWait(open_btree, page_number);
         if (leaf == null)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
index 9966c4f9a4..3bccff519d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
@@ -234,7 +234,9 @@ private void initScanParams(
         throws StandardException
     {
         // startKeyValue init.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         this.init_startKeyValue         = startKeyValue;
+//IC see: https://issues.apache.org/jira/browse/DERBY-404
         if (RowUtil.isRowEmpty(this.init_startKeyValue))
             this.init_startKeyValue = null;
 
@@ -247,7 +249,9 @@ private void initScanParams(
         this.init_qualifier             = qualifier;
 
         // stopKeyValue init.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         this.init_stopKeyValue          = stopKeyValue;
+//IC see: https://issues.apache.org/jira/browse/DERBY-404
         if (RowUtil.isRowEmpty(this.init_stopKeyValue))
             this.init_stopKeyValue = null;
 
@@ -266,6 +270,7 @@ private void initScanParams(
         scan_position.current_lock_template[this.init_template.length - 1] = 
             scan_position.current_lock_row_loc = (RowLocation)
                 init_template[init_template.length - 1].cloneValue(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 
         // Verify that all columns in start key value, stop key value, and
         // qualifiers are present in the list of columns described by the
@@ -287,6 +292,7 @@ private void initScanParams(
                 // add in start columns
                 if (this.init_startKeyValue != null)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
                     required_cols.grow(this.init_startKeyValue.length);
                     for (int i = 0; i < this.init_startKeyValue.length; i++)
                         required_cols.set(i);
@@ -307,6 +313,7 @@ private void initScanParams(
                 // FormatableBitSet equals requires the two FormatableBitSets to be of same
                 // length.
                 required_cols.grow(init_scanColumnList.size());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
 
                 if (!required_cols_and_scan_list.equals(required_cols))
                 {
@@ -335,6 +342,7 @@ private void initScanParams(
      **/
     protected void positionAtStartForForwardScan(
     BTreeRowPosition    pos)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         boolean         exact;
@@ -359,6 +367,8 @@ protected void positionAtStartForForwardScan(
             // Find the starting page and row slot, must start at root and
             // search either for leftmost leaf, or search for specific key.
             ControlRow root = ControlRow.get(this, BTree.ROOTPAGEID); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             // include search of tree in page visited stats.
             stat_numpages_visited += root.getLevel() + 1;
@@ -432,6 +442,7 @@ protected void positionAtStartForForwardScan(
             {
                 latch_released = 
                     !this.getLockingPolicy().lockScanRow(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6041
                         this, pos,
                         init_lock_fetch_desc,
                         pos.current_lock_template,
@@ -596,6 +607,7 @@ static boolean isEmpty(Page page) throws StandardException {
     }
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     Position scan at "start" position.
     <p>
     Positions the scan to the slot just before the first record to be returned
@@ -872,6 +884,7 @@ protected boolean reposition(
         {
             throw StandardException.newException(
                 SQLState.BTREE_SCAN_NOT_POSITIONED, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 this.scan_state);
         }
 
@@ -879,6 +892,7 @@ protected boolean reposition(
         if (SanityManager.DEBUG)
         {
             if (pos.current_positionKey == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
                 SanityManager.THROWASSERT(
                     "pos.current_rh  = (" + pos.current_rh + "), " +
                     "pos.current_positionKey = (" + 
@@ -889,6 +903,7 @@ protected boolean reposition(
         {
             throw StandardException.newException(
                     SQLState.BTREE_SCAN_INTERNAL_ERROR, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     (pos.current_rh == null), 
                     (pos.current_positionKey == null));
         }
@@ -934,6 +949,7 @@ protected boolean reposition(
 
         pos.current_leaf = (LeafControlRow)
                     ControlRow.get(this, BTree.ROOTPAGEID).search(sp);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
         if (!sp.resultExact && !missing_row_for_key_ok)
         {
@@ -965,6 +981,7 @@ protected boolean reposition(
 
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     Initialize the scan for use.
     <p>
     Any changes to this method may have to be reflected in close as well.
@@ -982,7 +999,9 @@ public void init(
     int                             open_mode,
     int                             lock_level,
     BTreeLockingPolicy              btree_locking_policy,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     FormatableBitSet                scanColumnList,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     DataValueDescriptor[]           startKeyValue,
     int                             startSearchOperator,
     Qualifier                       qualifier[][],
@@ -1007,12 +1026,14 @@ public void init(
                  ContainerHandle.MODE_FORUPDATE);
 
         // Keep track of whether this scan should use update locks.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         this.init_useUpdateLocks = 
             ((open_mode &
                 ContainerHandle.MODE_USE_UPDATE_LOCKS) != 0);
 
         this.init_hold                  = hold;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         this.init_template              = 
             runtime_mem.get_template(getRawTran());
 
@@ -1042,6 +1063,7 @@ public void init(
         
         if (SanityManager.DEBUG)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             SanityManager.ASSERT(
                 TemplateRow.checkColumnTypes(
                     getRawTran().getDataValueFactory(),
@@ -1098,6 +1120,7 @@ public void close()
     @exception  StandardException  Standard exception policy.
     **/
     public boolean delete()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         boolean     ret_val      = false;
@@ -1137,6 +1160,7 @@ public boolean delete()
                 // the lock to X.
                 boolean latch_released =
                     !this.getLockingPolicy().lockScanRow(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6041
                         this, scan_position,
                         init_lock_fetch_desc,
                         scan_position.current_lock_template,
@@ -1169,6 +1193,7 @@ scan_position, getLockingPolicy(),
                 }
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3216
             if (SanityManager.DEBUG) 
             {
                 // DERBY-2197: Assume no row locking here. If locking policy
@@ -1181,6 +1206,7 @@ scan_position, getLockingPolicy(),
             }
 
             if (scan_position.current_leaf.page.isDeletedAtSlot(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3216
                     scan_position.current_slot)) 
             {
                 ret_val = false;
@@ -1204,6 +1230,7 @@ scan_position, getLockingPolicy(),
             // that can be reclaimed.
 
             if (scan_position.current_leaf.page.nonDeletedRecordCount() == 1 &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-3216
                 !(scan_position.current_leaf.getIsRoot() && 
                  scan_position.current_leaf.getLevel() == 0)) 
             {
@@ -1356,6 +1383,9 @@ private void fetch(DataValueDescriptor[] row, boolean qualify)
 
                 throw StandardException.newException(
                         SQLState.AM_RECORD_NOT_FOUND,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         err_containerid,
                         scan_position.current_rh.getPageNumber(),
                         scan_position.current_rh.getId());
@@ -1371,6 +1401,7 @@ private void fetch(DataValueDescriptor[] row, boolean qualify)
             scan_position.current_rh = 
                 scan_position.current_leaf.page.fetchFromSlot(
                 (RecordHandle) null, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
                 scan_position.current_slot, row, 
                 qualify ? init_fetchDesc : null,
                 true);
@@ -1399,6 +1430,7 @@ private void fetch(DataValueDescriptor[] row, boolean qualify)
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         return;
     }
 
@@ -1407,11 +1439,13 @@ private void fetch(DataValueDescriptor[] row, boolean qualify)
      */
     public boolean isHeldAfterCommit() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2462
         return (scan_state == SCAN_HOLD_INIT ||
                 scan_state == SCAN_HOLD_INPROGRESS);
     }
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
     Fetch the row at the current position of the Scan.
     @see ScanController#fetch
 
@@ -1431,6 +1465,7 @@ public void fetch(DataValueDescriptor[] row)
      * @exception  StandardException  Standard exception policy.
      */
     public void fetchWithoutQualify(DataValueDescriptor[] row)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         fetch(row, false);
@@ -1450,6 +1485,7 @@ public void fetchWithoutQualify(DataValueDescriptor[] row)
      * @exception  StandardException  Standard exception policy.
      **/
     public ScanInfo getScanInfo()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         return(new BTreeScanInfo(this));
@@ -1468,6 +1504,9 @@ The results of a fetch() performed on a scan positioned on
     @exception StandardException Standard exception policy.
     **/
     public boolean isCurrentPositionDeleted()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         boolean     ret_val;
@@ -1513,6 +1552,7 @@ public boolean isCurrentPositionDeleted()
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         return(ret_val);
     }
 
@@ -1533,6 +1573,7 @@ public boolean isKeyed()
      * Not implemented for this class
      */
     public boolean positionAtRowLocation (RowLocation rLoc) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
         throws StandardException 
     {
         throw StandardException.newException(
@@ -1546,9 +1587,11 @@ public boolean positionAtRowLocation (RowLocation rLoc)
     @exception  StandardException  Standard exception policy.
     **/
     public boolean next()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         // Turn this call into a group fetch of a 1 element group.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         fetchNext_one_slot_array[0] = runtime_mem.get_scratch_row(getRawTran());
         boolean ret_val = 
             fetchRows(
@@ -1567,6 +1610,7 @@ public boolean next()
     Fetch the row at the next position of the Scan.
 
     If there is a valid next position in the scan then
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     the value in the template storable row is replaced
     with the value of the row at the current scan
     position.  The columns of the template row must
@@ -1583,6 +1627,7 @@ equivalent to making a next() call followed by a fetch(row)
 
     @param row The template row into which the value
     of the next position in the scan is to be stored.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
 
     @return True if there is a next position in the scan,
     false if there isn't.
@@ -1689,6 +1734,7 @@ public int fetchNextGroup(
     }
 
     public int fetchNextGroup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     DataValueDescriptor[][] row_array,
     RowLocation[]           old_rowloc_array,
     RowLocation[]           new_rowloc_array)
@@ -1836,6 +1882,7 @@ the current scan had been closed and a openScan() had been called instead.
     the original openScan.  The previous template row continues to be used.
 
     @param startKeyValue  An indexable row which holds a
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     (partial) key value which, in combination with the
     startSearchOperator, defines the starting position of
     the scan.  If null, the starting position of the scan
@@ -1941,6 +1988,7 @@ the current scan had been closed and a openScan() had been called instead.
     first next operation is attempted.
 
     @param qualifier An array of qualifiers which, applied
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     to each key, restrict the rows returned by the scan.  Rows
     for which any one of the qualifiers returns false are not
     returned by the scan. If null, all rows are returned.
@@ -1961,6 +2009,7 @@ public void reopenScanByRowLocation(
     */
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     Fetch the location of the current position in the scan.
     @see ScanController#fetchLocation
 
@@ -2019,6 +2068,7 @@ public boolean closeForEndTransaction(boolean closeHeldScan)
             positionAtDoneScan(scan_position);
 
             super.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
 
             // null out so that these object's can get GC'd earlier.
             this.init_rawtran       = null;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
index d974a01258..307d46cc5f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
@@ -213,6 +213,7 @@ public static long restartSplitFor(
         // Get the root page back, and perform a split following the
         // branch row which would not fit.
         ControlRow root = ControlRow.get(open_btree, BTree.ROOTPAGEID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
         if (SanityManager.DEBUG)
             SanityManager.ASSERT(root.page.isLatched());
@@ -413,6 +414,7 @@ protected boolean shrinkFor(
             // Find the child page for the shrink key.
 
             BranchRow branch_template =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 BranchRow.createEmptyTemplate(
                     open_btree.getRawTran(),
                     open_btree.getConglomerate());
@@ -601,6 +603,7 @@ protected long splitFor(
                 "page is not latched:");
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5604
         if ((this.page.recordCount() - 1 >= BTree.maxRowsPerPage) ||
             (!this.page.spaceForInsert(splitrow, (FormatableBitSet) null,
 				AccessFactoryGlobals.BTREE_OVERFLOW_THRESHOLD)))
@@ -625,6 +628,7 @@ protected long splitFor(
 				parent = (BranchControlRow)
                     ControlRow.get(open_btree, BTree.ROOTPAGEID);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
 				return(parent.splitFor(
                         open_btree, template, null, splitrow, flag));
@@ -668,6 +672,7 @@ else if ((flag & ControlRow.SPLIT_FLAG_LAST_ON_PAGE) != 0)
 
             // Read in the branch row which is at the split point.
             BranchRow split_branch_row =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 BranchRow.createEmptyTemplate(
                     open_btree.getRawTran(),
                     open_btree.getConglomerate());
@@ -697,6 +702,7 @@ else if ((flag & ControlRow.SPLIT_FLAG_LAST_ON_PAGE) != 0)
                 // there is no way to know the state of the tree, so the
                 // current split pass recursion must end.
                 return(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5055
                     BranchControlRow.restartSplitFor(
                         open_btree, template, parent, this,
                         newbranchrow.getRow(), splitrow, flag));
@@ -716,6 +722,7 @@ else if ((flag & ControlRow.SPLIT_FLAG_LAST_ON_PAGE) != 0)
 			// Allocate a new branch page and link it to the
 			// right of the current page.
 			BranchControlRow newbranch =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                 BranchControlRow.allocate(open_btree, childpage,
                     this.getLevel(), parent);
 			newbranch.linkRight(open_btree, this);
@@ -739,6 +746,7 @@ else if ((flag & ControlRow.SPLIT_FLAG_LAST_ON_PAGE) != 0)
             newbranchrow.setPageNumber(newbranch.page.getPageNumber());
 
             BranchRow branch_template =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 BranchRow.createEmptyTemplate(
                     open_btree.getRawTran(),
                     open_btree.getConglomerate());
@@ -841,6 +849,7 @@ else if ((flag & ControlRow.SPLIT_FLAG_LAST_ON_PAGE) != 0)
 			// Decide whether we're following the current page or the new page.
 			BranchControlRow pagetofollow;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
             if (compareIndexRowToKey(
                     splitrow, 
                     split_branch_row.getRow(),
@@ -889,6 +898,7 @@ else if ((flag & ControlRow.SPLIT_FLAG_LAST_ON_PAGE) != 0)
 
         // RESOLVE (mikem) - should this be passed in?
         BranchRow branch_template =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             BranchRow.createEmptyTemplate(
                     open_btree.getRawTran(),
                     open_btree.getConglomerate());
@@ -1201,6 +1211,7 @@ private static void growRoot(
             // rows from the root, and remain at the old root's level.
             // Its parent is the root.
             branch =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                 BranchControlRow.allocate(
                     open_btree, leftchild, root.getLevel(), root);
 
@@ -1420,6 +1431,7 @@ protected ControlRow getChildPageAtSlot(
                 child_pageno_buf);
 
             child_control_row =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                 ControlRow.get(open_btree, child_pageno_buf.getLong());
         }
 
@@ -1440,6 +1452,7 @@ protected ControlRow getChildPageAtSlot(
     public ControlRow getLeftChild(OpenBTree open_btree)
             throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
          return(ControlRow.get(open_btree, this.getLeftChildPageno()));
     }
 
@@ -1465,6 +1478,7 @@ protected ControlRow getRightChild(OpenBTree open_btree)
         // last branch row to find the rightmost child.
         right_child = 
             (num_slots == 1 ? 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                 ControlRow.get(open_btree, this.getLeftChildPageno()) :
                 getChildPageAtSlot(open_btree, (num_slots - 1)));
 
@@ -1522,6 +1536,7 @@ public DataValueDescriptor[] getRowTemplate(OpenBTree    open_btree)
 		throws StandardException
     {
         return(BranchRow.createEmptyTemplate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                     open_btree.getRawTran(),
                     open_btree.getConglomerate()).getRow());
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BranchRow.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BranchRow.java
index 9f800794dd..cbbead92c4 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BranchRow.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/BranchRow.java
@@ -81,6 +81,7 @@ private BranchRow()
 	}
 
 	private BranchRow(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     Transaction         rawtran,
     BTree               btree)
         throws StandardException
@@ -131,6 +132,7 @@ private SQLLongint getChildPage()
      * @exception StandardException Standard exception policy.
      */
     public static BranchRow createEmptyTemplate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     Transaction         rawtran,
     BTree               btree)
         throws StandardException
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/ControlRow.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/ControlRow.java
index 9eccc9d669..7a87504fc8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/ControlRow.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/ControlRow.java
@@ -318,6 +318,7 @@ protected ControlRow(
 		// Page numbers start out "invalid".  Presumably the caller will
 		// link the page into a page chain as one of its next steps.
 		leftSiblingPageNumber  = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6063
             new SQLLongint(ContainerHandle.INVALID_PAGE_NUMBER);
 		rightSiblingPageNumber = 
             new SQLLongint(ContainerHandle.INVALID_PAGE_NUMBER);
@@ -469,6 +470,7 @@ public ControlRow getLeftSibling(OpenBTree btree)
 			return null;
 
 		// Try to get the control row without waiting
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 		cr = ControlRow.getNoWait(btree, pageno);
 		if (cr == null)
 			throw new WaitError();
@@ -503,6 +505,7 @@ protected void setLeftSibling(ControlRow leftsib)
             if (SanityManager.DEBUG)
             {
                 SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
                     "setLeftSibling got an exception: " +
                     "control_row = " + this +
                     "trying to update field number " + CR_LEFTSIB_COLID + 
@@ -528,6 +531,7 @@ protected ControlRow getRightSibling(OpenBTree open_btree)
 		if (pageno == ContainerHandle.INVALID_PAGE_NUMBER)
 			return null;
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 			return ControlRow.get(open_btree, pageno);
 	}
 
@@ -560,6 +564,7 @@ protected void setRightSibling(ControlRow rightsib)
             if (SanityManager.DEBUG)
             {
                 SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
                     "setRightSibling got an exception: " +
                     "control_row = " + this +
                     "trying to update field number " + CR_RIGHTSIB_COLID + 
@@ -672,6 +677,7 @@ void setParent(long parent)
             if (SanityManager.DEBUG)
             {
                 SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
                     "setParent got an exception: " +
                     "control_row = " + this +
                     "trying to update field number " + CR_PARENT_COLID + 
@@ -800,6 +806,7 @@ public BTree getConglom(int format_id)
 	public static ControlRow get(OpenBTree open_btree, long pageNumber)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
         return(ControlRow.get(open_btree.container, pageNumber));
 	}
 
@@ -824,6 +831,7 @@ public static ControlRow get(ContainerHandle container, long pageNumber)
         }
 
 		// Return the corresponding control row.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 		return getControlRowForPage(container, page);
 	}
 
@@ -846,6 +854,7 @@ public static ControlRow getNoWait(
 
 		// Got the page without waiting.  Return the corresponding
 		// control row.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 		return getControlRowForPage(open_btree.container, page);
 	}
 
@@ -890,6 +899,7 @@ protected static ControlRow getControlRowForPage(
 
         // call page specific initialization.
         cr.controlRowInit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
         // cache this Control row with the page in the cache.
 		page.setAuxObject(cr);
@@ -923,6 +933,7 @@ public void release()
     object allocations occur during the execution of this method.
     <P>
     This method performs a binary search on the page and finds the entry i on
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     the page such that entry[i] &lt;= key &lt; entry[i+1].  The result of the search
     is filled into the passed in params structure.
 
@@ -1128,6 +1139,8 @@ protected void searchForEntryBackward(SearchParameters params)
         {
 			// Compare the index row to the key.
 			compare_ret = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                 compareIndexRowFromPageToKey(
                     this,
                     midslot,
@@ -1438,6 +1451,7 @@ protected boolean checkRowOrder(OpenBTree btree, ControlRow parent)
                SanityManager.ASSERT(btree.getConglomerate().nUniqueColumns <= 
                                     btree.getConglomerate().nKeyFields);
                int compare_result = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                    compareIndexRowToKey(
                        lesser, greater,
                        btree.getConglomerate().nUniqueColumns, 0,
@@ -1503,6 +1517,7 @@ protected boolean compareRowsOnSiblings(
                         (FetchDescriptor) null, true); 
 
                 int r = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                     compareIndexRowToKey(
                         left_lastrow, right_firstrow,
                         btree.getConglomerate().nUniqueColumns,
@@ -2018,6 +2033,7 @@ public void auxObjectInvalidated()
     public DataValueDescriptor[] getRowTemplate(OpenBTree    open_btree)
 		throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         return(open_btree.getConglomerate().createTemplate(
                     open_btree.getRawTran()));
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java
index 3db405dd34..63612bb37d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java
@@ -259,6 +259,7 @@ private static String diag_tabulate(
     Properties  prop,
     LevelInfo   level_info[])
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
         String ret_string   = "";
         LevelInfo   total   = new LevelInfo();
 
@@ -318,6 +319,8 @@ private static String olddiag_tabulate(
     Properties  prop,
     LevelInfo   level_info[])
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
         String ret_string   = "";
         long   total_pages  = 0;
         long   total_res    = 0;
@@ -391,17 +394,20 @@ public void init(Object obj)
     public String diag()
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5224
         OpenBTree   open_btree  = (OpenBTree) this.diag_object;
         ControlRow  root        = null;
         int         tree_height;
         LevelInfo   level_info[] = null;
         String      diag_info    = "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
 
         
         try
         {
             tree_height = open_btree.getHeight();
             root = ControlRow.get(open_btree, BTree.ROOTPAGEID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             // Allocate a LevelInfo array with one entry per level of the tree.
             level_info = new LevelInfo[tree_height];
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
index 592b28f594..8ee854dd7f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
@@ -530,6 +530,7 @@ protected long splitFor(
         }
 
         // See if this page has space.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5604
         if ((this.page.recordCount() - 1 < BTree.maxRowsPerPage) &&
             (this.page.spaceForInsert(splitrow, (FormatableBitSet) null,
 				AccessFactoryGlobals.BTREE_OVERFLOW_THRESHOLD)))
@@ -564,6 +565,7 @@ protected long splitFor(
             // point must not access this object's fields.
             
             ControlRow new_root = ControlRow.get(open_btree, BTree.ROOTPAGEID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             return(
                 new_root.splitFor(open_btree, template, null, splitrow, flag));
@@ -595,6 +597,7 @@ else if ((flag & ControlRow.SPLIT_FLAG_LAST_ON_PAGE) != 0)
         // Save away current split point leaf row, and build a branch row
         // based on it.
         DataValueDescriptor[] split_leaf_row = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             open_btree.getConglomerate().createTemplate(
                     open_btree.getRawTran());
 
@@ -623,6 +626,7 @@ else if ((flag & ControlRow.SPLIT_FLAG_LAST_ON_PAGE) != 0)
             // there is no way to know the state of the tree, so the
             // current split pass recursion must end.
             return(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5055
                 BranchControlRow.restartSplitFor(
                     open_btree, template, parent_page, this, 
                     branchrow.getRow(), splitrow, flag));
@@ -632,6 +636,7 @@ else if ((flag & ControlRow.SPLIT_FLAG_LAST_ON_PAGE) != 0)
         // Create a new leaf page under the parent.
         LeafControlRow newleaf = 
             LeafControlRow.allocate(open_btree, parent_page);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
         // Now that we know the page number of the new child page update
         // the branch row to be inserted with the correct value.
@@ -690,6 +695,7 @@ else if ((flag & ControlRow.SPLIT_FLAG_LAST_ON_PAGE) != 0)
 
 
         BranchRow branch_template = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             BranchRow.createEmptyTemplate(
                     open_btree.getRawTran(),
                     open_btree.getConglomerate());
@@ -801,6 +807,7 @@ private static void growRoot(
         // Allocate a new leaf page under the existing leaf root.
 
         newleaf = LeafControlRow.allocate(open_btree, leafroot);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
         // Test fail after allocation
         if (SanityManager.DEBUG)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/OpenBTree.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/OpenBTree.java
index 251dfd1e73..693b221434 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/OpenBTree.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/OpenBTree.java
@@ -270,6 +270,7 @@ public void checkConsistency()
             if (this.container == null)
             {
                 throw(StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         SQLState.BTREE_IS_CLOSED, err_containerid));
             }
 
@@ -277,6 +278,7 @@ public void checkConsistency()
                 SanityManager.ASSERT(this.init_conglomerate.format_ids != null);
 
             root = ControlRow.get(this, BTree.ROOTPAGEID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             int actualpages = root.checkConsistency(this, null, true);
 
@@ -396,6 +398,7 @@ public void init(
         {
             throw StandardException.newException(
                     SQLState.BTREE_CONTAINER_NOT_FOUND,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     err_containerid);
         }
 
@@ -425,6 +428,7 @@ public void init(
         this.runtime_mem    = 
             (dynamic_info != null ? 
              ((OpenConglomerateScratchSpace) dynamic_info) : 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
               (OpenConglomerateScratchSpace)
                 conglomerate.getDynamicCompiledConglomInfo());
 
@@ -505,6 +509,7 @@ void isIndexableRowConsistent(DataValueDescriptor[] row)
         {
             DataValueDescriptor[] template = 
                 this.init_conglomerate.createTemplate(getRawTran());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
             for (int i = 0; i < row.length; i++)
             {
@@ -555,6 +560,7 @@ public int getHeight()
         try
         {
             root = ControlRow.get(this, BTree.ROOTPAGEID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             int height = root.getLevel() + 1;
 
@@ -591,6 +597,7 @@ public void debugConglomerate()
                     "p_tree", "BTREE Dump: btree " + this.init_conglomerate);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
             root = ControlRow.get(this, BTree.ROOTPAGEID);
             root.printTree(this);
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2I.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2I.java
index 7a9721dd0c..7c50f89b0b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2I.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2I.java
@@ -258,6 +258,7 @@ public class B2I extends BTree
     base table rows which the index rows point at.
 	**/
 	long baseConglomerateId;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
 	/**
 	The column id (zero-based integer index) of the column which holds the row 
@@ -271,6 +272,7 @@ The column id (zero-based integer index) of the column which holds the row
 
     private static final int BASE_MEMORY_USAGE = 
         ClassSize.estimateBaseFromCatalog( B2I.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
     public int estimateMemoryUsage()
     {
@@ -588,9 +590,11 @@ public void create(
 
         // get collation ids from input collation ids, store it in the 
         // conglom state.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         collation_ids = 
             ConglomerateUtil.createCollationIds(template.length, collationIds);
         hasCollatedTypes = hasCollatedColumns(collation_ids);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
 
 		// Do the generic part of creating the b-tree.
 		super.create(
@@ -614,6 +618,7 @@ public void create(
                 TransactionController.MODE_TABLE,
                 rawtran.newLockingPolicy(
                     LockingPolicy.MODE_CONTAINER,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                     TransactionController.ISOLATION_SERIALIZABLE, true), 
                 base_cc, open_btree);
 
@@ -819,6 +824,7 @@ public ConglomerateController open(
 		b2ic.init(
             xact_manager,               // current transaction   
             rawtran,                    // current raw store transaction
+//IC see: https://issues.apache.org/jira/browse/DERBY-1058
             hold,                       // holdability
             open_mode,
             lock_level,
@@ -890,6 +896,7 @@ stopKeyValue, stopSearchOperator, this, new B2IUndo(),
 	 * @exception  StandardException  Standard exception policy.
      **/
 	public ScanManager defragmentConglomerate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     TransactionManager              xact_manager,
     Transaction                     rawtran,
     boolean                         hold,
@@ -919,6 +926,7 @@ public void compressConglomerate(
         throws StandardException
     {
 		B2IController b2ic = new B2IController();
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 
 		try
 		{
@@ -1055,6 +1063,7 @@ public StaticCompiledOpenConglomInfo getStaticCompiledConglomInfo(
 	*/
 	public int getTypeFormatId() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 		return StoredFormatIds.ACCESS_B2I_V5_ID;
 	}
 
@@ -1069,6 +1078,7 @@ public int getTypeFormatId()
      * @see java.io.Externalizable#writeExternal
      **/
 	public void writeExternal_v10_2(ObjectOutput out) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         throws IOException 
     {
 		super.writeExternal(out);
@@ -1101,6 +1111,7 @@ public void writeExternal_v10_3(ObjectOutput out)
     {
         // First part of ACCESS_B2I_V4_ID format is the ACCESS_B2I_V3_ID format.
         writeExternal_v10_2(out);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 		if (conglom_format_id == StoredFormatIds.ACCESS_B2I_V4_ID
                 || conglom_format_id == StoredFormatIds.ACCESS_B2I_V5_ID)
         {
@@ -1151,6 +1162,7 @@ public void readExternal(ObjectInput in)
         
         // In memory maintain a collation id per column in the template.
         collation_ids = new int[format_ids.length];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(!hasCollatedTypes);
         }
@@ -1165,6 +1177,7 @@ public void readExternal(ObjectInput in)
         // below when read from disk.  For version ACCESS_B2I_V3_ID and
         // ACCESS_B2I_V4_ID, this is the default and no resetting is necessary.
         setUniqueWithDuplicateNulls(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 
 		if (conglom_format_id == StoredFormatIds.ACCESS_B2I_V4_ID
                 || conglom_format_id == StoredFormatIds.ACCESS_B2I_V5_ID)
@@ -1179,6 +1192,7 @@ public void readExternal(ObjectInput in)
                     "length = " + collation_ids.length);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
             hasCollatedTypes =
                     ConglomerateUtil.readCollationIdArray(collation_ids, in);
         }
@@ -1194,6 +1208,7 @@ else if (conglom_format_id != StoredFormatIds.ACCESS_B2I_V3_ID)
                     "Unexpected format id: " + conglom_format_id);
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
         if (conglom_format_id == StoredFormatIds.ACCESS_B2I_V5_ID) {
             setUniqueWithDuplicateNulls(in.readBoolean());
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IController.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
index 84c463042a..dda1de523d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
@@ -100,6 +100,7 @@ void init(
                     static_info.base_table_static_info, 
                     /* TODO - maintain a dynamic info for this */
                     ((Conglomerate) static_info.getConglom()).
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                         getDynamicCompiledConglomInfo());
         }
         else
@@ -139,6 +140,7 @@ else if (lock_level == TransactionController.MODE_RECORD)
 		// Do generic b-tree initialization.
 		super.init(
             xact_manager, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1058
             hold,
             (ContainerHandle) null, 
             rawtran, 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java
index bccd95a39e..a3a67e5d8a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java
@@ -179,6 +179,7 @@ public Conglomerate createConglomerate(
             throws StandardException
 	{
         B2I btree = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
         if ((temporaryFlag & TransactionController.IS_TEMPORARY) != 0 &&
                 xact_mgr.getAccessManager().isReadOnly())
@@ -192,6 +193,7 @@ public Conglomerate createConglomerate(
         }
         else if (xact_mgr.checkVersion(
                 RawStoreFactory.DERBY_STORE_MAJOR_VERSION_10,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
                 RawStoreFactory.DERBY_STORE_MINOR_VERSION_4,
                 null)) 
         {
@@ -280,17 +282,20 @@ public Conglomerate readConglomerate(
 
                 throw StandardException.newException(
                     SQLState.STORE_CONGLOMERATE_DOES_NOT_EXIST, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     container_key.getContainerId());
             }
 
             // The conglomerate is located in the control row on the root page.
             root = ControlRow.get(container, BTree.ROOTPAGEID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             if (SanityManager.DEBUG)
                 SanityManager.ASSERT(root.getPage().isLatched());
 
             // read the Conglomerate from it's entry in the control row.
             btree = (Conglomerate) root.getConglom(B2I.FORMAT_NUMBER);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5224
 
             if (SanityManager.DEBUG)
                 SanityManager.ASSERT(btree instanceof B2I);
@@ -363,6 +368,7 @@ public void	boot(boolean create, Properties startParams)
 		// Find the UUID factory.
 		UUIDFactory uuidFactory = 
             getMonitor().getUUIDFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		// Make a UUID that identifies this conglomerate's format.
 		formatUUID = uuidFactory.recreateUUID(FORMATUUIDSTRING);
@@ -378,6 +384,7 @@ public void	stop()
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java
index 30b5eb9404..6a751ed41d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java
@@ -223,6 +223,7 @@ public void init(
                     static_info.base_table_static_info,
                     /* TODO - maintain a dynamic info for this */
                     ((Conglomerate) static_info.getConglom()).
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                         getDynamicCompiledConglomInfo());
         }
         else
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java
index bdee90f6e1..3eb27103d5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java
@@ -298,6 +298,7 @@ else if (current_leaf != null)
                 aux_leaf = null;
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             if ((((HeapController)base_cc).getOpenConglomerate().getOpenMode() &
                     TransactionManager.OPENMODE_LOCK_ROW_NOWAIT) != 0) {
                 throw StandardException.newException(SQLState.LOCK_TIMEOUT);
@@ -466,6 +467,7 @@ else if (prev_leaf.isLeftmostLeaf())
 
                 // error going left.  Release current page latch and 
                 // original page latch continue the search.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3244
                 if (current_leaf != null)
                 {
                     // current_leaf may have already been released as part of
@@ -483,6 +485,8 @@ else if (prev_leaf.isLeftmostLeaf())
                 // wait on the left page, which we could not get before. 
                 prev_leaf = (LeafControlRow) 
                     ControlRow.get(open_btree, previous_pageno);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
                 latches_released = true;
             }
@@ -803,6 +807,7 @@ public boolean lockNonScanPreviousRow(
                 // caller must research, get new locks if this routine 
                 // releases latches.
                 ret_status = this.searchLeftAndLockPreviousKey(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6041
                     current_leaf,
                     lock_fetch_desc, lock_template, lock_row_loc,
                     open_btree, lock_operation, lock_duration);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
index 0884f42555..ebef10be71 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
@@ -132,6 +132,7 @@ public Page findUndo(
 
             // Need Conglomerate to create templates - get from the root page.
             root = ControlRow.get(container, BTree.ROOTPAGEID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             if (SanityManager.DEBUG)
                 SanityManager.ASSERT(root.getPage().isLatched());
@@ -143,6 +144,7 @@ public Page findUndo(
 
             // create a template for the logged index row from the conglomerate.
             logged_index_row_template = btree.createTemplate(rawtran);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
             // create a template for the page index row from the conglomerate.
             template                  = btree.createTemplate(rawtran);
@@ -190,6 +192,7 @@ public Page findUndo(
             // Get the page where the record was originally, before splits
             // could have possibly moved it.
             control_row = ControlRow.get(open_btree, rechandle.getPageNumber());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
             // init compare_result, if record doesn't exist do the search 
             compare_result = 1;
@@ -216,6 +219,7 @@ public Page findUndo(
                 // compare the 2 rows, and if they are the same then the raw 
                 // store has the right page and record and there is no work to
                 // be done (this is usual case).
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                 compare_result = ControlRow.compareIndexRowToKey(
                     template, logged_index_row_template, 
                     logged_index_row_template.length, 1, 
@@ -241,6 +245,7 @@ public Page findUndo(
                 control_row = null;
                 control_row = 
                     ControlRow.get(open_btree, BTree.ROOTPAGEID).search(sp);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
 
                 if (!sp.resultExact)
                 {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java
index ca4aa06e2a..5be080daba 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java
@@ -218,6 +218,7 @@ public static int[] createCollationIds(
     int[]   collationIds)
     {
         int[] collation_ids = new int[sizeof_ids];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         if (collationIds != null)
         {
             if (SanityManager.DEBUG)
@@ -333,6 +334,7 @@ public static boolean readCollationIdArray(
             int array_index = CompressedNumber.readInt(in);
             collation_id_array[array_index] = CompressedNumber.readInt(in);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
         return num_compressed_entries > 0;
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
index ccf8fec82c..7fed6081cb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
@@ -219,6 +219,7 @@ public int compare(DataValueDescriptor other)
      * @return {@code true} if a collation other than UCS BASIC was found.
      */
     public static boolean hasCollatedColumns(int[] collationIds) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
         for (int i=0; i < collationIds.length; i++) {
             if (collationIds[i] != StringDataValue.COLLATION_TYPE_UCS_BASIC) {
                 return true;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
index 21fe6890b3..f3d89a8fd1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
@@ -365,6 +365,7 @@ public boolean fetch(
 
         getRowPositionFromRowLocation(loc, pos);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-707
         if (!open_conglom.latchPage(pos)) 
         {
             return false;
@@ -379,6 +380,7 @@ public boolean fetch(
 
         if (open_conglom.isForUpdate())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4685
             open_conglom.lockPositionForWrite(pos, waitForLock);
         }
         else
@@ -457,22 +459,34 @@ public boolean replace(
             {
                 throw(StandardException.newException(
                         SQLState.HEAP_TEMPLATE_MISMATCH,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         invalidColumn, 
                         open_conglom.getFormatIds().length));
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-806
+//IC see: https://issues.apache.org/jira/browse/DERBY-806
+//IC see: https://issues.apache.org/jira/browse/DERBY-806
+//IC see: https://issues.apache.org/jira/browse/DERBY-806
         RowPosition pos = 
             open_conglom.getRuntimeMem().get_scratch_row_position();
 
         getRowPositionFromRowLocation(loc, pos);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-707
+//IC see: https://issues.apache.org/jira/browse/DERBY-707
         if (!open_conglom.latchPage(pos)) 
         {
             return false;
         }
 
         open_conglom.lockPositionForWrite(pos, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4685
+//IC see: https://issues.apache.org/jira/browse/DERBY-4685
+//IC see: https://issues.apache.org/jira/browse/DERBY-4685
 
         boolean ret_val = true;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
index ec01c1ae5f..57d36c1b64 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
@@ -65,6 +65,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
                 extended
                 to provide more information if necessary.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2462
 scan_state    - a scan has 5 possible states:
                 SCAN_INIT, SCAN_INPROGRESS, SCAN_DONE, SCAN_HOLD_INIT, and
                 SCAN_HOLD_INPROGRESS
@@ -247,6 +248,7 @@ private final void repositionScanForUpateOper()
             throw StandardException.newException(
                     SQLState.AM_RECORD_NOT_FOUND, 
                     open_conglom.getContainer().getId(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     scan_position.current_rh.getPageNumber(),
                     scan_position.current_rh.getId());
         }
@@ -257,6 +259,7 @@ private final void repositionScanForUpateOper()
             // scan positioned on the row, need to request an
             // X lock before we can actually perform the delete
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4685
             open_conglom.lockPositionForWrite(scan_position, true);
         }
     }
@@ -292,7 +295,9 @@ protected void positionAtInitScan(
         throws StandardException
     {
         // startKeyValue init.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         this.init_startKeyValue         = startKeyValue;
+//IC see: https://issues.apache.org/jira/browse/DERBY-404
         if (RowUtil.isRowEmpty(this.init_startKeyValue))
             this.init_startKeyValue = null;
 
@@ -309,13 +314,16 @@ protected void positionAtInitScan(
         // so allocating it here is probably not that bad.
         init_fetchDesc = 
             new FetchDescriptor(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
               (open_conglom.getRuntimeMem().get_scratch_row(
                     open_conglom.getRawTran())).length,
               init_scanColumnList,
               init_qualifier);
 
         // stopKeyValue init.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         this.init_stopKeyValue          = stopKeyValue;
+//IC see: https://issues.apache.org/jira/browse/DERBY-404
         if (RowUtil.isRowEmpty(this.init_stopKeyValue))
             this.init_stopKeyValue = null;
 
@@ -346,6 +354,7 @@ protected void positionAtInitScan(
                 // add in start columns
                 if (this.init_startKeyValue != null)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
                     required_cols.grow(this.init_startKeyValue.length);
                     for (int i = 0; i < this.init_startKeyValue.length; i++)
                         required_cols.set(i);
@@ -366,6 +375,7 @@ protected void positionAtInitScan(
                 // FormatableBitSet equals requires the two FormatableBitSets to be of same
                 // length.
                 required_cols.grow(init_scanColumnList.size());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
 
                 if (!required_cols_and_scan_list.equals(required_cols))
                 {
@@ -620,6 +630,8 @@ else if (this.scan_state == SCAN_HOLD_INPROGRESS)
         else if (this.scan_state == SCAN_HOLD_INIT)
         {
             reopenAfterEndTransaction();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
 
             positionAtStartForForwardScan(scan_position);
 
@@ -642,6 +654,7 @@ else if (this.scan_state == SCAN_HOLD_INIT)
         // (scan_position.current_page will be null).  
         // Along the way apply qualifiers to skip rows which don't qualify.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         while (scan_position.current_page != null)
         {
             while ((scan_position.current_slot + 1) < 
@@ -662,6 +675,7 @@ else if (this.scan_state == SCAN_HOLD_INIT)
                         if (row_array[ret_row_count] == null)
                         {
                             row_array[ret_row_count] = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                               open_conglom.getRuntimeMem().get_row_for_export(
                                   open_conglom.getRawTran());
                         }
@@ -671,6 +685,7 @@ else if (this.scan_state == SCAN_HOLD_INIT)
                     else
                     {
                         fetch_row = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                             open_conglom.getRuntimeMem().get_row_for_export(
                                 open_conglom.getRawTran());
                     }
@@ -841,6 +856,7 @@ else if (scan_position.current_slot == -1)
         // we need to decrement when we stop scan at the end of the table.
         this.stat_numpages_visited--;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         return(ret_row_count);
     }
 
@@ -868,6 +884,7 @@ the current scan had been closed and a openScan() had been called instead.
     first next operation is attempted.
 
     @param qualifier An array of qualifiers which, applied
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     to each key, restrict the rows returned by the scan.  Rows
     for which any one of the qualifiers returns false are not
     returned by the scan. If null, all rows are returned.
@@ -910,6 +927,7 @@ protected abstract RowLocation makeRowLocation( RowPosition pos )
      */
     public void init(
     OpenConglomerate                open_conglom,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     FormatableBitSet                scanColumnList,
     DataValueDescriptor[]           startKeyValue,
     int                             startSearchOperator,
@@ -921,6 +939,7 @@ public void init(
         super.init(open_conglom);
 
         scan_position = open_conglom.getRuntimeMem().get_scratch_row_position();
+//IC see: https://issues.apache.org/jira/browse/DERBY-806
 
         // remember inputs
         init_scanColumnList         = scanColumnList;
@@ -933,7 +952,9 @@ public void init(
             stopSearchOperator,
             scan_position);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
         reusableRecordIdSequenceNumber = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-806
             open_conglom.getContainer().getReusableRecordIdSequenceNumber();
     }
 
@@ -1004,6 +1025,7 @@ private void closeScan()
 
         // If we are closed due to catching an error in the middle of init,
         // xact_manager may not be set yet. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         if (open_conglom.getXactMgr() != null)
             open_conglom.getXactMgr().closeMe(this);
 
@@ -1034,6 +1056,7 @@ public void close()
      * @exception StandardException Derby standard exception
      */
     protected final boolean reopenAfterEndTransaction() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
         throws StandardException
     {
         // Only reopen if holdable
@@ -1101,6 +1124,7 @@ else if (this.scan_state == SCAN_INIT)
     @see org.apache.derby.iapi.store.access.ScanController#delete
     **/
     public boolean delete()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         repositionScanForUpateOper();
@@ -1293,6 +1317,7 @@ the current scan had been closed and a openScan() had been called instead.
     the original openScan.  The previous template row continues to be used.
 
     @param startKeyValue  An indexable row which holds a 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     (partial) key value which, in combination with the
     startSearchOperator, defines the starting position of
     the scan.  If null, the starting position of the scan
@@ -1360,6 +1385,7 @@ public void reopenScan(
     public boolean replace(
     DataValueDescriptor[]   row, 
     FormatableBitSet                 validColumns)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         repositionScanForUpateOper();
@@ -1434,6 +1460,7 @@ public boolean doesCurrentPositionQualify()
         }
 
         DataValueDescriptor row[] = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             open_conglom.getRuntimeMem().get_scratch_row(
                 open_conglom.getRawTran());
 
@@ -1454,12 +1481,14 @@ public boolean doesCurrentPositionQualify()
     }
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
     Fetch the row at the current position of the Scan without applying the 
     qualifiers.
     
     @see org.apache.derby.iapi.store.access.ScanController#fetchWithoutQualify
     **/
     public void fetchWithoutQualify(DataValueDescriptor[] row)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         fetch(row, false);
@@ -1470,6 +1499,7 @@ public void fetchWithoutQualify(DataValueDescriptor[] row)
      */
     public boolean isHeldAfterCommit() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2462
         return (scan_state == SCAN_HOLD_INIT ||
                 scan_state == SCAN_HOLD_INPROGRESS);
     }
@@ -1482,6 +1512,7 @@ public boolean isHeldAfterCommit() throws StandardException
     @see org.apache.derby.iapi.store.access.ScanController#fetch
     **/
     public void fetch(DataValueDescriptor[] row)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         fetch(row, true);
@@ -1498,6 +1529,7 @@ public void fetch(DataValueDescriptor[] row)
     @exception StandardException Standard exception policy.
     **/
     private void fetch(DataValueDescriptor[] row, boolean qualify)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         if (scan_state != SCAN_INPROGRESS)
@@ -1509,6 +1541,7 @@ private void fetch(DataValueDescriptor[] row, boolean qualify)
             throw StandardException.newException(
                     SQLState.AM_RECORD_NOT_FOUND, 
                     open_conglom.getContainer().getId(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     scan_position.current_rh.getPageNumber(),
                     scan_position.current_rh.getId());
         }
@@ -1519,6 +1552,7 @@ private void fetch(DataValueDescriptor[] row, boolean qualify)
                 scan_position.current_rh, 
                 scan_position.current_slot, 
                 row, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
                 qualify ? init_fetchDesc : null, 
                 false);
 
@@ -1543,6 +1577,7 @@ private void fetch(DataValueDescriptor[] row, boolean qualify)
             throw StandardException.newException(
                     SQLState.AM_RECORD_NOT_FOUND, 
                     open_conglom.getContainer().getId(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     scan_position.current_rh.getPageNumber(),
                     scan_position.current_rh.getId());
         }
@@ -1551,6 +1586,7 @@ private void fetch(DataValueDescriptor[] row, boolean qualify)
     }
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
     Fetch the location of the current position in the scan.
     @see org.apache.derby.iapi.store.access.ScanController#fetchLocation
 
@@ -1577,6 +1613,7 @@ public void fetchLocation(RowLocation templateLocation)
      * @exception  StandardException  Standard exception policy.
      **/
     public ScanInfo getScanInfo()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         throw StandardException.newException(
@@ -1598,6 +1635,10 @@ The results of a fetch() performed on a scan positioned on
     @exception StandardException Standard exception policy.
     **/
     public boolean isCurrentPositionDeleted()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
+//IC see: https://issues.apache.org/jira/browse/DERBY-4690
         throws StandardException
     {
         if (scan_state != SCAN_INPROGRESS)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
index af883a69fc..9e6a0df7b5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
@@ -242,7 +242,9 @@ public boolean latchPageAndRepositionScan(RowPosition pos)
         {
             // position on the next page.
             long current_pageno;
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
             if (pos.current_rh != null)
             {
                 current_pageno = pos.current_rh.getPageNumber();
@@ -565,6 +567,7 @@ public boolean lockPositionForWrite(
         // This method is only used for locking existing rows, never for
         // insert operations.
         final boolean forInsert = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4685
 
         boolean lock_granted_with_latch_held =
             this.container.getLockingPolicy().
@@ -790,6 +793,7 @@ public void debugConglomerate()
 
             // get a template.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             DataValueDescriptor[] row = 
                 runtime_mem.get_row_for_export(getRawTran());
 
@@ -876,6 +880,7 @@ public ContainerHandle init(
         this.runtime_mem    = 
             (dynamic_info != null ? 
              ((OpenConglomerateScratchSpace) dynamic_info) : 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
              ((OpenConglomerateScratchSpace)
                 conglomerate.getDynamicCompiledConglomInfo()));
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
index 2509e5ac72..f3404c08f3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
@@ -115,6 +115,7 @@ public OpenConglomerateScratchSpace(
     {
         this.format_ids     = format_ids;
         this.collation_ids  = collation_ids;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
         this.hasCollatedTypes = hasCollatedTypes;
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(GenericConglomerate.hasCollatedColumns(
@@ -154,6 +155,7 @@ public DataValueDescriptor[] get_row_for_export(Transaction rawtran)
             row_for_export_template = 
                 RowUtil.newTemplate(
                     rawtran.getDataValueFactory(), 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2359
                     null, format_ids, collation_ids);
         }
 
@@ -182,6 +184,7 @@ public DataValueDescriptor[] get_scratch_row(Transaction    rawtran)
         // parameters.
         if (scratch_row == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             scratch_row = get_row_for_export(rawtran);
         }
 
@@ -207,6 +210,7 @@ public DataValueDescriptor[] get_template(Transaction rawtran)
         if (scratch_template == null)
         {
             scratch_template = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 TemplateRow.newRow(
                     rawtran, 
                     (FormatableBitSet) null, format_ids, collation_ids);
@@ -228,6 +232,7 @@ public DataValueDescriptor[] get_template(Transaction rawtran)
      **/
     public RowPosition get_scratch_row_position()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-806
         if (scratch_row_position == null)
         {
             scratch_row_position = new RowPosition();
@@ -244,6 +249,7 @@ public RowPosition get_scratch_row_position()
      *      different than UCS BASIC.
      */
     public boolean hasCollatedTypes() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
         return hasCollatedTypes;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java
index ba78f0b9ae..cd91b4cdb8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java
@@ -70,6 +70,7 @@ public void init()
         current_rh              = null;
         current_slot            = Page.INVALID_SLOT_NUMBER;
         current_rh_qualified    = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
         current_pageno          = ContainerHandle.INVALID_PAGE_NUMBER;
     }
 
@@ -81,6 +82,7 @@ public final void positionAtNextSlot()
 
     public final void positionAtPrevSlot()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
         current_slot--;
         current_rh   = null;
     }
@@ -104,6 +106,7 @@ public String toString()
             ret_string = 
                 ";current_slot=" + current_slot +
                 ";current_rh=" + current_rh +
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
                 ";current_pageno=" + current_pageno +
                 ";current_page=" + 
                     (current_page == null ? 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
index 89eb2a9d61..baf2f7e1ad 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
@@ -67,6 +67,7 @@ private TemplateRow() {
 	 * @exception  StandardException  Standard exception policy.
      **/
     private static DataValueDescriptor[] allocate_objects(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     Transaction         rawtran,
     int                 num_cols_to_allocate,
     FormatableBitSet    column_list,
@@ -80,6 +81,7 @@ private static DataValueDescriptor[] allocate_objects(
             (column_list == null ? format_ids.length : column_list.size());
 
         DataValueFactory dvf = rawtran.getDataValueFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
         for (int i = 0; i < num_cols; i++)
         {
@@ -94,6 +96,7 @@ private static DataValueDescriptor[] allocate_objects(
 
                 // get empty instance of object identified by the format id.
                 ret_row[i] = dvf.getNull(format_ids[i], collation_ids[i]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
                 if (SanityManager.DEBUG)
                 {
@@ -102,6 +105,7 @@ private static DataValueDescriptor[] allocate_objects(
                     if (o == null)
                     {
                         SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                         "obj from DataValueFactory.newNull(" +
                         format_ids[i] + ", " + collation_ids[i] + ") null." +
                         ";src column position = "  + i              +
@@ -165,6 +169,7 @@ public static DataValueDescriptor[] newRow(
         DataValueDescriptor[] columns = 
             new DataValueDescriptor[template.length];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         for (int i = template.length; i-- > 0 ;)
         {
             // get empty instance of object identified by the format id.
@@ -189,6 +194,7 @@ public static DataValueDescriptor[] newRow(
 	 * @exception  StandardException  Standard exception policy.
      **/
     public static DataValueDescriptor[] newRow(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     Transaction          rawtran,
     FormatableBitSet     column_list,
     int[]                format_ids,
@@ -220,6 +226,7 @@ public static DataValueDescriptor[] newRow(
 	 * @exception  StandardException  Standard exception policy.
      **/
     public static DataValueDescriptor[] newBranchRow(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     Transaction         rawtran,
     int[]               format_ids,
     int[]               collation_ids,
@@ -231,6 +238,7 @@ public static DataValueDescriptor[] newBranchRow(
         // the page pointer in the branch row.
         DataValueDescriptor[] columns = 
             allocate_objects(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 rawtran,
                 format_ids.length + 1, 
                 (FormatableBitSet) null, format_ids, collation_ids);
@@ -254,6 +262,7 @@ public static DataValueDescriptor[] newBranchRow(
 	 * @exception  StandardException  Standard exception policy.
      **/
 	static public boolean checkColumnTypes(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     DataValueFactory        dvf,
     int[]                   format_ids, 
     int[]                   collation_ids,
@@ -295,6 +304,7 @@ static public boolean checkColumnTypes(
                     column_template = 
                         dvf.getNull(format_ids[colid], collation_ids[colid]);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
                     // is this the right check?
                     if (column.getClass() != column_template.getClass())
@@ -303,6 +313,7 @@ static public boolean checkColumnTypes(
                             "check", "row = " +  RowUtil.toString(row));
 
                         SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                             "input column["+colid+"] (" + column.getClass() +
                             ") did not match expected template class (" +
                             column_template.getClass() + ")" +
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/D_HeapController.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/D_HeapController.java
index ac34028560..6c73722c54 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/D_HeapController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/D_HeapController.java
@@ -120,6 +120,7 @@ private static String out_summary(
 
         if (ratio > 0.001)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5017
             String double_str = "" + ratio;
             short_str = double_str.substring(
                 0, 
@@ -141,6 +142,7 @@ private static String diag_tabulate(
     TableStats stat)
     {
         String ret_string   = "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
 
         // Totals:
         ret_string += 
@@ -241,6 +243,7 @@ public String diag()
 
         while (page != null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5055
             D_HeapController.diag_page(page, prop, stat);
             pageid = page.getPageNumber();
             page.unlatch();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/Heap.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/Heap.java
index 49a35368bf..ca3abaf271 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/Heap.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/Heap.java
@@ -794,6 +794,7 @@ public ConglomerateController open(
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     Long.toString(container_key.getContainerId()));
         }
 
@@ -820,6 +821,7 @@ public ScanManager openScan(
     int                             lock_level,
     LockingPolicy                   locking_policy,
     int                             isolation_level,
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 	FormatableBitSet				scanColumnList,
     DataValueDescriptor[]	        startKeyValue,
     int                             startSearchOperator,
@@ -830,6 +832,7 @@ public ScanManager openScan(
     DynamicCompiledOpenConglomInfo  dynamic_info)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         if (SanityManager.DEBUG) {
             if ((open_mode &
                     TransactionController.OPENMODE_LOCK_ROW_NOWAIT) != 0) {
@@ -841,6 +844,7 @@ public ScanManager openScan(
 
         // Heap scans do not suppport start and stop scan positions (these
         // only make sense for ordered storage structures).
+//IC see: https://issues.apache.org/jira/browse/DERBY-404
 		if (!RowUtil.isRowEmpty(startKeyValue)
 			|| !RowUtil.isRowEmpty(stopKeyValue))
 		{
@@ -865,6 +869,7 @@ public ScanManager openScan(
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     id.getContainerId());
         }
 
@@ -883,6 +888,7 @@ public ScanManager openScan(
 	}
 
 	public void purgeConglomerate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     TransactionManager              xact_manager,
     Transaction                     rawtran)
         throws StandardException
@@ -914,6 +920,7 @@ public void purgeConglomerate(
             {
                 throw StandardException.newException(
                         SQLState.HEAP_CONTAINER_NOT_FOUND, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         id.getContainerId());
             }
 
@@ -936,8 +943,10 @@ public void purgeConglomerate(
                 (ContainerHandle) null,
                 this,
                 this.format_ids,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 this.collation_ids,
                 nested_xact,
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
                 nested_xact.getRawStoreXact(),
                 true,
                 TransactionController.OPENMODE_FORUPDATE,
@@ -949,6 +958,7 @@ public void purgeConglomerate(
             {
                 throw StandardException.newException(
                         SQLState.HEAP_CONTAINER_NOT_FOUND, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         Long.toString(id.getContainerId()));
             }
 
@@ -979,6 +989,7 @@ public void purgeConglomerate(
                     // the heapcontroller know this has happened.  Usually
                     // the transaction takes care of this, but this controller
                     // is internal, so the transaction does not know about it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
                     heapcontroller.closeForEndTransaction(false);
                     
                     // the commit will close the underlying 
@@ -1042,6 +1053,7 @@ public void compressConglomerate(
             {
                 throw StandardException.newException(
                         SQLState.HEAP_CONTAINER_NOT_FOUND, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         id.getContainerId());
             }
 
@@ -1084,12 +1096,17 @@ public ScanManager defragmentConglomerate(
                 (ContainerHandle) null,
                 this,
                 this.format_ids,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 this.collation_ids,
                 xact_manager,
                 rawtran,
                 hold,
                 open_mode,
                 lock_level,
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
                 rawtran.newLockingPolicy(
                     LockingPolicy.MODE_RECORD,
                     TransactionController.ISOLATION_REPEATABLE_READ, true),
@@ -1097,6 +1114,7 @@ public ScanManager defragmentConglomerate(
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     id.getContainerId());
         }
 
@@ -1143,6 +1161,9 @@ public StoreCostController openStoreCost(
                 (ContainerHandle) null,
                 this,
                 this.format_ids,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 this.collation_ids,
                 xact_manager,
                 rawtran,
@@ -1154,6 +1175,7 @@ public StoreCostController openStoreCost(
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     id.getContainerId());
         }
 
@@ -1207,6 +1229,7 @@ public DataValueDescriptor getConglom()
      **/
 	public int getTypeFormatId()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		return StoredFormatIds.ACCESS_HEAP_V3_ID;
 	}
 
@@ -1250,6 +1273,7 @@ protected void writeExternal_v10_2(ObjectOutput out) throws IOException
 
         // write the format id of this conglomerate
         FormatIdUtil.writeFormatIdInteger(out, conglom_format_id);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2598
 
 		out.writeInt((int) id.getSegmentId());
         out.writeLong(id.getContainerId());
@@ -1272,6 +1296,7 @@ protected void writeExternal_v10_2(ObjectOutput out) throws IOException
 	public void writeExternal(ObjectOutput out) throws IOException
     {
         writeExternal_v10_2(out);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
         if (conglom_format_id == StoredFormatIds.ACCESS_HEAP_V3_ID)
         {
@@ -1310,6 +1335,7 @@ public void readExternal(ObjectInput in)
 
         // In memory maintain a collation id per column in the template.
         collation_ids = new int[format_ids.length];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(!hasCollatedTypes);
         }
@@ -1324,6 +1350,7 @@ public void readExternal(ObjectInput in)
         {
             // current format id, read collation info from disk
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
             hasCollatedTypes =
                     ConglomerateUtil.readCollationIdArray(collation_ids, in);
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapCompressScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapCompressScan.java
index c1e9240512..2cd292b131 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapCompressScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapCompressScan.java
@@ -154,6 +154,8 @@ else if (getScanState() == SCAN_HOLD_INPROGRESS)
         else if (getScanState() == SCAN_HOLD_INIT)
         {
             reopenAfterEndTransaction();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
 
             positionAtStartForForwardScan(scan_position);
 
@@ -189,6 +191,7 @@ else if (getScanState() == SCAN_HOLD_INIT)
                     if (row_array[ret_row_count] == null)
                     {
                         row_array[ret_row_count] = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                           open_conglom.getRuntimeMem().get_row_for_export(
                               open_conglom.getRawTran());
                     }
@@ -262,6 +265,7 @@ else if (getScanState() == SCAN_HOLD_INIT)
                 // then return the maximum number and come back into the same 
                 // method to fetch the remaining rows. In this block we ensure
                 // that the scan_position is appropriate.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2549
                 if (ret_row_count >= max_rowcnt)
                 {
                     // filled group buffer, exit fetch loop and return to caller
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
index 37ebdc4f20..8957b48758 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
@@ -171,6 +171,7 @@ public Conglomerate createConglomerate(
     int                     segment,
     long                    input_containerid,
     DataValueDescriptor[]   template,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 	ColumnOrdering[]        columnOrder,
     int[]                   collationIds,
     Properties              properties,
@@ -260,6 +261,7 @@ public Conglomerate readConglomerate(
             {
                 throw StandardException.newException(
                     SQLState.STORE_CONGLOMERATE_DOES_NOT_EXIST,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     container_key.getContainerId());
             }
 
@@ -353,6 +355,7 @@ public void	boot(boolean create, Properties startParams)
 	{
 		// Find the UUID factory.
 		UUIDFactory uuidFactory = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             getMonitor().getUUIDFactory();
 		
 		// Make a UUID that identifies this conglomerate's format.
@@ -377,6 +380,7 @@ public HeapConglomerateFactory()
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapController.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapController.java
index 41f9e501de..0cf82f304c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapController.java
@@ -124,6 +124,7 @@ protected void queueDeletePostCommitWork(
 	 * @exception  StandardException  Standard exception policy.
      **/
     protected final boolean purgeCommittedDeletes(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     Page                page)
         throws StandardException
     {
@@ -352,6 +353,7 @@ protected long load(
                 (ContainerHandle) null,
                 heap,
                 heap.format_ids,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 heap.collation_ids,
                 xact_manager,
                 xact_manager.getRawStoreXact(),
@@ -365,6 +367,7 @@ protected long load(
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     heap.getId().getContainerId());
         }
 
@@ -384,6 +387,7 @@ protected long load(
 		RecordHandle rh;
 		HeapRowLocation rowlocation;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (callbackWithRowLocation ||
             rowSource.needsRowLocationForDeferredCheckConstraints())
 			rowlocation = new HeapRowLocation();
@@ -413,6 +417,8 @@ protected long load(
                     {
                         throw(StandardException.newException(
                                 SQLState.HEAP_TEMPLATE_MISMATCH,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                                 invalidColumn, 
                                 heap.format_ids.length));
                     }
@@ -453,6 +459,7 @@ protected long load(
 					rowSource.rowLocation(rowlocation);
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 if (rowSource.needsRowLocationForDeferredCheckConstraints()) {
                     rowlocation.setFrom(rh);
                     rowSource.offendingRowLocation(rowlocation,
@@ -548,6 +555,7 @@ protected Page getUserPageWait(long pageno)
     protected boolean lockRowAtSlotNoWaitExclusive(RecordHandle rh)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
         try {
             return(
                    open_conglom.getContainer().getLockingPolicy().
@@ -754,6 +762,7 @@ public RowLocation newRowLocationTemplate()
      **************************************************************************
      */
     public OpenConglomerate getOpenConglomerate() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         return open_conglom;
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java
index 521117dd05..b15eefd152 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java
@@ -95,6 +95,7 @@ public void setValueFromResultSet(java.sql.ResultSet resultSet, int colNumber,
 	}
 
 	public DataValueDescriptor getNewNull() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
 		return new HeapRowLocation();
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapScan.java
index a012c1dfc7..1304cf55eb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapScan.java
@@ -136,6 +136,7 @@ protected RowLocation makeRowLocation( RowPosition pos )
     }
 
     protected void setRowLocationArray(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     RowLocation[]   rowloc_array,
     int             index,
     RecordHandle    rh)
@@ -171,6 +172,7 @@ protected void setRowLocationArray(
      * @exception StandardException Standard exception policy.
      */
     private boolean reopenScanByRecordHandleAndSetLocks (RecordHandle rh) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
             throws StandardException 
     {
         if (rh == null) 
@@ -263,6 +265,7 @@ public boolean next()
         // We could optimize this, if there are no qualifiers and read
         // into a zero column row, but callers should be using fetchNext()
         // instead.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         fetchNext_one_slot_array[0] = 
             open_conglom.getRuntimeMem().get_scratch_row(
                     open_conglom.getRawTran());
@@ -282,6 +285,7 @@ public boolean next()
      * @see org.apache.derby.iapi.store.access.ScanController#positionAtRowLocation
      */
     public boolean positionAtRowLocation(RowLocation rl) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
         if (open_conglom.isClosed() && !rowLocationsInvalidated) 
         {
             reopenAfterEndTransaction();
@@ -334,6 +338,7 @@ public int fetchNextGroup(
     }
 
     public int fetchNextGroup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     DataValueDescriptor[][] row_array,
     RowLocation[]           old_rowloc_array,
     RowLocation[]           new_rowloc_array)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
index 5413736b5e..f43abc7b67 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
@@ -131,6 +131,7 @@ public UUID primaryFormat()
 	 */
 	protected MergeSort getMergeSort() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 		return new MergeSort();
 	}
 
@@ -158,6 +159,7 @@ public Sort createSort(
         throws StandardException
 	{
 		MergeSort sort = getMergeSort();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 
         // RESOLVE - mikem change this to use estimatedRows and 
         // estimatedRowSize to come up with a smarter number for sortBufferMax
@@ -360,6 +362,7 @@ public void	boot(boolean create, Properties startParams)
 	{
 		// Find the UUID factory.
 		UUIDFactory uuidFactory = getMonitor().getUUIDFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		// Make a UUID that identifies this sort's format.
 		formatUUID = uuidFactory.recreateUUID(FORMATUUIDSTRING);
@@ -397,6 +400,7 @@ public void	stop()
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeInserter.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
index f6673fb6c2..0931621a89 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
@@ -35,6 +35,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 **/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 final class MergeInserter implements SortController
 {
 	/**
@@ -73,6 +74,7 @@ final class MergeInserter implements SortController
     int     stat_numMergeRuns;
     Vector<Integer>  stat_mergeRunsSize;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	/*
 	 * Methods of SortController
@@ -188,8 +190,10 @@ public void insert(DataValueDescriptor[] row)
             stat_sortType = "external";
 			long conglomid = sort.createMergeRun(tran, sortBuffer);
 			if (mergeRuns == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				mergeRuns = new Vector<Long>();
 			mergeRuns.addElement(conglomid);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
             stat_numMergeRuns++;
             // calculate size of this merge run
@@ -226,6 +230,7 @@ public void completedInserts()
         if (stat_sortType == "external")
         {
             stat_numMergeRuns++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             stat_mergeRunsSize.addElement(stat_numRowsInput - totalRunSize);
         }
 
@@ -284,6 +289,7 @@ boolean initialize(MergeSort sort, TransactionManager tran)
         stat_numMergeRuns = 0;
         stat_numRowsInput = 0;
         stat_numRowsOutput = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         stat_mergeRunsSize = new Vector<Integer>();
         runSize = 0;
         totalRunSize = 0;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeScan.java
index 2114804fdc..f14015ee99 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeScan.java
@@ -70,6 +70,7 @@ public class MergeScan extends SortScan
     MergeSort           sort, 
     TransactionManager  tran,
     SortBuffer          sortBuffer, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     Vector<Long>              mergeRuns,
 	SortObserver		sortObserver,
     boolean             hold)
@@ -182,6 +183,7 @@ public boolean init(TransactionManager tran)
 
 		// Open a scan on each merge run.
 		int scanindex = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Enumeration<Long> e = mergeRuns.elements();
 		while (e.hasMoreElements())
 		{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java
index 2f41edcbbb..713991d838 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java
@@ -58,6 +58,7 @@ public class MergeScanRowSource extends MergeScan implements ScanControllerRowSo
     MergeSort           sort, 
     TransactionManager  tran,
     SortBuffer          sortBuffer, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     Vector<Long>              mergeRuns,
 	SortObserver		sortObserver,
     boolean             hold)
@@ -103,6 +104,7 @@ public boolean needsRowLocation()
 
     public boolean needsRowLocationForDeferredCheckConstraints()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         return false;
     }
 
@@ -125,6 +127,7 @@ public void rowLocation(RowLocation rl)
 	}
 
     public void offendingRowLocation(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             RowLocation rl, long containdId) throws StandardException {
         if (SanityManager.DEBUG) {
             SanityManager.NOTREACHED();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeSort.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeSort.java
index 4d729310a7..8f688d1c25 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeSort.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/MergeSort.java
@@ -50,6 +50,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 **/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
 class MergeSort implements Sort
 {
 	/*
@@ -114,6 +115,7 @@ class MergeSort implements Sort
 	protected boolean columnOrderingAscendingMap[];
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
     A lookup table to speed up lookup of nulls-low ordering of a column, 
 	**/
 	protected boolean columnOrderingNullsLowMap[];
@@ -297,6 +299,8 @@ public ScanControllerRowSource openSortRowSource(TransactionManager tran)
 			// Dump the rows in the sort buffer to a merge run.
 			long containerId = createMergeRun(tran, sortBuffer);
 			mergeRuns.addElement(containerId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 			// If there are more merge runs than we can sort
 			// at once with our sort buffer, we have to reduce
@@ -342,6 +346,7 @@ public void drop(TransactionController tran)
 		// which will give us any in-progress merge
 		// runs, if there are any.
 		if (inserter != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 			inserter.completedInserts();
 		inserter = null;
 
@@ -412,6 +417,7 @@ private boolean checkColumnOrdering(
 			Object columnVal = 
                 RowUtil.getColumn(template, (FormatableBitSet) null, colid);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5077
             if (columnVal == null)
 				return false;
 		}
@@ -451,6 +457,8 @@ void checkColumnTypes(DataValueDescriptor[] row)
                 Object col2 = template[colid];
                 if (col1 == null)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4413
+//IC see: https://issues.apache.org/jira/browse/DERBY-4442
 					SanityManager.THROWASSERT(
 						"col[" + colid + "]  is null");
 				}
@@ -479,6 +487,9 @@ protected int compare(
 		// ordering array.
         for (int i = 0; i < colsToCompare; i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             if (i == colsToCompare - 1 && sortObserver.deferrable()) {
                 if (sortObserver.deferred()) {
                     // Last column, which is RowLocation. We compared equal
@@ -498,6 +509,7 @@ protected int compare(
 
 			// If the columns don't compare equal, we're done.
 			// Return the sense of the comparison.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
 			if ((r = r1[colid].compare(r2[colid], nullsLow)) 
                     != 0)
 			{
@@ -543,7 +555,10 @@ public void initialize(
         // to change throughout a sort.
         columnOrderingMap          = new int[columnOrdering.length];
         columnOrderingAscendingMap = new boolean[columnOrdering.length];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
         columnOrderingNullsLowMap  = new boolean[columnOrdering.length];
+//IC see: https://issues.apache.org/jira/browse/DERBY-4413
+//IC see: https://issues.apache.org/jira/browse/DERBY-4442
         for (int i = 0; i < columnOrdering.length; i++)
         {
             columnOrderingMap[i] = columnOrdering[i].getColumnId();
@@ -577,6 +592,7 @@ public void initialize(
 	An inserter is closing.
 	**/
 	void doneInserting(MergeInserter inserter,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		SortBuffer sortBuffer, Vector<Long> mergeRuns)
 	{
         if (SanityManager.DEBUG)
@@ -609,6 +625,7 @@ void doneScanning(Scan scan, SortBuffer sortBuffer)
 	}
 
 	void doneScanning(Scan scan, SortBuffer sortBuffer,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Vector<Long> mergeRuns)
 	{
 		this.mergeRuns = mergeRuns;
@@ -627,6 +644,7 @@ void dropMergeRuns(TransactionManager tran)
 		if (mergeRuns != null)
 		{
 			Enumeration<Long> e = mergeRuns.elements();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 			try 
 			{
@@ -635,6 +653,7 @@ void dropMergeRuns(TransactionManager tran)
 
 				while (e.hasMoreElements())
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					long containerId = (e.nextElement()).longValue();
 					rawTran.dropStreamContainer(segmentId, containerId);
 				}
@@ -673,6 +692,7 @@ void printRunInfo(TransactionController tran)
 	private void multiStageMerge(TransactionManager tran)
 		throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Enumeration<Long> e;
 		//int iterations = 0; // DEBUG (nat)
 		int maxMergeRuns = sortBuffer.capacity();
@@ -733,6 +753,7 @@ private void multiStageMerge(TransactionManager tran)
 				properties, msRowSource);
 
 			mergeRuns.addElement(id);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 			// Drop the conglomerates in the merge subset
 			e = subset.elements();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/Scan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/Scan.java
index c024677fef..f53f12d0e8 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/Scan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/Scan.java
@@ -97,6 +97,7 @@ public int fetchNextGroup(
     }
 
     public int fetchNextGroup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     DataValueDescriptor[][]     row_array,
     RowLocation[]               old_rowloc_array,
     RowLocation[]               new_rowloc_array)
@@ -321,6 +322,7 @@ public RowLocation newRowLocationTemplate()
      *@see ScanController#positionAtRowLocation
      */
     public boolean positionAtRowLocation(RowLocation rl) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
         throws StandardException 
     {
         throw StandardException.newException(
@@ -363,6 +365,7 @@ public Properties getAllScanInfo(Properties prop)
      */
     public boolean isHeldAfterCommit() throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2462
         throw StandardException.newException(
                 SQLState.SORT_IMPROPER_SCAN_METHOD);
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBuffer.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBuffer.java
index 0df632c9d0..b8e9c71f0a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBuffer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBuffer.java
@@ -112,6 +112,7 @@ Read by the getLastAux() method.  This value is read out
 	Arrange that the next node allocated in the tree have
 	it's aux field set to the argument.
 	**/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 	void setNextAux(int aux)
 	{
 		nextAux = aux;
@@ -130,6 +131,7 @@ int getLastAux()
 	Construct doesn't do anything, callers must call init
 	and check its return code.
 	**/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 	SortBuffer(MergeSort sort)
 	{
 		this.sort = sort;
@@ -159,6 +161,7 @@ boolean init()
 		return true;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 	void reset()
 	{
 		allocator.reset();
@@ -178,6 +181,7 @@ void close()
 	/**
 	Grow by a certain percent if we can
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 	void grow(int percent)
 	{
 		if (percent > 0)
@@ -415,6 +419,7 @@ else if (p.balance == 0)
 	Return the lowest key and delete it from 
 	the tree, preserving the balance of the tree.
 	**/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 	DataValueDescriptor[] removeFirst()
 	{
 		if (head.rightLink == null)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java
index 7b73aafcec..b0f749ffb1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java
@@ -104,6 +104,7 @@ public boolean needsRowLocation()
 
     public boolean needsRowLocationForDeferredCheckConstraints()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         return false;
     }
 
@@ -123,6 +124,7 @@ public void rowLocation(RowLocation rl)
 	}
 
     public void offendingRowLocation(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             RowLocation rl, long containdId) throws StandardException {
         if (SanityManager.DEBUG) {
             SanityManager.NOTREACHED();
@@ -191,6 +193,7 @@ public boolean next() throws StandardException
      * @see org.apache.derby.iapi.store.access.ScanController#fetchWithoutQualify
      **/
     public void fetchWithoutQualify(DataValueDescriptor[] result) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
         throws StandardException
     {
         throw StandardException.newException(
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java
index 28abbedacd..457ef6ed71 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java
@@ -75,6 +75,7 @@ public boolean next()
                 "next() called on scan after scan was closed.");
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6322
         current = sortBuffer.removeFirst();
         return current != null;
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortScan.java
index f0b000ee36..c83171ef49 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/SortScan.java
@@ -153,6 +153,7 @@ public final void fetch(DataValueDescriptor[] result)
 	}
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
     Fetch the row at the current position of the Scan and does not apply the
     qualifiers.
     
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/UniqueWithDuplicateNullsMergeSort.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/UniqueWithDuplicateNullsMergeSort.java
index 9b05022973..02523c857b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/UniqueWithDuplicateNullsMergeSort.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/UniqueWithDuplicateNullsMergeSort.java
@@ -72,6 +72,9 @@ protected int compare(DataValueDescriptor[] r1, DataValueDescriptor[] r2)
             //location too.  This is used to provide proper sorting of
             //duplicate keys with nulls, they must be ordered properly 
             //according to the last field also.
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             if (i == colsToCompare - 1 && nonull) {
                 if (sortObserver.deferred()) {
                     sortObserver.rememberDuplicate(r1);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java
index cccb8fa90d..ca06ee0bb0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java
@@ -95,6 +95,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	String TransactionFactoryId=<moduleIdentifier>
 	</PRE>
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	<P>
 	Class is final as it has methods with privilege blocks
 	and implements PrivilegedExceptionAction.
@@ -174,12 +175,14 @@ public void	boot(boolean create, Properties properties)
         boolean transformExistingData = false;
         boolean inReplicationSlaveMode = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
         String slave = properties.getProperty(SlaveFactory.REPLICATION_MODE);
         if (slave != null && slave.equals(SlaveFactory.SLAVE_MODE)) {
             inReplicationSlaveMode = true;
         }
 
 		DaemonFactory daemonFactory =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 			(DaemonFactory)startSystemModule(org.apache.derby.shared.common.reference.Module.DaemonFactory);
 		rawStoreDaemon = daemonFactory.createNewDaemon("rawStoreDaemon");
 		xactFactory = (TransactionFactory)
@@ -206,6 +209,7 @@ public void	boot(boolean create, Properties properties)
         }
 
         // setup database encryption engines.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         if (create) {
             transformExistingData = setupEncryptionEngines(create, properties);
             if (SanityManager.DEBUG) {
@@ -231,6 +235,7 @@ public void	boot(boolean create, Properties properties)
         
 		// log factory is booted by the data factory
 		logFactory =(LogFactory) findServiceModule(this, getLogFactoryModule());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		// if this is a restore from backup, restore the jar files.
 		if(restoreFromBackup !=null)
@@ -275,6 +280,7 @@ public void	boot(boolean create, Properties properties)
 		
 		// save the service properties to a file if we are doing a 
 		// restore from. This marks the end of restore from backup.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1240
 		if (restoreFromBackup !=null)
 		{
 			((UpdateServiceProperties)properties).saveServiceProperties();
@@ -301,9 +307,11 @@ public void	boot(boolean create, Properties properties)
             if(properties.getProperty(
                               RawStoreFactory.DB_ENCRYPTION_STATUS) !=null) 
             {   
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 handleIncompleteDbCryptoOperation(properties);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             transformExistingData = setupEncryptionEngines(create, properties);
         }
 
@@ -322,11 +330,14 @@ public void	boot(boolean create, Properties properties)
         // If SlaveFactory is to be booted, the boot has to happen
         // before logFactory.recover since that method will be blocked
         // when in replication slave mode.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
         if (inReplicationSlaveMode) {
             // The LogFactory has already been booted in slave mode.
             // Can now start slave replication by booting the
             // SlaveFactory service
             slaveFactory = (SlaveFactory) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 bootServiceModule(create, this,
                                           getSlaveFactoryModule(),
                                           properties);
@@ -340,6 +351,7 @@ public void	boot(boolean create, Properties properties)
 
         // If user requested to encrypt an un-encrypted database or encrypt with
         // a new alogorithm then do that now.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         if (transformExistingData) {
             applyBulkCryptoOperation(properties, newCipherFactory);
         }
@@ -399,6 +411,7 @@ public LockFactory getLockFactory() {
 
     
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 		Get the Transaction Factory to use with this store.
 	*/
 	public TransactionFactory getXactFactory() {
@@ -459,7 +472,9 @@ public Transaction startTransaction(ContextManager contextMgr, String transName)
 	}
 
 	public Transaction startNestedReadOnlyUserTransaction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
     Transaction parentTransaction,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
     CompatibilitySpace compatibilitySpace,
     ContextManager  contextMgr,
     String          transName)
@@ -529,9 +544,11 @@ public void startReplicationMaster(String dbmaster, String host, int port,
                       SQLState.LOGMODULE_DOES_NOT_SUPPORT_REPLICATION);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3551
         RawTransaction t = 
                 xactFactory.findUserTransaction(
                 this,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 getContextService().getCurrentContextManager(), 
                 AccessFactoryGlobals.USER_TRANS_NAME);
 
@@ -550,6 +567,7 @@ public void startReplicationMaster(String dbmaster, String host, int port,
                                      replicationMode);
 
         MasterFactory masterFactory = (MasterFactory)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             bootServiceModule(true, this, getMasterFactoryModule(),
                                       replicationProps);
         masterFactory.startMaster(this, dataFactory, logFactory,
@@ -565,6 +583,7 @@ public void startReplicationMaster(String dbmaster, String host, int port,
      */
     public void stopReplicationMaster() throws StandardException {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3189
         MasterFactory masterFactory = null;
         
         if (isReadOnly()) {
@@ -578,6 +597,7 @@ public void stopReplicationMaster() throws StandardException {
         }
         catch (StandardException se) {
             throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3392
                       SQLState.REPLICATION_NOT_IN_MASTER_MODE);
         }
         masterFactory.stopMaster();
@@ -597,10 +617,13 @@ public void failover(String dbname) throws StandardException {
 
         try {
             masterFactory = (MasterFactory) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 findServiceModule(this, getMasterFactoryModule());
         }
         catch (StandardException se) {
             throw StandardException.newException
+//IC see: https://issues.apache.org/jira/browse/DERBY-3392
                     (SQLState.REPLICATION_NOT_IN_MASTER_MODE);
         }
         masterFactory.startFailover();
@@ -630,6 +653,8 @@ public void unfreeze() throws StandardException
      * @exception StandardException thrown on error
      */
     public void backup(String backupDir, boolean wait) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-523
         throws StandardException 
     {
 		if (backupDir == null || backupDir.equals(""))
@@ -651,6 +676,7 @@ public void backup(String backupDir, boolean wait)
 
 		// find the user transaction, it is necessary for online backup 
 		// to open the container through page cache
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 		RawTransaction t = 
             xactFactory.findUserTransaction(this,
                 getContextService().getCurrentContextManager(), 
@@ -674,6 +700,8 @@ public void backup(String backupDir, boolean wait)
             // and stop new ones from starting until the backup is completed.
             if (!xactFactory.blockBackupBlockingOperations(wait))
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-523
                 throw StandardException.newException(
                       SQLState.BACKUP_BLOCKING_OPERATIONS_IN_PROGRESS);  
             }
@@ -683,6 +711,7 @@ public void backup(String backupDir, boolean wait)
         }finally {
             // let the xactfatory know that backup is done, so that
             // it can allow backup blocking operations. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
             xactFactory.unblockBackupBlockingOperations();
         }
 	}
@@ -706,6 +735,7 @@ public synchronized void backup(Transaction t, File backupDir)
         if (!privExists(backupDir))
 		{
             // if backup dir does not exist, go ahead and create it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
             createBackupDirectory(backupDir);
 		}
 		else
@@ -725,6 +755,7 @@ public synchronized void backup(Transaction t, File backupDir)
             // is assumed to be a derby database directory because derby 
             // databases always have this file. 
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-1248
             if (privExists(
                     new File(backupDir, PersistentService.PROPERTIES_NAME))) 
             { 
@@ -740,6 +771,8 @@ public synchronized void backup(Transaction t, File backupDir)
 		File oldbackup = null;
 		File backupcopy = null;
 		OutputStreamWriter historyFile = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
         StorageFile dbHistoryFile = null;
         File backupHistoryFile = null;
 		LogInstant backupInstant = logFactory.getFirstUnflushedInstant();
@@ -750,6 +783,7 @@ public synchronized void backup(Transaction t, File backupDir)
 			StorageFile dbase           = storageFactory.newStorageFile(null); 
             String      canonicalDbName = storageFactory.getCanonicalName();
             String      dbname = StringUtil.shortDBName( canonicalDbName, storageFactory.getSeparator() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
 			// append to end of history file
 			historyFile = 
@@ -757,6 +791,8 @@ public synchronized void backup(Transaction t, File backupDir)
                     storageFactory.newStorageFile(BACKUP_HISTORY), true);
             
 			backupcopy = new File(backupDir, dbname);
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
 
 			logHistory(
                 historyFile,
@@ -781,6 +817,7 @@ public synchronized void backup(Transaction t, File backupDir)
 
                 if (!privRenameTo(backupcopy,oldbackup))
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-336
                     renameFailed = true;
                     throw StandardException.
                         newException(SQLState.RAWSTORE_ERROR_RENAMING_FILE,
@@ -792,6 +829,8 @@ public synchronized void backup(Transaction t, File backupDir)
                         historyFile,
                         MessageService.getTextMessage(
                             MessageId.STORE_MOVED_BACKUP,
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
                             getFilePath(backupcopy),
                             getFilePath(oldbackup)));
 					renamed = true;
@@ -800,7 +839,10 @@ public synchronized void backup(Transaction t, File backupDir)
 
             // create the backup database directory
             createBackupDirectory(backupcopy);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
             dbHistoryFile = storageFactory.newStorageFile(BACKUP_HISTORY);
             backupHistoryFile = new File(backupcopy, BACKUP_HISTORY); 
 
@@ -816,6 +858,7 @@ public synchronized void backup(Transaction t, File backupDir)
             StorageFile jarDir = 
                 storageFactory.newStorageFile(FileResource.JAR_DIRECTORY_NAME);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1248
             if (privExists(jarDir)) 
             {
                 // find the list of schema directories under the jar dir and
@@ -826,13 +869,17 @@ public synchronized void backup(Transaction t, File backupDir)
                 // copy will fail while copying the backup dir onto itself in 
                 // recursion
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
                 String [] jarDirContents = privList(jarDir);
                 File backupJarDir = new File(backupcopy, 
                                              FileResource.JAR_DIRECTORY_NAME);
                 // Create the backup jar directory
                 createBackupDirectory(backupJarDir);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
                 LanguageConnectionContext lcc = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                     (LanguageConnectionContext)getContextOrNull(
                         LanguageConnectionContext.CONTEXT_ID);
         
@@ -894,8 +941,10 @@ public synchronized void backup(Transaction t, File backupDir)
 
             StorageFile logdir = logFactory.getLogDirectory();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-1248
             try 
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 String name = getServiceName(this);
                 PersistentService ps = 
                     getMonitor().getServiceType(this);
@@ -924,6 +973,7 @@ public synchronized void backup(Transaction t, File backupDir)
             
                 // save the service properties into the backup.
                 ps.saveServiceProperties(backupcopy.getPath(), prop);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5260
 
             }
             catch(StandardException se) 
@@ -966,6 +1016,7 @@ public synchronized void backup(Transaction t, File backupDir)
 
 			// Create the log directory
             createBackupDirectory(logBackup);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
 
 			// do a checkpoint to get the persistent store up to date.
 			logFactory.checkpoint(this, dataFactory, xactFactory, true);
@@ -977,10 +1028,13 @@ public synchronized void backup(Transaction t, File backupDir)
 			
 			// Create the data segment directory
             createBackupDirectory(segBackup);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
 
 			// backup all the information in the data segment.
 			dataFactory.backupDataFiles(t, segBackup);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
             logHistory(historyFile,
                    MessageService.getTextMessage(
                    MessageId.STORE_DATA_SEG_BACKUP_COMPLETED,
@@ -995,6 +1049,8 @@ public synchronized void backup(Transaction t, File backupDir)
 			logHistory(historyFile,
                 MessageService.getTextMessage(
                     MessageId.STORE_COPIED_LOG,
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
                     getFilePath(logdir),
                     getFilePath(logBackup)));
 
@@ -1015,6 +1071,7 @@ public synchronized void backup(Transaction t, File backupDir)
 					
 					// Abort all activity related to backup in the log factory.
 					logFactory.abortLogBackup();
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 
 					// remove the half backed up copy
 					// unless the error occured during  rename process;
@@ -1042,6 +1099,8 @@ public synchronized void backup(Transaction t, File backupDir)
 						logHistory(historyFile,
                             MessageService.getTextMessage(
                                 MessageId.STORE_REMOVED_BACKUP,
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
                                 getFilePath(oldbackup)));
  					}
 					logHistory(historyFile,
@@ -1082,6 +1141,7 @@ public synchronized void backup(Transaction t, File backupDir)
     private void createBackupDirectory(File dir) throws StandardException {
         boolean created = false;
         IOException ex = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
 
         try {
             created = privMkdirs(dir);
@@ -1117,6 +1177,8 @@ private void createBackupDirectory(File dir) throws StandardException {
      * @exception StandardException thrown on error.
      */
     public void backupAndEnableLogArchiveMode(
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-523
     String backupDir,
     boolean deleteOnlineArchivedLogFiles,
     boolean wait) 
@@ -1126,6 +1188,8 @@ public void backupAndEnableLogArchiveMode(
         try {
             // Enable the log archive mode, if it is not already enabled.
             if(!logFactory.logArchived()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
                 logFactory.enableLogArchiveMode();
                 enabledLogArchive = true ;
             }
@@ -1139,6 +1203,7 @@ public void backupAndEnableLogArchiveMode(
             {
                 logFactory.deleteOnlineArchivedLogFiles();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         }catch (Throwable error) {
             // On any errors , disable the log archive, if it 
             // is enabled on this call. 
@@ -1165,6 +1230,7 @@ public void disableLogArchiveMode(boolean deleteOnlineArchivedLogFiles)
 		logFactory.disableLogArchiveMode();
 		if(deleteOnlineArchivedLogFiles)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
             logFactory.deleteOnlineArchivedLogFiles();
         }
 	}
@@ -1177,6 +1243,7 @@ public void disableLogArchiveMode(boolean deleteOnlineArchivedLogFiles)
 	 *  2) copy backup history file. 
 	 */
 	private void restoreRemainingFromBackup(String backupPath) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1240
 		throws StandardException 
 	{
 	
@@ -1267,6 +1334,7 @@ public void getRawStoreProperties(PersistentSet set)
 	public void freezePersistentStore() throws StandardException
 	{
 		// do a checkpoint to get the persistent store up to date.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4239
 		logFactory.checkpoint(this, dataFactory, xactFactory, true);
 		logFactory.freezePersistentStore();
 
@@ -1300,6 +1368,7 @@ public void unfreezePersistentStore() throws StandardException
      *      requested configuration is denied, or if something else goes wrong
      */
     private boolean setupEncryptionEngines(boolean create,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                                            Properties properties)
         throws StandardException
     {
@@ -1319,11 +1388,13 @@ private boolean setupEncryptionEngines(boolean create,
             // for encrypted database, and this takes precedence over the
             // value specified by the user.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             String name = getServiceName(this);
             PersistentService ps = getMonitor().getServiceType(this);
             String canonicalName = ps.getCanonicalServiceName(name);
             Properties serviceprops = ps.getServiceProperties(canonicalName,
                                                               (Properties)null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             isEncryptedDatabase =
                     isTrue(serviceprops, Attribute.DATA_ENCRYPTION);
 
@@ -1334,6 +1405,7 @@ private boolean setupEncryptionEngines(boolean create,
                 reEncrypt = isSet(properties, Attribute.NEW_BOOT_PASSWORD) ||
                         isSet(properties, Attribute.NEW_CRYPTO_EXTERNAL_KEY);
                 encryptDatabase = reEncrypt;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             } else if (encryptDatabase && decryptDatabase) {
                 // We cannot both encrypt and decrypt at the same time.
                 throw StandardException.newException(
@@ -1347,6 +1419,7 @@ private boolean setupEncryptionEngines(boolean create,
             // it is ignored.
 
             // Prevent attempts to (re)encrypt or decrypt a read-only database.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5962
             if ((encryptDatabase || decryptDatabase) && isReadOnly()) {
                 throw StandardException.newException(
                         SQLState.CANNOT_ENCRYPT_READONLY_DATABASE);
@@ -1354,6 +1427,7 @@ private boolean setupEncryptionEngines(boolean create,
         }
 
         // setup encryption engines.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         if (isEncryptedDatabase || encryptDatabase) {
             // Check if database is or will be encrypted. We save encryption
             // properties as service properties, such that
@@ -1369,6 +1443,7 @@ private boolean setupEncryptionEngines(boolean create,
 
             CipherFactoryBuilder cb = (CipherFactoryBuilder)
                 startSystemModule(org.apache.derby.shared.common.reference.Module.CipherFactoryBuilder);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
             // create instance of the cipher factory with the
             // specified encryption properties.
@@ -1413,6 +1488,7 @@ private boolean setupEncryptionEngines(boolean create,
                                    String.valueOf(encryptionBlockSize));
                 }
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 if (isSet(properties, RawStoreFactory.ENCRYPTION_BLOCKSIZE)) {
                     encryptionBlockSize =
                         Integer.parseInt(properties.getProperty(
@@ -1459,6 +1535,7 @@ private boolean setupEncryptionEngines(boolean create,
         }
         // We need to transform existing data if we are (re-)encrypting an
         // existing database, or decrypting an already encrypted database.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         return (!create &&
                 (encryptDatabase || (isEncryptedDatabase && decryptDatabase)));
     }
@@ -1475,6 +1552,7 @@ public int encrypt(byte[] cleartext, int offset, int length,
                        boolean newEngine)
 		 throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         if ((encryptionEngine == null && newEncryptionEngine == null)) {
             throw StandardException.newException(
                         SQLState.STORE_FEATURE_NOT_IMPLEMENTED);
@@ -1482,6 +1560,7 @@ public int encrypt(byte[] cleartext, int offset, int length,
 
 		counter_encrypt++;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
         if (newEngine) {
             return newEncryptionEngine.encrypt(cleartext, offset, length,
                                             ciphertext, outputOffset);
@@ -1499,15 +1578,18 @@ public int encrypt(byte[] cleartext, int offset, int length,
 		@exception StandardException Standard Derby Error Policy
 	 */
 	public int decrypt(byte[] ciphertext, int offset, int length,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 					   byte[] cleartext, int outputOffset) 
 		 throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
 		if (isEncryptedDatabase == false || decryptionEngine == null) {
             throw StandardException.newException(
                         SQLState.STORE_FEATURE_NOT_IMPLEMENTED);
         }
 
 		counter_decrypt++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
         return decryptionEngine.decrypt(ciphertext, offset, length,
                                             cleartext, outputOffset);
 	}
@@ -1524,6 +1606,7 @@ public int getEncryptionBlockSize()
 	public int random()
 	{
 		// don't synchronize it, the more random the better.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
 		return isEncryptedDatabase ? random.nextInt() : 0;
 	}
 
@@ -1533,6 +1616,7 @@ public Serializable changeBootPassword(Properties properties, Serializable chang
 		if (isReadOnly())
 			throw StandardException.newException(SQLState.DATABASE_READ_ONLY);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
 		if (!isEncryptedDatabase)
 			throw StandardException.newException(SQLState.DATABASE_NOT_ENCRYPTED);
 
@@ -1547,6 +1631,7 @@ public Serializable changeBootPassword(Properties properties, Serializable chang
 		String changeString = (String)changePassword;
 
 		return currentCipherFactory.changeBootPassword((String)changePassword, properties, encryptionEngine);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 
 	}
 
@@ -1596,6 +1681,7 @@ private void crashOnDebugFlag(String debugFlag,
             if (SanityManager.DEBUG_ON(debugFlag))
             {
                StandardException se = StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5962
                                       SQLState.DATABASE_ENCRYPTION_FAILED,
                                       debugFlag);
                markCorrupt(se);
@@ -1650,10 +1736,12 @@ private void crashOnDebugFlag(String debugFlag,
      * @exception StandardException Standard Derby Error Policy
      */
     private void applyBulkCryptoOperation(Properties properties,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                                           CipherFactory newCipherFactory)
         throws StandardException 
     {
         boolean decryptDatabase = (isEncryptedDatabase &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 isTrue(properties, Attribute.DECRYPT_DATABASE));
         boolean reEncrypt = (isEncryptedDatabase && (
                 isSet(properties, Attribute.NEW_BOOT_PASSWORD) ||
@@ -1679,12 +1767,16 @@ private void applyBulkCryptoOperation(Properties properties,
         RawTransaction transaction =
             xactFactory.startTransaction(
                    this,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                     getContextService().getCurrentContextManager(),
                     AccessFactoryGlobals.USER_TRANS_NAME);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1786
         try 
 		{
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             if (decryptDatabase) {
                 dataFactory.decryptAllContainers(transaction);
             } else {
@@ -1713,6 +1805,7 @@ private void applyBulkCryptoOperation(Properties properties,
 
             // Let the log factory and data factory know whether the
             // database is encrypted.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             if (decryptDatabase) {
                 isEncryptedDatabase = false;
                 logFactory.setDatabaseEncrypted(false, true);
@@ -1723,6 +1816,7 @@ private void applyBulkCryptoOperation(Properties properties,
                 // before enabling encryption of the log with
                 // the new key.
                 logFactory.setDatabaseEncrypted(true, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
 
                 if (reEncrypt) {
                     // Switch the encryption/decryption engine to the new ones.
@@ -1798,6 +1892,7 @@ private void applyBulkCryptoOperation(Properties properties,
                         properties.put(RawStoreFactory.OLD_ENCRYPTED_KEY,
                                        keyString);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             } else if (decryptDatabase) {
                 // We cannot remove the encryption properties here, as we may
                 // have to revert back to the encrypted database. Instead we set
@@ -1835,6 +1930,7 @@ private void applyBulkCryptoOperation(Properties properties,
 
             // force the checkpoint with new encryption key.
             logFactory.checkpoint(this, dataFactory, xactFactory, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4239
 
             if (SanityManager.DEBUG) {
                 crashOnDebugFlag(TEST_REENCRYPT_CRASH_AFTER_CHECKPOINT, 
@@ -1850,8 +1946,10 @@ private void applyBulkCryptoOperation(Properties properties,
 
             // database is (re)encrypted successfuly, 
             // remove the old version of the container files.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             dataFactory.removeOldVersionOfContainers();
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             if (decryptDatabase) {
                 // By now we can remove all cryptographic properties.
                 removeCryptoProperties(properties);
@@ -1882,6 +1980,7 @@ private void applyBulkCryptoOperation(Properties properties,
             transaction.close(); 
 
         } catch (StandardException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5962
             throw StandardException.newException(
                 SQLState.DATABASE_ENCRYPTION_FAILED, se, se.getMessage());
         } finally {
@@ -1922,6 +2021,7 @@ public void handleIncompleteDbCryptoOperation(Properties properties)
 
         boolean reEncryption = false;
         boolean decryptionFailed =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 isSet(properties, Attribute.DATA_ENCRYPTION) &&
                 !isTrue(properties, Attribute.DATA_ENCRYPTION);
         // check if engine crashed when (re) encryption was in progress.
@@ -1972,6 +2072,7 @@ public void handleIncompleteDbCryptoOperation(Properties properties)
                 
             if (SanityManager.DEBUG) {
                 crashOnDebugFlag(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1786
                    TEST_REENCRYPT_CRASH_AFTER_RECOVERY_UNDO_LOGFILE_DELETE, 
                    reEncryption);
             }
@@ -2005,6 +2106,7 @@ public void handleIncompleteDbCryptoOperation(Properties properties)
                     // only incase of re-encryption there should
                     // be old verify key file. 
                     reEncryption = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 } else if (!decryptionFailed) {
                     // remove the verify key file. 
                     if (!privDelete(verifyKeyFile))
@@ -2036,8 +2138,10 @@ public void handleIncompleteDbCryptoOperation(Properties properties)
             }
 
             if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 SanityManager.ASSERT(!(decryptionFailed && reEncryption));
                 crashOnDebugFlag(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1786
                     TEST_REENCRYPT_CRASH_AFTER_RECOVERY_UNDO_REVERTING_KEY, 
                     reEncryption);
             }
@@ -2054,11 +2158,13 @@ public void handleIncompleteDbCryptoOperation(Properties properties)
         if (dbEncryptionStatus == RawStoreFactory.DB_ENCRYPTION_IN_CLEANUP)
         {
             // remove all the old versions of the  containers. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             dataFactory.removeOldVersionOfContainers();
         }
         
         if (SanityManager.DEBUG) {
                 crashOnDebugFlag(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1786
                    TEST_REENCRYPT_CRASH_BEFORE_RECOVERY_FINAL_CLEANUP, 
                    reEncryption);
         }
@@ -2086,6 +2192,7 @@ public void handleIncompleteDbCryptoOperation(Properties properties)
         }
 
         // Finalize cleanup for failed decryption attempts.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         if (decryptionFailed) {
             if (dbEncryptionStatus == RawStoreFactory.DB_ENCRYPTION_IN_UNDO) {
                 // This action is not idempotent in the sense that once set
@@ -2121,6 +2228,7 @@ private void cryptoOperationAllowed(boolean reEncrypt, boolean decrypt)
         throws StandardException 
     {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         String feature;
         if (decrypt) {
             feature = Attribute.DECRYPT_DATABASE + " attribute";
@@ -2152,6 +2260,7 @@ private void cryptoOperationAllowed(boolean reEncrypt, boolean decrypt)
         // be read once database is reconfigure with new encryption 
         // key.
         if (xactFactory.hasPreparedXact()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5962
             throw StandardException.newException(
                     SQLState.ENCRYPTION_PREPARED_XACT_EXIST);
         }
@@ -2166,6 +2275,7 @@ private void cryptoOperationAllowed(boolean reEncrypt, boolean decrypt)
         // when rollforward recovery is performed. 
     
         if (logFactory.logArchived()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5962
             throw StandardException.newException(
                    SQLState.CANNOT_ENCRYPT_LOG_ARCHIVED_DATABASE);
         }
@@ -2196,11 +2306,13 @@ public String getTransactionFactoryModule()
 	}
 
     public String getSlaveFactoryModule() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
         return SlaveFactory.MODULE;
     }
 
     public String getMasterFactoryModule()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
         return MasterFactory.MODULE;
     }
 
@@ -2233,6 +2345,8 @@ private void logHistory(OutputStreamWriter historyFile, String msg) throws IOExc
      * grant permissions to read user.dir property.
      */
     private String getFilePath(StorageFile file) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
         String path = privGetCanonicalPath(file);
         if(path != null ) {
             return path;
@@ -2266,8 +2380,11 @@ private String getFilePath(File file) {
     }
 
 	protected boolean privCopyDirectory(StorageFile from, File to)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-304
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 		return privCopyDirectory(from, to, (byte[])null, 
                                  (String[])null, true);
 	}
@@ -2316,6 +2433,7 @@ public long getMaxContainerId()
 	public boolean checkVersion(
     int     requiredMajorVersion, 
     int     requiredMinorVersion, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
     String  feature) 
         throws StandardException
     {
@@ -2331,6 +2449,7 @@ public boolean checkVersion(
      */
     private void removeCryptoProperties(Properties properties) {
         // Common props for external key or password.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         properties.remove(Attribute.DATA_ENCRYPTION);
         properties.remove(RawStoreFactory.LOG_ENCRYPT_ALGORITHM_VERSION);
         properties.remove(RawStoreFactory.DATA_ENCRYPT_ALGORITHM_VERSION);
@@ -2459,6 +2578,7 @@ private synchronized boolean privMkdirs(File file) throws IOException
             Object ret = AccessController.doPrivileged( this);
             return ((Boolean) ret).booleanValue();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
         catch (PrivilegedActionException pae) {
             throw (IOException) pae.getCause();
         }
@@ -2523,10 +2643,13 @@ private synchronized boolean privRenameTo( File file1, File file2)
     }
 
     private synchronized boolean privCopyDirectory(StorageFile from, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-304
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
                                                    File to, 
                                                    byte[] buffer, 
                                                    String[] filter,
                                                    boolean copySubdirs)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             throws StandardException
     {
         actionCode = COPY_STORAGE_DIRECTORY_TO_REGULAR_ACTION;
@@ -2598,8 +2721,11 @@ private synchronized boolean privCopyFile( File from, StorageFile to)
     }
 
     private synchronized boolean privCopyFile( StorageFile from, File to)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-304
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         actionCode = COPY_STORAGE_FILE_TO_REGULAR_ACTION;
         actionStorageFile = from;
         actionRegularFile = to;
@@ -2609,6 +2735,8 @@ private synchronized boolean privCopyFile( StorageFile from, File to)
             Object ret = AccessController.doPrivileged( this);
             return ((Boolean) ret).booleanValue();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
         catch( PrivilegedActionException pae) {
             throw (StandardException)pae.getCause();
         }
@@ -2643,6 +2771,8 @@ private synchronized boolean privCopyFile( StorageFile from, StorageFile to)
 
     private synchronized String[] privList(final StorageFile file)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-304
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         actionCode = STORAGE_FILE_LIST_DIRECTORY_ACTION;
         actionStorageFile = file;
 
@@ -2660,6 +2790,8 @@ private synchronized String[] privList(final StorageFile file)
 
     private synchronized String privGetCanonicalPath(final StorageFile file)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
         actionCode = STORAGE_FILE_GET_CANONICALPATH_ACTION;
         actionStorageFile = file;
 
@@ -2667,6 +2799,7 @@ private synchronized String privGetCanonicalPath(final StorageFile file)
         {
             return (String) AccessController.doPrivileged( this);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
         catch( PrivilegedActionException pae) {
             return null;
         } // does not throw an exception
@@ -2691,6 +2824,9 @@ private synchronized String privGetCanonicalPath(final File file)
         {
             return (String) AccessController.doPrivileged( this);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
         catch( PrivilegedActionException pae) {
             return null;
         } // does not throw an exception
@@ -2717,6 +2853,7 @@ public final Object run() throws IOException, StandardException
 
         case REGULAR_FILE_EXISTS_ACTION:
             return actionRegularFile.exists();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 
         case STORAGE_FILE_EXISTS_ACTION:
             return actionStorageFile.exists();
@@ -2732,8 +2869,10 @@ public final Object run() throws IOException, StandardException
             boolean created = actionRegularFile.mkdirs();
 
             FileUtil.limitAccessToOwner(actionRegularFile);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
             return created;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 
         case REGULAR_FILE_IS_DIRECTORY_ACTION:
             // SECURITY PERMISSION - MP1
@@ -2774,6 +2913,7 @@ public final Object run() throws IOException, StandardException
 
         case COPY_STORAGE_FILE_TO_REGULAR_ACTION:
             // SECURITY PERMISSION - MP1, OP4
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
             return FileUtil.copyFile((WritableStorageFactory) storageFactory,
                     actionStorageFile, actionRegularFile);
 
@@ -2783,6 +2923,8 @@ public final Object run() throws IOException, StandardException
             return FileUtil.copyFile((WritableStorageFactory) storageFactory,
                     actionStorageFile, actionToStorageFile);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
         case REGULAR_FILE_GET_CANONICALPATH_ACTION:
             // SECURITY PERMISSION - MP1
             return (String)(actionRegularFile.getCanonicalPath());
@@ -2798,6 +2940,7 @@ public final Object run() throws IOException, StandardException
 
     /** Tells if the attribute/property has been specified. */
     private static boolean isSet(Properties p, String attribute) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         return p.getProperty(attribute) != null;
     }
 
@@ -2845,6 +2988,7 @@ public void createDataWarningFile() throws StandardException {
      */
     private static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getFactory();
@@ -2871,6 +3015,7 @@ public ContextService run()
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<Context>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocExtent.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
index 72e8c991f4..6ee0edd868 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
@@ -607,6 +607,7 @@ protected void undoCompressPages(
     int        new_highest_page,
     int        num_pages_truncated)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
         if (new_highest_page >= 0)
         {
             freePages.shrink(new_highest_page + 1);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocPage.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocPage.java
index 7fe3bbed1d..e44e4e96bc 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocPage.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocPage.java
@@ -82,6 +82,7 @@ bytes must be stored outside of the normal record interface yet it must be
 	(non-first) alloc page have N == 0.
 
 	<PRE>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                              [ borrowed ]
 	+----------+-------------+---+---------+-------------------+-------------+--------+
 	| FormatId | page header | N | N bytes | alloc extend rows | slot offset |checksum|
@@ -98,6 +99,7 @@ bytes must be stored outside of the normal record interface yet it must be
 	first physical byte of the container.  Subsequent allocation pages are
 	chained via the nextAllocPageOffset.  Each allocation page is expected to
 	manage at least 1000 user pages (for 1K page size) so this chaining may not
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	be a severe performance hit.  The logical -&gt; physical mapping of an
 	allocation page is stored in the previous allocation page.  The container
 	object will need to maintain this mapping.
@@ -574,6 +576,7 @@ public static void WriteContainerInfo(byte[] containerInfo,
             {
 				throw StandardException.newException(
                         SQLState.DATA_CHANGING_CONTAINER_INFO, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         oldN, 
                         N);
             }
@@ -596,6 +599,7 @@ public static void WriteContainerInfo(byte[] containerInfo,
 	*/
 	public static void ReadContainerInfo(byte[] containerInfo,
 										 byte[] epage)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6504
 	throws StandardException
 	{
 		int N = (int)epage[BORROWED_SPACE_OFFSET];
@@ -614,6 +618,7 @@ public static void ReadContainerInfo(byte[] containerInfo,
 
 		if (N != 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6504
 		    try {
 		        System.arraycopy(
 		                epage, BORROWED_SPACE_OFFSET+BORROWED_SPACE_LEN,
@@ -945,6 +950,7 @@ protected void compressSpace(
      * Handle undo of compress space operation.
      **/
 	protected void undoCompressSpace(
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
     LogInstant  instant,
     int         new_highest_page,
     int         num_pages_truncated)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java
index 51f96346cb..52c46e2dc0 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java
@@ -44,6 +44,7 @@ public final class AllocPageOperation extends PhysicalPageOperation
 	protected int doStatus;		// what the doMe operation should set the status to
 	protected int undoStatus;	// what the undoMe operation should set the status to
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     AllocPageOperation(AllocPage allocPage, long pageNumber, int doStatus, int undoStatus)
 		 throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseContainer.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
index 0a6fb80bc9..3c789e717d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
@@ -62,6 +62,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	<BR> MT - Mutable - mutable identity : 
 */
 abstract class BaseContainer implements Lockable {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 	/**
 		Identity of the container.
@@ -82,6 +83,7 @@ locked by this thread, or the container must have no identity (ie. it is being c
 
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-4960
 		Committed Drop state of the container.  If a post commit action
 		determined that the drop container operation is committed, the whole
 		container may be removed and space reclaimed.
@@ -102,6 +104,7 @@ store may decide that record Ids may be reused after the page is
 	*/
 	protected boolean isReusableRecordId = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	BaseContainer() {
 	}
 
@@ -167,6 +170,7 @@ public void unlockEvent(Latch lockInfo) {
 
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 		Release free space to the OS.
 		<P>
         As is possible release any free space to the operating system.  This
@@ -213,6 +217,7 @@ public void compressContainer(BaseContainerHandle handle)
                     getContainerId());
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		CompatibilitySpace cs = ntt.getCompatibilitySpace();
 		// Latch this container, the commit will release the latch
 		ntt.getLockFactory().lockObject(
@@ -220,12 +225,14 @@ public void compressContainer(BaseContainerHandle handle)
 
 		try
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
             incrementReusableRecordIdSequenceNumber();						
             compressContainer(ntt, allocHandle);
 		}
 		finally
 		{
             ntt.commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
 
 			ntt.close();
 		}
@@ -299,11 +306,14 @@ public Page addPage(BaseContainerHandle handle, boolean isOverflow) throws Stand
         {
 			throw StandardException.newException(
                     SQLState.DATA_ALLOC_NTT_CANT_OPEN, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     getSegmentId(), 
                     getContainerId());
         }
 
 		// Latch this container, the commit will release the latch
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		CompatibilitySpace cs = ntt.getCompatibilitySpace();
 		ntt.getLockFactory().lockObject(
                 cs, ntt, this, null, C_LockFactory.WAIT_FOREVER);
@@ -758,6 +768,7 @@ protected abstract BasePage getPageForInsert(BaseContainerHandle handle,
 		 throws StandardException;
 
 	protected abstract BasePage getPageForCompress(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     BaseContainerHandle handle,
     int                 flag,
     long                pageno)
@@ -778,6 +789,7 @@ protected abstract BasePage newPage(BaseContainerHandle userhandle,
 										boolean isOverflow) throws StandardException;
 
 	protected abstract void compressContainer(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     RawTransaction      t,
     BaseContainerHandle allocHandle)
         throws StandardException;
@@ -886,6 +898,7 @@ protected abstract void  backupContainer(BaseContainerHandle handle,
      * @exception StandardException Standard Derby error policy 
      */
     protected abstract void encryptOrDecryptContainer(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                                              BaseContainerHandle handle,
                                              String newFilePath,
                                              boolean doEncrypt)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseContainerHandle.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseContainerHandle.java
index 27250f3e4b..903684da05 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseContainerHandle.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseContainerHandle.java
@@ -52,6 +52,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
 	A handle to an open container, implememts RawContainerHandle.
 	<P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	This class is a DerbyObserver to observe RawTransactions
 	and is also a DerbyObservable to
 	handle the list of pages accessed thorough this handle.
@@ -63,6 +64,7 @@ This class implements Lockable (defined to be ContainerHandle) and is
 */
 
 public class BaseContainerHandle extends DerbyObservable 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     implements RawContainerHandle, DerbyObserver 
 {
 
@@ -186,6 +188,7 @@ public Page addPage() throws StandardException
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 		Release free space to the OS.
 		<P>
         As is possible release any free space to the operating system.  This
@@ -209,6 +212,7 @@ public void compressContainer() throws StandardException
 	 */
 	public long getReusableRecordIdSequenceNumber() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
 		checkOpen();
 		
 		return container.getReusableRecordIdSequenceNumber();
@@ -373,6 +377,7 @@ public Page getPageForInsert(int flag)
 	}
 
 	public Page getPageForCompress(int flag, long pageno) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 		 throws StandardException
 	{
 		checkUpdateOpen();
@@ -412,6 +417,7 @@ public synchronized void close()
 
         // notify our observers (Pages) that we are closing ...
         informObservers();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2141
 
         active = false;
 
@@ -1027,6 +1033,7 @@ public SpaceInfo getSpaceInfo()
      */
 	public void backupContainer(String backupContainerPath) throws StandardException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 		checkOpen();
 		container.backupContainer(this, backupContainerPath);
 	}
@@ -1035,6 +1042,7 @@ public void backupContainer(String backupContainerPath) throws StandardException
 
     /** {@inheritDoc} */
     public void encryptOrDecryptContainer(String newFilePath, boolean doEncrypt)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             throws StandardException {
         checkOpen();
         container.encryptOrDecryptContainer(this, newFilePath, doEncrypt);
@@ -1045,6 +1053,7 @@ public String toString()
     {
         if (SanityManager.DEBUG)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
             String str = "BaseContainerHandle:(" + identity.toString() + ")";
             return(str);
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
index f50ac56176..ec87128b39 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
@@ -116,6 +116,7 @@ Currently only getContainerClass() is abstract, there are probably more
 **/
 
 public class BaseDataFileFactory
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     implements DataFactory, CacheableFactory, ModuleControl, ModuleSupportable, PrivilegedExceptionAction<Object>
 {
 
@@ -239,6 +240,7 @@ public class BaseDataFileFactory
 	public BaseDataFileFactory() 
     {
         // Verify that we have permission to execute this method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6636
         SecurityUtil.checkDerbyInternalsPrivilege();
 	}
 
@@ -253,6 +255,7 @@ public boolean canSupport(Properties startParams)
 		if (serviceType == null)
 			return false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-927
 		if (!handleServiceType(serviceType))
 			return false;
 
@@ -266,10 +269,13 @@ public void	boot(boolean create, Properties startParams)
         throws StandardException 
     {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		jbmsVersion = getMonitor().getEngineVersion();
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-4715
 		jvmVersion = buildJvmVersion();
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5240
 		osInfo = buildOSinfo();
 		
 		jarCPath = jarClassPath(getClass());
@@ -277,6 +283,7 @@ public void	boot(boolean create, Properties startParams)
 		dataDirectory = startParams.getProperty(PersistentService.ROOT);
 
 		UUIDFactory uf = getMonitor().getUUIDFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		identifier = uf.createUUID();
 
@@ -310,6 +317,7 @@ public void	boot(boolean create, Properties startParams)
         }
 
         // you can't encrypt a database if the Lucene plugin is loaded
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         if ( luceneLoaded() )
         {
             String  encryptionProp = startParams.getProperty( Attribute.DATA_ENCRYPTION );
@@ -359,6 +367,7 @@ public void	boot(boolean create, Properties startParams)
             {
                 // restoreFrom and createFrom operations also need to know if database 
                 // is encrypted
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
                 String dataEncryption = 
                     startParams.getProperty(Attribute.DATA_ENCRYPTION);
                 databaseEncrypted = Boolean.valueOf(dataEncryption).booleanValue();
@@ -391,13 +400,16 @@ public void	boot(boolean create, Properties startParams)
 
 		//Log the OS info
 		logMsg(osInfo);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5240
 
 		//Log derby.system.home It will have null value if user didn't set it
+//IC see: https://issues.apache.org/jira/browse/DERBY-4853
 		logMsg(Property.SYSTEM_HOME_PROPERTY+"=" + 
 				PropertyUtil.getSystemProperty(Property.SYSTEM_HOME_PROPERTY));
 		
 		//Log properties related to redirection of derby.log 
 		String target = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
 			PropertyUtil.getSystemProperty(Property.ERRORLOG_STYLE_PROPERTY);
 		if (target != null)
 			logMsg(Property.ERRORLOG_STYLE_PROPERTY+"=" + target);
@@ -424,8 +436,10 @@ public void	boot(boolean create, Properties startParams)
 
 
 		CacheFactory cf = (CacheFactory) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             startSystemModule(
                 org.apache.derby.shared.common.reference.Module.CacheFactory);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         // Initialize the page cache
 	    int pageCacheSize = getIntParameter(
@@ -436,6 +450,7 @@ public void	boot(boolean create, Properties startParams)
                     RawStoreFactory.PAGE_CACHE_SIZE_MAXIMUM);
 
 		pageCache =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3734
             cf.newCacheManager(
                 this, "PageCache", pageCacheSize / 2, pageCacheSize);
 
@@ -453,6 +468,7 @@ public void	boot(boolean create, Properties startParams)
 
         // Register MBeans that allow users to monitor the page cache
         // and the container cache.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         pageCache.registerMBean(dataDirectory);
         containerCache.registerMBean(dataDirectory);
 
@@ -466,10 +482,12 @@ public void	boot(boolean create, Properties startParams)
 		}
 
 		droppedTableStubInfo = new Hashtable<LogInstant,Object[]>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         // If derby.system.durability=test then set flags to disable sync of
         // data pages at allocation when file is grown, disable sync of data
         // writes during checkpoint
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
         if (Property.DURABILITY_TESTMODE_NO_SYNC.equalsIgnoreCase(
             PropertyUtil.getSystemProperty(Property.DURABILITY_PROPERTY)))
         {
@@ -519,10 +537,14 @@ public void	stop()
 		}
 
 		boolean logBootTrace = PropertyUtil.getSystemBoolean(Property.LOG_BOOT_TRACE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4873
 		logMsg(LINE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4755
 		logMsg(new Date() +
                 MessageService.getTextMessage(
                     MessageId.STORE_SHUTDOWN_MSG,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4598
+//IC see: https://issues.apache.org/jira/browse/DERBY-4601
                     getIdentifier(),
                     getRootDirectory(),
                     // print object and ide of classloader.
@@ -556,6 +578,7 @@ public void	stop()
 
 		if (isReadOnly())		// do enough to close all files, then return 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5916
 			if (storageFactory != null)
 				storageFactory.shutdown();
 			return;
@@ -727,9 +750,11 @@ private RawContainerHandle openContainer(
                     (ContainerHandle.MODE_UNLOGGED | 
                      ContainerHandle.MODE_CREATE_UNLOGGED);
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 
 				// make sure everything is logged if logArchived is turn on
 				// clear all UNLOGGED flag
+//IC see: https://issues.apache.org/jira/browse/DERBY-3551
 				if (logFactory.logArchived() || 
                                         logFactory.inReplicationMasterMode()) {
 					mode &= ~(ContainerHandle.MODE_UNLOGGED |
@@ -747,6 +772,7 @@ private RawContainerHandle openContainer(
 						((mode & ContainerHandle.MODE_CREATE_UNLOGGED) == 
 						 ContainerHandle.MODE_CREATE_UNLOGGED))									   
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 						if (!t.blockBackup(false)) {
 							// when a backup is in progress transaction can not
                             // block the backup, so convert  unlogged opens 
@@ -1513,6 +1539,7 @@ public String getRootDirectory()
     Cacheable newContainerObject()
     {
         if( supportsRandomAccess)
+//IC see: https://issues.apache.org/jira/browse/DERBY-801
             return newRAFContainer(this);
         else
             return new InputStreamContainer( this);
@@ -1662,6 +1689,7 @@ public StorageFile getAlternateContainerPath(
 	*/
 	private synchronized void removeStubs()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5916
         if( storageFactory != null) 
         {
             actionCode = REMOVE_STUBS_ACTION;
@@ -1720,6 +1748,7 @@ public void removeDroppedContainerFileStubs(
 		{
 			synchronized(droppedTableStubInfo)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				for (Enumeration<LogInstant> e = droppedTableStubInfo.keys(); 
                      e.hasMoreElements(); ) 
 				{
@@ -1807,6 +1836,7 @@ private void bootLogFactory(
         }
 
 		logFactory = (LogFactory)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			bootServiceModule(
                 create, this, 
                 rawStoreFactory.getLogFactoryModule(), startParams);
@@ -1822,6 +1852,7 @@ private boolean handleServiceType(
         try
         {
             PersistentService ps = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 getMonitor().getServiceProvider(type);
             return ps != null && ps.hasStorageFactory();
         }
@@ -1963,6 +1994,7 @@ private void privGetJBMSLockOnDB() throws StandardException
             // write it out for future reference
             fileLockOnDB.writeUTF(myUUID.toString()); 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
             fileLockOnDB.sync();
             fileLockOnDB.seek(0);
             // check the UUID
@@ -2021,6 +2053,7 @@ private void privGetJBMSLockOnDB() throws StandardException
                 {
 
                     String warningMsg = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
                       MessageService.getTextMessage(
                           SQLState.DATA_MULTIPLE_JBMS_WARNING, args);
 
@@ -2045,10 +2078,13 @@ private void privGetJBMSLockOnDB() throws StandardException
                     fileLockOnDB.close();
                 fileLockOnDB = fileLock.getRandomAccessFile( "rw");
                 fileLock.limitAccessToOwner();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
                 // write it out for future reference
                 fileLockOnDB.writeUTF(myUUID.toString()); 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
                 fileLockOnDB.sync();
                 fileLockOnDB.close();
             }
@@ -2121,6 +2157,7 @@ private void privReleaseJBMSLockOnDB() throws IOException
             StorageFile fileLock = 
                 storageFactory.newStorageFile(DB_LOCKFILE_NAME);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-32
             fileLock.delete();
         }
 
@@ -2148,6 +2185,7 @@ public final boolean databaseEncrypted()
     /** {@inheritDoc} */
     public void setDatabaseEncrypted(boolean isEncrypted)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         databaseEncrypted = isEncrypted;
 	}
 
@@ -2161,6 +2199,7 @@ public int encrypt(
 		 throws StandardException
 	{
 		return rawStoreFactory.encrypt(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
                     cleartext, offset, length, 
                     ciphertext, outputOffset, 
                     newEngine);
@@ -2181,6 +2220,7 @@ public int decrypt(
     /** {@inheritDoc} */
     public void decryptAllContainers(RawTransaction t)
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         EncryptOrDecryptData containerDecrypter = new EncryptOrDecryptData(this);
         containerDecrypter.decryptAllContainers(t);
     }
@@ -2209,10 +2249,12 @@ public void removeOldVersionOfContainers()
      **/
     private static String jarClassPath(final Class cls)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return AccessController.doPrivileged( new PrivilegedAction<String>()
         {
           public String run()
           {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4715
               CodeSource cs = null;
               try {
                   cs = cls.getProtectionDomain().getCodeSource();
@@ -2221,6 +2263,7 @@ public String run()
                   return se.getMessage();
               }
   
+//IC see: https://issues.apache.org/jira/browse/DERBY-4944
               if ( cs == null || cs.getLocation() == null )
                   return null;        
       
@@ -2238,8 +2281,10 @@ public String run()
      * security exception.
      */
     private static String buildOSinfo () {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     	return AccessController.doPrivileged(new PrivilegedAction<String>(){
     		public String run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5240
     			String osInfo = "";
     			try {
     				String currentProp = PropertyUtil.getSystemProperty("os.name");
@@ -2265,6 +2310,7 @@ public String run() {
      * security exception.
      */
     private static String buildJvmVersion () {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return AccessController.doPrivileged( new PrivilegedAction<String>()
         {
            public String run()
@@ -2278,6 +2324,7 @@ public String run()
                      jvmversion += "\njava.runtime.version=" + currentProp;
                  if ((currentProp = PropertyUtil.getSystemProperty("java.fullversion")) != null)
                      jvmversion += "\njava.fullversion=" + currentProp ;         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4853
                  if ((currentProp = PropertyUtil.getSystemProperty("user.dir")) != null)
                      jvmversion += "\nuser.dir=" + currentProp ;         
               }
@@ -2338,6 +2385,7 @@ int random()
 	void fileToRemove( StorageFile file, boolean remove) 
     {
 		if (postRecoveryRemovedFiles == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			postRecoveryRemovedFiles = new Hashtable<String,StorageFile>();
         String path = null;
         synchronized( this)
@@ -2399,6 +2447,7 @@ public void postRecovery() throws StandardException
      * Set up the cache cleaner for the container cache and the page cache.
      */
     public void setupCacheCleaner(DaemonService daemon) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3131
         containerCache.useDaemonService(daemon);
         pageCache.useDaemonService(daemon);
     }
@@ -2471,6 +2520,8 @@ public void writeInProgress() throws StandardException
 				}
 				catch (InterruptedException ie)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.setInterrupted();
 				}
 			}
@@ -2509,6 +2560,7 @@ public void backupDataFiles(Transaction rt, File backupDir) throws StandardExcep
 		 * transaction log.
 		 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 		String[] files = getContainerNames();
 		
 		if (files != null) {
@@ -2583,6 +2635,7 @@ public void backupDataFiles(Transaction rt, File backupDir) throws StandardExcep
      * with other privileged actions execution in this class.
      * @return An array of all the file names in seg0.
      **/
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
     synchronized String[] getContainerNames()
 	{
         actionCode = GET_CONTAINER_NAMES_ACTION;
@@ -2622,6 +2675,7 @@ private void restoreDataDirectory(String backupPath)
          * This will fail with a security exception unless the database engine 
          * and all its callers have permission to read the backup directory.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         String[] bfilelist = AccessController.doPrivileged(
                                             new PrivilegedAction<String[]>() {
                                                 public String[] run() {
@@ -2640,8 +2694,10 @@ public String[] run() {
                     final File bsegdir = new File(backupRoot , bfilelist[i]);
                     boolean bsegdirExists = (
                             AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                                 new PrivilegedAction<Boolean>() {
                                     public Boolean run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5641
                                         return Boolean.valueOf(bsegdir.exists());
                                     }
                             })).booleanValue();
@@ -2651,6 +2707,7 @@ public Boolean run() {
                             AccessController.doPrivileged(
                             new PrivilegedAction<Boolean>() {
                                 public Boolean run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5641
                                     return Boolean.valueOf(bsegdir.isDirectory());
                                 }
                             })).booleanValue();
@@ -2710,6 +2767,7 @@ private void privRestoreDataDirectory() throws StandardException
             for (int i = 0; i < cfilelist.length; i++) 
             {
                 //delete only the seg* directories in the database home
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                 if(cfilelist[i].startsWith("seg") || Database.LUCENE_DIR.equals( cfilelist[i] ))
                 {
                     csegdir = storageFactory.newStorageFile( cfilelist[i]);
@@ -2728,6 +2786,7 @@ private void privRestoreDataDirectory() throws StandardException
         for (int i = 0; i < bfilelist.length; i++) 
         {
             //copy only the seg* directories and copy them from backup
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             if (bfilelist[i].startsWith("seg") || Database.LUCENE_DIR.equals( bfilelist[i] ))
             {
                 csegdir = storageFactory.newStorageFile( bfilelist[i]);
@@ -2777,6 +2836,7 @@ public boolean isReadOnly()
 
     /** Return true if the Lucene plugin is loaded */
     public  boolean luceneLoaded()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws StandardException
     {
         try {
@@ -2922,6 +2982,7 @@ public final Object run() throws IOException, StandardException
                     }
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
             return maxnum;
 		} // end of case FIND_MAX_CONTAINER_ID_ACTION
 
@@ -2941,6 +3002,7 @@ public final Object run() throws IOException, StandardException
 
         case POST_RECOVERY_REMOVE_ACTION:
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			for (Enumeration<StorageFile> e = postRecoveryRemovedFiles.elements(); 
                     e.hasMoreElements(); )
             {
@@ -2976,6 +3038,7 @@ public final Object run() throws IOException, StandardException
         case RESTORE_DATA_DIRECTORY_ACTION:
             privRestoreDataDirectory();
             return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 		case GET_CONTAINER_NAMES_ACTION:
         {
             StorageFile seg = storageFactory.newStorageFile( "seg0");
@@ -2997,6 +3060,7 @@ public final Object run() throws IOException, StandardException
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BasePage.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BasePage.java
index 52d789a83f..4f8b908225 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BasePage.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BasePage.java
@@ -76,6 +76,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  **/
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 abstract class BasePage implements Page, DerbyObserver, TypedFormat
 {
 
@@ -174,6 +175,7 @@ abstract class BasePage implements Page, DerbyObserver, TypedFormat
 
 		page goes thru the following transition:
 		VALID_PAGE &lt;-&gt; deallocated page -&gt; free page &lt;-&gt; VALID_PAGE
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		deallocated and free page are both INVALID_PAGE as far as BasePage is concerned.
 		When a page is deallocated, it transitioned from VALID to INVALID.
@@ -331,6 +333,7 @@ public static final RecordHandle MakeRecordHandle(PageKey pkey, int recordHandle
         {
 			throw StandardException.newException(
                 SQLState.DATA_CANNOT_MAKE_RECORD_HANDLE, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 recordHandleConstant);
         }
 
@@ -406,6 +409,7 @@ public final boolean recordExists(RecordHandle handle, boolean ignoreDelete)
 	public RecordHandle fetchFromSlot(
     RecordHandle            rh, 
     int                     slot, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     Object[]                row,
     FetchDescriptor         fetchDesc,
     boolean                 ignoreDelete)
@@ -467,6 +471,7 @@ public final RecordHandle fetchFieldFromSlot(
 		Object[] row = new Object[fieldId + 1];
 		row[fieldId] = column;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2223
 		FetchDescriptor fetchDesc = 
 			new FetchDescriptor(fieldId + 1, fieldId);
 
@@ -1362,6 +1367,7 @@ public void copyAndPurge(Page destPage, int src_slot, int num_rows, int dest_slo
 		// page does not copy over the remaining pieces, i.e.,the new head page
 		// still points to those pieces.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 		owner.getActionSet().actionPurge(
             t, this, src_slot, num_rows, recordIds, true);
 	}
@@ -1373,6 +1379,8 @@ public void copyAndPurge(Page destPage, int src_slot, int num_rows, int dest_slo
 	*/
 	public void unlatch() {
 		if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5258
+//IC see: https://issues.apache.org/jira/browse/DERBY-5248
 			SanityManager.ASSERT(isLatched(), 
                 "unlatch() attempted on page that is not latched.");
 		}
@@ -1389,6 +1397,7 @@ public void unlatch() {
 	 */
 	public final synchronized boolean isLatched() {
 		if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2107
 			SanityManager.ASSERT(identity != null);
 		}
 
@@ -1398,6 +1407,8 @@ public final synchronized boolean isLatched() {
 	/** @see Page#recordCount */
 	public final int recordCount() {
 		if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5258
+//IC see: https://issues.apache.org/jira/browse/DERBY-5248
 			SanityManager.ASSERT(
                 isLatched(), "page not latched on call to recordCount()");
 		}
@@ -1441,6 +1452,8 @@ protected int internalNonDeletedRecordCount()
 				}
 				if (delCount != deletedCount)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5258
+//IC see: https://issues.apache.org/jira/browse/DERBY-5248
 					SanityManager.THROWASSERT(
                         "incorrect deleted row count.  Should be: " + delCount +
                         ", instead got: " + deletedCount + 
@@ -1658,6 +1671,7 @@ public void update(DerbyObservable obj, Object arg) {
 		<BR> MT - RESOLVE
 	*/
 	public final PageKey getPageId() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2107
 		if (SanityManager.DEBUG) {
 			SanityManager.ASSERT(identity != null);
 		}
@@ -1671,6 +1685,7 @@ public final PageKey getPageId() {
 		MT - thread safe
 		@exception StandardException Standard Derby policy.
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2107
 	void setExclusive(BaseContainerHandle requester)
 		throws StandardException {
 
@@ -1707,10 +1722,12 @@ void setExclusive(BaseContainerHandle requester)
                 // the code is wrong.  If it still does, we'd better tear down
                 // the connection just in case, so the error has session level
                 // severity;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4982
                 throw StandardException.newException(
                     SQLState.DATA_DOUBLE_LATCH_INTERNAL_ERROR, identity);
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2107
 			while (owner != null) {
 				try {
 					// Expect notify from releaseExclusive().
@@ -1778,6 +1795,7 @@ boolean setExclusiveNoWait(BaseContainerHandle requester) throws StandardExcepti
 
 			// Pre-latch the page if no one already has latched it or requested
 			// a latch. Otherwise, give up and return false.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2107
 			if (owner == null) {
 				preLatch(requester);
 			} else {
@@ -1804,6 +1822,9 @@ boolean setExclusiveNoWait(BaseContainerHandle requester) throws StandardExcepti
                 } 
                 catch (InterruptedException ie) 
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.setInterrupted();
                 }
             }
@@ -1839,6 +1860,7 @@ protected synchronized void releaseExclusive() {
 			return;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2107
 		owner.deleteObserver(this);
 		owner = null;
 		notifyAll();
@@ -2210,6 +2232,7 @@ protected StoredRecordHeader shiftUp(int low)
             {
 				SanityManager.THROWASSERT(
                     "shiftUp failed, low must be between 0 and recordCount." + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1248
                     "  low = " + low + ", recordCount = " + recordCount +
                     "\n page = " + this);
             }
@@ -2855,6 +2878,7 @@ protected String slotTableToString()
 		{
             StoredRecordHeader rh;
 			str = "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
 
             for (int slot = FIRST_SLOT_NUMBER; slot < recordCount; slot++) {
                 rh = getHeaderAtSlot(slot);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BufferedByteHolderInputStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BufferedByteHolderInputStream.java
index d32758b847..4ff4f88bf7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BufferedByteHolderInputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BufferedByteHolderInputStream.java
@@ -47,6 +47,7 @@ public int read(byte b[], int off, int len)
 
 	public long skip(long count) throws IOException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2686
 		long bytesSkipped = 0L;
 		while (bytesSkipped < count) {
 			fillByteHolder();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CachedPage.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CachedPage.java
index 9bdd50ea85..14f466b8d9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CachedPage.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CachedPage.java
@@ -131,6 +131,7 @@ public CachedPage()
 
 	public final void setFactory(BaseDataFileFactory factory) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 		dataFactory     = factory;
 		pageCache       = factory.getPageCache();
 		containerCache  = factory.getContainerCache();
@@ -145,6 +146,7 @@ constructor.  Called by setIdentity() and createIdentity().
 	protected void initialize()
 	{
 		super.initialize();
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 		isDirty             = false;
 		preDirty            = false;
 		initialRowCount     = 0;
@@ -182,6 +184,7 @@ public Cacheable setIdentity(Object key)
 
 		FileContainer myContainer = 
             (FileContainer) containerCache.find(newIdentity.getContainerId());
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 
 		setContainerRowCount(myContainer.getEstimatedRowCount(0));
 
@@ -205,6 +208,7 @@ public Cacheable setIdentity(Object key)
 			int onPageFormatId = FormatIdUtil.readFormatIdInteger(pageData);
 			if (fmtId != onPageFormatId)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 				return changeInstanceTo(
                             onPageFormatId, newIdentity).setIdentity(key);
 			}
@@ -245,6 +249,7 @@ public Cacheable setIdentity(Object key)
      * @see Cacheable#createIdentity
      **/
 	public Cacheable createIdentity(
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
     Object  key, 
     Object  createParameter) 
         throws StandardException 
@@ -259,12 +264,14 @@ public Cacheable createIdentity(
 
 		PageKey newIdentity = (PageKey) key;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3589
 		PageCreationArgs createArgs = (PageCreationArgs) createParameter;
         int formatId = createArgs.formatId;
 
 		if (formatId == -1)
         {
 			throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3725
                     SQLState.DATA_UNKNOWN_PAGE_FORMAT_2, 
                     newIdentity,
                     org.apache.derby.iapi.util.StringUtil.hexDump(pageData));
@@ -273,6 +280,7 @@ public Cacheable createIdentity(
 		// createArgs[0] contains the integer form of the formatId 
 		// if it is not the same as this instance's formatId, instantiate the
 		// real page object
+//IC see: https://issues.apache.org/jira/browse/DERBY-3589
 		if (formatId != getTypeFormatId())
 		{
 			return(
@@ -303,6 +311,7 @@ public Cacheable createIdentity(
 		 * 0 means creating a page that has already been preallocated.
 		 */
         int syncFlag = createArgs.syncFlag;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3589
 		if ((syncFlag & WRITE_SYNC) != 0 ||
 			(syncFlag & WRITE_NO_SYNC) != 0)
 			writePage(newIdentity, (syncFlag & WRITE_SYNC) != 0);
@@ -315,6 +324,7 @@ public Cacheable createIdentity(
                     ((syncFlag & WRITE_SYNC) != 0)     ? "Write_Sync" :
 					(((syncFlag & WRITE_NO_SYNC) != 0) ? "Write_NO_Sync" :
 					                                          "No_write");
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 
 				SanityManager.DEBUG(
                     FileContainer.SPACE_TRACE,
@@ -362,6 +372,7 @@ private CachedPage changeInstanceTo(int fid, PageKey newIdentity)
             else
             {
                 throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3725
                     SQLState.DATA_UNKNOWN_PAGE_FORMAT_2, 
                     newIdentity,
                     org.apache.derby.iapi.util.StringUtil.hexDump(pageData));
@@ -373,6 +384,7 @@ private CachedPage changeInstanceTo(int fid, PageKey newIdentity)
 		// avoid creating the data buffer if possible, transfer it to the new 
         // page if this is the first time the page buffer is used, then 
         // createPage will create the page array with the correct page size
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 		if (this.pageData != null) 
         {
 			realPage.alreadyReadPage = true;
@@ -414,6 +426,7 @@ private CachedPage changeInstanceTo(int fid, PageKey newIdentity)
      **/
 	public boolean isDirty() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 		synchronized (this) 
         {
 			return isDirty || preDirty;
@@ -552,6 +565,7 @@ public void clean(boolean remove) throws StandardException
     {
 
 		// must wait for the page to be unlatched
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 		synchronized (this) 
         {
 			if (!isDirty())
@@ -583,12 +597,15 @@ public void clean(boolean remove) throws StandardException
             // (owner != null), and preLatch.
 			while ((owner != null) && !preLatch) 
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 				try 
                 { 
                     wait();
 				} 
                 catch (InterruptedException ie) 
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.setInterrupted();
 				}
 			}
@@ -596,6 +613,7 @@ public void clean(boolean remove) throws StandardException
 			// The page is now effectively latched by the cleaner.
 			// We only want to clean the page if the page is actually dirtied,
 			// not when it is just pre-dirtied.
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 			if (!isActuallyDirty()) 
             {
                 // the person who latched it gives up the
@@ -629,6 +647,7 @@ public void clean(boolean remove) throws StandardException
             // do not leave it inClean state or it will block the next cleaner 
             // forever
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 			synchronized (this) 
             {
 				inClean = false;
@@ -698,8 +717,10 @@ private void readPage(
 						StandardException.newException(
 								   SQLState.FILE_READ_PAGE_EXCEPTION, 
 								   ioe, newIdentity, pagesize);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 						
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 				    if (dataFactory.getLogFactory().inRFR())
                     {
                         //if in rollforward recovery, it is possible that this 
@@ -743,6 +764,7 @@ private void readPage(
 	 * @exception  StandardException  Standard exception policy.
      **/
 	private void writePage(
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
     PageKey identity, 
     boolean syncMe) 
 		 throws StandardException 
@@ -762,6 +784,7 @@ private void writePage(
 		LogInstant flushLogTo = getLastLogInstant();
 		dataFactory.flush(flushLogTo);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 		if (flushLogTo != null) 
         {					
 			clearLastLogInstant();
@@ -772,8 +795,10 @@ private void writePage(
 		FileContainer myContainer = 
             (FileContainer) containerCache.find(identity.getContainerId());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3215
 		if (myContainer == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 			StandardException nested =
 				StandardException.newException(
 					SQLState.DATA_CONTAINER_VANISHED,
@@ -781,6 +806,7 @@ private void writePage(
 			throw dataFactory.markCorrupt(
 				StandardException.newException(
 					SQLState.FILE_WRITE_PAGE_EXCEPTION, nested,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3215
 					identity));
 		}
 
@@ -799,6 +825,7 @@ private void writePage(
 
 				// let the container knows whether this page is a not
 				// filled, non-overflow page
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 				myContainer.trackUnfilledPage(
 					identity.getPageNumber(), unfilled());
 
@@ -814,6 +841,7 @@ private void writePage(
 
 				if (currentRowCount != initialRowCount)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 					myContainer.updateEstimatedRowCount(
 						currentRowCount - initialRowCount);
 
@@ -830,6 +858,7 @@ private void writePage(
 			// page cannot be written
 			throw StandardException.newException(
 				SQLState.FILE_WRITE_PAGE_EXCEPTION,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3215
 				ioe, identity);
 		}
 		finally
@@ -857,6 +886,7 @@ public void setContainerRowCount(long rowCount)
 	*/
 	protected void setPageArray(int pageSize)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 		if ((pageData == null) || (pageData.length != pageSize)) 
         {
             // Give a chance for garbage collection to free
@@ -889,6 +919,7 @@ protected byte[] getPageArray() throws StandardException
 	{
         // make subclass write the page format
 		writeFormatId(identity); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 
         // let subclass have a chance to write any cached
         // data to page data array
@@ -909,6 +940,7 @@ protected byte[] getPageArray() throws StandardException
 	protected abstract void initFromData(FileContainer container, PageKey id) 
         throws StandardException;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-758
 
 	// create the page
 	protected abstract void createPage(PageKey id, PageCreationArgs args)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java
index cbee80398a..4aef04f86c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java
@@ -44,6 +44,7 @@ public final class ChainAllocPageOperation extends PhysicalPageOperation
 	protected long newAllocPageNum;	// the next alloc page's page number
 	protected long newAllocPageOffset; // the next alloc page's page offset 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     ChainAllocPageOperation(AllocPage allocPage, long pageNumber, long pageOffset)
 		 throws StandardException
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation.java
index c38cba92fe..d881ef5084 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation.java
@@ -70,6 +70,7 @@ public class CompressSpacePageOperation extends PhysicalPageOperation
      * Constructors for This class:
      **************************************************************************
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     CompressSpacePageOperation(
     AllocPage   allocPage, 
     int         highest_page, 
@@ -182,6 +183,7 @@ public void undoMe(
 				"undo Page is not an allocPage");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
 		((AllocPage)undoPage).undoCompressSpace(
              CLRInstant, newHighestPage, num_pages_truncated);
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation10_2.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation10_2.java
index e5d56ab775..97e0e2296d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation10_2.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation10_2.java
@@ -42,6 +42,7 @@ public final class CompressSpacePageOperation10_2 extends CompressSpacePageOpera
 	* Constructors for This class:
 	**************************************************************************
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     CompressSpacePageOperation10_2(
 		AllocPage   allocPage, 
 		int         highest_page, 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java
index f8190335ab..8eace84cef 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java
@@ -31,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 */
 
 abstract class ContainerActionOnCommit implements DerbyObserver {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 	protected ContainerKey identity;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
index 971d8c6c18..a40f10c8d5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
@@ -72,6 +72,7 @@ public class CopyRowsOperation extends PhysicalPageOperation {
 
 	transient protected ByteArray preparedLog; 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     CopyRowsOperation(RawTransaction t, BasePage destPage, BasePage srcPage,
 							 int destSlot, int num_rows,
 							 int srcSlot, int[] recordIds)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java
index e3bb9dfd21..4aaac20c16 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java
@@ -64,6 +64,7 @@ public String diag()
         */
 
         long container_id = ch.getId().getContainerId();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2141
 
         long conglom_id   = 
             D_DiagnosticUtil.diag_containerid_to_conglomid(
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java
index 1272eeb860..fc075ad19f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java
@@ -88,6 +88,7 @@ private static Object getModuleFromDbName(String db_name)
         Object   store_module = null;
 
 		Object db = findService(Property.DATABASE_MODULE, db_name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         // RESOLVE (mikem) - find a single way to find the current 
         // AccessFactory that works both for ij and unit tests.
@@ -199,6 +200,7 @@ public static String diag_conglomid(String db_name, long conglomid)
             TransactionController tc =
                 store_module.getTransaction(
                     FileContainer.getContextService().getCurrentContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
             ConglomerateController open_table = 
                 tc.openConglomerate(
@@ -247,7 +249,9 @@ public static void diag_dump_page(
 
 			RawStoreFactory store_module = (RawStoreFactory)
 				findServiceModule(module, RawStoreFactory.MODULE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			xact = store_module.startInternalTransaction
                 (FileContainer.getContextService().getCurrentContextManager());
 
@@ -339,6 +343,7 @@ public static long diag_containerid_to_conglomid(
                 TransactionController tc = 
                     store_module.getTransaction(
                         FileContainer.getContextService().getCurrentContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
                 conglom_id = tc.findConglomid(containerid);
             }
@@ -408,6 +413,8 @@ public static long diag_conglomid_to_containerid(
         // Find the AccessFactory
         store_module = (AccessFactory) 
             getServiceModule(module, AccessFactory.MODULE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         if (store_module != null)
         {
@@ -416,6 +423,7 @@ public static long diag_conglomid_to_containerid(
                 TransactionController tc =
                     store_module.getTransaction(
                         FileContainer.getContextService().getCurrentContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
                 container_id = tc.findContainerid(conglomid);
             }
@@ -445,6 +453,7 @@ public static long diag_conglomid_to_containerid(
      * can't call this entry point.
      */
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
index 4fd3889a91..385c5443f3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
@@ -82,6 +82,7 @@ public final class DeleteOperation extends LogicalPageOperation
 
 	transient protected ByteArray preparedLog;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     DeleteOperation(RawTransaction t, BasePage page, int slot, int recordId,
 						   boolean delete, LogicalUndo undo)
 		throws StandardException
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptContainerOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptContainerOperation.java
index 0105c9f417..76d6234abb 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptContainerOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptContainerOperation.java
@@ -180,6 +180,7 @@ public void undoMe(Transaction tran) throws StandardException
         // restore the container to the state it was before the encrytpion.
         BaseDataFileFactory bdff = 
             (BaseDataFileFactory) ((RawTransaction) tran).getDataFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         EncryptOrDecryptData ed = new EncryptOrDecryptData(bdff);
         ed.restoreContainer(containerId);
         releaseResource(tran);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java
index c2d64fe27f..6804609216 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java
@@ -72,6 +72,7 @@ public class EncryptOrDecryptData implements PrivilegedAction<Boolean> {
     private StorageFile actionDestStorageFile;
 
     public EncryptOrDecryptData(BaseDataFileFactory dataFactory) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         this.dataFactory = dataFactory;
         this.storageFactory = dataFactory.getStorageFactory();
     }
@@ -135,6 +136,7 @@ private void encryptOrDecryptAllContainers(RawTransaction t,
 
                 ContainerKey ckey = new ContainerKey(segmentId,
                                                      containerId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 encryptOrDecryptContainer(t, ckey, doEncrypt);
             }
 
@@ -161,6 +163,7 @@ private void encryptOrDecryptAllContainers(RawTransaction t,
      * @exception StandardException Standard Derby error policy
      */
     private void encryptOrDecryptContainer(RawTransaction t,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                                            ContainerKey ckey,
                                            boolean doEncrypt)
         throws StandardException
@@ -181,6 +184,7 @@ private void encryptOrDecryptContainer(RawTransaction t,
         if (SanityManager.DEBUG )
             SanityManager.ASSERT(containerHdl != null);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         EncryptContainerOperation lop =
             new EncryptContainerOperation(containerHdl);
         t.logAndDo(lop);
@@ -220,6 +224,7 @@ private void encryptOrDecryptContainer(RawTransaction t,
         // get rid of the container entry from conatainer cache
         if (!dataFactory.getContainerCache().discard(ckey)) {
             if (SanityManager.DEBUG )
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 SanityManager.THROWASSERT("unable to discard a container " +
                                           ckey + " from the container cache");
         }
@@ -248,6 +253,7 @@ private void encryptOrDecryptContainer(RawTransaction t,
      * temporary versions of the container file.
      */
     private StorageFile getFile(ContainerKey containerId, boolean old) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         return storageFactory.newStorageFile(getFilePath(containerId,
                                                          old));
     }
@@ -268,6 +274,7 @@ private String getFilePath(ContainerKey containerId, boolean old) {
 
     private boolean isOldContainerFile(String fileName) {
         // Old versions start with prefix "o" and ends with ".dat".
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         return (fileName.startsWith("o") && fileName.endsWith(".dat"));
     }
 
@@ -289,6 +296,7 @@ private StorageFile getFile(String ctrFileName)
      * @param ckey the key of the container that needs to be restored.
      * @exception StandardException Standard Derby error policy
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
     void restoreContainer(ContainerKey containerId)
         throws StandardException
     {
@@ -344,6 +352,7 @@ void restoreContainer(ContainerKey containerId)
      * on the database.
      */
     public void removeOldVersionOfContainers()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             throws StandardException {
         // Find the old version of the container files and delete them.
         String[] files = dataFactory.getContainerNames();
@@ -355,6 +364,7 @@ public void removeOldVersionOfContainers()
                     StorageFile oldFile = getFile(files[i]);
                     if (!privDelete(oldFile)) {
                         throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5886
                                   SQLState.FILE_CANNOT_REMOVE_ENCRYPT_FILE,
                                   oldFile);
                     }
@@ -390,6 +400,9 @@ private synchronized boolean privRename(StorageFile fromFile,
         actionCode = STORAGE_FILE_RENAME_ACTION;
         actionStorageFile = fromFile;
         actionDestStorageFile = destFile;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Boolean ret = AccessController.doPrivileged(this);
         actionStorageFile = null;
         actionDestStorageFile = null;
@@ -405,6 +418,7 @@ public Boolean run()
         switch(actionCode)
         {
         case STORAGE_FILE_EXISTS_ACTION:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
             return actionStorageFile.exists();
         case STORAGE_FILE_DELETE_ACTION:
             return actionStorageFile.delete();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/FileContainer.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/FileContainer.java
index f1e181f53a..c36ca09c6b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/FileContainer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/FileContainer.java
@@ -3557,6 +3557,7 @@ protected abstract void backupContainer(BaseContainerHandle handle,
      */
     static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
index eab783647c..1f92111ee9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
@@ -73,6 +73,7 @@ public final class InitPageOperation extends PhysicalPageOperation
 	protected boolean reuse;	// is this page being initialize for reuse, or for first time
 	protected boolean overflowPage; // is this page an overflow page
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     InitPageOperation(BasePage page, int flag, int formatid,
 							 long offset)
 		 throws StandardException
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java
index add10875f8..ef8452f0ca 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java
@@ -46,6 +46,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 */
 
 final class InputStreamContainer extends FileContainer  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
     private StorageFile containerPath;
     
@@ -53,6 +54,7 @@ final class InputStreamContainer extends FileContainer  {
 	 * Constructors
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	InputStreamContainer(BaseDataFileFactory factory) {
 		super(factory);
 		canUpdate = false;
@@ -90,11 +92,13 @@ final boolean openContainer(ContainerKey newIdentity) throws StandardException {
 			// just opened the stream and the first allocation page
 			// is located at the beginning of the file.
 			readHeader(getEmbryonicPage(dis));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3347
 
 			return true;
 
         } catch (IOException ioe) {
             throw StandardException.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1958
                 newException(SQLState.FILE_CONTAINER_EXCEPTION, 
                              ioe,
                              new Object[] {getIdentity().toString(),
@@ -108,6 +112,7 @@ final boolean openContainer(ContainerKey newIdentity) throws StandardException {
 		}
 	} // end of openContainer
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	void closeContainer()
     {
 		containerPath = null;
@@ -138,6 +143,7 @@ protected final int preAllocate(long lastPreallocPagenum, int preAllocSize) {
 	protected void truncatePages(long lastValidPagenum)
     {
 		// Nothing to do since we are inherently read-only.
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
 		return;
     }
     
@@ -150,6 +156,7 @@ protected void truncatePages(long lastValidPagenum)
 		Create a new container, all references to identity must be through the
 		passed in identity, this object will no identity until after this method returns.
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	void createContainer(ContainerKey newIdentity) throws StandardException {
 		// RESOLVE - probably should throw an error ...
 	}
@@ -206,6 +213,7 @@ protected void readPositionedPage(long pageOffset, byte[] pageData) throws IOExc
 			is = getInputStream();
 
 			InputStreamUtil.skipFully(is, pageOffset);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
 
 			InputStreamUtil.readFully(is, pageData, 0, pageSize);
 
@@ -263,10 +271,12 @@ protected void backupContainer(BaseContainerHandle handle,	String backupLocation
      * @throws StandardException STORE_FEATURE_NOT_IMPLEMENTED
      */
 	protected void encryptOrDecryptContainer(BaseContainerHandle handle,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                                              String newFilePath,
                                              boolean doEncrypt)
 	    throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         throw StandardException.newException(
                 SQLState.STORE_FEATURE_NOT_IMPLEMENTED);
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InsertOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
index 36b8e05a24..f8066389b2 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
@@ -79,6 +79,7 @@ public final class InsertOperation extends LogicalPageOperation
 	transient protected ByteArray preparedLog;
 
 	// yyz: revisit later, whether we need preparedLog, maybe everything will be prepared...
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     InsertOperation(
     RawTransaction              t, 
     BasePage                    page, 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
index 92815d48c5..92781b7125 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
@@ -54,6 +54,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 */
 public final class InvalidatePageOperation extends PhysicalPageOperation
 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     InvalidatePageOperation(BasePage page)
 	{
 		super(page);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java
index c7f5cbebdf..f890ec74f6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java
@@ -120,6 +120,7 @@ public void actionCompressSpaceOperation(
     int             num_pages_truncated)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         Loggable lop = null;
         
         // DERBY-606. As part of the fix for DERBY-606, negative values can be 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
index 31b9fc3d82..66362b4939 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
@@ -65,6 +65,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	</PRE>
 
 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
 abstract class LogicalPageOperation
     extends PageBasicOperation implements LogicalUndoable
 {
@@ -82,6 +83,7 @@ abstract class LogicalPageOperation
 	// no-arg constructor, required by Formatable 
 	public LogicalPageOperation() { super(); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     LogicalPageOperation(BasePage page, LogicalUndo undo, int recordId)
 	{
 		super(page);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
index 4b22e5ba44..ea34548131 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
@@ -65,6 +65,7 @@ OptionalData	none (compensation operation never have optional data)
 */
 public final class LogicalUndoOperation extends PageBasicOperation
         implements Compensation {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
 
 	protected int recordId;				// the record id to call undoOp.undoMe with
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java
index 9dca63878e..a780fa75ed 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java
@@ -38,6 +38,7 @@ public class MemByteHolder
 
 	boolean writing = true;
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	Vector<byte[]> bufV;
 	int curBufVEleAt;
 
@@ -69,6 +70,7 @@ public MemByteHolder(int bufSize)
 		this.curBuf = new byte[bufSize];
 		this.curBufPos = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		this.bufV = new Vector<byte[]>(128);
 		bufV.addElement(curBuf);
 		this.curBufVEleAt = 0;
@@ -194,6 +196,8 @@ public void startReading()
 		//
 		//Reposition so reads start from the first
 		//byte.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		curBuf = bufV.elementAt(0);
 		this.curBufVEleAt = 0;
 		this.curBufPos = 0;
@@ -421,6 +425,8 @@ public boolean writingMode()
      * @see ByteHolder#cloneEmpty
      */
     public ByteHolder cloneEmpty() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
         return(new MemByteHolder(bufSize));
     }
 
@@ -444,6 +450,7 @@ protected void getNextBuffer_w() throws IOException
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			curBuf = bufV.elementAt(curBufVEleAt);
 		}
 		
@@ -489,6 +496,7 @@ protected boolean getNextBuffer_r() throws IOException
 			SanityManager.ASSERT(writing == false,
 								 "Reading should be true 5");
 		if (curBufVEleAt >= lastBufVEleAt) return true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		curBuf = bufV.elementAt(++curBufVEleAt);
 		curBufPos = 0;
 		if (curBufVEleAt == lastBufVEleAt)
@@ -506,6 +514,7 @@ private String dumpBuf(int bufVEleAt)
 	{
 		StringBuffer sb = new StringBuffer(100);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		byte[] buf = bufV.elementAt(bufVEleAt);
 		sb.append("(");
 		for (int ix = 0;ix<buf.length;ix++)
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java
index 045b9aca65..5ff6334327 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java
@@ -47,6 +47,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 Any time store fetches a long column, the value is returned as a stream.
 A long column is any column that at some point was longer than a page, so
 a long column in one table may not be long in another depending on page size.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 <p>
 When the column is fetched a new OverflowInputStream is created and then
 the datatype's stream is set using:
@@ -56,6 +57,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public class OverflowInputStream
 extends BufferedByteHolderInputStream
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
 implements Resetable, CloneableStream
 {
     /**************************************************************************
@@ -112,6 +115,8 @@ public OverflowInputStream(
     BaseContainerHandle owner,
     long                overflowPage, 
     int                 overflowId, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
     RecordHandle        recordToLock) {
         super(bh);
         this.owner              = owner;
@@ -155,6 +160,7 @@ public void fillByteHolder()
                     columnOverflowPage.restorePortionLongColumn(this);
                     columnOverflowPage.unlatch();
                     columnOverflowPage = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2992
                 } else {
                     // An overflow page was specified, but we failed to get it.
                     // Probably the value got deleted under our feet.
@@ -165,6 +171,7 @@ public void fillByteHolder()
             }
             catch (StandardException se)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 throw new IOException(se);
             }
 
@@ -338,6 +345,8 @@ public void closeStream()
      * @return Copy of this stream which can be used independently.
      */
     public InputStream cloneStream() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
         OverflowInputStream ret_stream = 
             new OverflowInputStream(
                 bh.cloneEmpty(),
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
index 6f3d495dc9..9bedfea85d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
@@ -72,6 +72,7 @@ must be physical (or more correctly, in Gray's term, physiological, since
 	@see Loggable
 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
 abstract class PageBasicOperation implements Loggable, RePreparable
 {
 
@@ -86,6 +87,7 @@ abstract class PageBasicOperation implements Loggable, RePreparable
 	transient protected RawContainerHandle	containerHdl;
 	transient protected boolean	            foundHere;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     PageBasicOperation(BasePage page)
     {
 		if (SanityManager.DEBUG) 
@@ -104,6 +106,7 @@ abstract class PageBasicOperation implements Loggable, RePreparable
 	}
 
 	// no-arg constructor, required by Formatable
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     PageBasicOperation()
     {
 	}
@@ -164,6 +167,7 @@ public final boolean needsRedo(Transaction xact)
 		else
 			throw StandardException.newException(
                     SQLState.DATA_MISSING_LOG, pageId, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     pversion, 
                     pageVersion);
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
index 5469b3a9bb..ed37613865 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
@@ -53,6 +53,7 @@ of the row(s) affected).
 	</PRE>
 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
 abstract class PhysicalPageOperation extends PageBasicOperation
         implements Undoable
 {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
index b95492ec18..c94fb88b29 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
@@ -58,6 +58,7 @@ OptionalData	none (compensation operation never have optional data)
 */
 public final class PhysicalUndoOperation extends PageBasicOperation
         implements Compensation {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
 
 	/** The operation to be rolled back */
 	transient private	PhysicalPageOperation undoOp; 
@@ -143,6 +144,7 @@ public final void doMe(Transaction xact, LogInstant instant, LimitObjectInput in
 
 		if (SanityManager.DEBUG) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
             if (oldversion >= this.page.getPageVersion())
             {
                 SanityManager.THROWASSERT(
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
index 89ef4ac350..8a5aa378d1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
@@ -80,6 +80,7 @@ public final class PurgeOperation extends PhysicalPageOperation {
 
 	transient protected ByteArray preparedLog;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     PurgeOperation(RawTransaction t, BasePage page, int slot, int
 						  num_rows, int[] recordIds, boolean needDataLogged)
 		throws StandardException
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
index b72a15f600..bbe154b7a5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
@@ -53,6 +53,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	for FileContainers which are implemented on java.io.RandomAccessFile.
 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 class RAFContainer extends FileContainer implements PrivilegedExceptionAction<Object>
 {
 
@@ -91,6 +92,7 @@ class RAFContainer extends FileContainer implements PrivilegedExceptionAction<Ob
 	 * Constructors
 	 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	RAFContainer(BaseDataFileFactory factory) {
 		super(factory);
 	}
@@ -116,6 +118,7 @@ protected void removeContainer(LogInstant instant, boolean leaveStub)
 		 throws StandardException
 	{
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 		try {
 			synchronized(this)
 			{
@@ -149,6 +152,7 @@ protected void removeContainer(LogInstant instant, boolean leaveStub)
 	}
 
 	void closeContainer() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-801
 
 		if (fileData != null) {
 			try {
@@ -183,6 +187,8 @@ protected void readPage(long pageNumber, byte[] pageData)
 		long pageOffset = pageNumber * pageSize;
 
 		synchronized (this) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-801
+//IC see: https://issues.apache.org/jira/browse/DERBY-733
 
 			fileData.seek(pageOffset);
 
@@ -215,6 +221,7 @@ protected void writePage(long pageNumber, byte[] pageData, boolean syncPage)
                 // committed and dropped, do nothing.
                 // This file container may only be a stub
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1392
 				return;
             }
 
@@ -281,6 +288,7 @@ On EPOC (www.symbian.com) a seek beyond the end of
 
 				if (SanityManager.DEBUG)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1392
 					SanityManager.ASSERT(
                         fileData.length() >= pageOffset,
                         "failed to blank filled missing pages");
@@ -333,6 +341,7 @@ On EPOC (www.symbian.com) a seek beyond the end of
      */
     protected byte[] updatePageArray(long pageNumber, 
                                    byte[] pageData, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
                                    byte[] encryptionBuf, 
                                    boolean encryptWithNewEngine) 
         throws StandardException, IOException
@@ -343,11 +352,14 @@ protected byte[] updatePageArray(long pageNumber,
             // bit because the alloc page have zero'ed out the borrowed
             // space
             writeHeader(getIdentity(), pageData);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3727
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1392
             if (SanityManager.DEBUG) 
             {
                 if (FormatIdUtil.readFormatIdInteger(pageData) != AllocPage.FORMAT_NUMBER)
                     SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
                             "expect " +
                             AllocPage.FORMAT_NUMBER +
                             "got " +
@@ -357,11 +369,14 @@ protected byte[] updatePageArray(long pageNumber,
             return pageData;
 
         } 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1392
         else 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             if (encryptionBuf != null &&
                     (dataFactory.databaseEncrypted() || encryptWithNewEngine))
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
                 return encryptPage(pageData, 
                                    pageSize, 
                                    encryptionBuf, 
@@ -439,6 +454,7 @@ public void clean(boolean forRemove) throws StandardException
         boolean success = false;
         int maxTries = InterruptStatus.MAX_INTERRUPT_RETRIES;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         while (!success) {
             success = true;
 
@@ -498,6 +514,7 @@ public void clean(boolean forRemove) throws StandardException
                         // Instead, just clobber the container info, which is
                         // checksum'ed seperately from the alloc page
                         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-3727
                         writeRAFHeader(
                             getIdentity(),
                             fileData,
@@ -514,6 +531,7 @@ public void clean(boolean forRemove) throws StandardException
                             // we re-grab monitor on "this" (which recovery
                             // needs) and retry writeRAFHeader.
                             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5498
                                 Thread.sleep(
                                     InterruptStatus.INTERRUPT_RETRY_SLEEP);
                             } catch (InterruptedException ee) {
@@ -534,6 +552,7 @@ public void clean(boolean forRemove) throws StandardException
 
                         throw dataFactory.markCorrupt(
                             StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1958
                                 SQLState.FILE_CONTAINER_EXCEPTION, ioe,
                                 getIdentity() != null ?
                                 getIdentity().toString() : "unknown",
@@ -584,7 +603,10 @@ protected int preAllocate(long lastPreallocPagenum,
 					dataFactory.writeInProgress();
 					inwrite = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
                     if (!dataFactory.dataNotSyncedAtAllocation)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
                         fileData.sync();
   				}
 				catch (IOException ioe)
@@ -622,6 +644,7 @@ protected int preAllocate(long lastPreallocPagenum,
 	 * @exception  StandardException  Standard exception policy.
      **/
 	protected void truncatePages(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     long lastValidPagenum)
         throws StandardException
 	{  
@@ -665,6 +688,7 @@ protected void truncatePages(
 		@param syncFile if true, sync the file
 	*/
     private void writeRAFHeader(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3727
     Object                  identity,
     StorageRandomAccessFile file, 
     boolean                 create, 
@@ -686,16 +710,19 @@ private void writeRAFHeader(
             // been written, ending up with the page at the incorrect
             // offset.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3726
             epage = new byte[pageSize];
 		}
 		else
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3347
 			epage = getEmbryonicPage(file, FIRST_ALLOC_PAGE_OFFSET);
 		}
 
 		// need to check for frozen state
 
         writeHeader(identity, file, create, epage);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3727
 
 		if (syncFile)
 		{
@@ -704,6 +731,7 @@ private void writeRAFHeader(
 			{
                 if (!dataFactory.dataNotSyncedAtCheckpoint)
                    file.sync();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
 
 			}
 			finally
@@ -727,6 +755,7 @@ protected void flushAll() throws StandardException {
 	}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	 synchronized StorageFile getFileName(ContainerKey identity, boolean stub,
 											 boolean errorOK, boolean tryAlternatePath)
 		 throws StandardException
@@ -784,7 +813,9 @@ protected StorageFile privGetFileName(ContainerKey identity, boolean stub,
                             }
                         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
                         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
                             directory.limitAccessToOwner();
                         } catch (IOException ioe) {
                             if (errorOK) {
@@ -804,6 +835,7 @@ protected StorageFile privGetFileName(ContainerKey identity, boolean stub,
     } // end of privGetFileName
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	synchronized void createContainer(ContainerKey newIdentity)
         throws StandardException
     {
@@ -832,6 +864,7 @@ synchronized void createContainer(ContainerKey newIdentity)
      */
     private void copyFile(final StorageFile from, final File to)
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
         PrivilegedAction<Boolean> pa = () ->
                 FileUtil.copyFile(dataFactory.getStorageFactory(), from, to);
         boolean success = AccessController.doPrivileged(pa);
@@ -848,6 +881,7 @@ private void copyFile(final StorageFile from, final File to)
      * @throws StandardException if the file could not be removed
      */
     private void removeFile(final File file) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
         PrivilegedAction<Boolean> pa = () -> !file.exists() || file.delete();
         boolean success = AccessController.doPrivileged(pa);
         if (!success) {
@@ -856,6 +890,7 @@ private void removeFile(final File file) throws StandardException {
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	synchronized boolean removeFile(StorageFile file)
         throws SecurityException, StandardException
     {
@@ -889,12 +924,14 @@ private boolean privRemoveFile(StorageFile file)
     } // end of privRemoveFile
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     synchronized boolean openContainer(ContainerKey newIdentity)
             throws StandardException {
         actionCode = OPEN_CONTAINER_ACTION;
         actionIdentity = newIdentity;
         try
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5312
             return AccessController.doPrivileged( this) != null;
         }
         catch( PrivilegedActionException pae) {
@@ -907,6 +944,7 @@ synchronized boolean openContainer(ContainerKey newIdentity)
         }
         finally
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5312
             actionIdentity = null;
         }
     }
@@ -1044,6 +1082,7 @@ private synchronized void stubbify(LogInstant instant)
      *
      */
     protected void backupContainer(BaseContainerHandle handle,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5894
                                    String backupLocation)
         throws StandardException 
     {
@@ -1066,6 +1105,8 @@ protected void backupContainer(BaseContainerHandle handle,
                         }
                         catch (InterruptedException ie)
                         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                             InterruptStatus.setInterrupted();
                         }	
                     }
@@ -1078,6 +1119,7 @@ protected void backupContainer(BaseContainerHandle handle,
                 // create container at the backup location.
                 if (isStub) {
                     // get the stub ( it is a committted drop table container )
+//IC see: https://issues.apache.org/jira/browse/DERBY-5894
                     StorageFile file = getFileName((ContainerKey)getIdentity(),
                                                        true, false, true);
                     backupFile = new File(backupLocation, file.getName());
@@ -1087,6 +1129,7 @@ protected void backupContainer(BaseContainerHandle handle,
                 }else {
                     // regular container file 
                     long lastPageNumber= getLastPageNumber(handle);
+//IC see: https://issues.apache.org/jira/browse/DERBY-750
                     if (lastPageNumber == ContainerHandle.INVALID_PAGE_NUMBER) {
                         // last page number is invalid if there are no pages in
                         // the container yet. No need to backup this container, 
@@ -1099,6 +1142,7 @@ protected void backupContainer(BaseContainerHandle handle,
                     }
 
                     StorageFile file = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5894
                         getFileName(
                             (ContainerKey)getIdentity(), false, false, true);
 
@@ -1120,12 +1164,14 @@ protected void backupContainer(BaseContainerHandle handle,
                     // to the backup location by reading through the page cache.
                     for (long pageNumber = FIRST_ALLOC_PAGE_NUMBER; 
                          pageNumber <= lastPageNumber; pageNumber++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
                         page = getLatchedPage(handle, pageNumber);
                         
                         // update the page array before writing to the disk 
                         // with container header and encrypt it if the database 
                         // is encrypted. 
                         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3727
                         byte[] dataToWrite = 
                             updatePageArray(
                                 pageNumber, 
@@ -1198,6 +1244,7 @@ protected void backupContainer(BaseContainerHandle handle,
                         }
                     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5894
                     removeFile(backupFile);
                 } 
             }
@@ -1238,8 +1285,10 @@ protected void encryptOrDecryptContainer(BaseContainerHandle handle,
             long lastPageNumber= getLastPageNumber(handle);
  
             newRaf = getRandomAccessFile(newFile);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5894
 
             byte[] encryptionBuf = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             if (doEncrypt) {
                 encryptionBuf = new byte[pageSize];
             }
@@ -1267,6 +1316,7 @@ protected void encryptOrDecryptContainer(BaseContainerHandle handle,
             }
 
             // sync the new version of the container.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
             newRaf.sync();
             newRaf.close();
             newRaf = null;
@@ -1276,6 +1326,7 @@ protected void encryptOrDecryptContainer(BaseContainerHandle handle,
                                     SQLState.FILE_CONTAINER_EXCEPTION, ioe,
                                     getIdentity() != null ?
                                         getIdentity().toString() : "unknown",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                                     doEncrypt ? "encrypt" : "decrypt",
                                     newFilePath);
         } finally {
@@ -1295,6 +1346,7 @@ protected void encryptOrDecryptContainer(BaseContainerHandle handle,
                                     SQLState.FILE_CONTAINER_EXCEPTION, ioe,
                                     getIdentity() != null ?
                                         getIdentity().toString() : "unknown",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                                     doEncrypt ?
                                         "encrypt-close" : "decrypt-close",
                                     newFilePath);
@@ -1312,7 +1364,9 @@ protected void encryptOrDecryptContainer(BaseContainerHandle handle,
      * @throws IOException if some other I/O error happens
      */
     private RandomAccessFile getRandomAccessFile(final File file)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5894
         try {
             return AccessController.doPrivileged(
                 new PrivilegedExceptionAction<RandomAccessFile>() {
@@ -1326,6 +1380,7 @@ public RandomAccessFile run() throws IOException {
                     }
                 });
         } catch (PrivilegedActionException pae) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
             throw (IOException) pae.getCause();
         }
     }
@@ -1370,6 +1425,7 @@ public Object run() throws StandardException
              }
 
              try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5325
 
                  // OK not to force WAL here, in fact, this operation
                  // preceeds the creation of the log record to ensure
@@ -1379,6 +1435,7 @@ public Object run() throws StandardException
                  try
                      {
                          fileData = file.getRandomAccessFile( "rw");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
                          file.limitAccessToOwner();
                      }
                  finally
@@ -1483,11 +1540,14 @@ public Object run() throws StandardException
                  // just means we can't write to it.
              }
              fileName = file.toString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1958
 
              try {
 
                  fileData = file.getRandomAccessFile(canUpdate ? "rw" : "r");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3347
+//IC see: https://issues.apache.org/jira/browse/DERBY-5312
                  readHeader(getEmbryonicPage(fileData,
                                              FIRST_ALLOC_PAGE_OFFSET));
                  
@@ -1505,6 +1565,7 @@ public Object run() throws StandardException
                      throw dataFactory.
                          markCorrupt(StandardException.
                                      newException(SQLState.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1958
                                              FILE_CONTAINER_EXCEPTION, ioe,
                                              getIdentity() != null ?
                                                  getIdentity().toString() :
@@ -1533,15 +1594,18 @@ public Object run() throws StandardException
                          fileData = 
                              stub.getRandomAccessFile(canUpdate ? "rw" : "r");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3347
                          readHeader(getEmbryonicPage(fileData,
                                                      FIRST_ALLOC_PAGE_OFFSET));
                      }
                      catch (IOException ioe2)
                      {
+//IC see: https://issues.apache.org/jira/browse/DERBY-336
                          throw dataFactory.
                              markCorrupt(StandardException.
                                          newException(SQLState.
                                                       FILE_CONTAINER_EXCEPTION,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1958
                                              ioe2,
                                              getIdentity() != null ?
                                                  getIdentity().toString() :
@@ -1556,6 +1620,7 @@ public Object run() throws StandardException
                      throw dataFactory.
                          markCorrupt(StandardException.
                                      newException(SQLState.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1958
                                                   FILE_CONTAINER_EXCEPTION, ioe,
                                              getIdentity() != null ?
                                                  getIdentity().toString() :
@@ -1565,6 +1630,7 @@ public Object run() throws StandardException
 
              return this;
          } // end of case OPEN_CONTAINER_ACTION
+//IC see: https://issues.apache.org/jira/browse/DERBY-5312
          case REOPEN_CONTAINER_ACTION:
          {
              StorageFile file =
@@ -1619,7 +1685,9 @@ public Object run() throws StandardException
                      // write the header to the stub
                      stubData = stub.getRandomAccessFile( "rw");
                      stub.limitAccessToOwner();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3727
                      writeRAFHeader(
                         actionIdentity,
                         stubData,
@@ -1648,6 +1716,7 @@ public Object run() throws StandardException
              }
              catch (SecurityException se)
              {
+//IC see: https://issues.apache.org/jira/browse/DERBY-336
                  throw StandardException.
                      newException(SQLState.FILE_CANNOT_REMOVE_FILE, se, file, 
                                   se.toString());
@@ -1674,11 +1743,13 @@ public Object run() throws StandardException
                  catch (IOException ioe2)
                  {
                      throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-336
                          SQLState.FILE_CANNOT_REMOVE_FILE, ioe2, file, ioe.toString());
                  }
                  catch (SecurityException se)
                  {
                      throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5886
                          SQLState.FILE_CANNOT_REMOVE_FILE, se, file, se.toString());
                  }
              }
@@ -1694,6 +1765,7 @@ public Object run() throws StandardException
              {
                  boolean exists = actionFile.exists();
                  Object result = actionFile.getRandomAccessFile("rw");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
                  if (!exists) {
                      actionFile.limitAccessToOwner();
@@ -1701,6 +1773,7 @@ public Object run() throws StandardException
 
                  return result;
              }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
              catch (IOException ioe)
              {
                  throw StandardException.newException(
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java
index 834b8bf1af..ff8e33cbad 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java
@@ -129,6 +129,7 @@ public RAFContainer4(BaseDataFileFactory factory) {
      * {@code RandomAccessFile}, {@code null} otherwise
      */
     private FileChannel getChannel(StorageRandomAccessFile file) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3347
         if (file instanceof RandomAccessFile) {
             /** XXX - this cast isn't testing friendly.
              * A testing class that implements StorageRandomAccessFile but isn't
@@ -179,10 +180,12 @@ synchronized boolean openContainer(ContainerKey newIdentity)
             SanityManager.ASSERT(iosInProgress == 0,
                     "Container opened while IO operations are in progress. "
                     + "This should not happen.");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3347
             SanityManager.ASSERT(fileData == null, "fileData isn't null");
             SanityManager.ASSERT(ourChannel == null, "ourChannel isn't null");
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5312
         currentIdentity = newIdentity;
         return super.openContainer(newIdentity);
     }
@@ -197,10 +200,12 @@ synchronized void createContainer(ContainerKey newIdentity)
             SanityManager.ASSERT(iosInProgress == 0,
                     "Container created while IO operations are in progress. "
                     + "This should not happen.");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3347
             SanityManager.ASSERT(fileData == null, "fileData isn't null");
             SanityManager.ASSERT(ourChannel == null, "ourChannel isn't null");
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5312
         currentIdentity = newIdentity;
         super.createContainer(newIdentity);
     }
@@ -227,6 +232,7 @@ synchronized void closeContainer() {
             // ignored, so we should not complain about starting a close
             // while there are IOs in progress if it is being dropped
             // anyway.
+//IC see: https://issues.apache.org/jira/browse/DERBY-801
             SanityManager.ASSERT( (iosInProgress == 0)
                     || getCommittedDropState(),
                     "Container closed while IO operations are in progress. "
@@ -428,6 +434,7 @@ private void readPage0(long pageNumber, byte[] pageData, long offset)
                     }
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 if (offset == -1L) {
                     // Normal page read doesn't specify offset,
                     // so use one computed from page number.
@@ -451,6 +458,7 @@ private void readPage0(long pageNumber, byte[] pageData, long offset)
             }
 
             if (dataFactory.databaseEncrypted() &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 pageNumber != FIRST_ALLOC_PAGE_NUMBER &&
                 pageNumber != -1L /* getEmbryonicPage */)
             {
@@ -490,6 +498,7 @@ protected void writePage(long pageNumber, byte[] pageData, boolean syncPage)
         // thread can do its thing.
         boolean stealthMode = Thread.holdsLock(allocCache);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         if (SanityManager.DEBUG) {
             SanityManager.ASSERT(!Thread.holdsLock(this));
         }
@@ -512,6 +521,8 @@ protected void writePage(long pageNumber, byte[] pageData, boolean syncPage)
                     }
 
                     try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5498
+//IC see: https://issues.apache.org/jira/browse/DERBY-5498
                         channelCleanupMonitor.wait(
                             InterruptStatus.INTERRUPT_RETRY_SLEEP);
                     } catch (InterruptedException e) {
@@ -527,6 +538,7 @@ protected void writePage(long pageNumber, byte[] pageData, boolean syncPage)
         boolean success = false;
         int retries = InterruptStatus.MAX_INTERRUPT_RETRIES;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5185
       try {
         while (!success) {
             try {
@@ -550,9 +562,12 @@ protected void writePage(long pageNumber, byte[] pageData, boolean syncPage)
                 success = true;
 
             } catch (ClosedChannelException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5325
+//IC see: https://issues.apache.org/jira/browse/DERBY-5325
                 handleClosedChannel(e, stealthMode, retries--);
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5185
       } finally {
         if (stealthMode) {
             // don't touch threadsInPageIO
@@ -735,6 +750,7 @@ private void awaitRestoreChannel (Exception e,
                             "already waited " + timesWaited + " times");
                     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5498
                     if (timesWaited > InterruptStatus.MAX_INTERRUPT_RETRIES) {
                         // Max, give up, probably way too long anyway,
                         // but doesn't hurt?
@@ -743,6 +759,7 @@ private void awaitRestoreChannel (Exception e,
                     }
 
                     try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5498
                         channelCleanupMonitor.wait(
                             InterruptStatus.INTERRUPT_RETRY_SLEEP);
                     } catch (InterruptedException we) {
@@ -778,6 +795,7 @@ private void awaitRestoreChannel (Exception e,
             // have raced past the interrupted thread, so let's wait a
             // bit before we attempt a new I/O.
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5498
                 Thread.sleep(InterruptStatus.INTERRUPT_RETRY_SLEEP);
             } catch (InterruptedException we) {
                 // This thread is getting hit, too..
@@ -852,6 +870,7 @@ private boolean recoverContainerAfterInterrupt(
             if (stealthMode) {
                 // don't touch threadsInPageIO
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 threadsInPageIO--;
             }
 
@@ -874,6 +893,11 @@ private boolean recoverContainerAfterInterrupt(
                     break;
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4920
+//IC see: https://issues.apache.org/jira/browse/DERBY-5185
+//IC see: https://issues.apache.org/jira/browse/DERBY-5185
+//IC see: https://issues.apache.org/jira/browse/DERBY-5185
+//IC see: https://issues.apache.org/jira/browse/DERBY-5185
                 if (retries-- == 0) {
                     // Clean up state and throw
                     restoreChannelInProgress = false;
@@ -885,8 +909,12 @@ private boolean recoverContainerAfterInterrupt(
             }
 
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5498
                 Thread.sleep(InterruptStatus.INTERRUPT_RETRY_SLEEP);
             } catch (InterruptedException te) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 InterruptStatus.setInterrupted();
             }
         }
@@ -910,6 +938,7 @@ private boolean recoverContainerAfterInterrupt(
                 while (true) {
                     synchronized(this) {
                         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5312
                             reopen();
                         } catch (Exception newE) {
                             // Something else failed - shutdown happening?
@@ -932,6 +961,7 @@ private boolean recoverContainerAfterInterrupt(
                     }
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 if (stealthMode) {
                     // don't touch threadsInPageIO
                 } else {
@@ -954,17 +984,20 @@ private void writePage0(long pageNumber, byte[] pageData, boolean syncPage)
          throws IOException, StandardException
     {
         FileChannel ioChannel;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3347
         synchronized (this) {
             // committed and dropped, do nothing.
             // This file container may only be a stub
             if (getCommittedDropState())
                 return;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3347
             ioChannel = getChannel();
         }
 
         if (SanityManager.DEBUG) {
             if (pageNumber == FIRST_ALLOC_PAGE_NUMBER) {
                 // page 0
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 SanityManager.ASSERT(Thread.holdsLock(this));
             } else {
                 SanityManager.ASSERT(!Thread.holdsLock(this));
@@ -1026,6 +1059,7 @@ private void writePage0(long pageNumber, byte[] pageData, boolean syncPage)
                      */
                     if (getCommittedDropState()) {
                         if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                             debugTrace(
                                 "write to a dropped and " +
                                 "closed container discarded.");
@@ -1078,6 +1112,7 @@ private void writePage0(long pageNumber, byte[] pageData, boolean syncPage)
                 }
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         } else {
             // iochannel was not initialized, fall back to original method.
             super.writePage(pageNumber, pageData, syncPage);
@@ -1112,6 +1147,7 @@ void writeAtOffset(StorageRandomAccessFile file, byte[] bytes, long offset)
 
         boolean success = false;
         final boolean stealthMode = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5325
 
         while (!success) {
 
@@ -1125,6 +1161,7 @@ void writeAtOffset(StorageRandomAccessFile file, byte[] bytes, long offset)
                 writeFull(ByteBuffer.wrap(bytes), ioChannel, offset);
                 success = true;
             } catch (ClosedChannelException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5325
                 handleClosedChannel(e, stealthMode, -1 /* NA */);
             }
         }
@@ -1149,6 +1186,7 @@ byte[] getEmbryonicPage(StorageRandomAccessFile file, long offset)
     {
         FileChannel ioChannel = getChannel(file);
         if (ioChannel != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             byte[] buffer = new byte[AllocPage.MAX_BORROWED_SPACE];
             readPage(-1L, buffer, offset);
             return buffer;
@@ -1170,11 +1208,13 @@ byte[] getEmbryonicPage(StorageRandomAccessFile file, long offset)
      * @throws StandardException If thread is interrupted.
      */
     private void readFull(ByteBuffer dstBuffer,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4960
                           FileChannel srcChannel,
                           long position)
             throws IOException, StandardException
     {
         while(dstBuffer.remaining() > 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             if (srcChannel.read(dstBuffer,
                                     position + dstBuffer.position()) == -1) {
                 throw new EOFException(
@@ -1207,8 +1247,10 @@ private void readFull(ByteBuffer dstBuffer,
      * @throws StandardException If thread is interrupted.
      */
     private void writeFull(ByteBuffer srcBuffer,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4960
                            FileChannel dstChannel,
                            long position)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             throws IOException
     {
         while(srcBuffer.remaining() > 0) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RFResource.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RFResource.java
index 1902831f67..428e3bb97e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RFResource.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RFResource.java
@@ -75,6 +75,7 @@ public long add(String name, InputStream source)
             ContextManager cm = 
                 FileContainer.getContextService().getCurrentContextManager();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
             RawTransaction tran = 
                 factory.getRawStoreFactory().getXactFactory().findUserTransaction(
                         factory.getRawStoreFactory(), 
@@ -90,6 +91,7 @@ public long add(String name, InputStream source)
             tran.blockBackup(true);
 
 			StorageFile directory = file.getParentDir();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             StorageFile parentDir = directory.getParentDir();
             boolean pdExisted = parentDir.exists();
 
@@ -102,6 +104,7 @@ public long add(String name, InputStream source)
                 }
 
                 directory.limitAccessToOwner();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
                 if (!pdExisted) {
                     parentDir.limitAccessToOwner();
@@ -152,11 +155,14 @@ public long add(String name, InputStream source)
      * @see FileResource#removeJarDir
      */
     public void removeJarDir(String f) throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
         if (factory.isReadOnly())
             throw StandardException.newException(SQLState.FILE_READ_ONLY);
 
         ContextManager cm =
             FileContainer.getContextService().getCurrentContextManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         RawTransaction tran =
             factory.getRawStoreFactory().getXactFactory().findUserTransaction(
@@ -189,7 +195,9 @@ public void remove(String name, long currentGenerationId)
 
 			
 		ContextManager cm = FileContainer.getContextService().getCurrentContextManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         RawTransaction tran = 
             factory.getRawStoreFactory().getXactFactory().findUserTransaction(
                         factory.getRawStoreFactory(), 
@@ -246,6 +254,7 @@ public char getSeparatorChar()
 } // end of class RFResource
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 final class RemoveFile implements Serviceable, PrivilegedExceptionAction<Object>
 {
 	private final StorageFile fileToGo;
@@ -279,15 +288,18 @@ public boolean serviceASAP()
      */
 	public boolean serviceImmediately()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 		return true;
 	}
 
     public Object run() throws StandardException {
         // SECURITY PERMISSION - MP1, OP5
         if (fileToGo.exists()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
             if (fileToGo.isDirectory()) {
                 if (!fileToGo.deleteAll()) {
                     throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5886
                             SQLState.FILE_CANNOT_REMOVE_JAR_FILE, fileToGo);
                 }
             } else {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RawField.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RawField.java
index d9518c2335..f2a6832a1f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RawField.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RawField.java
@@ -22,6 +22,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.derby.impl.store.raw.data;
 
 final class RawField {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
 
     private final byte[] data;
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RecordId.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RecordId.java
index ed92b94805..1fd7e0e880 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RecordId.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RecordId.java
@@ -249,6 +249,7 @@ public boolean equals(Object ref) {
 	*/
 	public int hashCode() {
         int hash = 7;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3280
         hash = 89 * hash + pageId.hashCode();
         hash = 89 * hash + recordId;
         return hash;
@@ -286,6 +287,7 @@ public boolean lockAttributes(int flag, Hashtable<String,Object> attributes)
 
 		attributes.put(VirtualLockTable.CONTAINERID, 
 					   pageId.getContainerId().getContainerId());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		attributes.put(VirtualLockTable.LOCKNAME,
 					   "(" + pageId.getPageNumber() + "," + recordId + ")");
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java
index 1010f11672..50799e43b5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java
@@ -48,6 +48,7 @@ public final class SetReservedSpaceOperation extends PageBasicOperation {
 	protected int	newValue;	// the new reserved space value
 	protected int	oldValue;	// the old reserved space value (for BI_logging)
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     SetReservedSpaceOperation(BasePage page, int slot,
 									 int recordId, int newValue, int oldValue)
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java
index ddb5c3252f..53b400e38f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java
@@ -683,6 +683,7 @@ else if ((status & FIELD_NULL) != 0)
                     CompressedNumber.sizeInt(fieldDataLength);
 
                 if (diffLen != 0)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3941
                     DataInputUtil.skipFully(in, diffLen);
             } 
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StoredPage.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StoredPage.java
index 698a966df8..612470faa9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StoredPage.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StoredPage.java
@@ -7084,6 +7084,8 @@ public int moveRecordForCompressAtSlot(
     public void logAction(LogInstant instant) throws StandardException
     {
         if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5258
+//IC see: https://issues.apache.org/jira/browse/DERBY-5248
             SanityManager.ASSERT(isLatched(), 
                 "logAction() executed on an unlatched page.");
         }
@@ -7683,6 +7685,7 @@ private int moveSavedDataToPage(DynamicByteArrayOutputStream savedData, int unus
         This method ensures there is enough room to replace the
         old data of length oldLength at the given offset, with the new data of length
         newLength. This method does put any new data on the page, it moves old data around
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         and zeros out any old data when newLength &lt; oldLength. This method does
         update the information in the slot table.
 
@@ -7869,6 +7872,7 @@ public void skipField(ObjectInput in) throws IOException {
         int fieldDataLength = StoredFieldHeader.readFieldDataLength(in, fieldStatus, slotFieldSize);
 
         if (fieldDataLength != 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3941
             DataInputUtil.skipFully(in, fieldDataLength);
         }
     }
@@ -8131,6 +8135,7 @@ public String toString()
 
     public String toUncheckedString()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5002
         if (SanityManager.DEBUG)
         {
             String str = "---------------------------------------------------\n";
@@ -8211,6 +8216,8 @@ private String pageHeaderToString()
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6320
+//IC see: https://issues.apache.org/jira/browse/DERBY-4923
     String getPageDumpString()
     {
         return(
@@ -8236,6 +8243,7 @@ private String recordToString(int slot)
     {
         if (SanityManager.DEBUG)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
             String str = "";
             try 
             {
@@ -8820,6 +8828,8 @@ public void doUpdateAtSlot(
                         hitLongColumn = true;
 
                     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6320
+//IC see: https://issues.apache.org/jira/browse/DERBY-4923
                     catch (NoSpaceOnPage nsop)
                     {
                         // DERBY-4923
@@ -8998,6 +9008,8 @@ else if (i < endFieldExclusive)
                     // information into the post commit work.
 
                     RecordHandle portionHandle;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6320
+//IC see: https://issues.apache.org/jira/browse/DERBY-4923
 
                     try 
                     {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
index ea31d00a0a..0bfd11fa1e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
@@ -81,6 +81,7 @@ size set to LARGE_SLOT_SIZE (4) bytes.
 **/
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6621
 class StreamFileContainer implements TypedFormat, PrivilegedExceptionAction<Object>
 {
 
@@ -186,6 +187,7 @@ class StreamFileContainer implements TypedFormat, PrivilegedExceptionAction<Obje
         {
 			file = getFileName(identity, true, false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
             if (privExists(file)) 
             {
 				// note I'm left in the no-identity state as fillInIdentity()
@@ -233,6 +235,7 @@ protected StreamFileContainer open(boolean forUpdate)
     {
 
 		file = getFileName(this.identity, false, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
         if (!privExists(file))
 			return null;
 
@@ -395,12 +398,14 @@ public void getContainerProperties(Properties prop)
 
 		AccessFactory af = (AccessFactory)
 			getServiceModule(dataFactory, AccessFactory.MODULE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		TransactionController tc = 
             (af == null) ? 
                 null : 
                 af.getTransaction(
                     getContextService().getCurrentContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		bufferSize = 
 			PropertyUtil.getServiceInt(tc, prop,
@@ -465,6 +470,7 @@ public void load(RowSource rowSource)
 		try 
         {
 			fileOut = privGetOutputStream(file);
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 
 			FormatableBitSet validColumns = rowSource.getValidColumns();
 
@@ -623,6 +629,7 @@ private void writeToFile()
 
 				dataFactory.encrypt(
                     out.getByteArray(), startByte, encryptedLen, ciphertext, 0, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
 
 				// write out the actual length, then the encrypted bytes.
 				CompressedNumber.writeInt(fileOut, realLen);
@@ -736,6 +743,7 @@ private void writeColumn(Object column)
 				if (lenRead != -1) 
                 {
 					fieldDataLength += lenRead;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4519
                     out.write(bufData, 0, lenRead);
 				} 
                 else
@@ -979,6 +987,7 @@ public boolean removeContainer()
     {
 		close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
         if (privExists(file))
         {
             return privDelete(file);
@@ -1018,6 +1027,7 @@ protected StorageFile getFileName(
 
 			StorageFile container = dataFactory.getContainerPath( identity, false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 			if (!privExists(container)) 
             {
 
@@ -1034,6 +1044,7 @@ protected StorageFile getFileName(
 						if (!privExists(directory)) 
                         {
                             boolean created = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
                             IOException ex = null;
                             try {
                                 created = privMkdirs(directory);
@@ -1045,6 +1056,7 @@ protected StorageFile getFileName(
                             {
 								if (errorOK)
 									return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 								else
 									throw StandardException.newException(
                                             SQLState.FILE_CANNOT_CREATE_SEGMENT,
@@ -1063,6 +1075,7 @@ protected StorageFile getFileName(
     
     private synchronized boolean privExists(StorageFile file)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
         actionCode = STORAGE_FILE_EXISTS_ACTION;
         actionStorageFile = file;
 
@@ -1083,6 +1096,7 @@ private synchronized boolean privExists(StorageFile file)
     }
 
     private synchronized boolean privMkdirs(StorageFile file)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
             throws IOException
     {
         actionCode = STORAGE_FILE_MKDIRS_ACTION;
@@ -1096,6 +1110,7 @@ private synchronized boolean privMkdirs(StorageFile file)
         {
             // method executed under this priveleged block 
             // could throw IOException
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
             throw (IOException) pae.getCause();
         } 
         finally
@@ -1172,6 +1187,7 @@ public Object run() throws IOException
         switch(actionCode)
         {
         case STORAGE_FILE_EXISTS_ACTION:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
             return actionStorageFile.exists();
         case STORAGE_FILE_DELETE_ACTION:
             return actionStorageFile.delete();
@@ -1194,6 +1210,7 @@ public Object run() throws IOException
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java
index b407a7459d..9dd3ebe593 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java
@@ -47,6 +47,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 */
 
 final class StreamFileContainerHandle 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     implements  StreamContainerHandle, DerbyObserver 
 {
 
@@ -308,6 +309,7 @@ public final RawTransaction getTransaction() {
 	*/
 	public String toString() {
         if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5491
             String str = "StreamContainerHandle:(" + identity.toString() + ")";
             return(str);
         } else {
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java
index 28d3015fa1..8272525438 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java
@@ -132,6 +132,7 @@ protected void writePage(long pageNumber, byte[] pageData, boolean syncPage) thr
 		needsSync = false;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	StorageFile getFileName(ContainerKey identity, boolean stub,
         boolean errorOK, boolean tryAlternatePath)
 	{
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
index 349c8fd8eb..0916399685 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
@@ -78,6 +78,7 @@ public final class UpdateFieldOperation extends LogicalPageOperation
 
 	transient protected ByteArray preparedLog;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     UpdateFieldOperation(
     RawTransaction      t, 
     BasePage            page, 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
index 8d71be7dab..18b9ce0ca5 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
@@ -77,6 +77,7 @@ public final class UpdateOperation extends PhysicalPageOperation {
 
 	transient protected ByteArray preparedLog;
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-6163
     UpdateOperation(
     RawTransaction              t, 
     BasePage                    page, 
@@ -331,6 +332,7 @@ public void restoreMe(Transaction xact, BasePage undoPage,
      **/
 	private RecordHandle getRecordHandle()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5165
 		return new RecordId(getPageId(), recordId);
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java
index 3f70911166..4c900bb731 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java
@@ -132,6 +132,7 @@ public void doMe(Transaction xact, LogInstant instant, LimitObjectInput in) thro
 		//redo the checkpoint if we are in roll-forward recovery only
 		if(((RawTransaction)xact).inRollForwardRecovery())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3562
 			((RawTransaction)xact).
 				checkpointInRollForwardRecovery(instant, redoLWM, undoLWM);
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/FileLogger.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/FileLogger.java
index f9f73e89e0..30ac2dee5a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/FileLogger.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/FileLogger.java
@@ -986,6 +986,7 @@ public void undo(
 				{
 					int optionalDataLength = rawInput.readInt();
 					int savePosition = rawInput.getPosition();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2118
 					rawInput.setLimit(optionalDataLength);
 	
 					compensation = lop.generateUndo(t, rawInput);
@@ -1471,6 +1472,7 @@ protected long redo(
                     }
 
 					int dataLength = logIn.readInt();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2118
 					logIn.setLimit(dataLength);
 										
 					// even though the log has already been written, we need to
@@ -1510,6 +1512,7 @@ protected long redo(
 					recoveryTransaction.commit();
 				}
 			} // while redoScan.getNextRecord() != null
+//IC see: https://issues.apache.org/jira/browse/DERBY-298
 
             // If the scan ended in an empty file, update logEnd to reflect that
             // in order to avoid to continue logging to an older file
@@ -1567,6 +1570,7 @@ protected long redo(
 			if (instant != LogCounter.INVALID_LOG_INSTANT)	
             {
 				SanityManager.ASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-298
                     LogCounter.getLogFileNumber(instant) <
                          LogCounter.getLogFileNumber(logEnd) ||
                     (LogCounter.getLogFileNumber(instant) ==
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java
index 51284157fc..e198109a86 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java
@@ -136,6 +136,7 @@ public InputStream getOptionalData()
 		{
 			int dataLength = rawInput.readInt();
 			readOptionalData = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2118
 			rawInput.setLimit(dataLength);
 			return rawInput;
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
index 9ec045a4fc..4f296a0871 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
@@ -59,6 +59,7 @@ when dirty buffers are being written(flushed) to the disk by a different
     the buffers. 
 
     Log Buffers are used in circular fashion, each buffer moves through following stages: 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	freeBuffers --&gt; dirtyBuffers --&gt; freeBuffers. Movement of buffers from one
     stage to 	another stage is synchronized using	the object(this) of this class. 
 
@@ -69,6 +70,7 @@ stage to 	another stage is synchronized using	the object(this) of this class.
 	when buffers is switched. Checksum log record is written into the reserved
 	space in the beginning buffer. 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2939
     In case of a large log record that does not fit into a buffer, the
     checksum is written to the byte[] allocated for the big log
     record. 
@@ -109,6 +111,7 @@ public class LogAccessFile
 	static int                      mon_numBytesToLog;
 
     // the MasterFactory that will accept log when in replication master mode
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
     MasterFactory masterFac; 
     boolean inReplicationMasterMode = false;
     boolean inReplicationSlaveMode = false;
@@ -126,6 +129,7 @@ public class LogAccessFile
 	private boolean databaseEncrypted=false;
 		
 	public LogAccessFile(LogToFile logFactory,
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 						 StorageRandomAccessFile    log, 
 						 int                 bufferSize) 
     {
@@ -138,15 +142,18 @@ public LogAccessFile(LogToFile logFactory,
 		// Puts this LogAccessFile object in replication slave or
 		// master mode if the database has such a role
 		logFactory.checkForReplication(this);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
 
 		this.log            = log;
 		logFileSemaphore    = log;
 		this.logFactory     = logFactory;
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 
 		if (SanityManager.DEBUG)
             SanityManager.ASSERT(LOG_NUMBER_LOG_BUFFERS >= 1);
 				
 		//initialize buffers lists
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		freeBuffers = new LinkedList<LogAccessFileBuffer>();
 		dirtyBuffers = new LinkedList<LogAccessFileBuffer>();
 
@@ -165,11 +172,14 @@ public LogAccessFile(LogToFile logFactory,
 		// writing the checksum log records.  Otherwise recovery will fail
 		// incase user tries to revert back to versions before 10.1 in 
 		// soft upgrade mode. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 		writeChecksum = logFactory.checkVersion(RawStoreFactory.DERBY_STORE_MAJOR_VERSION_10, 
 												RawStoreFactory.DERBY_STORE_MINOR_VERSION_1);
 
 		// Checksums are received from the master if in slave replication mode
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
 		if (inReplicationSlaveMode) writeChecksum = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 		if(writeChecksum)
 		{
 			/**
@@ -263,6 +273,7 @@ public void writeLogRecord(
     {
         int total_log_record_length = length + LOG_RECORD_FIXED_OVERHEAD_SIZE;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2939
         if (total_log_record_length <= currentBuffer.bytes_free) {
             int newpos = appendLogRecordToBuffer(currentBuffer.buffer,
                                                  currentBuffer.position,
@@ -275,6 +286,7 @@ public void writeLogRecord(
                                                  optional_data_length);
             currentBuffer.position = newpos;
             currentBuffer.bytes_free -= total_log_record_length;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
             currentBuffer.greatest_instant = instant;
             if (SanityManager.DEBUG) {
                 int normalizedPosition = currentBuffer.position;
@@ -339,6 +351,7 @@ public void writeLogRecord(
             // following direct log to file call finishes.
 
 			// write the log record directly to the log file.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
             writeToLog(bigbuffer, 0, bigBufferLength, instant);
         }
     }
@@ -414,6 +427,7 @@ private final int writeLong(long l , byte b[], int p)
         b[p++] = (byte) (((int)(l >>> 16)) & 0xff); 
         b[p++] = (byte) (((int)(l >>> 8)) & 0xff); 
         b[p++] = (byte) (((int)l) & 0xff); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 		return p;
 	}
 
@@ -519,6 +533,7 @@ protected void flushDirtyBuffers() throws IOException
 		
 				noOfBuffers = dirtyBuffers.size();
 				if(noOfBuffers > 0)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					buf = dirtyBuffers.removeFirst();
 				
 				flushInProgress = true;
@@ -526,6 +541,7 @@ protected void flushDirtyBuffers() throws IOException
 			
 			while(nFlushed < noOfBuffers)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
 				if (buf.position != 0) {
 					writeToLog(buf.buffer, 0, buf.position, buf.greatest_instant);
 				}
@@ -536,6 +552,7 @@ protected void flushDirtyBuffers() throws IOException
 					//add the buffer that was written previosly to the free list
 					freeBuffers.addLast(buf);
 					if(nFlushed < noOfBuffers)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 						buf = dirtyBuffers.removeFirst();
 					else
 					{
@@ -546,6 +563,7 @@ protected void flushDirtyBuffers() throws IOException
 						if(size > 0 && nFlushed <= LOG_NUMBER_LOG_BUFFERS)
 						{
 							noOfBuffers += size;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 							buf = dirtyBuffers.removeFirst();
 						}
 					}
@@ -585,12 +603,14 @@ public void switchLogBuffer() throws IOException, StandardException
 		synchronized(this)
 		{
 			// ignore empty buffer switch requests
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 			if(currentBuffer.position == checksumLogRecordSize)
 				return;
 
 			// calculate the checksum for the current log buffer 
 			// and write the record to the space reserverd in 
 			// the beginning of the buffer. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2939
 			if(writeChecksum)
 			{
 				checksumLogOperation.reset();
@@ -616,8 +636,10 @@ public void switchLogBuffer() throws IOException, StandardException
 				SanityManager.ASSERT(freeBuffers.size() > 0);
 
 			//switch over to the next log buffer, let someone else write it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			currentBuffer = freeBuffers.removeFirst();
 			currentBuffer.init(checksumLogRecordSize);
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 
 			if (SanityManager.DEBUG)
 			{
@@ -656,6 +678,7 @@ public void syncLogAccessFile()
             {
                 synchronized( this)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
                     log.sync();
                 }
 
@@ -673,11 +696,14 @@ public void syncLogAccessFile()
                 }
                 catch( InterruptedException ie )
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.setInterrupted();
                 }
 
                 if( i > 20 )
                     throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-336
                         SQLState.LOG_FULL, sfe);
             }
         }
@@ -700,6 +726,7 @@ public void close() throws IOException, StandardException
     {
 		if (SanityManager.DEBUG) 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 			if (currentBuffer.position !=  checksumLogRecordSize)
 				SanityManager.THROWASSERT(
 				"Log file being closed with data still buffered " + 
@@ -722,6 +749,7 @@ public void close() throws IOException, StandardException
      * controlling the master side replication behaviour.
      */
     protected void setReplicationMasterRole(MasterFactory masterFac) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
         this.masterFac = masterFac;
         inReplicationMasterMode = true;
     }
@@ -780,6 +808,7 @@ private void writeToLog(byte b[], int off, int len, long highestInstant)
                     try 
                     {
                         log.write(b, off, len);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
                         if (inReplicationMasterMode) {
                             masterFac.appendLog(highestInstant,
                                                 b, off, len);
@@ -814,6 +843,7 @@ private void writeToLog(byte b[], int off, int len, long highestInstant)
 	 * @return the space that is needed to write a checksum log record.
 	 */
 	protected long reserveSpaceForChecksum(int length, long logFileNumber, long currentPosition )
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 		throws StandardException, IOException 
 	{
 
@@ -881,6 +911,7 @@ protected long reserveSpaceForChecksum(int length, long logFileNumber, long curr
      * checksum is always written at the beginning of buffer.
 	 */
 	private void writeChecksumLogRecord(byte[] buffer)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2939
 		throws IOException, StandardException{
 		
 		int    p    = 0; //checksum is written in the beginning of the buffer
@@ -900,6 +931,7 @@ private void writeChecksumLogRecord(byte[] buffer)
 		{
 			//encrypt the checksum log operation part.
 			int len = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2939
 				logFactory.encrypt(buffer, LOG_RECORD_HEADER_SIZE, checksumLength, 
 								   buffer, LOG_RECORD_HEADER_SIZE);
 			
@@ -912,6 +944,7 @@ private void writeChecksumLogRecord(byte[] buffer)
 		p = LOG_RECORD_HEADER_SIZE + checksumLength ;
 
 		// writeInt(length) trailing
+//IC see: https://issues.apache.org/jira/browse/DERBY-2939
 		p = writeInt(checksumLength, buffer, p );
 		
 		if (SanityManager.DEBUG)
@@ -943,6 +976,7 @@ protected void writeEndMarker(int marker) throws IOException, StandardException
 		int    p    = 0; //end is written in the beginning of the buffer, no
 						 //need to checksum a int write.
 		p = writeInt(marker , b , p);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
 		writeToLog(b, 0, p, -1); //end marker has no instant
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java
index 698739fbd5..4e1240fcc3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java
@@ -56,6 +56,7 @@ public LogAccessFileBuffer(
         prev        = null;
         next        = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
         init(0);
     }
 
@@ -68,6 +69,7 @@ public void init(int reserve)
 		length =  buffer.length - reserve;
         bytes_free  = length;
         position    = reserve;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
         greatest_instant = -1;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogCounter.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogCounter.java
index 24ff5e82fb..d819a32d68 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogCounter.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogCounter.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	hence the getValueAsLong() method. Outside the LogFactory the instant
 	is passed around as a LogCounter (through its LogInstant interface).
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	The way the long is encoded is such that &lt; == &gt; correctly tells if
 	one log instant is lessThan, equals or greater than another.
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogRecord.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogRecord.java
index 2c9a3cc81f..9d6d9aed04 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogRecord.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogRecord.java
@@ -150,6 +150,7 @@ public static int maxTransactionIdStoredSize(TransactionId tranId)
 	public static int getStoredSize(int group, TransactionId xactId)
 	{
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 		if (SanityManager.DEBUG)
 		{
 			SanityManager.ASSERT(xactId == null, 
@@ -309,6 +310,7 @@ public int group()
 
 
 	public boolean isChecksum()	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 		return ((group & Loggable.CHECKSUM) != 0);
 	}
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java
index e7b94630e8..bbb36c999c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java
@@ -143,6 +143,7 @@ are present and where the last checkpoint log record is located.
 		int format id
 		int obsolete log file version
 		long the log instant (LogCounter) of the last completed checkpoint
+//IC see: https://issues.apache.org/jira/browse/DERBY-5196
 		   (logfile counter, position)
 		int Derby major version
 		int Derby minor version
@@ -201,12 +202,14 @@ has been recovered and any incomplete log record set to zero.
 
 	<P>Multithreading considerations:<BR>
 	Log Factory must be MT-safe.
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	<P>
 	Class is final as it has methods with privilege blocks
 	and implements PrivilegedExceptionAction.
 	*/
 
 public final class LogToFile implements LogFactory, ModuleControl, ModuleSupportable,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 								  Serviceable, java.security.PrivilegedExceptionAction<Object>
 {
 
@@ -348,6 +351,8 @@ public int getTypeFormatId() {
     //   switchLogFile (both in slave replication mode and after the
     //   database has been fully booted) when a new log file is
     //   allocated.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
 	long					 logFileNumber = -1; // current log file number.
 								// Other than during boot and recovery time,
 								// and during initializeReplicationSlaveRole if in
@@ -363,6 +368,7 @@ public int getTypeFormatId() {
     // Initially set to point to the log file with the latest
     // checkpoint (in boot()). Only used by recovery() after that
     long                     bootTimeLogFileNumber = -1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
 
 	long					 firstLogFileNumber = -1;
 								// first log file that makes up the active
@@ -681,6 +687,7 @@ public void recover(
 		// initialize the log writer only after the rawstorefactory is available, 
 		// log writer requires encryption block size info from rawstore factory 
 		// to encrypt checksum log records. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 		if (firstLog != null) 
 			logOut = new LogAccessFile(this, firstLog, logBufferSize);
 
@@ -693,6 +700,7 @@ public void recover(
         // but not the first one. While the recovery thread waits
         // here, the slave replication thread can perform necessary
         // initialization without causing serialization conflicts.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
         if (inReplicationSlaveMode) {
             synchronized (slaveRecoveryMonitor) {
                 // Recheck inReplicationSlaveMode==true every time
@@ -766,6 +774,7 @@ public void recover(
 
 						if (beginLogFileNumber != null)
                         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
 							bootTimeLogFileNumber = 
                                 Long.valueOf(beginLogFileNumber).longValue();
                         }
@@ -873,6 +882,7 @@ public void recover(
 					long start = 
 						LogCounter.makeLogInstantAsLong(
                             bootTimeLogFileNumber, LOG_FILE_HEADER_SIZE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
 
 					// no checkpoint, start redo from the beginning of the 
                     // file - assume this is the first log file
@@ -886,6 +896,7 @@ public void recover(
 				RawTransaction recoveryTransaction =
                     tf.startTransaction(
                         rawStoreFactory,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                         getContextService().getCurrentContextManager(),
                         AccessFactoryGlobals.USER_TRANS_NAME);
 
@@ -929,6 +940,7 @@ public void recover(
                 // number anymore. From this point on, logFileNumber
                 // is used for all references to the current log file
                 // number; bootTimeLogFileNumber is no longer used.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
                 logFileNumber = bootTimeLogFileNumber;
 				
 				// if we are only interested in dumping the log, don't alter
@@ -974,6 +986,7 @@ public void recover(
 							logFile = getLogFileName(++logFileNumber);
 						}
 					}
+//IC see: https://issues.apache.org/jira/browse/DERBY-4072
 					IOException accessException = null;
 					try
 					{
@@ -982,6 +995,7 @@ public void recover(
 					catch (IOException ioe)
 					{
 						theLog = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4072
 						accessException = ioe;
 					}
 
@@ -1063,6 +1077,7 @@ public void recover(
 					{
 						// if datafactory doesn't think it is readonly, we can
 						// do some futher test of our own
+//IC see: https://issues.apache.org/jira/browse/DERBY-4072
 						IOException accessException = null;
 						try
 						{
@@ -1074,6 +1089,7 @@ public void recover(
 						catch (IOException ioe)
 						{
 							theLog = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4072
                             accessException = ioe;
 						}
                         if (theLog == null || !privCanWrite(logFile))
@@ -1081,6 +1097,7 @@ public void recover(
 							if (theLog != null)
 								theLog.close();
 							theLog = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4072
 							Monitor.logTextMessage(MessageId.LOG_CHANGED_DB_TO_READ_ONLY);
 							if (accessException != null)
 								Monitor.logThrowable(accessException);	
@@ -1133,6 +1150,7 @@ public void recover(
 
 							Monitor.logTextMessage(MessageId.LOG_INCOMPLETE_LOG_RECORD,
 								logFile, endPosition, eof);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 							/* Write zeros from incomplete log record to end of file */
 							long nWrites = (eof - endPosition)/logBufferSize;
@@ -1175,6 +1193,7 @@ public void recover(
                         // one. DERBY-5937.
                         logOut.close();
                     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 					logOut = new LogAccessFile(this, theLog, logBufferSize);
                 }
 				
@@ -1373,6 +1392,7 @@ public void recover(
                 checkpointDaemon.subscribe(this, true /*onDemandOnly */);
 
             // use the same daemon for the cache cleaner
+//IC see: https://issues.apache.org/jira/browse/DERBY-3131
             dataFactory.setupCacheCleaner(checkpointDaemon);
         }
 	}
@@ -1435,6 +1455,7 @@ checkpoint log record (not guarenteed to be there)
 			4               |--------------------------------------(end of log)
 			5                                       |-^-|
 			.                                   Checkpoint Log Record
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			---A---&gt;|&lt;-------B---------&gt;|&lt;-------------C-----------
 		</PRE>
 
@@ -1481,6 +1502,7 @@ log record is only written after the buffer cache has been flushed.
         @param df           The DataFactory to use to do the checkpoint. 
         @param tf           The TransactionFactory to use to do the checkpoint.
         @param wait         If an existing checkpoint is in progress, then if
+//IC see: https://issues.apache.org/jira/browse/DERBY-4239
                             wait=true then this routine will wait for the 
                             checkpoint to complete and the do another checkpoint
                             and wait for it to finish before returning.
@@ -1516,6 +1538,7 @@ public boolean checkpoint(
         @param df           The DataFactory to use to do the checkpoint. 
         @param tf           The TransactionFactory to use to do the checkpoint.
         @param wait         If an existing checkpoint is in progress, then if
+//IC see: https://issues.apache.org/jira/browse/DERBY-4239
                             wait=true then this routine will wait for the 
                             checkpoint to complete and the do another checkpoint
                             and wait for it to finish before returning.
@@ -1542,6 +1565,7 @@ private boolean checkpointWithTran(
 		long approxLogLength;
 
 		boolean     proceed = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4239
         do
         {
             synchronized (this)
@@ -1649,6 +1673,7 @@ private boolean checkpointWithTran(
                 //checkpoint to zero.
 				logWrittenFromLastCheckPoint = 0;
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-4239
             else
 			{
 				//checkpoint is happening without the log switch,
@@ -1674,6 +1699,7 @@ private boolean checkpointWithTran(
 			if (needCPTran)
 				cptran = tf.startInternalTransaction(rsf,
 				getContextService().getCurrentContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			/////////////////////////////////////////////////////
 			// gather a snapshot of the various interesting points of the log
@@ -1776,6 +1802,7 @@ private boolean checkpointWithTran(
             // If a backup is in progress don't delete the stubs until 
             // it is done. Backup needs to copy all the stubs that 
             // are needed to recover from the backup checkpoint on restore.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
             if(!backupInProgress)
                 df.removeDroppedContainerFileStubs(redoLWM);
 		
@@ -2046,6 +2073,7 @@ public void switchLogFile() throws StandardException
             {
 				throw StandardException.newException(
                         SQLState.LOG_EXCEED_MAX_LOG_FILE_NUMBER, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         maxLogFileNumber); 
             }
 
@@ -2093,6 +2121,7 @@ public void switchLogFile() throws StandardException
 					// file.
 					
 					logOut.writeEndMarker(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 
 					setEndPosition( endPosition + INT_LENGTH );
 					//set that we are in log switch to prevent flusher 
@@ -2126,6 +2155,7 @@ public void switchLogFile() throws StandardException
 						newLog.seek(endPosition);
 					}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 					logOut = new LogAccessFile(this, newLog, logBufferSize);
 					newLog = null;
 
@@ -2187,6 +2217,7 @@ public void switchLogFile() throws StandardException
                 if (newLogFile != null && privExists(newLogFile))
 				{
                     privDelete(newLogFile);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5008
 					newLogFile = null;
 				}
 
@@ -2201,6 +2232,7 @@ public void switchLogFile() throws StandardException
 			
             // Replication slave: Recovery thread should be allowed to
             // read the previous log file
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
             if (inReplicationSlaveMode) {
                 allowedToReadFileNumber = logFileNumber-1;
                 synchronized (slaveRecoveryMonitor) {
@@ -2223,6 +2255,7 @@ public void switchLogFile() throws StandardException
 		@exception IOException Failed to flush to the log
 	*/
 	private void flushBuffer(long fileNumber, long wherePosition)
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 		throws IOException, StandardException
 	{
 		synchronized (this) {
@@ -2262,6 +2295,7 @@ private void truncateLog(CheckpointOperation checkpoint)
 		long firstLogNeeded;
 		if ((firstLogNeeded = getFirstLogNeeded(checkpoint))==-1)
 			return;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3562
 		truncateLog(firstLogNeeded);
 	}
 
@@ -2277,6 +2311,7 @@ private void truncateLog(long firstLogNeeded) {
 		// when  backup is in progress, log files that are yet to
         // be copied to the backup should not be deleted,  even 
         // if they are not required  for crash recovery.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1113
         if(backupInProgress) {
             long logFileNeededForBackup = logFileToBackup;
             // check if the log file number is yet to be copied 
@@ -2346,6 +2381,7 @@ private long getFirstLogNeeded(CheckpointOperation checkpoint)
 		// one truncation at a time
 		synchronized (this)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1248
 			firstLogNeeded = 
                 (checkpoint != null ? 
                      LogCounter.getLogFileNumber(checkpoint.undoLWM()) : -1);
@@ -2382,6 +2418,7 @@ private long getFirstLogNeeded(CheckpointOperation checkpoint)
         using the checksum we find that the control file
         is hosed then we  use the mirror file, which will have
         the control data written at last check point.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5196
 
 		see comment at beginning of file for log control file format.
 
@@ -2422,6 +2459,7 @@ boolean writeControlFile(StorageFile logControlFileName, long value)
 		daos.writeInt(jbmsVersion.getBuildNumberAsInt());
 
 		byte flags = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
 		if (onDiskBeta) 
             flags |= IS_BETA_FLAG;
         
@@ -2586,6 +2624,7 @@ else if (controlFilelength == 16)
                 // If yes, then on a boot error we report that this setting is
                 // probably the cause for the error and also log a warning
                 // in the derby.log that this mode was set previously
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
                 wasDBInDurabilityTestModeNoSync = 
                     (flags & IS_DURABILITY_TESTMODE_NO_SYNC_FLAG) != 0;
 
@@ -2671,6 +2710,7 @@ else if (controlFilelength == 16)
 
 		if (upgradeNeeded)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			if (isFullUpgrade(startParams,
 				ProductVersionHolder.simpleVersionString(onDiskMajorVersion, onDiskMinorVersion, onDiskBeta))) {
 
@@ -2701,6 +2741,7 @@ else if (controlFilelength == 16)
     */
 	private void createLogDirectory() throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1039
 		StorageFile logDir = 
             logStorageFactory.newStorageFile(LogFactory.LOG_DIRECTORY_NAME);
 
@@ -2716,6 +2757,7 @@ private void createLogDirectory() throws StandardException
             
         }else {
             // create the log directory.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
             IOException ex = null;
             boolean created = false;
             try {
@@ -2781,6 +2823,7 @@ public StorageFile getLogDirectory() throws StandardException
 
 		logDir = logStorageFactory.newStorageFile( LogFactory.LOG_DIRECTORY_NAME);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1039
         if (!privExists(logDir))
 		{
 			throw StandardException.newException(
@@ -2979,9 +3022,12 @@ protected LogScan openForwardsScan(long startAt, LogInstant stopAt)
 		Used by scan to switch to the next log file
 
 		<P> MT- read only </p>
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
 
 		<p> When the database is in slave replication mode only:
 		Assumes that only recover() will call this method after
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
 		initializeReplicationSlaveRole() has been called, and until slave
 		replication has ended. If this changes, the current
 		implementation will fail.</p>
@@ -3041,6 +3087,7 @@ protected StorageRandomAccessFile getLogFileAtBeginning(long filenumber)
         }
         // </SLAVE REPLICATION CODE>
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
         long instant = LogCounter.makeLogInstantAsLong(filenumber,
                                                        LOG_FILE_HEADER_SIZE);
         return getLogFileAtPosition(instant);
@@ -3154,8 +3201,11 @@ public void	boot(boolean create, Properties startParams) throws StandardExceptio
         // Is the database booted in replication slave mode?
         String mode = startParams.getProperty(SlaveFactory.REPLICATION_MODE);
         if (mode != null && mode.equals(SlaveFactory.SLAVE_MODE)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3051
             inReplicationSlaveMode = true; 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
             slaveRecoveryMonitor = new Object();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
         } else if (mode != null && mode.equals(SlaveFactory.SLAVE_PRE_MODE)) {
             inReplicationSlavePreMode = true;
         }
@@ -3176,6 +3226,7 @@ public void	boot(boolean create, Properties startParams) throws StandardExceptio
         }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1039
         if(create) {
             getLogStorageFactory();
             createLogDirectory();
@@ -3209,11 +3260,13 @@ public void	boot(boolean create, Properties startParams) throws StandardExceptio
         		
 		//if user does not set the right value for the log buffer size,
 		//default value is used instead.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		logBufferSize =  PropertyUtil.getSystemInt(org.apache.derby.shared.common.reference.Property.LOG_BUFFER_SIZE, 
 												   LOG_BUFFER_SIZE_MIN, 
 												   LOG_BUFFER_SIZE_MAX, 
 												   DEFAULT_LOG_BUFFER_SIZE);
 		jbmsVersion = getMonitor().getEngineVersion();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		
 		String logArchiveMode = 
@@ -3244,6 +3297,7 @@ public void	boot(boolean create, Properties startParams) throws StandardExceptio
         // If derby.system.durability=test is set,then set flag to 
         // disable sync of log records at commit and log file before 
         // data page makes it to disk
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
         if (Property.DURABILITY_TESTMODE_NO_SYNC.equalsIgnoreCase(
                PropertyUtil.getSystemProperty(Property.DURABILITY_PROPERTY)))
         {
@@ -3291,6 +3345,7 @@ else if (Performance.MEASURE)
 			{
                 if (privExists(logControlFileName))
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
 					checkpointInstant = 
                         readControlFile(logControlFileName, startParams);
 
@@ -3309,6 +3364,7 @@ else if (Performance.MEASURE)
                     }
 						
 					if (checkpointInstant == LogCounter.INVALID_LOG_INSTANT &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-1241
 										privExists(getMirrorControlFileName()))
                     {
 						checkpointInstant =
@@ -3360,6 +3416,7 @@ else if (!verifyLogFormat(logFile, logFileNumber))
 					// blow away the log file if possible
                     if (!privDelete(logFile) && logFileNumber == 1)
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
                         logErrMsgForDurabilityTestModeNoSync();
 						throw StandardException.newException(
                             SQLState.LOG_INCOMPATIBLE_FORMAT, dataDirectory);
@@ -3409,6 +3466,7 @@ else if (!verifyLogFormat(logFile, logFileNumber))
 
                         if (!privDelete(logFile))
                         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
                             logErrMsgForDurabilityTestModeNoSync();
 							throw StandardException.newException(
                                     SQLState.LOG_INCOMPATIBLE_FORMAT,
@@ -3449,11 +3507,13 @@ else if (!verifyLogFormat(logFile, logFileNumber))
 				}
 				else
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4072
 					Monitor.logTextMessage(MessageId.LOG_CHANGED_DB_TO_READ_ONLY);
 					Monitor.logThrowable(new Exception("Error writing control file"));
 					// read only database
 					ReadOnlyDB = true;
 					logOut = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 					firstLog = null;
 				}
 
@@ -3485,6 +3545,7 @@ else if (!verifyLogFormat(logFile, logFileNumber))
 						  RawStoreFactory.DERBY_STORE_MINOR_VERSION_1))
 			maxLogFileNumber = LogCounter.DERBY_10_0_MAX_LOGFILE_NUMBER;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
 		bootTimeLogFileNumber = logFileNumber;
 	} // end of boot
 
@@ -3492,6 +3553,7 @@ private void getLogStorageFactory() throws StandardException
     {
         if( logDevice == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             DataFactory df = (DataFactory) findServiceModule( this, DataFactory.MODULE);
             logStorageFactory = (WritableStorageFactory) df.getStorageFactory();
         }
@@ -3535,6 +3597,7 @@ public  void stop() {
 					logOut.flushLogAccessFile();
 					logOut.close();
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 				catch (IOException ioe) {}
 				catch(StandardException se){}
 				logOut = null;
@@ -3585,6 +3648,7 @@ private void deleteObsoleteLogfiles(){
         // when  backup is in progress, log files that are yet to
         // be copied to the backup should not be deleted,  even 
         // if they are not required  for crash recovery.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1113
         if(backupInProgress) {
             long logFileNeededForBackup = logFileToBackup;
             // check if the log file number is yet to be copied 
@@ -3665,6 +3729,7 @@ public void getLogFactoryProperties(PersistentSet set)
 		String cpInterval;
 		if(set == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 			lsInterval=PropertyUtil.getSystemProperty(org.apache.derby.shared.common.reference.Property.LOG_SWITCH_INTERVAL);
 			cpInterval=PropertyUtil.getSystemProperty(org.apache.derby.shared.common.reference.Property.CHECKPOINT_INTERVAL);
 		}else
@@ -3769,6 +3834,7 @@ public long appendLogRecord(byte[] data, int offset, int length,
 			byte[] optionalData, int optionalDataOffset, int optionalDataLength) 
 		 throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
         if (inReplicationSlavePreMode) {
             // Return the *current* end of log without adding the log
             // record to the log file. Effectively, this call to
@@ -3860,6 +3926,7 @@ public long appendLogRecord(byte[] data, int offset, int length,
                     {
 						throw StandardException.newException(
                                 SQLState.LOG_EXCEED_MAX_LOG_FILE_SIZE, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                                 logFileNumber, 
                                 endPosition, 
                                 length, 
@@ -4021,6 +4088,7 @@ protected void flush(long fileNumber, long wherePosition) throws StandardExcepti
 					// slave replication mode, however, log records
 					// received from the master may have been
 					// written to the log.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
 					if (recoveryNeeded && inRedo && !inReplicationSlaveMode) 
 					{
 						return;
@@ -4093,6 +4161,7 @@ protected void flush(long fileNumber, long wherePosition) throws StandardExcepti
                         // (i.e., wherePosition ==
                         // LogCounter.INVALID_LOG_INSTANT has already
                         // been checked)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3051
                         if (inReplicationMasterMode) {
                             masterFactory.flushedTo(LogCounter.
                                        makeLogInstantAsLong(fileNumber,
@@ -4111,6 +4180,7 @@ protected void flush(long fileNumber, long wherePosition) throws StandardExcepti
                     ioe,
                     getLogFileName(logFileNumber).getPath()));
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-5003
             catch (NullPointerException e) {
                 if (SanityManager.DEBUG) {
                     SanityManager.DEBUG_PRINT("DERBY-5003 [1]:", this.toString());
@@ -4140,6 +4210,7 @@ protected void flush(long fileNumber, long wherePosition) throws StandardExcepti
 			if (Performance.MEASURE)
 				mon_syncCalls++;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
 			if (isWriteSynced)
 			{
 				//LogAccessFile.flushDirtyBuffers() will allow only one write
@@ -4148,6 +4219,7 @@ protected void flush(long fileNumber, long wherePosition) throws StandardExcepti
 			}
 			else
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
 				if (!logNotSynced)
 				    logOut.syncLogAccessFile();
 			}
@@ -4174,6 +4246,7 @@ protected void flush(long fileNumber, long wherePosition) throws StandardExcepti
                 ioe,
                 getLogFileName(logFileNumber).getPath()));
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-5003
         catch (NullPointerException e) {
             if (SanityManager.DEBUG) {
                 SanityManager.DEBUG_PRINT("DERBY-5003 [2]", this.toString());
@@ -4259,6 +4332,7 @@ private void syncFile( StorageRandomAccessFile raf)
             try
             {
                 raf.sync();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
 
                 // the sync succeed, so return
                 break;
@@ -4274,12 +4348,14 @@ private void syncFile( StorageRandomAccessFile raf)
                 }
                 catch( InterruptedException ie )
                 {   
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.setInterrupted();
                 }
 
                 if( i > 20 )
                 {
                     throw StandardException.newException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-336
                                 SQLState.LOG_FULL, ioe);
                 }
             }
@@ -4342,6 +4418,7 @@ public final boolean databaseEncrypted()
     public void setDatabaseEncrypted(boolean isEncrypted, boolean flushLog)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         if (flushLog)  {
             flushAll();
         }
@@ -4436,6 +4513,7 @@ public int encrypt(byte[] cleartext, int offset, int length,
 						  byte[] ciphertext, int outputOffset)
 		 throws StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
         return rawStoreFactory.encrypt(cleartext, offset, length, 
                                        ciphertext, outputOffset, false);
 	}
@@ -4460,6 +4538,7 @@ public int getEncryptionBlockSize()
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 	   returns the length that will make the data to be multiple of encryption
 	   block size based on the given length. Block cipher algorithms like DES 
 	   and Blowfish ..etc  require their input to be an exact multiple of the block size.
@@ -4535,6 +4614,7 @@ public boolean logArchived()
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 	   Check to see if a database has been upgraded to the required
 	   level in order to use a store feature.
 	   @param requiredMajorVersion  required database Engine major version
@@ -4617,6 +4697,7 @@ public boolean checkVersion(int requiredMajorVersion,
 	*/
 	protected void logErrMsg(String msg)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
        	logErrMsgForDurabilityTestModeNoSync();
 		Monitor.logTextMessage(MessageId.LOG_BEGIN_ERROR);
 		Monitor.logMessage(msg);
@@ -4629,6 +4710,7 @@ protected void logErrMsg(String msg)
 	*/
 	protected void logErrMsg(Throwable t)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
 		logErrMsgForDurabilityTestModeNoSync();
 		if (corrupt != null)
 		{
@@ -4658,6 +4740,7 @@ protected void logErrMsg(Throwable t)
      */
     private void logErrMsgForDurabilityTestModeNoSync()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-218
         if (logNotSynced || wasDBInDurabilityTestModeNoSync)
         {
             Monitor.logTextMessage(
@@ -4674,6 +4757,7 @@ private void logErrMsgForDurabilityTestModeNoSync()
      */
 	private void printErrorStack(Throwable t)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-237
 		ErrorStringBuilder esb = 
             new ErrorStringBuilder(Monitor.getStream().getHeader());
 		esb.stackTrace(t);
@@ -4704,12 +4788,14 @@ private long logtest_appendPartialLogRecord(byte[] data, int offset,
 			String TestPartialLogWrite = PropertyUtil.getSystemProperty(TEST_LOG_PARTIAL_LOG_WRITE_NUM_BYTES);
 			if (TestPartialLogWrite != null)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
 				bytesToWrite = Integer.parseInt(TestPartialLogWrite);
 			}
 
 			Monitor.logMessage("TEST_LOG_INCOMPLETE_LOG_WRITE: writing " + bytesToWrite + 
 				   " bytes out of " + length + " + " + LOG_RECORD_OVERHEAD + " log record");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 			long instant;
 			try
 			{
@@ -4839,6 +4925,7 @@ protected void testLogFull() throws IOException
 			{
 				String RecordToFillLog = PropertyUtil.getSystemProperty(TEST_RECORD_TO_FILL_LOG);
 				if (RecordToFillLog != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
 					test_numRecordToFillLog = Integer.parseInt(RecordToFillLog);
 				else
 					test_numRecordToFillLog = 100;
@@ -4857,6 +4944,7 @@ protected void testLogFull() throws IOException
 	*/
 	public StorageRandomAccessFile getLogFileToSimulateCorruption(long filenum) throws IOException, StandardException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 		if (SanityManager.DEBUG)
 		{
 			//long filenum = LogCounter.getLogFileNumber(logInstant);
@@ -4880,6 +4968,7 @@ public StorageRandomAccessFile getLogFileToSimulateCorruption(long filenum) thro
          *               unlogged operations need not be logged.
          */
         public boolean inReplicationMasterMode() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3551
             return inReplicationMasterMode;
         }
 	
@@ -4934,6 +5023,7 @@ public boolean inReplicationMasterMode() {
 	*/
 	public static final String TEST_RECORD_TO_FILL_LOG = 
         SanityManager.DEBUG ? "derbyTesting.unittest.recordToFillLog" : null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-891
 
 	/**
 	 * Set to true if we want to simulate max possible log file number is 
@@ -4953,11 +5043,13 @@ public void enableLogArchiveMode() throws StandardException
 			logArchived = true;
 			AccessFactory af = 
             (AccessFactory)getServiceModule(this, AccessFactory.MODULE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			if (af != null)
 			{
 				TransactionController tc = null;
 				tc = af.getTransaction(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                         getContextService().getCurrentContextManager());
 				tc.setProperty(Property.LOG_ARCHIVE_MODE , "true", true);
 			}
@@ -4968,13 +5060,17 @@ public void enableLogArchiveMode() throws StandardException
 	public void disableLogArchiveMode() throws StandardException
 	{
 		AccessFactory af = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             (AccessFactory)getServiceModule(this, AccessFactory.MODULE);
 		if (af != null)
 		{
 			TransactionController tc = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			tc = af.getTransaction(getContextService().getCurrentContextManager());
 			tc.setProperty(Property.LOG_ARCHIVE_MODE , "false", true);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         logArchived = false;
 	}
 
@@ -5031,6 +5127,13 @@ public void startLogBackup(File toDir) throws StandardException
 				}	
 				catch (InterruptedException ie)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                     InterruptStatus.setInterrupted();
 				}	
 			}
@@ -5045,6 +5148,7 @@ public void startLogBackup(File toDir) throws StandardException
 			toFile = new File(toDir,fromFile.getName());
 			if(!privCopyFile(fromFile, toFile))
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1248
 				throw StandardException.newException(
                     SQLState.RAWSTORE_ERROR_COPYING_FILE, fromFile, toFile);
 			}
@@ -5054,11 +5158,13 @@ public void startLogBackup(File toDir) throws StandardException
 			toFile = new File(toDir,fromFile.getName());
 			if(!privCopyFile(fromFile, toFile))
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1248
 				throw StandardException.newException(
                     SQLState.RAWSTORE_ERROR_COPYING_FILE, fromFile, toFile);
 			}
 
 			// find the first log file number that is active
+//IC see: https://issues.apache.org/jira/browse/DERBY-1113
 			logFileToBackup = getFirstLogNeeded(currentCheckpoint);
 		}
 
@@ -5076,12 +5182,14 @@ private void backupLogFiles(File toDir, long lastLogFileToBackup)
         throws StandardException
 	{
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1113
 		while(logFileToBackup <= lastLogFileToBackup)
 		{
 			StorageFile fromFile = getLogFileName(logFileToBackup);
 			File toFile = new File(toDir, fromFile.getName());
 			if(!privCopyFile(fromFile, toFile))
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1248
 				throw StandardException.newException(
                     SQLState.RAWSTORE_ERROR_COPYING_FILE, fromFile, toFile);
 			}
@@ -5107,6 +5215,7 @@ public void endLogBackup(File toDir) throws StandardException
         // Without this force, the backup may end up with page versions 
         // in the backup without their associated log records.
         flush(logFileNumber, endPosition);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1248
 
 		if (logArchived)
 		{
@@ -5119,6 +5228,7 @@ public void endLogBackup(File toDir) throws StandardException
 			// if we see a log file with fuzzy end, we think that is the 
 			// end of the recovery.
 			switchLogFile();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1248
 			lastLogFileToBackup = getLogFileNumber() - 1;
 		}
         else
@@ -5184,6 +5294,7 @@ public boolean inRFR()
      * @throws org.apache.derby.shared.common.error.StandardException 
      */
 	public void checkpointInRFR(LogInstant cinstant, long redoLWM,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3562
 								long undoLWM, DataFactory df)
 								throws StandardException
 	{
@@ -5208,6 +5319,7 @@ public void checkpointInRFR(LogInstant cinstant, long redoLWM,
 		//remove the stub files
 		df.removeDroppedContainerFileStubs(new LogCounter(redoLWM));
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-3562
 		if (inReplicationSlaveMode) {
 			truncateLog(LogCounter.getLogFileNumber(undoLWM));
 		}
@@ -5225,6 +5337,7 @@ public void checkpointInRFR(LogInstant cinstant, long redoLWM,
      * never thrown here.
      */
     public void startReplicationMasterRole(MasterFactory masterFactory) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3051
         throws StandardException {
         this.masterFactory = masterFactory;
         synchronized(this) {
@@ -5241,7 +5354,9 @@ public void startReplicationMasterRole(MasterFactory masterFactory)
     public void stopReplicationMasterRole() {
         inReplicationMasterMode = false;
         masterFactory = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3447
         if(logOut != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
             logOut.stopReplicationMasterRole();
         }
     }
@@ -5282,6 +5397,7 @@ public void stopReplicationSlaveRole() throws StandardException {
     protected void checkForReplication(LogAccessFile log) {
         if (inReplicationMasterMode) {
             log.setReplicationMasterRole(masterFactory);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
         } else if (inReplicationSlaveMode) {
             log.setReplicationSlaveRole();
         }
@@ -5320,8 +5436,11 @@ protected void checkForReplication(LogAccessFile log) {
      */
     public void initializeReplicationSlaveRole()
         throws StandardException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
 
         if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
             SanityManager.ASSERT(inReplicationSlaveMode, 
                                  "This method should only be used when"
                                  + " in slave replication mode");
@@ -5332,6 +5451,8 @@ public void initializeReplicationSlaveRole()
          * end position in that file
          */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
         try {
             // Find the log file with the highest file number on disk
             while (getLogFileAtBeginning(logFileNumber+1) != null) {
@@ -5396,6 +5517,7 @@ public void failoverSlave() {
             // do nothing
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3254
         inReplicationSlaveMode = false;
         synchronized (slaveRecoveryMonitor) {
             slaveRecoveryMonitor.notify();
@@ -5434,6 +5556,7 @@ private boolean restoreLogs(Properties properties) throws StandardException
 
 		//check if the user requested for restore/recovery/create from backup
 		backupPath = properties.getProperty(Attribute.CREATE_FROM);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1039
         if (backupPath != null) {
             isCreateFrom = true;
         } else {
@@ -5481,6 +5604,7 @@ private boolean restoreLogs(Properties properties) throws StandardException
 					//it may be just a file, try deleting it
 					if(!privDelete(logDir))
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1039
 						throw StandardException.newException(
                             SQLState.UNABLE_TO_REMOVE_DATA_DIRECTORY,
                             getLogDirPath( logDir));
@@ -5519,6 +5643,7 @@ private boolean restoreLogs(Properties properties) throws StandardException
 			logSwitchRequired = true;
 
             // log is restored from backup.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1039
             return true;
 		} else {
             // log is not restored from backup.
@@ -5725,6 +5850,7 @@ protected boolean privCanWrite(StorageFile file)
 
     protected boolean privMkdirs(StorageFile file) throws IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
         this.action = 4;
         this.activeFile = file;
         try {
@@ -5766,6 +5892,7 @@ private synchronized String[] privList(StorageFile file)
 
 
 	private synchronized boolean privCopyFile(StorageFile from, File to)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             throws StandardException
 	{
 		action = 6;
@@ -5777,6 +5904,7 @@ private synchronized boolean privCopyFile(StorageFile from, File to)
 		}
         catch (java.security.PrivilegedActionException pae)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             if (pae.getCause() instanceof StandardException) {
                 throw (StandardException)pae.getCause();
             }
@@ -5835,6 +5963,7 @@ public final Object run() throws IOException, StandardException {
 		switch (action) {
 		case 0:
 			// SECURITY PERMISSION - MP1
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 			return activeFile.exists();
 		case 1:
 			// SECURITY PERMISSION - OP5
@@ -5844,6 +5973,7 @@ public final Object run() throws IOException, StandardException {
 			// dependening on the value of activePerms
             boolean exists = activeFile.exists();
             Object result = activeFile.getRandomAccessFile(activePerms);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
             if (!exists) {
                 activeFile.limitAccessToOwner();
@@ -5852,6 +5982,7 @@ public final Object run() throws IOException, StandardException {
             return result;
 		case 3:
 			// SECURITY PERMISSION - OP4
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
 			return activeFile.canWrite();
 		case 4:
 			// SECURITY PERMISSION - OP4
@@ -5861,6 +5992,7 @@ public final Object run() throws IOException, StandardException {
                 activeFile.limitAccessToOwner();
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6885
             return created;
 		case 5:
 			// SECURITY PERMISSION - MP1
@@ -5886,6 +6018,7 @@ public final Object run() throws IOException, StandardException {
     @Override
     @SuppressWarnings("StringConcatenationInsideStringBufferAppend")
     public String toString() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5003
         StringBuilder sb = new StringBuilder();
         if (SanityManager.DEBUG) { // to reduce footprint in insane code
             sb.append("LogToFile: [\n");
@@ -5961,12 +6094,14 @@ public String toString() {
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/ReadOnly.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/ReadOnly.java
index 03fe99824a..b9263ee0e1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/ReadOnly.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/ReadOnly.java
@@ -469,6 +469,7 @@ public boolean checkVersion(int requiredMajorVersion,
      * ReadOnly databases can not be replicated
      */
     public void startReplicationMasterRole(MasterFactory masterFactory)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3051
         throws StandardException {
         throw StandardException.newException(
                   SQLState.LOGMODULE_DOES_NOT_SUPPORT_REPLICATION);
@@ -481,6 +482,7 @@ public void startReplicationMasterRole(MasterFactory masterFactory)
      */
     
     public boolean inReplicationMasterMode() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3551
         return false;
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/Scan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/Scan.java
index 4f237c4a81..6daea1a525 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/Scan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/Scan.java
@@ -376,6 +376,7 @@ private LogRecord getNextRecordBackward(ArrayInputStream input,
 					throw logFactory.markCorrupt(
                         StandardException.newException(
                             SQLState.LOG_RECORD_CORRUPTED, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                             checkLength,
                             recordLength,
                             inst,
@@ -465,6 +466,7 @@ private LogRecord getNextRecordBackward(ArrayInputStream input,
 
 			// skip the checksum log records, there is no need to look at them 
 			// during backward scans. They are used only in forwardscan during recovery. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 			if(lr.isChecksum())
 			{
 				candidate = false; 
@@ -709,6 +711,7 @@ private LogRecord getNextRecordForward(ArrayInputStream input,
 
 				// scan is position just past the log header
 				recordStartPosition = scan.getFilePointer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-298
 
                 // Verify that the header of the new log file refers
                 // to the end of the log record of the previous file
@@ -751,6 +754,7 @@ private LogRecord getNextRecordForward(ArrayInputStream input,
                 // Advance knownGoodLogEnd to make sure that if this
                 // log file is the last log file and empty, logging
                 // continues in this file, not the old file.
+//IC see: https://issues.apache.org/jira/browse/DERBY-298
                 knownGoodLogEnd = LogCounter.makeLogInstantAsLong
                     (currentLogFileNumber, recordStartPosition);
 
@@ -955,6 +959,7 @@ private LogRecord getNextRecordForward(ArrayInputStream input,
 						throw logFactory.markCorrupt
 						(StandardException.newException(
 							SQLState.LOG_RECORD_CORRUPTED, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                             checkLength,
                             recordLength,
                             currentInstant,
@@ -998,6 +1003,7 @@ private LogRecord getNextRecordForward(ArrayInputStream input,
 			 * specified length of the data in the log file. cheksum values
 			 * should match unless the right was incomplete before the crash.
 			 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-96
 			if(lr.isChecksum())
 			{
 				// checksum log record should not be returned to the logger recovery redo
@@ -1200,6 +1206,7 @@ public long getInstant()
 
 	/**
 		Return the log instant at the end of the log record on the current
+//IC see: https://issues.apache.org/jira/browse/DERBY-298
 		LogFile in the form of a log instant.
         After the scan has been closed, the end of the last log record will be
         returned except when the scan ended in an empty log file.  In that
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java
index 91b925fdc0..50de4e280e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java
@@ -43,6 +43,7 @@ public class GlobalXactId extends GlobalXact implements GlobalTransactionId
      * Constructors for This class:
      **************************************************************************
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6184
     GlobalXactId(
 						int     format_id,
 						byte[]  global_id,
@@ -149,6 +150,7 @@ int getFormat_Id()
      * Obtain the global transaction identifier as an array of bytes.
      * @return a byte array containing the global transaction identifier
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6184
     byte[] getGlobalTransactionId()
     {
         return(global_id);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/InternalXact.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/InternalXact.java
index 519426fccf..8252813949 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/InternalXact.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/InternalXact.java
@@ -56,6 +56,7 @@ protected InternalXact(
     DataValueFactory    dataValueFactory) 
     {
 		super(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
             xactFactory, null, logFactory, dataFactory, dataValueFactory, 
             false, null, false);
 
@@ -148,6 +149,7 @@ protected void setIdleState()
 			catch (StandardException se)
 			{
 				if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
 					SanityManager.THROWASSERT("unexpected exception", se);
 			}
 		}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
index fa0871e37f..707af6c8e9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
@@ -79,6 +79,7 @@ a goal to use this transaction table (and traversing from the redoLWM)
 	TransactionTable must be MT-safe it is called upon by many threads
 	simultaneously (except during recovery)
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
     <P>Methods that are only called during
     recovery don't need to take MT considerations, and can safely use iterators
     with no additional synchronization.
@@ -100,6 +101,7 @@ public class TransactionTable implements Formatable
 	*/
 	public TransactionTable()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
         trans = new ConcurrentHashMap<TransactionId, TransactionTableEntry>();
 	}
 
@@ -115,6 +117,7 @@ private TransactionTableEntry findTransactionEntry(TransactionId id)
                 id != null, "findTransacionEntry with null id");
 
 		// Hashtable is synchronized
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		return trans.get(id);
 	}
 
@@ -168,10 +171,12 @@ static interface EntryVisitor {
      * @param visitor the visitor to apply on each transaction table entry
      */
     void visitEntries(EntryVisitor visitor) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
         for (Object entry : trans.values()) {
             if (!visitor.visit((TransactionTableEntry) entry)) {
                 // The visitor returned false, meaning that it's done with
                 // all of its work and we can stop the scan.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3092
                 break;
             }
         }
@@ -182,6 +187,7 @@ void add(Xact xact, boolean exclude)
 	{
 		TransactionId id = xact.getId();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4512
         TransactionTableEntry newEntry = new TransactionTableEntry(
                 xact, id, 0, exclude ? TransactionTableEntry.EXCLUDE : 0);
 
@@ -237,6 +243,7 @@ boolean remove(TransactionId id)
         }
 
 		// Hashtable is synchronized
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		 TransactionTableEntry ent = trans.remove(id);
 		 return (ent == null || ent.needExclusion());
 	}
@@ -377,6 +384,7 @@ void prepareTransaction(TransactionId id)
 	public ContextManager findTransactionContextByGlobalId(
     final GlobalXactId global_id)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
         for (TransactionTableEntry entry : trans.values()) {
             GlobalTransactionId entry_gid = entry.getGid();
             if (entry_gid != null && entry_gid.equals(global_id)) {
@@ -403,6 +411,7 @@ boolean hasActiveUpdateTransaction()
 	{
 		synchronized (this)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
             for (TransactionTableEntry entry : trans.values()) {
                 if (entry.isUpdate()) {
                     return true;
@@ -441,6 +450,7 @@ public void writeExternal(final ObjectOutput out) throws IOException
 		synchronized(this)
         {
             int count = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
             for (TransactionTableEntry entry : trans.values()) {
                 if (entry.isUpdate()) {
                     count++;
@@ -455,6 +465,7 @@ public void writeExternal(final ObjectOutput out) throws IOException
                 // Count the number of writes in debug builds.
                 int writeCount = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
                 for (TransactionTableEntry entry : trans.values()) {
                     if (entry.isUpdate()) {
                         // only write out update transactions
@@ -533,6 +544,7 @@ public TransactionId largestUpdateXactId()
 	*/
 	public boolean hasRollbackFirstTransaction()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
         for (TransactionTableEntry ent : trans.values())
 		{
 			if (ent != null && ent.isRecovery() && 
@@ -583,6 +595,7 @@ public boolean hasPreparedXact()
 
     private boolean hasPreparedXact(boolean recovered)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
         for (TransactionTableEntry ent : trans.values())
         {
             if (ent != null && 
@@ -623,6 +636,7 @@ public boolean getMostRecentRollbackFirstTransaction(RawTransaction tran)
 		}
 
 		TransactionId id = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
         for (TransactionTableEntry ent : trans.values())
 		{
 			if (ent != null && ent.isUpdate() && ent.isRecovery() &&
@@ -675,6 +689,7 @@ public boolean getMostRecentTransactionForRollback(RawTransaction tran)
 
         if (!trans.isEmpty())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
             for (TransactionTableEntry ent : trans.values())
 			{
 				if (ent != null         && 
@@ -712,6 +727,7 @@ public boolean getMostRecentTransactionForRollback(RawTransaction tran)
                 else
                 {
                     // all transactions in the table must be prepared.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
                     for (TransactionTableEntry ent : trans.values())
                     {
                         SanityManager.ASSERT(ent.isPrepared());
@@ -767,6 +783,7 @@ public boolean getMostRecentPreparedRecoveredXact(
             TransactionId           id          = null;
             GlobalTransactionId     gid         = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
             for (TransactionTableEntry ent : trans.values())
 			{
 				if (ent != null         && 
@@ -790,6 +807,7 @@ public boolean getMostRecentPreparedRecoveredXact(
                     // if no entry's were found then the transaction table
                     // should have the passed in idle tran, and the rest should
                     // be non-recover, prepared global transactions.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
                     for (TransactionTableEntry ent : trans.values())
                     {
                         if (XactId.compare(ent.getXid(), tran.getId()) != 0)
@@ -814,6 +832,7 @@ public boolean getMostRecentPreparedRecoveredXact(
                 //               to take over.
                 TransactionTableEntry new_ent =
                     trans.remove(tran.getId());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
                 // At this point only the found_ent should be in the table.
                 if (SanityManager.DEBUG)
@@ -842,6 +861,7 @@ public LogInstant getFirstLogInstant()
 		// assume for now that it is acceptable to return null if a transaction
 		// starts right in the middle of this call.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
         LogInstant logInstant = null;
         for (TransactionTableEntry entry : trans.values()) {
             if (entry.isUpdate()) {
@@ -913,6 +933,7 @@ public TransactionInfo[] getTransactionInfo()
         final ArrayList<TransactionTableEntry> tinfo = new ArrayList<TransactionTableEntry>();
 
         // Get clones of all the entries in the transaction table.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
         for (TransactionTableEntry entry : trans.values()) {
             tinfo.add((TransactionTableEntry) entry.clone());
         }
@@ -933,6 +954,7 @@ public String toString()
 
             boolean hasReadOnlyTransaction = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6242
             for (TransactionTableEntry entry : trans.values()) {
                 if (entry.isUpdate()) {
                     str.append(entry);
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
index 3015d8ddab..252138eac9 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
@@ -466,6 +466,7 @@ public String getUsernameString()
 			SanityManager.ASSERT(isClone, "Should only call method on a clone");
 
 		getlcc();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         return (lcc == null) ? null : lcc.getSessionUserId();
 	}
 
@@ -551,6 +552,7 @@ protected Object clone()
 			if (SanityManager.DEBUG) 
             {
 				SanityManager.THROWASSERT(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2581
                     "TransactionTableEntry cloneable but throws " +
 					"CloneNotSupportedException", e);
 			}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/Xact.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/Xact.java
index 8e0935fcc0..b4c805612c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/Xact.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/Xact.java
@@ -2881,6 +2881,7 @@ public boolean inRollForwardRecovery()
      * @throws org.apache.derby.shared.common.error.StandardException 
      */
 	public void checkpointInRollForwardRecovery(LogInstant cinstant,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3562
 												long redoLWM, long undoLWM)
 		throws StandardException
 	{
@@ -2889,6 +2890,7 @@ public void checkpointInRollForwardRecovery(LogInstant cinstant,
 
     public boolean isNestedOwner()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
         return (parentTransactionId != null );
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactContext.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactContext.java
index 8019445b01..2e636d9443 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactContext.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactContext.java
@@ -46,6 +46,7 @@ context manager (ie. typically a single user) for a single RawStoreFactory.
 **/
 
 final class XactContext extends ContextImpl {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
 	private		RawTransaction	xact;
 	private     RawStoreFactory factory;
@@ -144,6 +145,7 @@ public void cleanupOnError(Throwable error) throws StandardException {
 
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 	RawTransaction getTransaction() {
 		return xact;
 	}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactFactory.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactFactory.java
index e67828f355..4090e12c89 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactFactory.java
@@ -125,29 +125,36 @@ public void	boot(boolean create, Properties properties)
 	{
 
 		uuidFactory = getMonitor().getUUIDFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         /*
         dataValueFactory =  (DataValueFactory)
             findServiceModule(
                 this,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 org.apache.derby.shared.common.reference.ClassName.DataValueFactory);
         */
             // if datafactory has not been booted yet, try now.  This can
             // happen in the unit tests.  Usually it is booted before store
             // booting is called.
             dataValueFactory = (DataValueFactory) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                 bootServiceModule(
                     create, 
                     this,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                     org.apache.derby.shared.common.reference.ClassName.DataValueFactory, 
                     properties);
 		
 
 		contextFactory = getContextService();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		lockFactory = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             (LockFactory) bootServiceModule(false, this,
 				org.apache.derby.shared.common.reference.Module.LockFactory, properties);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 		
         // adding entries to locking policy table which means we support that
@@ -268,6 +275,7 @@ public void createFinished() throws StandardException
      **/
     private Xact startCommonTransaction(
     RawStoreFactory     rsf, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
     Xact                    parentTransaction, 
     ContextManager      cm,
     boolean             readOnly,
@@ -291,6 +299,7 @@ private Xact startCommonTransaction(
 
 		Xact xact = 
             new Xact(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                 this, parentTransaction, logFactory, dataFactory, dataValueFactory, 
                 readOnly, compatibilitySpace, flush_log_on_xact_end);
 
@@ -311,6 +320,7 @@ public RawTransaction startTransaction(
         return(
             startCommonTransaction(
                 rsf, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                 null, 
                 cm, 
                 false,              // user xact always read/write 
@@ -323,7 +333,9 @@ public RawTransaction startTransaction(
 
 	public RawTransaction startNestedReadOnlyUserTransaction(
     RawStoreFactory rsf,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
     RawTransaction parentTransaction,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
     CompatibilitySpace compatibilitySpace,
     ContextManager  cm,
     String          transName)
@@ -332,6 +344,7 @@ public RawTransaction startNestedReadOnlyUserTransaction(
         return(
             startCommonTransaction(
                 rsf, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                 (Xact) parentTransaction, 
                 cm, 
                 true, 
@@ -345,6 +358,7 @@ public RawTransaction startNestedReadOnlyUserTransaction(
 
 	public RawTransaction startNestedUpdateUserTransaction(
     RawStoreFactory rsf,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
     RawTransaction parentTransaction,
     ContextManager  cm,
     String          transName,
@@ -354,6 +368,7 @@ public RawTransaction startNestedUpdateUserTransaction(
         return(
             startCommonTransaction(
                 rsf, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                 (Xact) parentTransaction, 
                 cm, 
                 false, 
@@ -382,9 +397,11 @@ public RawTransaction startGlobalTransaction(
             throw StandardException.newException(SQLState.STORE_XA_XAER_DUPID);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6184
         Xact xact =
             startCommonTransaction(
                 rsf, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                 null, 
                 cm, 
                 false, 
@@ -439,6 +456,7 @@ public RawTransaction startNestedTopTransaction(RawStoreFactory rsf, ContextMana
 
 		Xact xact = 
             new Xact(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
                 this, null, logFactory, dataFactory, dataValueFactory, 
                 false, null, false);
 
@@ -462,6 +480,7 @@ public RawTransaction startInternalTransaction(RawStoreFactory rsf, ContextManag
 		}
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		Xact xact = 
             new InternalXact(this, logFactory, dataFactory, dataValueFactory);
 
@@ -713,6 +732,7 @@ public void setNewTransactionId(TransactionId oldxid, Xact t)
 			excludeMe = remove(oldxid);
 
         XactId xid = new XactId(tranId.getAndIncrement());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4478
 
 		t.setTransactionId(t.getGlobalId(), xid);
 
@@ -736,6 +756,7 @@ public void setNewTransactionId(TransactionId oldxid, Xact t)
 	public void resetTranId()
 	{
 		XactId xid = (XactId)ttab.largestUpdateXactId();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4478
         long highestId = (xid == null) ? 0L : xid.getId();
         tranId.set(highestId + 1);
 	}
@@ -866,6 +887,7 @@ public void setRawStoreFactory(RawStoreFactory rsf) throws StandardException
 		// now its ok to look for the log and data factory
 		// log factory is booted by the data factory
 		logFactory = (LogFactory) findServiceModule(this, rsf.getLogFactoryModule());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		// data factory is booted by the raw store implementation
 		dataFactory = (DataFactory) findServiceModule(this, rsf.getDataFactoryModule());
@@ -1047,6 +1069,7 @@ public boolean inDatabaseCreation()
      */
 	protected boolean blockBackup(boolean wait)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 		synchronized(backupSemaphore) {
             // do not allow backup blocking operations, if online backup is
             // is in progress.
@@ -1057,6 +1080,7 @@ protected boolean blockBackup(boolean wait)
                         try {
                             backupSemaphore.wait();
                         } catch (InterruptedException ie) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                             InterruptStatus.setInterrupted();
                         }
                     }
@@ -1124,6 +1148,7 @@ public boolean blockBackupBlockingOperations(boolean wait)
 							backupSemaphore.wait();
 						}
 						catch (InterruptedException ie) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                             InterruptStatus.setInterrupted();
 						}
 					}
@@ -1144,6 +1169,8 @@ public boolean blockBackupBlockingOperations(boolean wait)
             
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-523
         if (SanityManager.DEBUG) {
             if (inBackup) {
                 SanityManager.ASSERT(backupBlockingOperations == 0 ,
@@ -1173,12 +1200,14 @@ public void unblockBackupBlockingOperations()
      */
     private static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactId.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactId.java
index 384724b2ff..0aa1cd7eca 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactId.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactId.java
@@ -132,6 +132,7 @@ public int hashCode()
 	
 	/**
 		Return	0 if a == b, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				+ve number if a &gt; b
 				-ve number if a &lt; b
 	*/
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java
index 7c790c8ae3..29be0d6224 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java
@@ -243,9 +243,11 @@ public Xid[] recover(int flags)
         if ((flags & XAResource.TMSTARTRSCAN) != 0)
         {
             final ArrayList<XAXactId> xid_list = new ArrayList<XAXactId>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
             // Create a visitor that adds each of the prepared transactions
             // to xid_list.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3092
             final TransactionTable.EntryVisitor visitor =
                     new TransactionTable.EntryVisitor() {
                 public boolean visit(TransactionTableEntry entry) {
@@ -253,6 +255,7 @@ public boolean visit(TransactionTableEntry entry) {
                     if (xact.isPrepared())
                     {
                         GlobalXactId xa_id = (GlobalXactId) xact.getGlobalId();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6184
 
                         xid_list.add(
                             new XAXactId(
@@ -260,6 +263,7 @@ public boolean visit(TransactionTableEntry entry) {
                                 xa_id.getGlobalTransactionId(), 
                                 xa_id.getBranchQualifier()));
                     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3092
                     return true; // scan the entire transaction table
                 }
             };
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/ReplicationLogger.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/ReplicationLogger.java
index 9187677c47..b8132e3c2b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/ReplicationLogger.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/ReplicationLogger.java
@@ -41,6 +41,7 @@ public class ReplicationLogger {
     private final String dbname;
 
     public ReplicationLogger(String dbname) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
         verbose = PropertyUtil.getSystemBoolean(Property.REPLICATION_VERBOSE,
                                                 true);
         this.dbname = dbname;
@@ -88,6 +89,7 @@ public void logError(String msgId, Throwable t) {
      */
     public void logText(String text, boolean writeHeader) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
         if (verbose) {
             if (writeHeader) {
                 Monitor.logTextMessage(MessageId.REPLICATION_ERROR_BEGIN,
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer/LogBufferElement.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer/LogBufferElement.java
index 757ed8341c..2aab4c824c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer/LogBufferElement.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer/LogBufferElement.java
@@ -77,6 +77,7 @@ protected void init() {
      **/
     protected void appendLog(long greatestInstant,
                              byte[] log, int logOffset, int logLength) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
 
         if (SanityManager.DEBUG){
             SanityManager.ASSERT(freeSize() >= logLength,
@@ -147,6 +148,7 @@ protected void setRecyclable(boolean r){
      */
     private int appendBytes(byte b[], int offset, int pos, int length) {
         if (SanityManager.DEBUG){
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
             SanityManager.ASSERT(freeSize() >= length,
                                  "byte[] is to big to fit"+
                                  " into this buffer");
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
index 793ba97d69..10fc7d697a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
@@ -107,12 +107,14 @@ public ReplicationLogBuffer(int bufferSize, MasterFactory mf) {
         defaultBufferSize = bufferSize;
         
         this.mf = mf;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3359
 
         outBufferData = new byte[bufferSize];
         outBufferStored = 0;
         outBufferLastInstant = 0;
         validOutBuffer = false; // no valid data in outBuffer yet
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         dirtyBuffers = new LinkedList<LogBufferElement>();
         freeBuffers = new LinkedList<LogBufferElement>();
 
@@ -137,6 +139,7 @@ public ReplicationLogBuffer(int bufferSize, MasterFactory mf) {
      * free space in the buffer to store the chunk of log.
      **/
     public void appendLog(long greatestInstant,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
                           byte[] log, int logOffset, int logLength)
         throws LogBufferFullException{
 
@@ -153,6 +156,7 @@ public void appendLog(long greatestInstant,
 
             // switch buffer if current buffer does not have enough space
             // for the incoming data
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
             if (logLength > currentDirtyBuffer.freeSize()) {
                 switchDirtyBuffer();
                 switchedBuffer = true;
@@ -220,12 +224,14 @@ public boolean next() {
                 if (dirtyBuffers.size() > 0 ) {
                     LogBufferElement current =
                         dirtyBuffers.removeFirst();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
                     // The outBufferData byte[] should have the
                     // default size or the size of the current
                     // LogBufferElement if that is bigger than the
                     // default size.
                     int requiredOutBufferSize = Math.max(defaultBufferSize,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2926
                                                          current.size());
                     if (outBufferData.length != requiredOutBufferSize) {
                         // The current buffer has a different size
@@ -322,6 +328,7 @@ public long getLastInstant() throws NoSuchElementException{
         synchronized (outputLatch) {
             if (validOutBuffer) {
                 return outBufferLastInstant;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3359
             } else {
                 throw new NoSuchElementException();
             }
@@ -351,6 +358,7 @@ private void switchDirtyBuffer() throws LogBufferFullException{
         if (currentDirtyBuffer == null) {
             try {
                 currentDirtyBuffer =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     freeBuffers.removeFirst();
                 currentDirtyBuffer.init();
             } catch (NoSuchElementException nsee) {
@@ -369,6 +377,7 @@ private void switchDirtyBuffer() throws LogBufferFullException{
      *         information.
      */
     public int getFillInformation() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3359
         return ((dirtyBuffers.size()*100)/DEFAULT_NUMBER_LOG_BUFFERS);
     }
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
index 5fd0b21964..8687939833 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
@@ -176,19 +176,23 @@ public class AsynchronousLogShipper extends Thread implements
      * the log file (typically derby.log)
      */
     public AsynchronousLogShipper(ReplicationLogBuffer logBuffer,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
                                   ReplicationMessageTransmit transmitter,
                                   MasterController masterController,
                                   ReplicationLogger repLogger) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3437
         super("derby.master.logger-" + masterController.getDbName());
         this.logBuffer = logBuffer;
         this.transmitter = transmitter;
         this.masterController = masterController;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3064
         this.stopShipping = false;
         this.repLogger = repLogger;
 
         getLogShipperProperties();
         shippingInterval = minShippingInterval;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3359
         lastShippingTime = System.currentTimeMillis();
     }
     
@@ -209,12 +213,14 @@ public void run() {
         while (!stopShipping) {
             try {
                 synchronized (forceFlushSemaphore) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3719
                     shipALogChunk();
                     // Wake up a thread waiting for forceFlush, if any
                     forceFlushSemaphore.notify();
                 }
                 //calculate the shipping interval (wait time) based on the
                 //fill information obtained from the log buffer.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3526
                 shippingInterval = calculateSIfromFI();
                 if (shippingInterval != -1) {
                     synchronized(objLSTSync) {
@@ -222,10 +228,12 @@ public void run() {
                     }
                 }
             } catch (InterruptedException ie) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 InterruptStatus.setInterrupted();
             } catch (IOException ioe) {
                 //The transmitter is recreated if the connection to the
                 //slave can be re-established.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3509
                 transmitter = masterController.handleExceptions(ioe);
                 //The transmitter cannot be recreated hence stop the log
                 //shipper thread.
@@ -254,6 +262,7 @@ public void run() {
     private synchronized boolean shipALogChunk()
     throws IOException, StandardException {
         byte [] logRecords = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3064
         ReplicationMessage mesg = null;
         try {
             //Check to see if a previous log record exists that needs
@@ -275,7 +284,9 @@ private synchronized boolean shipALogChunk()
                 
                 transmitter.sendMessage(mesg);
                 highestShippedInstant = logBuffer.getLastInstant();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3359
                 lastShippingTime = System.currentTimeMillis();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3235
                 return true;
             } 
         } catch (NoSuchElementException nse) {
@@ -284,6 +295,7 @@ private synchronized boolean shipALogChunk()
             //buffer.
             masterController.handleExceptions(StandardException.newException
                 (SQLState.REPLICATION_UNEXPECTED_EXCEPTION, nse));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3064
         } catch (IOException ioe) {
             //An exception occurred while transmitting the log record.
             //Store the previous log record so that it can be re-transmitted
@@ -293,6 +305,7 @@ private synchronized boolean shipALogChunk()
             }
             throw ioe;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3235
         return false;
     }
     
@@ -323,6 +336,7 @@ public void flushBuffer() throws IOException, StandardException {
      */
     public void forceFlush() throws IOException, StandardException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3567
         if (stopShipping) return;
         synchronized (forceFlushSemaphore) {
             synchronized (objLSTSync) {
@@ -334,6 +348,7 @@ public void forceFlush() throws IOException, StandardException
             try {
                 forceFlushSemaphore.wait(DEFAULT_FORCEFLUSH_TIMEOUT);
             } catch (InterruptedException ex) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 InterruptStatus.setInterrupted();
             }
         }
@@ -389,8 +404,10 @@ public void workToDo() {
         fi = logBuffer.getFillInformation();
         
         if (fi >= FI_HIGH || 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
                 (System.currentTimeMillis() - lastShippingTime) >
                  minShippingInterval) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3526
             synchronized (objLSTSync) {
                 objLSTSync.notify();
             }
@@ -420,6 +437,7 @@ private long calculateSIfromFI() {
         if (fi >= FI_HIGH) {
             si = -1;
         } else if (fi > FI_LOW && fi < FI_HIGH) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
             si = minShippingInterval;
         } else {
             si = maxShippingInterval;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/master/MasterController.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/master/MasterController.java
index 960b6f992a..788a9dc3fe 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/master/MasterController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/master/MasterController.java
@@ -160,6 +160,7 @@ public boolean canSupport(Properties startParams) {
      * Will stop the replication master service.
      */
     public void stop() { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3447
         try {
             stopMaster();
         } catch (StandardException se) {
@@ -204,6 +205,7 @@ public void startMaster(RawStoreFactory rawStore,
         }
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
             slaveAddr = new SlaveAddress(slavehost, slaveport);
         } catch (UnknownHostException uhe) {
             throw StandardException.newException
@@ -217,22 +219,27 @@ public void startMaster(RawStoreFactory rawStore,
         dataFactory = dataFac;
         logFactory = logFac;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
         repLogger = new ReplicationLogger(dbname);
         getMasterProperties();
         logBuffer = new ReplicationLogBuffer(logBufferSize, this);
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3051
             logFactory.startReplicationMasterRole(this);
         
             rawStoreFactory.unfreeze();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3384
 
             setupConnection();
 
             if (replicationMode.equals(MasterFactory.ASYNCHRONOUS_MODE)) {
                 logShipper = new AsynchronousLogShipper(logBuffer,
                                                         transmitter,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
                                                         this,
                                                         repLogger);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3447
                 logShipper.setDaemon(true);
                 logShipper.start();
             }
@@ -272,11 +279,13 @@ public void stopMaster() throws StandardException {
         try {
             logShipper.flushBuffer();
         } catch (IOException ioe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
             repLogger.
                 logError(MessageId.REPLICATION_LOGSHIPPER_EXCEPTION, ioe);
         } catch(StandardException se) {
             repLogger.
                 logError(MessageId.REPLICATION_LOGSHIPPER_EXCEPTION, se);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3364
         } finally {
             teardownNetwork();
         }
@@ -298,6 +307,7 @@ public void startFailover() throws StandardException {
 
         //acknowledgment returned from the slave containing
         //the status of the failover performed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3254
         ReplicationMessage ack = null;
         
         //A failover stops the master controller and shuts down
@@ -315,6 +325,7 @@ public void startFailover() throws StandardException {
             //acknowledgement.
             ReplicationMessage mesg = new ReplicationMessage(
                         ReplicationMessage.TYPE_FAILOVER, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
             ack = transmitter.sendMessageWaitForReply(mesg);
         } catch (IOException ioe) {
             handleFailoverFailure(ioe);
@@ -334,12 +345,14 @@ public void startFailover() throws StandardException {
             //The exception thrown is of Database Severity, this shuts
             //down the master database.
             teardownNetwork();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3364
 
             //If we require an exception of Database Severity to shutdown the
             //database to shutdown the database we need to unfreeze first
             //before throwing the exception. Unless we unfreeze the shutdown
             //hangs.
             rawStoreFactory.unfreeze();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3428
 
             throw StandardException.newException
                     (SQLState.REPLICATION_FAILOVER_SUCCESSFUL, dbname);  
@@ -355,6 +368,7 @@ public void startFailover() throws StandardException {
      * Load relevant system property: replication log buffer size
      */
     private void getMasterProperties() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
         logBufferSize =
             PropertyUtil.getSystemInt(Property.REPLICATION_LOG_BUFFER_SIZE,
                                       DEFAULT_LOG_BUFFER_SIZE);
@@ -390,6 +404,7 @@ private void getMasterProperties() {
      */
     private void handleFailoverFailure(Throwable t) 
     throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3364
         teardownNetwork();
         rawStoreFactory.unfreeze();
         if (t != null) {
@@ -414,16 +429,19 @@ private void handleFailoverFailure(Throwable t)
      **/
     public void appendLog(long greatestInstant,
                           byte[] log, int logOffset, int logLength){
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
 
         try {
             logBuffer.appendLog(greatestInstant, log, logOffset, logLength);
         } catch (LogBufferFullException lbfe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3064
             try {
                 logShipper.forceFlush();
                 // Either the forceFlush succeeded in sending a chunk of log
                 // (making room for this log chunk in the buffer), or
                 // forceFlush did not succeed (in which case replication is
                 // stopped)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3567
                 logBuffer.appendLog(greatestInstant, log,
                                     logOffset, logLength);
             } catch (LogBufferFullException lbfe2) {
@@ -475,6 +493,7 @@ private void setupConnection() throws StandardException {
             if (transmitter != null) {
                 transmitter.tearDown();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3489
             transmitter = new ReplicationMessageTransmit(slaveAddr);
             
             // getHighestShippedInstant is -1 until the first log
@@ -499,6 +518,7 @@ private void setupConnection() throws StandardException {
         } catch (IOException ioe) {
             throw StandardException.newException
                     (SQLState.REPLICATION_CONNECTION_EXCEPTION, ioe, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3489
                      dbname, getHostName(), String.valueOf(getPortNumber()));
         } catch (StandardException se) {
             throw se;
@@ -519,14 +539,17 @@ private void setupConnection() throws StandardException {
      * @return an instance of the transmitter used to transmit messages to the
      *         slave.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3509
     ReplicationMessageTransmit handleExceptions(Exception exception) {
         if (exception instanceof IOException) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
             repLogger.logError(MessageId.REPLICATION_LOGSHIPPER_EXCEPTION,
                                exception);
             Monitor.logTextMessage(MessageId.REPLICATION_MASTER_RECONN, dbname);
             
             while (active) {
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3489
                     transmitter = new ReplicationMessageTransmit(slaveAddr);
                     // see comment in setupConnection
                     if (logShipper != null &&
@@ -549,6 +572,7 @@ ReplicationMessageTransmit handleExceptions(Exception exception) {
                     continue;
                 } catch (Exception e) {
                     printStackAndStopMaster(e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3509
                     return null;
                 }
             }
@@ -581,6 +605,7 @@ private void printStackAndStopMaster(Exception e) {
      * Used to notify the log shipper that a log buffer element is full.
      */
     public void workToDo() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3359
         logShipper.workToDo();
     }
 
@@ -591,6 +616,7 @@ public void workToDo() {
     private void teardownNetwork() {
 
         if (logShipper != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3235
             logShipper.stopLogShipment();
         }
 
@@ -621,6 +647,7 @@ private void teardownNetwork() {
      * 
      * @return a master database name
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3437
     String getDbName() {
         return this.dbname;
     }
@@ -632,6 +659,7 @@ String getDbName() {
      *         connected to.
      */
     private String getHostName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3489
         return slaveAddr.getHostAddress().getHostName();
     }
     
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java
index 10eef05b4e..3ebff76641 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java
@@ -104,6 +104,7 @@ public class ReplicationMessageReceive {
      * @param dbname the name of the database.
      */
     public ReplicationMessageReceive(SlaveAddress slaveAddress, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3489
                                      String dbname) {
         this.slaveAddress = slaveAddress;
         Monitor.logTextMessage(MessageId.REPLICATION_SLAVE_NETWORK_LISTEN,
@@ -150,14 +151,18 @@ public void initConnection(int timeout, long synchOnInstant, String dbname)
         // Create the ServerSocket object if this is the first
         // initConnection attempt. Otherwise, we reuse the existing
         // server socket
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
         if (serverSocket == null) {
             serverSocket = createServerSocket();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
         serverSocket.setSoTimeout(timeout);
         Socket client = null;
         try {
             //Start listening on the socket and accepting the connection
             client =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 AccessController.doPrivileged(new PrivilegedExceptionAction<Socket>() {
                     public Socket run() throws IOException {
                         return serverSocket.accept();
@@ -176,6 +181,7 @@ public Socket run() throws IOException {
         // ...and have equal log files
         parseAndAckInstant(readMessage(), synchOnInstant, dbname);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         killPingThread = false;
         pingThread = new SlavePingThread(dbname);
         pingThread.setDaemon(true);
@@ -195,8 +201,10 @@ public Socket run() throws IOException {
     private ServerSocket createServerSocket() throws IOException {
         //create a ServerSocket at the specified host name and the
         //port number.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4812
         ServerSocket ss = null;
         try { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             ss = AccessController.doPrivileged
             (new PrivilegedExceptionAction<ServerSocket>() {
                 public ServerSocket run() throws IOException  {
@@ -219,6 +227,7 @@ public ServerSocket run() throws IOException  {
      *                     close the socket or the associated resources.
      */
     public void tearDown() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         synchronized (sendPingSemaphore) {
             killPingThread = true;
             sendPingSemaphore.notify();
@@ -278,6 +287,7 @@ private void parseAndAckVersion(ReplicationMessage initiatorMessage,
         if (masterVersion == ReplicationMessage.serialVersionUID) {
             ack = new ReplicationMessage
                 (ReplicationMessage.TYPE_ACK, "UID OK");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
             sendMessage(ack);
         } else {
             //If the UID's are not equal send an error message. The
@@ -287,6 +297,7 @@ private void parseAndAckVersion(ReplicationMessage initiatorMessage,
                  new String[]{SQLState.
                               REPLICATION_MASTER_SLAVE_VERSION_MISMATCH});
             sendMessage(ack);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
 
             //The UID's do not match.
             throw StandardException.newException
@@ -336,6 +347,7 @@ private void parseAndAckInstant(ReplicationMessage initiatorMessage,
             // Notify the master that the logs are in synch
             ack = new ReplicationMessage
                 (ReplicationMessage.TYPE_ACK, "Instant OK");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
             sendMessage(ack);
         } else {
             // Notify master that the logs are out of synch
@@ -354,6 +366,7 @@ private void parseAndAckInstant(ReplicationMessage initiatorMessage,
             ack = new ReplicationMessage(ReplicationMessage.TYPE_ERROR, 
                                          exception);
             sendMessage(ack);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
 
             throw StandardException.
                 newException(SQLState.REPLICATION_LOG_OUT_OF_SYNCH, exception);
@@ -387,6 +400,7 @@ private void handleUnexpectedMessage(String dbname,
             new ReplicationMessage(ReplicationMessage.TYPE_ERROR, exception);
 
         sendMessage(ack);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
 
         throw StandardException.
             newException(SQLState.REPLICATION_UNEXPECTED_MESSAGEID, exception);
@@ -404,6 +418,7 @@ private void handleUnexpectedMessage(String dbname,
      *                     2) if the connection handle is invalid.
      */
     public void sendMessage(ReplicationMessage message) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
         checkSocketConnection();
         socketConn.writeMessage(message);
     }
@@ -427,8 +442,10 @@ public void sendMessage(ReplicationMessage message) throws IOException {
      */
     public ReplicationMessage readMessage() throws
         ClassNotFoundException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
         checkSocketConnection();
         ReplicationMessage msg = (ReplicationMessage)socketConn.readMessage();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
 
         if (msg.getType() == ReplicationMessage.TYPE_PONG) {
             // If a pong is received, connection is confirmed to be working.
@@ -450,6 +467,7 @@ public ReplicationMessage readMessage() throws
      *                     valid (is null).
      */
     private void checkSocketConnection() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
         if (socketConn == null) {
             throw new IOException
                     (MessageId.REPLICATION_INVALID_CONNECTION_HANDLE);
@@ -471,9 +489,11 @@ public synchronized boolean isConnectedToMaster() {
         // guaraneed to get to receivePongSemaphore.wait before the pong
         // message is processed in readMessage
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         synchronized (receivePongSemaphore) {
             connectionConfirmed = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             long startWaitingatTime;
             long giveupWaitingAtTime;
             long nextWait = DEFAULT_PING_TIMEOUT;
@@ -529,6 +549,7 @@ public void run() {
             try {
                 while (!killPingThread) {
                     synchronized (sendPingSemaphore) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                         while (!doSendPing) {
                             try {
                                 sendPingSemaphore.wait();
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
index 1fd75afcf9..dc23dd3d96 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
@@ -81,6 +81,7 @@ public class ReplicationMessageTransmit {
      *                     of the slave to connect to.
      */
     public ReplicationMessageTransmit(SlaveAddress slaveAddress) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3489
         this.slaveAddress = slaveAddress;
     }
     
@@ -117,9 +118,12 @@ public void initConnection(int timeout, long synchOnInstant) throws
         
         Socket s = null;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3064
         final int timeout_ = timeout;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4812
         try {
             //create a connection to the slave.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             s = AccessController.doPrivileged(new PrivilegedExceptionAction<Socket>() {
                 public Socket run() throws IOException {
                     SocketFactory sf = SocketFactory.getDefault();
@@ -136,6 +140,7 @@ public Socket run() throws IOException {
         }
         
         // keep socket alive even if no log is shipped for a long time
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         s.setKeepAlive(true);
         
         socketConn = new SocketConnection(s);
@@ -157,6 +162,7 @@ public Socket run() throws IOException {
      */
     public void tearDown() throws IOException {
         stopMessageReceiver = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
         if(socketConn != null) {
             socketConn.tearDown();
             socketConn = null;
@@ -197,11 +203,14 @@ public void sendMessage(ReplicationMessage message) throws IOException {
      * after DEFAULT_MESSAGE_RESPONSE_TIMEOUT millis
      */
     public synchronized ReplicationMessage
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         sendMessageWaitForReply(ReplicationMessage message)
         throws IOException, StandardException {
         receivedMsg = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
         checkSocketConnection();
         socketConn.writeMessage(message);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         long startMillis = System.currentTimeMillis();
         long waited = 0L;
 
@@ -258,7 +267,9 @@ private void brokerConnection(long synchOnInstant)
         // Check that master and slave have the same serialVersionUID
         ReplicationMessage initiatorMsg = 
             new ReplicationMessage(ReplicationMessage.TYPE_INITIATE_VERSION, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                                    ReplicationMessage.serialVersionUID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         verifyMessageType(sendMessageWaitForReply(initiatorMsg),
                           ReplicationMessage.TYPE_ACK);
 
@@ -287,6 +298,7 @@ private boolean verifyMessageType(ReplicationMessage message,
         throws StandardException {
         //If the message is a TYPE_ACK the slave is capable
         //of handling the messages and is at a compatible database version.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         if (message.getType() == expectedType) {
             return true;
         } else if (message.getType() == ReplicationMessage.TYPE_ERROR) {
@@ -309,6 +321,7 @@ private boolean verifyMessageType(ReplicationMessage message,
      *                     valid (is null).
      */
     private void checkSocketConnection() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
         if (socketConn == null) {
             throw new IOException
                     (MessageId.REPLICATION_INVALID_CONNECTION_HANDLE);
@@ -316,7 +329,9 @@ private void checkSocketConnection() throws IOException {
     }
 
     private void startMessageReceiverThread(String dbname) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4819
         MasterReceiverThread msgReceiver = new MasterReceiverThread(dbname);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         msgReceiver.setDaemon(true);
         msgReceiver.start();
     }
@@ -390,6 +405,7 @@ public void run() {
          */
         private ReplicationMessage readMessage() throws
             ClassNotFoundException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3454
             checkSocketConnection();
             return (ReplicationMessage)socketConn.readMessage();
         }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/SocketConnection.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/SocketConnection.java
index 103d6d5afc..92a4cadf77 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/SocketConnection.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/SocketConnection.java
@@ -94,6 +94,7 @@ public Object readMessage()
      */
     public void writeMessage(Object message) throws IOException {
         // reset stream so that previously shipped objects can be gc'ed
+//IC see: https://issues.apache.org/jira/browse/DERBY-3497
         objOutputStream.reset();
         objOutputStream.writeObject(message);
         //flush the stream to ensure that all the data that is part
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/slave/ReplicationLogScan.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/slave/ReplicationLogScan.java
index 8f31669a4d..1395db9da3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/slave/ReplicationLogScan.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/slave/ReplicationLogScan.java
@@ -162,6 +162,7 @@ protected boolean next() throws StandardException {
             // not be possible for currentPosition to be greater than
             // logToScan.length if not an exception was thrown by the
             // previous next() call
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
             hasInfo = false;
             return hasInfo;
         }
@@ -185,6 +186,7 @@ protected boolean next() throws StandardException {
 
                 retrieveInt();                   // (int) trailing length
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2977
                 isLogSwitch = false;
                 hasInfo = true;
             }
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/slave/SlaveController.java b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
index bdf7742af7..b256ec3818 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
@@ -133,11 +133,13 @@ public void boot(boolean create, Properties properties)
 
         String port = properties.getProperty(Attribute.REPLICATION_SLAVE_PORT);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3489
         try {
             //if slavePort is -1 the default port
             //value will be used.
             int slavePort = -1;
             if (port != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 slavePort = Integer.parseInt(port);
             }
             slaveAddr = new SlaveAddress(
@@ -150,6 +152,7 @@ public void boot(boolean create, Properties properties)
         }
 
         dbname = properties.getProperty(SlaveFactory.SLAVE_DB);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
         repLogger = new ReplicationLogger(dbname);
     }
 
@@ -234,6 +237,7 @@ public void startSlave(RawStoreFactory rawStore, LogFactory logFac)
         // Retry to setup a connection with the master until a
         // connection has been established or until we are no longer
         // in replication slave mode
+//IC see: https://issues.apache.org/jira/browse/DERBY-3489
         receiver = new ReplicationMessageReceive(slaveAddr, dbname);
         while (!setupConnection()) {
             if (!inReplicationSlaveMode) {
@@ -252,6 +256,8 @@ public void startSlave(RawStoreFactory rawStore, LogFactory logFac)
 
         startLogReceiverThread();
         startupSuccessful = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3361
+//IC see: https://issues.apache.org/jira/browse/DERBY-3356
 
         Monitor.logTextMessage(MessageId.REPLICATION_SLAVE_STARTED, dbname);
     }
@@ -260,6 +266,7 @@ public void startSlave(RawStoreFactory rawStore, LogFactory logFac)
      * Will perform all work that is needed to stop replication
      */
     private void stopSlave() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3254
         inReplicationSlaveMode = false;
         teardownNetwork();
 
@@ -273,6 +280,7 @@ private void stopSlave() throws StandardException {
      */
     public void stopSlave(boolean forcedStop) 
             throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         if (!forcedStop && isConnectedToMaster()){
             throw StandardException.newException(
                     SQLState.SLAVE_OPERATION_DENIED_WHILE_CONNECTED);
@@ -281,6 +289,7 @@ public void stopSlave(boolean forcedStop)
     }
 
     public void failover() throws StandardException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         if (isConnectedToMaster()){
             throw StandardException.newException(
                 SQLState.SLAVE_OPERATION_DENIED_WHILE_CONNECTED);
@@ -307,6 +316,8 @@ private void doFailover() {
      * @see SlaveFactory#isStarted
      */
     public boolean isStarted() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3361
+//IC see: https://issues.apache.org/jira/browse/DERBY-3356
         return startupSuccessful;
     }
 
@@ -327,6 +338,8 @@ public boolean isStarted() {
      */
     private boolean setupConnection() throws StandardException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
+//IC see: https://issues.apache.org/jira/browse/DERBY-3071
         try {
             // highestLogInstant is -1 until the first log chunk has
             // been received from the master. If a log chunk has been
@@ -349,12 +362,15 @@ private boolean setupConnection() throws StandardException {
             return true; // will not reach this if timeout
         } catch (StandardException se) {
             throw se;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4910
+//IC see: https://issues.apache.org/jira/browse/DERBY-4812
         } catch (SocketTimeoutException ste) {
             // Got a timeout. Return normally and let the caller retry.
             return false;
         } catch (Exception e) {
             throw StandardException.newException
                     (SQLState.REPLICATION_CONNECTION_EXCEPTION, e,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3489
                     dbname, getHostName(), String.valueOf(getPortNumber()));
         }
     }
@@ -375,6 +391,7 @@ private void handleDisconnect(Exception e) {
         }
 
         repLogger.logError(MessageId.REPLICATION_SLAVE_LOST_CONN, e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
 
         try {
             while (!setupConnection()) {
@@ -398,6 +415,7 @@ private void handleDisconnect(Exception e) {
      * @return true if the network connection is working, false otherwise
      */
     private boolean isConnectedToMaster() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3527
         if (receiver == null) {
             return false;
         } else {
@@ -412,6 +430,7 @@ private boolean isConnectedToMaster() {
      */
     private void startLogReceiverThread() {
         logReceiverThread = new SlaveLogReceiverThread();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3447
         logReceiverThread.setDaemon(true);
         logReceiverThread.start();
     }
@@ -447,6 +466,7 @@ private void handleFatalException(Exception e) {
         }
 
         repLogger.logError(MessageId.REPLICATION_FATAL_ERROR, e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
 
         // todo: notify master of the problem
         try {
@@ -459,11 +479,14 @@ private void handleFatalException(Exception e) {
     private void teardownNetwork() {
         try {
             // Unplug the replication network connection layer
+//IC see: https://issues.apache.org/jira/browse/DERBY-3361
+//IC see: https://issues.apache.org/jira/browse/DERBY-3356
             if (receiver != null) {
                 receiver.tearDown();
                 receiver = null;
             }
         } catch (IOException ioe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3388
             repLogger.logError(null, ioe);
         }
     }
@@ -474,6 +497,7 @@ private void teardownNetwork() {
      * @return a String containing the host name of the slave.
      */
     private String getHostName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3489
         return slaveAddr.getHostAddress().getHostName();
     }
     
@@ -500,6 +524,7 @@ private class SlaveLogReceiverThread extends Thread {
          * Creates a new instance of <tt>SlaveLogReceiverThread</tt>
          * with a debugging-friendly thread name.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3437
         SlaveLogReceiverThread() {
             super("derby.slave.logger-" + dbname);
         }
@@ -515,6 +540,7 @@ public void run() {
                         byte[] logChunk = (byte[])message.getMessage();
                         handleLogChunk(logChunk);
                         break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3254
                     case ReplicationMessage.TYPE_FAILOVER:
                         doFailover();
                         ReplicationMessage ack = new ReplicationMessage
@@ -522,6 +548,7 @@ public void run() {
                         receiver.sendMessage(ack);
                         teardownNetwork();
                         break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3235
                     case ReplicationMessage.TYPE_STOP:
                         stopSlave();
                         break;
@@ -585,6 +612,7 @@ private void handleLogChunk(byte[] logChunk)
                         throw StandardException.newException
                             (SQLState.REPLICATION_LOG_OUT_OF_SYNCH,
                              dbname,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                              LogCounter.getLogFileNumber(logScan.getInstant()),
                              LogCounter.getLogFilePosition(logScan.getInstant()),
                              LogCounter.getLogFileNumber(localInstant),
diff --git a/java/org.apache.derby.engine/org/apache/derby/io/StorageFactory.java b/java/org.apache.derby.engine/org/apache/derby/io/StorageFactory.java
index 5ec7ecfb46..340c710f01 100644
--- a/java/org.apache.derby.engine/org/apache/derby/io/StorageFactory.java
+++ b/java/org.apache.derby.engine/org/apache/derby/io/StorageFactory.java
@@ -230,6 +230,7 @@ public void init( String home, String databaseName, String tempDirName, String u
      * @return StorageFile
      */
     public StorageFile createTemporaryFile (String prefix, String suffix)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
                                                             throws IOException;
     
     /**
diff --git a/java/org.apache.derby.engine/org/apache/derby/mbeans/Management.java b/java/org.apache.derby.engine/org/apache/derby/mbeans/Management.java
index 324e8e3664..695c02017f 100644
--- a/java/org.apache.derby.engine/org/apache/derby/mbeans/Management.java
+++ b/java/org.apache.derby.engine/org/apache/derby/mbeans/Management.java
@@ -42,6 +42,7 @@ public class Management implements ManagementMBean {
     
     private ManagementMBean getManagementService() {
         return (ManagementMBean)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
              getSystemModule(Module.JMX);
     }
     
@@ -94,6 +95,7 @@ public String getSystemIdentifier() {
      */
     private static  Object getSystemModule( final String factoryInterface )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<Object>()
diff --git a/java/org.apache.derby.engine/org/apache/derby/mbeans/Version.java b/java/org.apache.derby.engine/org/apache/derby/mbeans/Version.java
index c803108c3e..807f2b894b 100644
--- a/java/org.apache.derby.engine/org/apache/derby/mbeans/Version.java
+++ b/java/org.apache.derby.engine/org/apache/derby/mbeans/Version.java
@@ -47,6 +47,7 @@ public class Version implements VersionMBean {
     
     public Version(ProductVersionHolder pvh, String permissionName) {
         versionInfo = pvh;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         this.permissionName = permissionName;
     }
     
@@ -59,6 +60,7 @@ public Version(ProductVersionHolder pvh, String permissionName) {
      */
     private void checkMonitor() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
         try {
             if (System.getSecurityManager() != null)
                 AccessController.checkPermission(
diff --git a/java/org.apache.derby.engine/org/apache/derby/osgi/EmbeddedActivator.java b/java/org.apache.derby.engine/org/apache/derby/osgi/EmbeddedActivator.java
index 891e50a7cc..472992b120 100644
--- a/java/org.apache.derby.engine/org/apache/derby/osgi/EmbeddedActivator.java
+++ b/java/org.apache.derby.engine/org/apache/derby/osgi/EmbeddedActivator.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public final class EmbeddedActivator implements BundleActivator {
 
 	public void start(BundleContext context) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		new org.apache.derby.iapi.jdbc.AutoloadedDriver();
 	}
 
diff --git a/java/org.apache.derby.engine/org/apache/derby/security/DatabasePermission.java b/java/org.apache.derby.engine/org/apache/derby/security/DatabasePermission.java
index eedfd3e0a4..83ae282c4a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/security/DatabasePermission.java
+++ b/java/org.apache.derby.engine/org/apache/derby/security/DatabasePermission.java
@@ -316,6 +316,7 @@ protected void initLocation(String url)
             // doPrivileged() block to allow for confined codebase permission
             // grants
             if (p.startsWith(URL_PATH_RELATIVE_PREFIX)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 final String cwd = AccessController.doPrivileged(
                     new PrivilegedAction<String>() {
                         public String run() {
@@ -333,6 +334,7 @@ public String run() {
             // block to allow for confined codebase permission grants
             final File f;
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 f = AccessController.doPrivileged(
                     new PrivilegedExceptionAction<File>() {
                         public File run() throws IOException {
diff --git a/java/org.apache.derby.engine/org/apache/derby/vti/ForeignTableVTI.java b/java/org.apache.derby.engine/org/apache/derby/vti/ForeignTableVTI.java
index c5fcf68c93..f96d64f79c 100644
--- a/java/org.apache.derby.engine/org/apache/derby/vti/ForeignTableVTI.java
+++ b/java/org.apache.derby.engine/org/apache/derby/vti/ForeignTableVTI.java
@@ -167,6 +167,7 @@ public	class   ForeignTableVTI extends ForwardingVTI implements  RestrictedVTI
      */
     public  ForeignTableVTI
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
          String foreignSchemaName,
          String foreignTableName,
          Connection foreignConnection
@@ -232,6 +233,7 @@ public	class   ForeignTableVTI extends ForwardingVTI implements  RestrictedVTI
      */
     public  static  void    dropConnection( String connectionURL )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6440
         _connections.remove( connectionURL );
     }
 
@@ -265,6 +267,7 @@ public  void    close() throws SQLException
             _restriction = null;
             _columnNumberMap = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
             if ( getWrappedResultSet() != null ) { getWrappedResultSet().close(); }
             if ( _foreignPreparedStatement != null ) { _foreignPreparedStatement.close(); }
 
@@ -298,6 +301,7 @@ public  boolean next()  throws SQLException
         ( String[] columnNames, Restriction restriction )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6197
         _columnNames = ArrayUtil.copy( columnNames );
         _restriction = restriction;
 
@@ -307,6 +311,7 @@ public  boolean next()  throws SQLException
         int foreignColumnID = 1;
         for ( int i = 0; i < columnCount; i++ )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6197
             if ( _columnNames[ i ] != null ) { _columnNumberMap[ i ] = foreignColumnID++; }
         }
     }
@@ -318,12 +323,14 @@ public  boolean next()  throws SQLException
     ////////////////////////////////////////////////////////////////////////
 
     private static  Connection  getForeignConnection
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
         ( String connectionURL, Connection foreignConnection )
         throws SQLException
     {
         if ( foreignConnection != null ) { return foreignConnection; }
         
         Connection  conn = _connections.get( connectionURL );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         if ( conn == null )
         {
diff --git a/java/org.apache.derby.engine/org/apache/derby/vti/IQualifyable.java b/java/org.apache.derby.engine/org/apache/derby/vti/IQualifyable.java
index 2ac80cb8f8..e07c01e6ce 100644
--- a/java/org.apache.derby.engine/org/apache/derby/vti/IQualifyable.java
+++ b/java/org.apache.derby.engine/org/apache/derby/vti/IQualifyable.java
@@ -40,6 +40,7 @@ public interface IQualifyable {
 	*/
 	public void setQualifiers
       (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
        VTIEnvironment vtiEnvironment,
        org.apache.derby.iapi.store.access.Qualifier[][] qualifiers
        )
diff --git a/java/org.apache.derby.engine/org/apache/derby/vti/StringColumnVTI.java b/java/org.apache.derby.engine/org/apache/derby/vti/StringColumnVTI.java
index 736cc1e2be..b3412d67a6 100644
--- a/java/org.apache.derby.engine/org/apache/derby/vti/StringColumnVTI.java
+++ b/java/org.apache.derby.engine/org/apache/derby/vti/StringColumnVTI.java
@@ -109,6 +109,7 @@ public  abstract    class   StringColumnVTI extends VTITemplate
      */
     public  StringColumnVTI( String[] columnNames )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
         if ( columnNames != null )
         {
             _columnNames = ArrayUtil.copy( columnNames );
@@ -132,10 +133,12 @@ public  StringColumnVTI( String[] columnNames )
      * @throws SQLException on error
      */
     public  void    setColumnNames( String[] columnNames )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
         throws SQLException
     {
         if ( _columnNames != null ) { throw makeSQLException( SQLState.LANG_CANNOT_CHANGE_COLUMN_NAMES ); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6197
         _columnNames = ArrayUtil.copy( columnNames );
     }
 
@@ -227,6 +230,7 @@ public int getInt(int columnIndex) throws SQLException
         else
         {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
                 return Integer.parseInt( columnValue );
             } catch (NumberFormatException e) { throw wrap( e ); }
         }
@@ -253,6 +257,7 @@ public float getFloat(int columnIndex) throws SQLException
         else
         {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
                 return Float.parseFloat( columnValue );
             } catch (NumberFormatException e) { throw wrap( e ); }
         }
@@ -266,6 +271,7 @@ public double getDouble(int columnIndex) throws SQLException
         else
         {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
                 return Double.parseDouble( columnValue );
             } catch (NumberFormatException e) { throw wrap( e ); }
         }
@@ -435,6 +441,7 @@ private InputStream getEncodedStream( String columnValue, String encoding  )
     private SQLException    makeSQLException( String sqlstate, Object... args )
     {
         StandardException   se = StandardException.newException( sqlstate, args );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
 
         return new SQLException( se.getMessage(), se.getSQLState() );
     }
diff --git a/java/org.apache.derby.engine/org/apache/derby/vti/UpdatableVTITemplate.java b/java/org.apache.derby.engine/org/apache/derby/vti/UpdatableVTITemplate.java
index 2db8080e7b..5b2c9bdf07 100644
--- a/java/org.apache.derby.engine/org/apache/derby/vti/UpdatableVTITemplate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/vti/UpdatableVTITemplate.java
@@ -47,6 +47,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1983
    An abstract implementation of PreparedStatement (JDBC 3.0) that is useful
 	when writing a read-write (updatable) virtual table interface (VTI).
 	
@@ -279,6 +280,7 @@ public boolean getMoreResults() throws SQLException
 	 */
 	public int getResultSetConcurrency() throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
         return ResultSet.CONCUR_UPDATABLE;
 	}
 
@@ -688,6 +690,7 @@ public void setArray(int i, Array x) throws SQLException {
 	}
 
     public void setURL(int arg0, URL arg1) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1983
         throw new SQLException("setURL");    
     }
 
@@ -728,6 +731,7 @@ public int getResultSetHoldability() throws SQLException {
     }
 
     public ParameterMetaData getParameterMetaData() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1983
         throw new SQLException("getParameterMetaData");
     }
 
@@ -735,6 +739,7 @@ public ParameterMetaData getParameterMetaData() throws SQLException {
     public  <T> T unwrap(Class<T> iface) throws SQLException { throw new SQLException( "unwrap" ); }
 
     public boolean isClosed() throws SQLException
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     { throw new SQLException("isClosed"); }
     public boolean isPoolable() throws SQLException
     { throw new SQLException("isPoolable"); }
diff --git a/java/org.apache.derby.engine/org/apache/derby/vti/VTIMetaDataTemplate.java b/java/org.apache.derby.engine/org/apache/derby/vti/VTIMetaDataTemplate.java
index db22e80d76..8a7584808a 100644
--- a/java/org.apache.derby.engine/org/apache/derby/vti/VTIMetaDataTemplate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/vti/VTIMetaDataTemplate.java
@@ -303,6 +303,7 @@ public String getColumnClassName(int column) throws SQLException {
      */
     protected SQLException    notImplemented( String methodName )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return new SQLFeatureNotSupportedException( "Unimplemented method: " + methodName );
     }
 }
diff --git a/java/org.apache.derby.engine/org/apache/derby/vti/VTITemplate.java b/java/org.apache.derby.engine/org/apache/derby/vti/VTITemplate.java
index d401de7dbc..0b0309ded3 100644
--- a/java/org.apache.derby.engine/org/apache/derby/vti/VTITemplate.java
+++ b/java/org.apache.derby.engine/org/apache/derby/vti/VTITemplate.java
@@ -54,6 +54,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
 	An abstract implementation of ResultSet that is useful
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
 	when writing table functions, read-only VTIs (virtual table interface), and
 	the ResultSets returned by executeQuery in read-write VTI classes.
 	
@@ -308,6 +309,7 @@ public abstract class VTITemplate   implements ResultSet, AwareVTI
      */
     protected SQLException    notImplemented( String methodName )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return new SQLFeatureNotSupportedException( "Unimplemented method: " + methodName );
     }
     
@@ -323,6 +325,7 @@ protected SQLException    notImplemented( String methodName )
      * @throws SQLException on error
      */
     public  ColumnDescriptor[]  getReturnTableSignature( Connection currentConnection )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         ArrayList<ColumnDescriptor> columns = new ArrayList<ColumnDescriptor>();
diff --git a/java/org.apache.derby.engine/org/apache/derby/vti/XmlVTI.java b/java/org.apache.derby.engine/org/apache/derby/vti/XmlVTI.java
index fdd2432a80..9580f67ca1 100644
--- a/java/org.apache.derby.engine/org/apache/derby/vti/XmlVTI.java
+++ b/java/org.apache.derby.engine/org/apache/derby/vti/XmlVTI.java
@@ -236,6 +236,7 @@ public  XmlVTI( InputStream xmlResource, String rowTag, int firstChildTagIdx, St
      * @throws Exception on error
      */
     public  static  XmlVTI  xmlVTI( String fileName, String rowTag, String... childTags )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6256
         throws Exception
     {
         return xmlVTI( fileName, rowTag, null, asList( childTags ) );
@@ -413,6 +414,8 @@ public  boolean next() throws SQLException
             else { return false; }
         } catch (Throwable t)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6820
+//IC see: https://issues.apache.org/jira/browse/DERBY-6810
             throw new SQLException( t.getMessage(), t );
         }
     }
@@ -444,7 +447,10 @@ private    void    readRows() throws Exception
 
         _builder = factory.newDocumentBuilder();
         _builder.setErrorHandler(new XMLErrorHandler());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6820
+//IC see: https://issues.apache.org/jira/browse/DERBY-6810
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6256
         Document        doc = _builder.parse( _xmlResource );
         Element             root = doc.getDocumentElement();
                          
@@ -468,6 +474,7 @@ private    void    parseRow( int rowNumber ) throws Exception
 
         for ( int i = 0; i < columnCount; i++ )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6256
             _currentRow[ i ] = findColumnValue( rawRow, i );
         }
     }
@@ -549,6 +556,8 @@ private class XMLErrorHandler implements ErrorHandler
     {
         private void closeInput()
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6820
+//IC see: https://issues.apache.org/jira/browse/DERBY-6810
             try
             {
                 if( _xmlResource != null )
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneUtils.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneUtils.java
index b842d04b39..e0acf1cd05 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneUtils.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/LuceneUtils.java
@@ -283,6 +283,7 @@ public  DefaultIndexDescriptor()    {}
          */
         public Analyzer getAnalyzer()   throws SQLException
         { return LuceneUtils.defaultAnalyzer(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         /**
          * Return LuceneUtils.defaultQueryParser(  LuceneUtils.currentVersion(), getFieldNames(), getAnalyzer() ).
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java
index ac6d10eeaa..be82a2491d 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java
@@ -146,6 +146,7 @@ public  static  JSONArray   toJSON( ResultSet rs )
      * @throws SQLException on error
      */
     public static JSONArray readArray( Reader reader )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         throws SQLException
     {
         JSONParser  parser = new JSONParser();
@@ -155,6 +156,7 @@ public static JSONArray readArray( Reader reader )
             obj = parser.parse( reader );
         }
         catch( Throwable t) { throw ToolUtilities.wrap( t ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
 
         if ( (obj == null) || !(obj instanceof JSONArray) )
         {
@@ -201,7 +203,9 @@ public  static  JSONArray   readArrayFromString( String document )
         try {
             return readArray( new InputStreamReader( inputStream, characterSetName ) );
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (UnsupportedEncodingException uee) { throw ToolUtilities.wrap( uee ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         finally
         {
             try {
@@ -240,6 +244,7 @@ public FileInputStream run() throws IOException
              );
         }
         catch (PrivilegedActionException pae) { throw ToolUtilities.wrap( pae ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
 
         return readArrayFromStream( fis, characterSetName );
     }
@@ -273,6 +278,7 @@ public InputStream run() throws IOException, MalformedURLException
              }
              );
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (PrivilegedActionException pae) { throw ToolUtilities.wrap( pae ); }
         
         return readArrayFromStream( inputStream, characterSetName );
@@ -287,6 +293,7 @@ public InputStream run() throws IOException, MalformedURLException
      */
     public static Clob arrayToClob( JSONArray array )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         if ( array == null ) { return null; }
         else { return new HarmonySerialClob( array.toJSONString() ); }
     }
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonVTI.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonVTI.java
index 8b24686a1d..28ba09bc1f 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonVTI.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonVTI.java
@@ -309,6 +309,7 @@ public BigDecimal getBigDecimal(int columnIndex) throws SQLException
         try {
             return new BigDecimal( stringValue );
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (Throwable t) { throw ToolUtilities.wrap( t ); }
     }
     
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/DataFileVTI.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/DataFileVTI.java
index 1366481b46..c0622a23a9 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/DataFileVTI.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/DataFileVTI.java
@@ -544,6 +544,7 @@ else if ( StringUtil.SQLEqualsIgnoreCase( provider, Property.AUTHENTICATION_PROV
          )
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName( customProvider );
         UserAuthenticator   authenticator = (UserAuthenticator) clazz.getConstructor().newInstance();
 
@@ -891,6 +892,7 @@ private CipherProvider  makeDecryptionEngine( String encryptionProperties ) thro
             
             File    serviceProperties = new File( _dbDirectory, "service.properties" );
             Properties  properties = unpackEncryptionProperties( encryptionProperties );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6864
             try (FileInputStream in = new FileInputStream(serviceProperties)) {
                 properties.load(in);
             }
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/RawDBReader.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/RawDBReader.java
index 6433ec6bfe..2d173358f2 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/RawDBReader.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/RawDBReader.java
@@ -126,6 +126,7 @@ public  void    loadTool( String... configurationParameters )
         String  recoveryScript = configurationParameters[ idx++ ];
         String  controlSchema = configurationParameters[ idx++ ];
         String  schemaPrefix = configurationParameters[ idx++ ];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
         String  corruptDBLocation = configurationParameters[ idx++ ];
         String  encryptionAttributes = configurationParameters[ idx++ ];
         String  dbo = configurationParameters[ idx++ ];
@@ -182,6 +183,7 @@ public  void    unloadTool( String... configurationParameters )
         String  controlSchema = configurationParameters[ idx++ ];
         String  schemaPrefix = configurationParameters[ idx++ ];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
         if ( nullOrEmpty( controlSchema) )
         { throw badArgs( "Null or empty control schema argument." ); }
         if ( nullOrEmpty( schemaPrefix ) )
@@ -245,6 +247,11 @@ private SQLException    badArgs( String message )
              conn,
              controlSchema,
              "SYSCOLUMNS", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
              "( referenceid char(36), columnname varchar(128), columnnumber int, columndatatype serializable, columndefault serializable, columndefaultid char(36), autoincrementvalue bigint, autoincrementstart bigint, autoincrementinc bigint, autoincrementcycle boolean )",
              "c90.dat",
              corruptDBLocation,
@@ -324,6 +331,7 @@ private SQLException    badArgs( String message )
              "(\n" +
              "    " + qualifiedName + "\n" +
              "    (\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
              "        '" + corruptDBLocation + "',\n" +
              "        '" + heapFileName + "',\n" +
              "        '" + tableSignature + "',\n" +
@@ -372,6 +380,7 @@ private SQLException    badArgs( String message )
     /** Make the name of a local schema from a prefix and the name of a corrupt schema */
     private String  makeSchemaName( String schemaPrefix, String corruptName )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
         return IdUtil.normalToDelimited( schemaPrefix + corruptName );
     }
     
@@ -421,6 +430,7 @@ private String  makeSchemaName( String schemaPrefix, String corruptName )
 
         ArrayList<String>   columnNames = new ArrayList<String>();
         ArrayList<TypeDescriptor>   columnTypes = new ArrayList<TypeDescriptor>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
         String  corruptSchemaName = null;
         String  corruptTableName = null;
         String  schemaName = null;
@@ -467,6 +477,7 @@ private String  makeSchemaName( String schemaPrefix, String corruptName )
                 }
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
             corruptSchemaName = currentCorruptSchemaName;
             corruptTableName = currentCorruptTableName;
             schemaName = newSchemaName;
@@ -485,6 +496,8 @@ private String  makeSchemaName( String schemaPrefix, String corruptName )
                  conn,
                  scriptWriter,
                  controlSchema,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
                  corruptSchemaName,
                  corruptTableName,
                  schemaName,
@@ -513,6 +526,7 @@ private String  normalizeColumnName( String unnormalizedName )
              (
               dblook.stripQuotes
               (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
                dblook.addQuotes( unnormalizedName )
                )
               )
@@ -536,6 +550,10 @@ private String  normalizeColumnName( String unnormalizedName )
          long   conglomerateNumber,
          ArrayList<String>  columnNames,
          ArrayList<TypeDescriptor>  columnTypes,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
          String corruptDBLocation,
          String encryptionAttributes,
          String dbo,
@@ -546,6 +564,7 @@ private String  normalizeColumnName( String unnormalizedName )
         String  conglomerateName = "c" + Long.toHexString( conglomerateNumber ) + ".dat";
         String  tableSignature = makeTableSignature( controlSchema, columnNames, columnTypes );
         String  localTableName =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
             IdUtil.normalToDelimited( corruptSchemaName ) + "." +
             IdUtil.normalToDelimited( corruptTableName );
         String  viewName = schemaName + "." + tableName;
@@ -565,6 +584,11 @@ private String  normalizeColumnName( String unnormalizedName )
              tableName, 
              tableSignature,
              conglomerateName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
              corruptDBLocation,
              encryptionAttributes,
              dbo,
@@ -751,6 +775,7 @@ private Connection  getDerbyConnection() throws SQLException
     private SQLException    wrap( Throwable t )
     {
         String  errorMessage = t.getMessage();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
         String  sqlState = org.apache.derby.shared.common.reference.SQLState.JAVA_EXCEPTION
             .substring( 0, 5 );
 
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/json/SimpleJsonTool.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/json/SimpleJsonTool.java
index 659bf6a17a..d1e61b7e39 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/json/SimpleJsonTool.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/json/SimpleJsonTool.java
@@ -67,6 +67,7 @@ public	class   SimpleJsonTool  implements OptionalTool
 
     private FunctionDescriptor[]    _functionDescriptors =
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         new FunctionDescriptor
         (
             "toJSON",
@@ -108,6 +109,7 @@ public	class   SimpleJsonTool  implements OptionalTool
             "external name 'org.apache.derby.optional.api.SimpleJsonUtils.readArrayFromURL'\n"
         ),
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         new FunctionDescriptor
         (
             "arrayToClob",
@@ -167,9 +169,11 @@ public  void    loadTool( String... configurationParameters )
         Connection          derbyConn = getDerbyConnection();
 
         createUDT( derbyConn );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         createFunctions( derbyConn );
         
         boolean sqlAuthorizationEnabled = ToolUtilities.sqlAuthorizationEnabled( derbyConn );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         if ( sqlAuthorizationEnabled ) { grantPermissions( derbyConn ); }
     }
 
@@ -202,6 +206,7 @@ public  void    unloadTool( String... configurationParameters )
 
         Connection          derbyConn = getDerbyConnection();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         dropFunctions( derbyConn );
         dropUDT( derbyConn );
     }
@@ -290,6 +295,7 @@ public  void    unloadTool( String... configurationParameters )
         )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         for ( FunctionDescriptor desc : _functionDescriptors )
         {
             executeDDL( derbyConn, desc.creationDDL );
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexInput.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexInput.java
index 2d51b74839..7a9bd6bf3d 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexInput.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexInput.java
@@ -40,6 +40,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Lucene IndexInput.
  * </p>
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6621
 class DerbyIndexInput   extends IndexInput
 {
     /////////////////////////////////////////////////////////////////////
@@ -95,6 +96,7 @@ private DerbyIndexInput(StorageFile file, String description,
         super(description);
 
         setConstructorFields( file );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         _offset = offset;
         if (length == null) {
@@ -123,6 +125,7 @@ public Void run() throws IOException
                 }
              }
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         } catch (PrivilegedActionException pae) {
             throw (IOException) pae.getCause();
         }
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexOutput.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexOutput.java
index c91df3d3f2..a011ea548f 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexOutput.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexOutput.java
@@ -35,6 +35,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Lucene IndexOutput.
  * </p>
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6621
 class DerbyIndexOutput   extends IndexOutput
 {
     /////////////////////////////////////////////////////////////////////
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyLuceneDir.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyLuceneDir.java
index cb9b38e799..64ab7d482b 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyLuceneDir.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyLuceneDir.java
@@ -92,9 +92,11 @@ class DerbyLuceneDir extends Directory
      * </p>
      */
     static  synchronized    DerbyLuceneDir  getDirectory
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         ( StorageFactory storageFactory, String schema, String table, String textcol )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         DerbyLuceneDir  candidate = new DerbyLuceneDir( storageFactory, schema, table, textcol );
         String              key = getKey( candidate );
         DerbyLuceneDir  result = _openDirectories.get( key );
@@ -122,6 +124,7 @@ private static  synchronized    void    removeDir( DerbyLuceneDir dir )
     /** Get the key associated with a directory */
     private static  String  getKey( DerbyLuceneDir dir )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         return dir._directory.getPath();
     }
     
@@ -133,9 +136,11 @@ private static  String  getKey( DerbyLuceneDir dir )
      * </p>
      */
     private DerbyLuceneDir( StorageFactory storageFactory, String schema, String table, String textcol )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         _storageFactory = storageFactory;
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         _schema = schema;
         _table = table;
         _textcol = textcol;
@@ -182,6 +187,7 @@ StorageFile getDirectory()
 
     /** Clear the lock */
     public void clearLock( String name )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws IOException
     {
         _lockFactory.clearLock( name );
@@ -345,6 +351,7 @@ private StorageFile getStorageFile( String name )
     /** Make an IOException with the given SQLState and args */
     private IOException newIOException( String sqlState, Object... args )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         return new IOException( ToolUtilities.newSQLException( sqlState, args ).getMessage() );
     }
 
@@ -361,7 +368,9 @@ private void    checkIfClosed() throws IOException
 	 * Create the path if necessary.
 	 */
     private static StorageFile createPath
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         ( final StorageFactory storageFactory, final String schema, final String table, final String textcol )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         StorageFile    luceneDir = createPathLeg( storageFactory, null, Database.LUCENE_DIR );
@@ -377,6 +386,7 @@ private void    checkIfClosed() throws IOException
 	 */
     private static StorageFile createPathLeg
         ( final StorageFactory storageFactory, final StorageFile parentDir, final String fileName )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         try {
@@ -385,6 +395,7 @@ private void    checkIfClosed() throws IOException
              {
                  public StorageFile run() throws SQLException
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
                      String         normalizedName = ToolUtilities.derbyIdentifier( fileName );
                      StorageFile    file = parentDir == null ?
                          storageFactory.newStorageFile( normalizedName  ) :
@@ -393,6 +404,7 @@ public StorageFile run() throws SQLException
                      if ( !file.exists() ) { file.mkdir(); }
                      if ( !file.exists() )
                      {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
                          throw ToolUtilities.newSQLException
                              ( SQLState.SERVICE_DIRECTORY_CREATE_ERROR, normalizedName );
                      }
@@ -400,6 +412,7 @@ public StorageFile run() throws SQLException
                  }
              }
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         } catch (PrivilegedActionException pae) {
             throw (SQLException) pae.getCause();
         }
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java
index 15e76a573c..28cc1970a0 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java
@@ -46,6 +46,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * See org.apache.derby.optional.lucene.LuceneSupport.listIndexes.
  * 
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6621
 class LuceneListIndexesVTI extends StringColumnVTI
 {
     private Connection  connection;
@@ -61,8 +62,10 @@ class LuceneListIndexesVTI extends StringColumnVTI
 	 * Return a new LuceneListIndexesVTI.
 	 */
 	public LuceneListIndexesVTI()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 		super
             ( new String[]
                 {
@@ -72,13 +75,16 @@ public LuceneListIndexesVTI()
                     "LASTUPDATED",
                     "LUCENEVERSION",
                     "ANALYZER",
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                     "INDEXDESCRIPTORMAKER",
                 }
               );
 		
         connection = LuceneSupport.getDefaultConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         StorageFactory  dir = LuceneSupport.getStorageFactory( connection );
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 		StorageFile luceneDir = dir.newStorageFile( Database.LUCENE_DIR );
         ArrayList<StorageFile> allIndexes = new ArrayList<StorageFile>();
 
@@ -99,12 +105,14 @@ public LuceneListIndexesVTI()
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         indexes = new StorageFile[ allIndexes.size() ];
         allIndexes.toArray( indexes );
 	}
 
 	public void close() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 		connection = null;
         indexes = null;
         schema = null;
@@ -146,6 +154,7 @@ protected String getRawColumn( int col ) throws SQLException
         case 3: return column;
         case 5: return getProperty( LuceneSupport.LUCENE_VERSION );
         case 6: return getProperty( LuceneSupport.ANALYZER );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         case 7: return getProperty( LuceneSupport.INDEX_DESCRIPTOR_MAKER );
         default:
             throw ToolUtilities.newSQLException
@@ -162,9 +171,13 @@ public  Timestamp   getTimestamp( int col ) throws SQLException
     {
         if ( col != 4 )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.newSQLException
                 (
                  SQLState.LANG_INVALID_COLUMN_POSITION,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                  col,
                  getColumnCount()
                  );
@@ -175,6 +188,7 @@ public  Timestamp   getTimestamp( int col ) throws SQLException
 
             return new Timestamp( timestampMillis );
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (NumberFormatException nfe) { throw ToolUtilities.wrap( nfe ); }
     }
     
@@ -184,6 +198,7 @@ private void    readSchemaTableColumn()
     {
         if ( column != null ) { return; }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         StorageFile    columnDir = indexes[ row ];
         column = columnDir.getName();
         StorageFile    tableDir = columnDir.getParentDir();
@@ -207,10 +222,13 @@ private Properties  getRowProperties()
         {
             try {
                 readSchemaTableColumn();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
                 String      delimitedColumnName = LuceneSupport.delimitID( column );
                 StorageFile    indexPropertiesFile = LuceneSupport.getIndexPropertiesFile( connection, schema, table, delimitedColumnName );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                 rowProperties = readIndexProperties( indexPropertiesFile );
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             catch (IOException ioe) { throw ToolUtilities.wrap( ioe ); }
             catch (PrivilegedActionException pae) { throw ToolUtilities.wrap( pae ); }
         }
@@ -223,10 +241,12 @@ private static  StorageFile[]  listDirectories( final StorageFactory storageFact
     {
         return AccessController.doPrivileged
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              new PrivilegedAction<StorageFile[]>()
              {
                 public StorageFile[] run()
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                     ArrayList<StorageFile>  subdirectories = new ArrayList<StorageFile>();
                     String[]    fileNames = dir.list();
 
@@ -247,6 +267,7 @@ public StorageFile[] run()
 
     /** Read the index properties file */
     private static  Properties readIndexProperties( final StorageFile file )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws IOException
     {
         try {
@@ -260,9 +281,10 @@ public Properties run() throws IOException
                 }
              }
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         } catch (PrivilegedActionException pae) {
             throw (IOException) pae.getCause();
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneQueryVTI.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneQueryVTI.java
index 8ea2c77115..18813e0767 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneQueryVTI.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneQueryVTI.java
@@ -68,6 +68,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * LuceneSupport.luceneQuery.
  * 
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6621
 class LuceneQueryVTI extends StringColumnVTI
 {
     /////////////////////////////////////////////////////////////////////
@@ -119,17 +120,21 @@ class LuceneQueryVTI extends StringColumnVTI
         (
          String queryText,
          int    windowSize,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
          Float scoreCeiling
          )
         throws SQLException
     {
         super( null );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6596
         LuceneSupport.checkNotNull( "QUERY", queryText );
         
         _connection = LuceneSupport.getDefaultConnection();
         _queryText = queryText;
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         _windowSize = windowSize;
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         _scoreCeiling = scoreCeiling;
 	}
 
@@ -156,6 +161,7 @@ public String getRawColumn( int columnid ) throws SQLException
 			if ( isKeyID( columnid ) ) { return _searcher.doc( docID ).get( getColumnName( columnid ) ); }
 			else { throw invalidColumnPosition( columnid ); }
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException e)   { throw ToolUtilities.wrap( e ); }
 	}
 
@@ -163,6 +169,7 @@ public String getRawColumn( int columnid ) throws SQLException
     public  boolean getBoolean( int columnid ) throws SQLException
     {
         String  stringValue = getRawColumn( columnid );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6602
 
         if ( stringValue == null )
         {
@@ -179,6 +186,7 @@ public  boolean getBoolean( int columnid ) throws SQLException
     public  float   getFloat( int columnid )    throws SQLException
     {
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             if ( columnid == _scoreColumnID ) { return getScoreDoc().score; }
 			else if ( isKeyID( columnid ) )
             {
@@ -189,6 +197,7 @@ else if ( isKeyID( columnid ) )
             }
 			else { throw invalidColumnPosition( columnid ); }
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException e)   { throw ToolUtilities.wrap( e ); }
     }
 
@@ -205,6 +214,7 @@ public  double   getDouble( int columnid )    throws SQLException
             }
 			else { throw invalidColumnPosition( columnid ); }
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException e)   { throw ToolUtilities.wrap( e ); }
     }
 
@@ -235,6 +245,7 @@ public  long    getLong( int columnid )  throws SQLException
             }
 			else { throw invalidColumnPosition( columnid ); }
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException e)   { throw ToolUtilities.wrap( e ); }
     }
     
@@ -253,6 +264,7 @@ public  Date    getDate( int columnid )  throws SQLException
             }
 			else { throw invalidColumnPosition( columnid ); }
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException e)   { throw ToolUtilities.wrap( e ); }
     }
     
@@ -271,6 +283,7 @@ public  Time    getTime( int columnid )  throws SQLException
             }
 			else { throw invalidColumnPosition( columnid ); }
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException e)   { throw ToolUtilities.wrap( e ); }
     }
     
@@ -289,6 +302,7 @@ public  Timestamp    getTimestamp( int columnid )  throws SQLException
             }
 			else { throw invalidColumnPosition( columnid ); }
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException e)   { throw ToolUtilities.wrap( e ); }
     }
     
@@ -310,12 +324,14 @@ else if ( isKeyID( columnid ) )
             }
 			else { throw invalidColumnPosition( columnid ); }
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException e)   { throw ToolUtilities.wrap( e ); }
     }
     private Number getNumberValue( int columnid ) throws IOException
     {
         IndexableField  field = _searcher.doc( getScoreDoc().doc ).getField( getColumnName( columnid ) );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6602
         if ( field == null )
         {
             _wasNull = true;
@@ -323,6 +339,8 @@ private Number getNumberValue( int columnid ) throws IOException
         }
         else
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6602
+//IC see: https://issues.apache.org/jira/browse/DERBY-6602
             _wasNull = false;
             Number  number = field.numericValue();
 
@@ -349,11 +367,13 @@ public  byte[]  getBytes( int columnid ) throws SQLException
                     if ( ref != null )  { return ref.bytes; }
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6602
                 _wasNull = true;
                 return null;
             }
 			else { throw invalidColumnPosition( columnid ); }
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException e)   { throw ToolUtilities.wrap( e ); }
     }
 
@@ -362,6 +382,7 @@ private SQLException    invalidColumnPosition( int columnid )
         return ToolUtilities.newSQLException
             (
              SQLState.LANG_INVALID_COLUMN_POSITION,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              columnid,
              getColumnCount()
              );
@@ -375,6 +396,7 @@ private ScoreDoc    getScoreDoc()   throws IOException
 	public boolean next()
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6602
         _wasNull = false;
         if ( _schema == null ) { initScan(); }
         
@@ -398,6 +420,7 @@ public void close()
 
     public  boolean wasNull() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6602
         return _wasNull;
     }
     
@@ -426,6 +449,7 @@ private void closeReader()
 		try {
 			_indexReader.close();
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException e) { throw ToolUtilities.wrap( e ); }
         finally
         {
@@ -456,6 +480,7 @@ private void    initScan()  throws SQLException
             for ( int i = 0; i < returnColumns.length; i++ ) { columnNames[ i ] = returnColumns[ i ].columnName; }
             setColumnNames( columnNames );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             _scoreColumnID = getColumnCount();
             _docIDColumnID = _scoreColumnID - 1;
             _maxKeyID = _docIDColumnID - 1;
@@ -464,28 +489,35 @@ private void    initScan()  throws SQLException
             // make sure the user has SELECT privilege on all relevant columns of the underlying table
             vetPrivileges();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
             String      delimitedColumnName = LuceneSupport.delimitID( _column );
             DerbyLuceneDir  derbyLuceneDir = LuceneSupport.getDerbyLuceneDir( _connection, _schema, _table, delimitedColumnName );
             StorageFile propertiesFile = LuceneSupport.getIndexPropertiesFile( derbyLuceneDir );
             Properties  indexProperties = readIndexProperties( propertiesFile );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             String          indexDescriptorMaker = indexProperties.getProperty( LuceneSupport.INDEX_DESCRIPTOR_MAKER );
             LuceneIndexDescriptor   indexDescriptor = getIndexDescriptor( indexDescriptorMaker );
             Analyzer    analyzer = indexDescriptor.getAnalyzer( );
             QueryParser qp = indexDescriptor.getQueryParser();
 
             vetLuceneVersion( indexProperties.getProperty( LuceneSupport.LUCENE_VERSION ) );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
             _indexReader = getIndexReader( derbyLuceneDir );
             _searcher = new IndexSearcher( _indexReader );
 
             Query luceneQuery = qp.parse( _queryText );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             TopScoreDocCollector tsdc = TopScoreDocCollector.create( _windowSize, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             if ( _scoreCeiling != null ) {
                 tsdc = TopScoreDocCollector.create( _windowSize, new ScoreDoc( 0, _scoreCeiling ), true );
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             searchAndScore( luceneQuery, tsdc );
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (IOException ioe) { throw ToolUtilities.wrap( ioe ); }
         catch (ParseException pe) { throw ToolUtilities.wrap( pe ); }
         catch (PrivilegedActionException pae) { throw ToolUtilities.wrap( pae ); }
@@ -498,6 +530,7 @@ private void    initScan()  throws SQLException
      * </p>
      */
     private void    vetLuceneVersion( String indexVersionString )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         Version     currentVersion = LuceneUtils.currentVersion();
@@ -510,6 +543,7 @@ private void    vetLuceneVersion( String indexVersionString )
 
         if ( (indexVersion == null) || !currentVersion.onOrAfter( indexVersion ) )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.newSQLException
                 ( SQLState.LUCENE_BAD_VERSION, currentVersion.toString(), indexVersionString );
         }
@@ -530,6 +564,7 @@ private void    vetPrivileges() throws SQLException
         for ( int i = 0; i < _maxKeyID; i++ )
         {
             if ( i > 0 ) { buffer.append( ", " ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
             buffer.append( LuceneSupport.delimitID( getColumnName( i + 1 ) ) );
         }
         buffer.append( ", " + LuceneSupport.delimitID( _column ) );
@@ -553,6 +588,7 @@ private boolean isKeyID( int columnid )
 	private static IndexReader getIndexReader( final DerbyLuceneDir dir )
         throws IOException, PrivilegedActionException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         try {
             return AccessController.doPrivileged
             (
@@ -560,6 +596,7 @@ private static IndexReader getIndexReader( final DerbyLuceneDir dir )
              {
                  public IndexReader run() throws IOException
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                      return DirectoryReader.open( dir );
                  }
              }
@@ -584,6 +621,7 @@ public Properties run() throws IOException
                 }
              }
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         } catch (PrivilegedActionException pae) {
             throw (IOException) pae.getCause();
         }
@@ -594,10 +632,12 @@ public Properties run() throws IOException
      * The method has no arguments.
 	 */
 	private static LuceneIndexDescriptor getIndexDescriptor( final String indexDescriptorMaker )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6600
         throws PrivilegedActionException, SQLException
     {
         return AccessController.doPrivileged
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              new PrivilegedExceptionAction<LuceneIndexDescriptor>()
              {
                  public LuceneIndexDescriptor run()
@@ -613,9 +653,11 @@ public LuceneIndexDescriptor run()
 	
     /** Read the index properties file */
     private void    searchAndScore( final Query luceneQuery, final TopScoreDocCollector tsdc )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws IOException
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             AccessController.doPrivileged
             (
              new PrivilegedExceptionAction<Object>()
@@ -630,6 +672,7 @@ public Object run() throws IOException
                 }
              }
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         } catch (PrivilegedActionException pae) {
             throw (IOException) pae.getCause();
         }
diff --git a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneSupport.java b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneSupport.java
index 34159b3af5..dbb15f2755 100644
--- a/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneSupport.java
+++ b/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneSupport.java
@@ -142,10 +142,12 @@ public void loadTool(String... configurationParameters) throws SQLException
         forbidReadOnlyConnections();
 
         // not allowed during soft-upgrade
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         try {
             ConnectionUtil.getCurrentLCC().getDataDictionary().checkVersion
                 ( DataDictionary.DD_VERSION_DERBY_10_11, "luceneSupport" );
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (StandardException se)    { throw ToolUtilities.sqlException( se ); }
         
         Connection  conn = getDefaultConnection();
@@ -155,8 +157,10 @@ public void loadTool(String... configurationParameters) throws SQLException
         // Lucene indexes are not allowed in encrypted databases. They leak
         // encrypted data in plaintext.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         if ( getDataFactory( conn ).databaseEncrypted() )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.newSQLException( SQLState.LUCENE_ENCRYPTED_DB );
         }
 
@@ -178,6 +182,7 @@ public void loadTool(String... configurationParameters) throws SQLException
 		listFunction.append("lastupdated timestamp,");
 		listFunction.append("luceneversion varchar( 20 ),");
 		listFunction.append("analyzer varchar( 32672 ),");
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 		listFunction.append("indexdescriptormaker varchar( 32672 )");
 		listFunction.append(")");
 		listFunction.append("language java ");
@@ -192,6 +197,7 @@ public void loadTool(String... configurationParameters) throws SQLException
 		createProcedure.append(" (schemaname varchar( 128 ),");
 		createProcedure.append("tablename varchar( 128 ),");
 		createProcedure.append("textcolumn varchar( 128 ),");
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 		createProcedure.append("indexdescriptormaker varchar( 32672 ),");
 		createProcedure.append("keyColumns varchar( 32672 )...)");
 		createProcedure.append("parameter style derby modifies sql data language java external name ");
@@ -214,6 +220,7 @@ public void loadTool(String... configurationParameters) throws SQLException
 		updateProcedure.append(" (schemaname varchar( 128 ),");
 		updateProcedure.append("tablename varchar( 128 ),");
 		updateProcedure.append("textcolumn varchar( 128 ),");
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 		updateProcedure.append("indexdescriptormaker varchar( 32672 ))");
 		updateProcedure.append("parameter style java reads sql data language java external name ");
 		updateProcedure.append("'" + getClass().getName() + ".updateIndex'");
@@ -222,6 +229,7 @@ public void loadTool(String... configurationParameters) throws SQLException
 
         if ( sqlAuthorizationEnabled ) { grantPermissions(); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         createLuceneDir( conn );
 	}
 
@@ -245,10 +253,13 @@ private void    grantPermissions()  throws SQLException
 	public void unloadTool(String... configurationParameters)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         forbidReadOnlyConnections();
         
         Connection  conn = getDefaultConnection();
         ToolUtilities.mustBeDBO( conn );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
 
         if ( !luceneSchemaExists( conn ) )
         {
@@ -261,6 +272,7 @@ public void unloadTool(String... configurationParameters)
         String      className = getClass().getName();
         int             endPackageIdx = className.lastIndexOf( "." );
         String      packageName = className.substring( 0, endPackageIdx );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         PreparedStatement   ps = conn.prepareStatement
             (
              "select s.schemaName, a.alias, a.aliastype\n" +
@@ -292,6 +304,7 @@ public void unloadTool(String... configurationParameters)
         //
         // Now delete the Lucene subdirectory;
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         StorageFactory storageFactory = getStorageFactory(conn);
         StorageFile luceneDir =
                 storageFactory.newStorageFile(Database.LUCENE_DIR);
@@ -320,10 +333,13 @@ public void unloadTool(String... configurationParameters)
         (
          String queryText,
          int    windowSize,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
          Float scoreCeiling
          )
         throws ParseException, IOException, SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 		LuceneQueryVTI lqvti = new LuceneQueryVTI( queryText, windowSize, scoreCeiling );
 		return lqvti;
 	}
@@ -365,19 +381,23 @@ public static void updateIndex( String schema, String table, String textcol, Str
         throws SQLException, IOException, PrivilegedActionException
     {
         forbidReadOnlyConnections();
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         Connection              conn = getDefaultConnection();
 
         vetIdentifiers( schema, table, textcol );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6596
 
         // only the dbo or the schema owner can perform this function
         ToolUtilities.mustBeOwner( conn, schema );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
 
         if ( !tableFunctionExists( conn, schema, table, textcol ) )
         {
             throw ToolUtilities.newSQLException( SQLState.LUCENE_INDEX_DOES_NOT_EXIST );
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         createOrRecreateIndex( conn, schema, table, textcol, indexDescriptorMaker, false );
 	}
 	
@@ -408,16 +428,19 @@ public static void updateIndex( String schema, String table, String textcol, Str
          )
         throws SQLException, IOException, PrivilegedActionException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         forbidReadOnlyConnections();
         
         Connection              conn = getDefaultConnection();
         DatabaseMetaData    dbmd = conn.getMetaData();
 
         vetIdentifiers( schema, table, textcol );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6596
 
         // First make sure that the text column exists and is a String type
         vetTextColumn( dbmd, schema, table, textcol );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         createOrRecreateIndex( conn, schema, table, textcol, indexDescriptorMaker, true, keyColumns );
 	}
 
@@ -435,13 +458,20 @@ public static void updateIndex( String schema, String table, String textcol, Str
 	private static void createOrRecreateIndex
         (
          Connection conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
          String schema,
          String table,
          String textcol,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
          String indexDescriptorMaker,
          boolean create,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
          String... keyColumns
          )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException, IOException, PrivilegedActionException
     {
         VTITemplate.ColumnDescriptor[] primaryKeys = new VTITemplate.ColumnDescriptor[ 0 ];
@@ -458,11 +488,13 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
         // can't create an index without specifying keys for joining it back to Derby data
         if ( primaryKeys.length == 0 )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.newSQLException( SQLState.LUCENE_NO_PRIMARY_KEY );
         }
 
         // don't let the user create a table function with duplicate column names
         vetColumnName( ToolUtilities.derbyIdentifier( textcol ) );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         for ( VTITemplate.ColumnDescriptor key : primaryKeys )
         {
             vetColumnName(  key.columnName );
@@ -470,6 +502,7 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
         
         int             keyCount = 0;
         StorageFile propertiesFile = getIndexPropertiesFile( conn, schema, table, textcol );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         //
         // Drop the old index directory if we're recreating the index.
@@ -484,8 +517,10 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
 
         // create the new directory
         DerbyLuceneDir  derbyLuceneDir = getDerbyLuceneDir( conn, schema, table, textcol );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         // get the Analyzer and the field names. use the default if the user didn't specify an override
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         if ( indexDescriptorMaker == null ) { indexDescriptorMaker = LuceneUtils.class.getName() + ".defaultIndexDescriptor"; }
         LuceneIndexDescriptor   indexDescriptor = getIndexDescriptor( indexDescriptorMaker );
         String[]  fieldNames = indexDescriptor.getFieldNames();
@@ -493,6 +528,7 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
 
         // make sure the field names don't overlap with the key names
         sortAndVetFieldNames( fieldNames, primaryKeys );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         Properties  indexProperties = new Properties();
         indexProperties.setProperty( LUCENE_VERSION, luceneVersion.toString() );
@@ -502,9 +538,11 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
             
         StringBuilder   tableFunction = new StringBuilder();
         tableFunction.append( "create function " + makeTableFunctionName( schema, table, textcol ) + "\n" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         tableFunction.append( "( query varchar( 32672 ), windowSize int, scoreCeiling real )\n" );
         tableFunction.append( "returns table\n(" );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6597
         writeIndexProperties( propertiesFile, indexProperties );
         
         PreparedStatement   ps = null;
@@ -512,12 +550,14 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
         IndexWriter iw = null;
         try {
             iw = getIndexWriter( luceneVersion, analyzer, derbyLuceneDir );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
             // select all keys and the textcol from this column, add to lucene index
             StringBuilder query = new StringBuilder("select ");
         
             for ( VTITemplate.ColumnDescriptor keyDesc : primaryKeys )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
                 String  keyName = delimitID( keyDesc.columnName );
                 if ( keyCount > 0 ) { query.append( ", " ); }
                 query.append( keyName );
@@ -528,10 +568,12 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
                 tableFunction.append( "\n\t" + keyName + " " + keyType );
                 keyCount++;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             tableFunction.append(",\n\t" + DOCUMENT_ID + " int");
             tableFunction.append(",\n\t" + SCORE + " real");
             tableFunction.append( "\n)\nlanguage java parameter style derby_jdbc_result_set contains sql\n" );
             tableFunction.append( "external name '" + LuceneSupport.class.getName() + ".luceneQuery'" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
             // now create the table function for this text column
             if ( create )
@@ -540,6 +582,7 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
             }
         
             query.append(", ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             query.append( delimitID( ToolUtilities.derbyIdentifier( textcol ) ) );
             query.append(" from " + makeTableName( schema, table ) );
 
@@ -559,6 +602,7 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
                 String  textcolValue = rs.getString( keyCount + 1 );
                 if ( textcolValue != null )
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                     for ( String fieldName : fieldNames )
                     {
                         doc.add( new TextField( fieldName, textcolValue, Store.NO ) );
@@ -586,6 +630,7 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
     /** Verify that the schema, table, and column names aren't null */
 	private static void vetIdentifiers
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6596
          String schema,
          String table,
          String textcol
@@ -602,12 +647,14 @@ else if ( (keyColumns != null) && (keyColumns.length > 0) )
      * fields have the same name.
      */
     private static  void    sortAndVetFieldNames( String[] fieldNames, VTITemplate.ColumnDescriptor[] keys )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         for ( String fieldName : fieldNames )
         {
             if ( fieldName == null )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
                 throw ToolUtilities.newSQLException( SQLState.LUCENE_DUPLICATE_FIELD_NAME, fieldName );
             }
         }
@@ -621,6 +668,7 @@ private static  void    sortAndVetFieldNames( String[] fieldNames, VTITemplate.C
         {
             if ( fieldName.equals( previousFieldName ) )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
                 throw ToolUtilities.newSQLException( SQLState.LUCENE_DUPLICATE_FIELD_NAME, fieldName );
             }
             previousFieldName = fieldName;
@@ -648,11 +696,14 @@ private static  void    sortAndVetFieldNames( String[] fieldNames, VTITemplate.C
 	 * @throws SQLException
 	 */
 	public static void dropIndex( String schema, String table, String textcol )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         forbidReadOnlyConnections();
         
         vetIdentifiers( schema, table, textcol );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6596
 
         getDefaultConnection().prepareStatement
             (
@@ -668,9 +719,11 @@ public static void dropIndex( String schema, String table, String textcol )
      * </p>
      */
 	private static void dropIndexDirectories( String schema, String table, String textcol )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         DerbyLuceneDir  derbyLuceneDir = getDerbyLuceneDir( getDefaultConnection(), schema, table, textcol );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         StorageFile indexDir = derbyLuceneDir.getDirectory();
 		StorageFile tableDir = indexDir.getParentDir();
@@ -737,6 +790,7 @@ private static String    mapType( int jdbcType, int precision, int scale, String
         case    Types.VARBINARY:        return "varchar " + precisionToLength( precision ) + "  for bit data";
         case    Types.VARCHAR:          return "varchar" + precisionToLength( precision );
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         default:  throw ToolUtilities.newSQLException( SQLState.LUCENE_UNSUPPORTED_TYPE, typeName );
         }
     }
@@ -837,12 +891,14 @@ private static  String  precisionAndScale( int precision, int scale )
             break;
             
         default:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.newSQLException
                 ( SQLState.LUCENE_UNSUPPORTED_TYPE, keyDescriptor.typeName );
         }
 
         // Lucene fields do not allow null values
         if ( rs.wasNull() ) { field = null; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6602
 
         if ( field != null ) { doc.add( field ); }
     }
@@ -1025,6 +1081,7 @@ private static  String  precisionAndScale( int precision, int scale )
 	private static void vetTextColumn( DatabaseMetaData dbmd, String schema, String table, String textcol )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         schema = ToolUtilities.derbyIdentifier( schema );
         table = ToolUtilities.derbyIdentifier( table );
         textcol = ToolUtilities.derbyIdentifier( textcol );
@@ -1044,6 +1101,7 @@ private static void vetTextColumn( DatabaseMetaData dbmd, String schema, String
                 }
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.sqlException
                 ( StandardException.newException( SQLState.LUCENE_NOT_A_STRING_TYPE ) );
         }
@@ -1065,15 +1123,18 @@ private static void vetTextColumn( DatabaseMetaData dbmd, String schema, String
      * or text columns supplied by the user.
      */
     private static  void    vetColumnName( String columnName )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         String  derbyColumnName = columnName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
 
         if (
             DOCUMENT_ID.equals( derbyColumnName ) ||
             SCORE.equals( derbyColumnName )
             )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.newSQLException( SQLState.LUCENE_BAD_COLUMN_NAME, derbyColumnName );
         }
     }
@@ -1084,6 +1145,7 @@ private static  void    vetColumnName( String columnName )
 	static String   makeTableName( String schema, String table )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         schema = ToolUtilities.derbyIdentifier( schema );
         table = ToolUtilities.derbyIdentifier( table );
 
@@ -1100,6 +1162,7 @@ private static String   makeTableFunctionName( String schema, String table, Stri
         forbidCharacter( schema, table, textcol, "/" );
         forbidCharacter( schema, table, textcol, "\\" );
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         schema = ToolUtilities.derbyIdentifier( schema );
         String  function = makeUnqualifiedTableFunctionName( table, textcol );
 
@@ -1110,6 +1173,7 @@ private static String   makeTableFunctionName( String schema, String table, Stri
     private static  String  makeUnqualifiedTableFunctionName( String table, String textcol )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         return ToolUtilities.derbyIdentifier( table ) + SEPARATOR +
             ToolUtilities.derbyIdentifier( textcol );
     }
@@ -1155,6 +1219,7 @@ static  String[]    decodeFunctionName( String functionName )
 	static StorageFile getIndexPropertiesFile( Connection conn, String schema, String table, String textcol )
         throws SQLException, IOException, PrivilegedActionException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         return getIndexPropertiesFile( getDerbyLuceneDir( conn, schema, table, textcol ) );
     }
     
@@ -1188,6 +1253,7 @@ static  Properties readIndexPropertiesNoPrivs( StorageFile file )
 
     /** Write the index properties file */
     private static  void    writeIndexProperties( final StorageFile file, Properties properties )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws IOException
     {
         if (file == null || properties == null) {
@@ -1221,10 +1287,12 @@ public OutputStream run() throws IOException {
      * Raise an error if the connection is readonly.
      */
     private static  void    forbidReadOnlyConnections()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         if ( ConnectionUtil.getCurrentLCC().getAuthorizer().isReadOnlyConnection() )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.newSQLException( SQLState.AUTH_WRITE_WITH_READ_ONLY_CONNECTION );
         }
     }
@@ -1276,15 +1344,18 @@ private void executeDDL(Connection c, String text) throws SQLException {
     /** Double quote an identifier in order to preserver casing */
     static String delimitID( String id )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
         return IdUtil.normalToDelimited( id );
     }
 
     /** Raise an error if an argument is being given a null value */
     static  void    checkNotNull( String argumentName, String argumentValue )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6596
         throws SQLException
     {
         if ( argumentValue == null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.newSQLException( SQLState.ARGUMENT_MAY_NOT_BE_NULL, argumentName );
         }
     }
@@ -1300,6 +1371,7 @@ static  void    checkNotNull( String argumentName, String argumentValue )
          )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         ResultSet   keysRS = conn.getMetaData().getPrimaryKeys
             ( null, ToolUtilities.derbyIdentifier( schema ), ToolUtilities.derbyIdentifier( table ) );
         ArrayList<VTITemplate.ColumnDescriptor>    keyArray = new ArrayList<VTITemplate.ColumnDescriptor>();
@@ -1342,6 +1414,7 @@ static  void    checkNotNull( String argumentName, String argumentValue )
      */
     private static  VTITemplate.ColumnDescriptor[] getKeys
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
          Connection conn,
          String schema,
          String table,
@@ -1349,6 +1422,7 @@ static  void    checkNotNull( String argumentName, String argumentValue )
          )
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         schema = ToolUtilities.derbyIdentifier( schema );
         String  functionName = makeUnqualifiedTableFunctionName( table, textcol );
         ArrayList<VTITemplate.ColumnDescriptor>    keyArray = new ArrayList<VTITemplate.ColumnDescriptor>();
@@ -1409,9 +1483,11 @@ static  void    checkNotNull( String argumentName, String argumentValue )
         for ( String key : keyColumns )
         {
             checkNotNull( "KEYCOLUMNS", key );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6596
 
             if ( counter > 0 ) { buffer.append( ", " ); }
             counter++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             buffer.append( delimitID( ToolUtilities.derbyIdentifier( key ) ) );
         }
         buffer.append( "\nfrom " + qualifiedName );
@@ -1457,8 +1533,10 @@ static  void    checkNotNull( String argumentName, String argumentValue )
     /** Return true if the directory is empty */
     private static  boolean isEmpty( final StorageFile dir )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         String[]  contents = AccessController.doPrivileged
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              new PrivilegedAction<String[]>()
              {
                  public String[] run()
@@ -1478,6 +1556,7 @@ private static  boolean exists( final StorageFile file )
     {
         return AccessController.doPrivileged
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              new PrivilegedAction<Boolean>()
              {
                  public Boolean run()
@@ -1490,6 +1569,7 @@ public Boolean run()
 
     /** Really delete a file */
     private static  boolean deleteFile( final StorageFile file )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         boolean result = AccessController.doPrivileged(
@@ -1500,6 +1580,7 @@ public Boolean run() {
         });
 
         if (!result) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.newSQLException
                 ( SQLState.UNABLE_TO_DELETE_FILE, file.getPath() );
         }
@@ -1513,6 +1594,7 @@ private static  void    forbidCharacter( String schema, String table, String tex
     {
 		if (schema.indexOf( invalidCharacter ) > 0 || table.indexOf( invalidCharacter ) > 0 || textcol.indexOf( invalidCharacter ) > 0)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throw ToolUtilities.newSQLException( SQLState.LUCENE_INVALID_CHARACTER, invalidCharacter );
 		}		
     }
@@ -1534,10 +1616,13 @@ private static  void    forbidCharacter( String schema, String table, String tex
 	 */
 	private static IndexWriter getIndexWriter
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
          final Version  luceneVersion,
          final  Analyzer    analyzer,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
          final DerbyLuceneDir   derbyLuceneDir
          )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws IOException
     {
         try {
@@ -1549,6 +1634,7 @@ public IndexWriter run() throws IOException
                  {
                      // allow this to be overridden in the configuration during load later.
                      IndexWriterConfig iwc = new IndexWriterConfig( luceneVersion, analyzer );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                      IndexWriter iw = new IndexWriter( derbyLuceneDir, iwc );
 		
                      return iw;
@@ -1568,6 +1654,7 @@ public IndexWriter run() throws IOException
          final IndexWriter  indexWriter,
          final Document     document
          )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws IOException
     {
         try {
@@ -1583,6 +1670,7 @@ public Void run() throws IOException
                  }
              }
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         } catch (PrivilegedActionException pae) {
             throw (IOException) pae.getCause();
         }
@@ -1607,6 +1695,8 @@ public Void run() throws IOException
                  }
              }
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         } catch (PrivilegedActionException pae) {
             throw (IOException) pae.getCause();
         }
@@ -1617,10 +1707,12 @@ public Void run() throws IOException
      * The method has no arguments.
 	 */
 	private static LuceneIndexDescriptor getIndexDescriptor( final String indexDescriptorMaker )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6600
         throws PrivilegedActionException, SQLException
     {
         return AccessController.doPrivileged
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              new PrivilegedExceptionAction<LuceneIndexDescriptor>()
              {
                  public LuceneIndexDescriptor run()
@@ -1656,6 +1748,7 @@ static LuceneIndexDescriptor getIndexDescriptorNoPrivs( String indexDescriptorMa
 	 * Add a document to a Lucene index wrier.
 	 */
     private static void createLuceneDir( final Connection conn )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         try {
@@ -1675,6 +1768,7 @@ public Object run() throws SQLException
                  }
                  );
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         catch (PrivilegedActionException pae) {
             throw (SQLException) pae.getCause();
         }
@@ -1696,6 +1790,7 @@ static DerbyLuceneDir getDerbyLuceneDir( Connection conn, String schema, String
     {
         StorageFactory  storageFactory = getStorageFactory( conn );
         DerbyLuceneDir  result = DerbyLuceneDir.getDirectory( storageFactory, schema, table, textcol );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         return result;
     }
@@ -1712,14 +1807,17 @@ static  DataFactory  getDataFactory( Connection conn )
         throws SQLException
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             Object monitor = findService
                 ( Property.DATABASE_MODULE, ((EmbedConnection) conn).getDBName() ) ;
             return (DataFactory) findServiceModule( monitor, DataFactory.MODULE );
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         catch (StandardException se) { throw ToolUtilities.wrap( se ); }
     }
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6600
 		Get the ClassFactory to use with this database.
 	*/
 	static  ClassFactory getClassFactory()
@@ -1733,6 +1831,7 @@ static  ClassFactory getClassFactory()
      * can't call this entry point.
      */
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.runner/org/apache/derby/run/run.java b/java/org.apache.derby.runner/org/apache/derby/run/run.java
index 28286e1a34..9360ee8c09 100644
--- a/java/org.apache.derby.runner/org/apache/derby/run/run.java
+++ b/java/org.apache.derby.runner/org/apache/derby/run/run.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.tools.sysinfo;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-1063
   <p>
   The run class facilitates running the various Derby utilities with the
   java -jar command. For example:
@@ -57,10 +58,12 @@ static public void main(String[] args) throws IOException {
           sysinfo.main(trimArgs(args));
       } else if (args[0].equals("dblook")) {
           dblook.main(trimArgs(args));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1063
       } else if (args[0].equals("server")) {
           NetworkServerControl.main(trimArgs(args));
       } else if (args[0].equals("SignatureChecker")) {
           SignatureChecker.main(trimArgs(args));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5950
       } else if (args[0].equals("PlanExporter")) {
     	  PlanExporter.main(trimArgs(args));  
       } else printUsage();
diff --git a/java/org.apache.derby.server/org/apache/derby/drda/NetServlet.java b/java/org.apache.derby.server/org/apache/derby/drda/NetServlet.java
index 01bfd63bc0..fd3acbef0c 100644
--- a/java/org.apache.derby.server/org/apache/derby/drda/NetServlet.java
+++ b/java/org.apache.derby.server/org/apache/derby/drda/NetServlet.java
@@ -39,10 +39,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     This servlet can be used to start Derby Network Server from a remote location.
     <P>
     These servlet configuration parameters are understood by this servlet.
     <UL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-5509
     <LI><PRE>portNumber</PRE> - Port number to use. The default is 1527.</LI>
     <LI><PRE>startNetworkServerOnInit</PRE> - Starts the Derby Network Server at servlet 
             initialization if 'true'.</LI>
@@ -75,6 +77,7 @@ public class NetServlet extends HttpServlet {
         Initialize the servlet.
         Configuration parameters:
         <UL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-5509
         <LI><PRE>portNumber</PRE> - Port number</LI>
         <LI><PRE>host</PRE> - Host name</LI>
         <LI><PRE>traceDirectory</PRE> - location of trace directory</LI>
@@ -91,10 +94,12 @@ public void init(ServletConfig config)
             if (p > 0)
                 portNumber = p;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1054
         String hostName = config.getInitParameter("host");
         if (hostName != null)
             host = hostName;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-117
         this.tracingDirectory = config.getInitParameter("tracingDirectory");
         
         if ( this.tracingDirectory == null ) {
@@ -122,7 +127,9 @@ public void init(ServletConfig config)
             boolean start = Boolean.valueOf(startup).booleanValue();
             if (start)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6680
                 LocalizedResource langUtil = new LocalizedResource(SERVLET_PROP_MESSAGES);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                 runServer(langUtil, null, null);
                 return;
             }
@@ -134,6 +141,7 @@ public void init(ServletConfig config)
         Network server.
     */
     public synchronized void doGet (HttpServletRequest request,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
                                     HttpServletResponse response)
             throws ServletException, IOException
     {
@@ -158,14 +166,17 @@ public synchronized void doGet (HttpServletRequest request,
         //prevent caching of the servlet since contents can change - beetle 4649
         response.setHeader("Cache-Control", "no-cache,no-store");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
         String formTarget = request.getContextPath() + request.getServletPath();
         String formHeader = "<form enctype='multipart/form-data; charset=UTF-8'"
                 + " action='" + formTarget + "'>";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
         PrintWriter out = new PrintWriter
             ( new OutputStreamWriter(response.getOutputStream(), "UTF8"),true );
         
         //inialize messages
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         logOnMessage = escapeSingleQuotes(langUtil.getTextMessage("SRV_LogOn"));
         logOffMessage = escapeSingleQuotes(langUtil.getTextMessage("SRV_LogOff"));
         traceOnMessage = escapeSingleQuotes(langUtil.getTextMessage("SRV_TraceOn"));
@@ -211,6 +222,7 @@ public synchronized void doGet (HttpServletRequest request,
         else if (form.equals(startMessage))
         {
             if (!serverStatus)  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                 runServer(langUtil, returnMessage, out);
             }
         }
@@ -222,6 +234,7 @@ else if (form.equals(stopMessage))
             setDefaults();
                     
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
         else if (form.equals(returnMessage))
         {
             // check if server is still running and use that to determine which form
@@ -240,12 +253,14 @@ else if (form.equals(returnMessage))
 
         form = escapeSingleQuotes(form);
         doAction = escapeSingleQuotes(doAction);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (form.equals(startMessage))
         {
             String logButton = getLogging(request);
             String traceButton = getTrace(request);
             if (logButton !=  null && logButton.equals(logOnMessage))
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                 if (logging(langUtil, true, returnMessage, out))
                     logStatus = true;
             }
@@ -298,6 +313,7 @@ else if (form.equals(returnMessage))
         else if (form.equals(stopMessage))
         {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
             printAsContentHeader(langUtil.getTextMessage("SRV_NotStarted"), out);
             String logButton = getLogging(request);
             String traceButton =  getTrace(request);
@@ -339,20 +355,24 @@ else if (form.equals(traceSessionMessage))
                 if (doAction.equals(traceOnOffMessage))
                 {
                     String sessionid = request.getParameter("sessionid");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                     Integer session;
                     try {
                         session = Integer.valueOf(sessionid);
                     } catch (NumberFormatException nfe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                         printErrorForm(langUtil,
                             langUtil.getTextMessage("SRV_InvalidVal",
                             sessionid, langUtil.getTextMessage("SRV_SessionID")),
                                        returnMessage, out);
                         return;
                     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                     Properties p;
                     try {
                         p = server.getCurrentProperties();
                     } catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                         printErrorForm(langUtil, e, returnMessage, out);
                         return;
                     }
@@ -362,6 +382,7 @@ else if (form.equals(traceSessionMessage))
                         val = false;
                     else
                         val = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                     if (traceSession(langUtil, val, session.intValue(),
                             returnMessage, out))
                     {
@@ -375,6 +396,7 @@ else if (form.equals(traceSessionMessage))
                         
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
             printAsContentHeader(langUtil.getTextMessage("SRV_TraceSessButton"), out);
             out.println( "<h4>" + getHtmlLabelledMessageInstance(langUtil,
                 "SRV_SessionID", "sessionId") + "</h4>");
@@ -388,12 +410,14 @@ else if (form.equals(traceDirMessage))
         {
             boolean set = false;
             String traceDirectory = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
             printAsContentHeader(traceDirMessage, out);
             if (doAction != null)
             {
                 if (doAction.equals(traceDirMessage))
                 {
                     traceDirectory = getParam(request, "tracedirectory");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                     if (traceDirectory(langUtil, traceDirectory,
                                        returnMessage, out) )
                         set = true;
@@ -404,6 +428,7 @@ else if (form.equals(traceDirMessage))
             }
             if (set)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                 out.println("<h2>" + langUtil.getTextMessage("SRV_TraceDirDone",
                         escapeHTML(traceDirectory)) + "</h2>");
                 out.println( "<INPUT type=submit name=form value='"+returnMessage+"'>" );
@@ -413,6 +438,7 @@ else if (form.equals(traceDirMessage))
                 out.println( "<h4>" + getHtmlLabelledMessageInstance(langUtil,
                     "SRV_TraceDir", "tracedir") + "</h4>");
                 out.println( "<INPUT type=text name=tracedirectory size=60 maxlength=256 " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                     "id='tracedir' value='"+escapeHTML(tracingDirectory)+"'>");
                 out.println( "<h4> </h4>");
                 out.println( "<INPUT type=submit name=doaction value='"+traceDirMessage+ "'>" );
@@ -428,10 +454,13 @@ else if (form.equals(netParamMessage))
             try {
                 Properties p = server.getCurrentProperties();
                 String val = p.getProperty(Property.DRDA_PROP_MAXTHREADS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 maxThreads= Integer.parseInt(val);
                 val = p.getProperty(Property.DRDA_PROP_TIMESLICE);
                 timeSlice= Integer.parseInt(val);
             } catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                 printErrorForm(langUtil, e, returnMessage, out);
                 return;
             }
@@ -450,7 +479,9 @@ else if (!(newMaxThreads == NOT_GIVEN && newTimeSlice == NOT_GIVEN))
                         maxThreads = newMaxThreads;
                     if (newTimeSlice != NOT_GIVEN)
                         timeSlice = newTimeSlice;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                     if (!setNetParam(langUtil, maxThreads, timeSlice,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
                             returnMessage, out))
                         return;
                 }
@@ -458,6 +489,7 @@ else if (!(newMaxThreads == NOT_GIVEN && newTimeSlice == NOT_GIVEN))
             
             out.println(formHeader);
             printAsContentHeader(netParamMessage, out);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             out.println( "<h4>"+langUtil.getTextMessage("SRV_MaxThreads", Integer.toString(maxThreads) +"</h4>"));
             out.println( "<h4>"+langUtil.getTextMessage("SRV_TimeSlice", Integer.toString(timeSlice) +"</h4>"));
             out.println( "<h4> </h4>");
@@ -474,6 +506,7 @@ else if (!(newMaxThreads == NOT_GIVEN && newTimeSlice == NOT_GIVEN))
         else
         {
             System.out.println("Internal Error: Unknown form, "+ form);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
             out.println("Internal Error: Unknown form");
         }
 
@@ -516,6 +549,7 @@ private String getParam(HttpServletRequest request, String paramName) throws
     java.io.IOException { 
                 
         String value = request.getParameter(paramName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
         if (value != null) {
             return new String(value.getBytes("ISO-8859-1"),"UTF8");
         } else {
@@ -534,9 +568,11 @@ private String getParam(HttpServletRequest request, String paramName) throws
      *      Network Server during initialization
      */
     private void runServer
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
         ( LocalizedResource localUtil, String returnMessage, PrintWriter out )
         throws ServletException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
         final Runnable service = new Runnable() {
             public void run() {
                 try {
@@ -553,6 +589,7 @@ public void run() {
         };
         Thread servThread = null;
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             servThread = AccessController.doPrivileged(
                                 new PrivilegedExceptionAction<Thread>() {
                                     public Thread run() throws Exception
@@ -587,6 +624,7 @@ public Thread run() throws Exception
             }while (!connectWorked && t < MAX_CONNECT_TRYS);
             if (t >= MAX_CONNECT_TRYS)
                 throw new Exception(localUtil.getTextMessage("SRV_MaxTrys",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                      Integer.toString(MAX_CONNECT_TRYS)));
             // turn logging on if required
             if (logStatus)
@@ -596,6 +634,7 @@ public Thread run() throws Exception
                 server.trace(true);
         }catch (Exception e) {
             if (out != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                 printErrorForm(localUtil, e, returnMessage, out);
             else
                 throw new ServletException(e.getMessage());
@@ -611,6 +650,7 @@ public Thread run() throws Exception
      */
     private void printErrorForm
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
          LocalizedResource localUtil,
          Exception e,
          String returnMessage,
@@ -618,6 +658,7 @@ public Thread run() throws Exception
          )
     {
         printAsContentHeader(localUtil.getTextMessage("SRV_NetworkServerError"), out);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
         out.println( "<h4>" +
                 localUtil.getTextMessage(
                     "SRV_Message", escapeHTML(e.getMessage())) + "</h4>" );
@@ -635,6 +676,7 @@ public Thread run() throws Exception
      */
     private void printErrorForm
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
          LocalizedResource localUtil,
          String msg,
          String returnMessage,
@@ -642,12 +684,18 @@ public Thread run() throws Exception
          )
     {
         printAsContentHeader(localUtil.getTextMessage("SRV_NetworkServerError"), out);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
         out.println(
                 "<h4>" +
                 localUtil.getTextMessage("SRV_Message", escapeHTML(msg)) +
                 "</h4>" );
         out.println( "<INPUT type=submit name=form value='"+returnMessage+"'>" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         out.println( "</body>" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
         out.println( "</html>" ); 
     }
     /**
@@ -659,6 +707,7 @@ public Thread run() throws Exception
      */
     private void displayCurrentStatus
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
          LocalizedResource localUtil,
          String returnMessage,
          PrintWriter out
@@ -686,6 +735,7 @@ public Thread run() throws Exception
                 out.println( "<h4>"+localUtil.getTextMessage("SRV_StatusTraceOn")+"</h4>");
             else
                 out.println( "<h4>"+localUtil.getTextMessage("SRV_StatusTraceOff")+"</h4>");
+//IC see: https://issues.apache.org/jira/browse/DERBY-117
             val = p.getProperty(Property.DRDA_PROP_PORTNUMBER);
             out.println( "<h4>"+localUtil.getTextMessage("SRV_PortNumber", val)+"</h4>");
             
@@ -798,6 +848,9 @@ private boolean getServerStatus()
      */
     private boolean traceSession
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
          LocalizedResource localUtil,
          boolean val,
          int session,
@@ -806,6 +859,7 @@ private boolean getServerStatus()
          )
     {
         boolean retval = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         try {
             server.trace(session, val);
             retval = true;
@@ -827,6 +881,7 @@ private boolean getServerStatus()
      */
     private boolean traceDirectory
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
          LocalizedResource localUtil,
          String traceDirectory,
          String returnMessage,
@@ -836,6 +891,7 @@ private boolean getServerStatus()
         boolean retval = false;
 
         if ((traceDirectory == null) || traceDirectory.equals("")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
             printErrorForm(localUtil,
                 localUtil.getTextMessage("SRV_MissingParam",
                                          localUtil.getTextMessage("SRV_TraceDir")), returnMessage, out);
@@ -844,6 +900,7 @@ private boolean getServerStatus()
         }
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-117
             this.tracingDirectory = traceDirectory;
             server.setTraceDirectory(traceDirectory);
             retval = true;
@@ -866,6 +923,8 @@ private boolean getServerStatus()
      */
     private boolean setNetParam
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
          LocalizedResource localUtil,
          int max,
          int slice,
@@ -875,12 +934,20 @@ private boolean getServerStatus()
     {
         boolean retval = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         try {
             server.setMaxThreads(max);
             server.setTimeSlice(slice);
             retval = true;
         } catch (Exception e) 
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
             printErrorForm(localUtil, e, returnMessage, out);
         }
         return retval;
@@ -907,6 +974,7 @@ private void setDefaults()
      */
     private int getIntParameter
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
          HttpServletRequest request,
          String name,
          String fieldKey,
@@ -915,14 +983,18 @@ private void setDefaults()
          PrintWriter out
          )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         String val = request.getParameter(name);
         int retval;
         if (val == null || val.equals(""))
             return NOT_GIVEN;
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             retval = Integer.parseInt(val);
         } catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
             printErrorForm(localUtil,localUtil.getTextMessage("SRV_InvalidVal",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
                 val, localUtil.getTextMessage(fieldKey)), returnMessage, out);
             return INVALID;
         }
@@ -939,6 +1011,7 @@ private void setDefaults()
      */
     private void printBanner(LocalizedResource localUtil, PrintWriter out)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
         out.println("<!DOCTYPE html>");
         out.println("<html>");        
         out.println("<head>");
@@ -967,8 +1040,10 @@ private LocalizedResource getCurrentAppUI(HttpServletRequest request, String[] l
     {
         LocalizedResource localUtil;
         String acceptLanguage = request.getHeader("Accept-Language");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6680
         localUtil = new LocalizedResource(SERVLET_PROP_MESSAGES);
         // if no language specified use one set by derby.locale, derby.codeset
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
         locale[ 0 ] = null;
         if (acceptLanguage == null)
         {
@@ -987,6 +1062,7 @@ private LocalizedResource getCurrentAppUI(HttpServletRequest request, String[] l
             {
                 localUtil.init(null, lang, SERVLET_PROP_MESSAGES);
                 // locale will be passed to server, server routines will get set appropriately
+//IC see: https://issues.apache.org/jira/browse/DERBY-5328
                 locale[ 0 ] = lang;
                 return localUtil;
             }
@@ -1011,6 +1087,7 @@ private String getLocStringFromLanguage(String lang)
             lang = lang.substring(0, semi);
         }
         // trim any whitespace and fix the code, as some browsers might send a bad format
+//IC see: https://issues.apache.org/jira/browse/DERBY-117
         lang = fixLanguageCode(lang.trim());
         return lang;
     }
@@ -1026,6 +1103,7 @@ private int translationAvailable(String lang)
         // assert lang == fixLanguageCode(lang)
         // we don't need to use toUpperCase() anymore, as the lang is already fixed
         for (int i = 0; i < knownLang.length; i++)
+//IC see: https://issues.apache.org/jira/browse/DERBY-117
             if (knownLang[i].equals(lang))
                 return i;
         return -1;
@@ -1061,6 +1139,7 @@ private String fixLanguageCode(String lang, int index) {
      */
     private String getHtmlLabelledMessageInstance(LocalizedResource localUtil,
                                                   String key, String id) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
 
         if (id == null)
             id = "";
@@ -1098,6 +1177,7 @@ private String escapeSingleQuotes(String str) {
         // character is a single quote, which means the
         // escaped string would need to be 5 times as long.
         char [] result = new char[5*cA.length];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
 
         int j = 0;
         for (int i = 0; i < cA.length; i++) {
@@ -1107,6 +1187,7 @@ private String escapeSingleQuotes(String str) {
                 result[j++] = '#';
                 result[j++] = '3';
                 result[j++] = '9';
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
                 result[j++] = ';';
             }
             else
@@ -1128,6 +1209,7 @@ private String escapeSingleQuotes(String str) {
      * @return A sanitized string.
      */
     private String escapeHTML(String str) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5639
         if (str == null || str.length() == 0) {
             return str;
         }
@@ -1204,6 +1286,7 @@ private String escapeHTML(String str) {
 
     private static boolean isServerStarted(NetworkServerControl server, int ntries)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         for (int i = 1; i <= ntries; i ++)
         {
             try {
diff --git a/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java b/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java
index edae7f8128..e1b973121f 100644
--- a/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java
+++ b/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java
@@ -36,8 +36,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.impl.drda.NetworkServerControlImpl;
 
 /** 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
     <P>
     NetworkServerControl provides the ability to start a Network Server or 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3195
     connect to a running Network Server to shutdown, configure or retrieve 
     diagnostic information.  With the exception of ping, these commands 
     can  only be performed from the  machine on which the server is running.  
@@ -45,7 +47,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
     arguments:
     </P>
     <UL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     <LI>start [-h &lt;host&gt;] [-p &lt;portnumber&gt;] [-ssl &lt;sslmode&gt;]:  This starts the Network
+//IC see: https://issues.apache.org/jira/browse/DERBY-3195
     Server on the port/host specified or on localhost, port 1527 if no
     host/port is specified and no properties are set to override the 
     defaults. By default a security manager with a default security policy will 
@@ -66,13 +70,16 @@ on a specific interface on a  multiple IP machine.
     classpath and version information about the Network Server, 
     the JVM and the Derby engine. 
     </LI>
+//IC see: https://issues.apache.org/jira/browse/DERBY-5509
 
     <LI>runtimeinfo [-h &lt;host] [-p &lt;portnumber] [-ssl &lt;sslmode&gt;]: This prints
     extensive debbugging information about sessions, threads, 
     prepared statements, and memory usage for the running Network Server.
     </LI>
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     <LI>logconnections {on | off} [-h &lt;host&gt;] [-p &lt;portnumber&gt;] [-ssl &lt;sslmode&gt;]:  
+//IC see: https://issues.apache.org/jira/browse/DERBY-809
     This turns logging of connections on or off.  
     Connections are logged to derby.log. 
     Default is off.</LI>
@@ -109,12 +116,15 @@ on a specific interface on a  multiple IP machine.
     The following is a list of properties that can be set for 
     NetworkServerControl:
     </P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     <UL><LI>derby.drda.portNumber=&lt;port number&gt;: This property 
     indicates which port should be used for the Network Server. </LI>
 
     <LI>derby.drda.host=&lt;host name  or ip address &gt;: This property 
     indicates the ip address to which NetworkServerControl should connect. </LI>
+//IC see: https://issues.apache.org/jira/browse/DERBY-5509
 
     <LI>derby.drda.traceDirectory=&lt;trace directory&gt;: This property 
     indicates where to put trace files. </LI>
@@ -124,7 +134,9 @@ on a specific interface on a  multiple IP machine.
 
     <LI>derby.drda.logConnections=true:  This property turns on logging
     of connections. Default is connections are not logged.</LI>
+//IC see: https://issues.apache.org/jira/browse/DERBY-809
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     <LI>derby.drda.minThreads=&lt;value&gt;: If this property
     is set, the &lt;value&gt; number of threads will be created when the Network Server is
     booted. </LI>
@@ -150,6 +162,7 @@ on a specific interface on a  multiple IP machine.
 <P><B>Examples.</B></P>
 
     <P>This is an example of shutting down the server on port 1621.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
     </P>
     <PRE> 
     java org.apache.derby.drda.NetworkServerControl shutdown -p 1621
@@ -161,6 +174,7 @@ on a specific interface on a  multiple IP machine.
     java org.apache.derby.drda.NetworkServerControl  trace on -s 3 
     </PRE>
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3195
     <P>This is an example of starting and then shutting down the Network 
        Server on port 1621 on machine myhost   
     </P>
@@ -302,6 +316,7 @@ public NetworkServerControl() throws Exception
      */
     public static void main(String args[]) {
         NetworkServerControlImpl server = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-214
 
         //
         // The following variable lets us preserve the error printing behavior
@@ -321,8 +336,11 @@ public static void main(String args[]) {
             int     command = server.parseArgs( args );
 
             // Java 7 and above: file permission restriction
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
+//IC see: https://issues.apache.org/jira/browse/DERBY-6857
             if (command == NetworkServerControlImpl.COMMAND_START) {
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6857
                     AccessController.doPrivileged((PrivilegedAction<Void>) () ->
                     {
                         System.setProperty(
@@ -340,6 +358,7 @@ public static void main(String args[]) {
             // In order to run secure-by-default, we install a security manager
             // if one isn't already installed. This feature is described by DERBY-2196.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-2196
             if ( needsSecurityManager( server, command ) )
             {
                 verifySecurityState( server );
@@ -356,12 +375,14 @@ public static void main(String args[]) {
         catch (Exception e)
         {
             //if there was an error, exit(1)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             if ((e.getMessage() == null) ||
                 !e.getMessage().equals(NetworkServerControlImpl.UNEXPECTED_ERR) ||
                 printErrors
             )
             {
                 if (server != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5413
                     server.consoleExceptionPrint(e);
                 else
                     e.printStackTrace();  // default output stream is System.out
@@ -602,6 +623,7 @@ public Properties getCurrentProperties() throws Exception
           
     protected void setClientLocale(String locale)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         serverImpl.setClientLocale( locale );
     }
 
@@ -626,6 +648,7 @@ private static  boolean needsSecurityManager( NetworkServerControlImpl server, i
             (
              (System.getSecurityManager() == null) &&
              (command == NetworkServerControlImpl.COMMAND_START) &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-3083
              (!server.runningUnsecure())
              );
    }
@@ -679,6 +702,7 @@ private static  void installSecurityManager( NetworkServerControlImpl server )
         // SocketPermissions. This is an internal property which customers
         // may not override.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6438
         System.setProperty(Property.DERBY_SECURITY_PORT,
                            String.valueOf(server.getPort()));
 
@@ -708,6 +732,7 @@ private static  void installSecurityManager( NetworkServerControlImpl server )
         System.setSecurityManager( securityManager );
 
         // Report success.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5908
         if (securityManager.equals(System.getSecurityManager())) {
             String successMessage = server.localizeMessage(
                     "DRDA_SecurityInstalled.I", null);
@@ -801,6 +826,7 @@ private static  URL  getCodeSourceURL( NetworkServerControlImpl server )
     {
         // Note: This method is expected to run only when no security manager
         //       has been installed, hence no use of privileged blocks.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5908
         ProtectionDomain pd = NetworkServerControl.class.getProtectionDomain();
         CodeSource cs = pd.getCodeSource();
         if (cs == null) {
@@ -836,6 +862,7 @@ private static String getCodeSourcePrefix(
         // Otherwise, we have the directory prefix for our url.
         //
         String directoryPrefix = extForm.substring(0, idx);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5908
 
         return directoryPrefix;
     }
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/AppRequester.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/AppRequester.java
index 7fe8912a14..1d731576cf 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/AppRequester.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/AppRequester.java
@@ -25,6 +25,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.sanity.SanityManager;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     AppRequester stores information about the application requester.
     It is used so that multiple sessions can share information when they are
     started from the same version of the application requester.
@@ -40,6 +41,7 @@ class AppRequester
 
     private static final int [] MIN_MGR_LEVELS = {
                                             3, // AGENT - JCC comes in at 3
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                                             4, // CCSIDMGR
                                             3, // CMNAPPC, 
                                             4, // CMNSYNCPT
@@ -51,6 +53,8 @@ class AppRequester
                                             6, // SQLAM
                                             1, // SUPERVISOR    
                                             5, // SYNCPTMGR
+//IC see: https://issues.apache.org/jira/browse/DERBY-4746
+//IC see: https://issues.apache.org/jira/browse/DERBY-2031
                                             1208, // UNICODEMGR
                                             0  // XAMGR
                                             };
@@ -75,6 +79,7 @@ class AppRequester
      * 
      * @exception throws IOException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     AppRequester () 
     {
         for (int i = 0; i < CodePoint.MGR_CODEPOINTS.length; i++)
@@ -107,6 +112,7 @@ protected void setClientVersion(String productId)
         versionLevel = Integer.parseInt(prdid.substring (3, 5));
         releaseLevel = Integer.parseInt(prdid.substring (5, 7));
         modifyLevel = Integer.parseInt(prdid.substring (7, 8));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5565
         if ((prdid.indexOf(DRDAConstants.DERBY_DRDA_CLIENT_ID) != -1)) {
             clientType = DNC_CLIENT;
         } else {
@@ -135,6 +141,7 @@ protected boolean supportsSecMecUSRSSBPWD()
      * LMTBLKPRC
      */
     protected final boolean supportsQryclsimpForLmtblkprc() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         return clientType == DNC_CLIENT;
     }
 
@@ -251,6 +258,8 @@ private boolean notEquals(Object a, Object b)
      */
 
     protected int supportedMessageParamLength() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6802
+//IC see: https://issues.apache.org/jira/browse/DERBY-6823
         return MessageUtils.DB2_JCC_MAX_EXCEPTION_PARAM_LENGTH;
     }
 
@@ -283,6 +292,7 @@ protected  boolean isXARequester()
      * @return {@code true} if the status byte is sent, {@code false} if not
      */
     protected boolean supportsEXTDTAAbort() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         return (clientType == DNC_CLIENT && greaterThanOrEqualTo(10, 6, 0));
     }
     
@@ -291,10 +301,14 @@ protected boolean supportsEXTDTAAbort() {
      * @return {@code true} if the AppRequester supports CCSID 1208, {@code false} if not
      */
     protected boolean supportsUtf8Ccsid() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4746
+//IC see: https://issues.apache.org/jira/browse/DERBY-2031
         return (getManagerLevel(CodePoint.UNICODEMGR) == CcsidManager.UTF8_CCSID);
     }
 
     protected boolean supportsSessionDataCaching() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         return (clientType == DNC_CLIENT && greaterThanOrEqualTo(10, 4, 0));
     }
 
@@ -332,6 +346,7 @@ protected boolean supportsLongerLDStrings() {
     protected int getTimestampLength()
     {
         return supportsTimestampNanoseconds() ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
             DRDAConstants.JDBC_TIMESTAMP_LENGTH : DRDAConstants.DRDA_OLD_TIMESTAMP_LENGTH;
     }
 
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/CcsidManager.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/CcsidManager.java
index 8c90dacb04..4eb977ad0a 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/CcsidManager.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/CcsidManager.java
@@ -47,6 +47,7 @@ abstract class CcsidManager
    * @param str The Java String from which to obtain the length.
    * @return The length in bytes of the String str.
    */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4746
   abstract int getByteLength (String str);
   
   // Convert a Java String into bytes for a particular ccsid.
@@ -55,6 +56,7 @@ abstract class CcsidManager
   // @return A new byte array representing the String in a particular ccsid.
   abstract byte[] convertFromJavaString (String sourceString);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
 
     /**
      * Convert a Java String into bytes for a particular ccsid.
@@ -64,6 +66,7 @@ abstract class CcsidManager
      * @param buffer        The buffer to convert the String into.
      */
     abstract void convertFromJavaString(String sourceString, ByteBuffer buffer);
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
 
   // Convert a byte array representing characters in a particular ccsid into a Java String.
   //
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/CharacterEncodings.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/CharacterEncodings.java
index 55fb570cc4..1c0073613e 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/CharacterEncodings.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/CharacterEncodings.java
@@ -23,6 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 import java.util.HashMap;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 final class CharacterEncodings
 {
 
@@ -31,6 +32,7 @@ private CharacterEncodings () {}
 
   private static final HashMap<Integer, String> ccsidToJavaEncodingTable__ =
           new HashMap<Integer, String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
   static {
     populate_ccsidToJavaEncodingTable();
@@ -38,6 +40,7 @@ private CharacterEncodings () {}
 
   static void populate_ccsidToJavaEncodingTable ()
   {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
     ccsidToJavaEncodingTable__.put(5346, "Cp1250");
     ccsidToJavaEncodingTable__.put(5347, "Cp1251");
     ccsidToJavaEncodingTable__.put(5348, "Cp1252");
@@ -231,6 +234,7 @@ static void populate_ccsidToJavaEncodingTable ()
 
   public static String getJavaEncoding (int ccsid) throws java.io.UnsupportedEncodingException
   {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     String javaEncoding = ccsidToJavaEncodingTable__.get(ccsid);
     if (javaEncoding == null) {
       throw new java.io.UnsupportedEncodingException ("unsupported ccsid");
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/ClientThread.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/ClientThread.java
index 9c888a8413..67e1e6b535 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/ClientThread.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/ClientThread.java
@@ -29,11 +29,14 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.security.PrivilegedActionException;
 
 final class ClientThread extends Thread {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     NetworkServerControlImpl parent;
     ServerSocket serverSocket;
     private int timeSlice;
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     ClientThread (NetworkServerControlImpl nsi, ServerSocket ss) {
         // Use a more meaningful name for this thread.
         super(NetworkServerControlImpl.getUniqueThreadName(
@@ -74,10 +77,12 @@ public void run()
                         
                         // Set time out: Stops DDMReader.fill() from
                         // waiting indefinitely when timeSlice is set.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2748
                         if (timeSlice > 0)
                             clientSocket.setSoTimeout(timeSlice);
                         
                         //create a new Session for this socket
+//IC see: https://issues.apache.org/jira/browse/DERBY-1817
                         parent.addSession(clientSocket);
                         
                     } catch (PrivilegedActionException e) {
@@ -86,6 +91,7 @@ public void run()
                     } // end inner try/catch block
                     
                 } catch (InterruptedException ie) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4326
                     if (parent.getShutdown()) {
                         // This is a shutdown and we'll just exit the
                         // thread. NOTE: This is according to the logic
@@ -93,6 +99,7 @@ public void run()
                         // is allways the case, but will not alter the
                         // behaviour since it is not within the scope of
                         // this change (DERBY-2108).
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                         clientSocket.close();
                         return;
                     }
@@ -115,6 +122,7 @@ public void run()
                     return; // Exit the thread
                     
                 } catch (IOException ioe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4326
                     if (clientSocket != null)
                         clientSocket.close();
                     // IOException causes this thread to stop.  No
@@ -125,12 +133,14 @@ public void run()
                             return; // Exit the thread
                         } 
                     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3704
                     parent.consoleExceptionPrintTrace(ioe);
                 }
             } catch (Exception e) {
                 // Catch and log all other exceptions
                 
                 parent.consoleExceptionPrintTrace(e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3704
                 try {
                     if (clientSocket != null)
                         clientSocket.close();
@@ -152,6 +162,7 @@ public void run()
      * 
      */
     private Socket acceptClientWithRetry() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
                 new PrivilegedAction<Socket>() {
                     public Socket run() {
@@ -162,6 +173,7 @@ public Socket run() {
                                 // Cannot just aimlessly loop
                                 // writing errors
                                 return serverSocket.accept();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6112
                             } catch (Exception acceptE) {
                                 // If not a normal shutdown,
                                 // log and shutdown the server
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/CodePoint.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/CodePoint.java
index f591241658..38cef09df3 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/CodePoint.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/CodePoint.java
@@ -870,6 +870,7 @@ class CodePoint
 
     protected static int [] MGR_CODEPOINTS = {
                                             AGENT,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                                             CCSIDMGR,
                                             CMNAPPC, 
                                             CMNSYNCPT,
@@ -881,6 +882,8 @@ class CodePoint
                                             SQLAM,
                                             SUPERVISOR,
                                             SYNCPTMGR,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4746
+//IC see: https://issues.apache.org/jira/browse/DERBY-2031
                                             UNICODEMGR,
                                             XAMGR
                                             };
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/CodePointNameTable.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/CodePointNameTable.java
index 89ef93b982..10dbd422a0 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/CodePointNameTable.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/CodePointNameTable.java
@@ -26,10 +26,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   It is arranged in alphabetical order.
 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 class CodePointNameTable extends java.util.Hashtable<Integer, String>
 {
   CodePointNameTable ()
   {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
     put(CodePoint.ABNUOWRM, "ABNUOWRM");
     put(CodePoint.ACCRDB, "ACCRDB");
     put(CodePoint.ACCRDBRM, "ACCRDBRM");
@@ -165,6 +167,7 @@ class CodePointNameTable extends java.util.Hashtable<Integer, String>
 
   String lookup (int codePoint)
   {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     return get(codePoint);
   }
 
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/ConsistencyToken.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/ConsistencyToken.java
index f887c0670b..e38c73c1c7 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/ConsistencyToken.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/ConsistencyToken.java
@@ -23,6 +23,7 @@
 /**
  * Class which represents an RDB Package Consistency Token.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
 final class ConsistencyToken {
     /** Byte array representation of the token. */
     private final byte[] bytes;
@@ -34,6 +35,7 @@ final class ConsistencyToken {
      *
      * @param bytes byte array representing the token
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     ConsistencyToken(byte[] bytes) {
         this.bytes = bytes;
     }
@@ -74,6 +76,7 @@ public int hashCode() {
         // frequently used as keys in hash tables. Therefore, it is a good idea
         // to cache their hash codes.
         int h = hash;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1688
         if (h == 0) {
             // The hash code has not been calculated yet (or perhaps the hash
             // code actually is 0). Calculate a new one and cache it. No
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DDMReader.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DDMReader.java
index 8a90c6b60e..dad58a5603 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DDMReader.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DDMReader.java
@@ -29,10 +29,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.sanity.SanityManager;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     The DDMReader is used to read DRDA protocol.   DRDA Protocol is divided into
     three layers corresponding to the DDM three-tier architecture. For each layer,
     their is a DSS (Data Stream Structure) defined.
         Layer A     Communications management services
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         Layer B     Agent services
         Layer C     Data management services
     <P>
@@ -53,6 +55,7 @@ is higher than the previous request (all correlation identifiers must
     <P>
     At layer B are object mapping, object validation and command routing.
     Layer B objects with data 5 bytes less than 32K bytes consist of
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         2 bytes     Length
         2 bytes     Type of the object (code point)
         Object data
@@ -61,7 +64,9 @@ a string of bytes formatted as the class description of the object required.
     Collections consist of a set of objects in which the entries in the collection
     are nested within the length/ code point of the collection.
     <P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     Layer B objects with data &gt;=32763 bytes long format is 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         2 bytes     Length - length of class, length, and extended total length fields
                     (high order bit set, indicating &gt;=32763)
         2 bytes     Type of the object (code point)
@@ -164,8 +169,11 @@ class DDMReader
     // since this is just statistics.
     
     volatile long totalByteCount = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
 
     // constructor
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     DDMReader (DRDAConnThread agent, DssTrace dssTrace)
     {
         buffer = new byte[DEFAULT_BUFFER_SIZE];
@@ -177,6 +185,7 @@ class DDMReader
     * It is used by ProtocolTestAdapter to read the protocol returned by the
      * server 
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
     DDMReader(InputStream inputStream)
     {
         buffer = new byte[DEFAULT_BUFFER_SIZE];
@@ -193,6 +202,7 @@ class DDMReader
     protected void initialize(DRDAConnThread agent, DssTrace dssTrace)
     {
         this.agent = agent;
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         this.utf8CcsidManager = new Utf8CcsidManager();
         this.ebcdicCcsidManager = new EbcdicCcsidManager();
         this.ccsidManager = ebcdicCcsidManager;
@@ -209,12 +219,14 @@ protected void initialize(DRDAConnThread agent, DssTrace dssTrace)
         prevCorrelationID = DssConstants.CORRELATION_ID_UNKNOWN;
         dssCorrelationID = DssConstants.CORRELATION_ID_UNKNOWN;
         this.dssTrace = dssTrace;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1425
         dssIsChainedWithDiffID = false;
         dssIsChainedWithSameID = false;
     }
 
     // Switch the ccsidManager to the UTF-8 instance
     protected void setUtf8Ccsid() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         ccsidManager = utf8CcsidManager;
     }
     
@@ -225,6 +237,7 @@ protected void setEbcdicCcsid() {
     
     protected boolean terminateChainOnErr()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         return terminateChainOnErr;
     }
 
@@ -393,6 +406,7 @@ protected int readDssHeader () throws DRDAProtocolException
         {
             // chaining bit not b'1', make sure DSSFMT same id not b'1'
             if ((gdsFormatter & DssConstants.DSSCHAIN_SAME_ID) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     == DssConstants.DSSCHAIN_SAME_ID)
             {  // Next DSS can not have same correlator
                 agent.throwSyntaxrm(CodePoint.SYNERRCD_CHAIN_OFF_SAME_NEXT_CORRELATOR,
@@ -478,6 +492,8 @@ protected void readReplyDss() throws DRDAProtocolException
         // Determine if the current DSS is chained with the
         // next DSS, with the same or different request ID.
         if ((gdsFormatter & DssConstants.DSSCHAIN) == DssConstants.DSSCHAIN) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         {   // on indicates structure chained to next structure
             if ((gdsFormatter & DssConstants.DSSCHAIN_SAME_ID) 
                     == DssConstants.DSSCHAIN_SAME_ID) 
@@ -521,6 +537,7 @@ protected int readLengthAndCodePoint( boolean isLayerBStreamingPossible )
     {
         ensureBLayerDataInBuffer (4, NO_ADJUST_LENGTHS);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-706
         ddmScalarLen = readCodePoint();
         int codePoint = readCodePoint();
         
@@ -541,6 +558,7 @@ protected int readLengthAndCodePoint( boolean isLayerBStreamingPossible )
             switch (numberOfExtendedLenBytes) {
             case 8:
                  ddmScalarLen =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2935
                     ((buffer[pos++] & 0xFFL) << 56) +
                     ((buffer[pos++] & 0xFFL) << 48) +
                     ((buffer[pos++] & 0xFFL) << 40) +
@@ -586,6 +604,7 @@ protected int readLengthAndCodePoint( boolean isLayerBStreamingPossible )
                 
                 break;
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             default:
                 agent.throwSyntaxrm(CodePoint.SYNERRCD_INCORRECT_EXTENDED_LEN,
                                DRDAProtocolException.NO_CODPNT_ARG);
@@ -870,6 +889,7 @@ protected BigDecimal readBigDecimal(int precision, int scale) throws DRDAProtoco
       else
         signum =  1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
       if (precision <= 18) {
         // can be handled by long without overflow.
         long value = packedNybblesToLong(buffer, pos, 0, length*2-1);
@@ -906,6 +926,7 @@ else if (precision <= 27) {
         magnitude[10] = (byte)(value[2] >>> 8);
         magnitude[11] = (byte)(value[2]);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         pos += length;
         return new java.math.BigDecimal (new java.math.BigInteger(signum, magnitude), scale);
       }
@@ -941,6 +962,9 @@ else if (precision <= 31) {
         magnitude[14] = (byte)(value[3] >>> 8);
         magnitude[15] = (byte)(value[3]);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         pos += length;
         return new java.math.BigDecimal (new java.math.BigInteger(signum, magnitude), scale);
       }
@@ -961,6 +985,7 @@ else if (precision <= 31) {
      *         statement as a binary stream.
      * @exception DRDAProtocolException standard DRDA protocol exception
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1559
     EXTDTAReaderInputStream getEXTDTAReaderInputStream
         (final boolean checkNullability)
         throws DRDAProtocolException
@@ -971,6 +996,7 @@ else if (precision <= 31) {
 
         // Check if we must read the status byte sent by the client.
         boolean readEXTDTAStatusByte =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
                 agent.getSession().appRequester.supportsEXTDTAAbort();
             
         if (doingLayerBStreaming) {
@@ -990,6 +1016,7 @@ else if (precision <= 31) {
      *
      * @exception DRDAProtocolException standard DRDA protocol exception
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     ByteArrayInputStream readLOBInitStream() 
         throws DRDAProtocolException
     {
@@ -1052,6 +1079,7 @@ ByteArrayInputStream readLOBContinuationStream (final long desiredLength)
         try {
             return readLOBChunk(true, desiredLength);
         } catch (DRDAProtocolException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
             e.printStackTrace(agent.getServer().logWriter());
             throw new IOException(e.getMessage());
         }
@@ -1072,6 +1100,7 @@ ByteArrayInputStream readLOBContinuationStream (final long desiredLength)
         (final boolean readHeader, final long desiredLength)
         throws DRDAProtocolException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (readHeader) {
             readDSSContinuationHeader();
         }
@@ -1093,6 +1122,7 @@ ByteArrayInputStream readLOBContinuationStream (final long desiredLength)
         
         // Create ByteArrayInputStream on top of buffer. 
         // This will not make a copy of the buffer.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         ByteArrayInputStream bais = 
             new ByteArrayInputStream(buffer, pos, copySize);
         pos += copySize;
@@ -1113,10 +1143,14 @@ byte[] getExtData (long desiredLength, boolean checkNullability) throws DRDAProt
 
     boolean readHeader;
     int copySize;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1513
+//IC see: https://issues.apache.org/jira/browse/DERBY-1535
+//IC see: https://issues.apache.org/jira/browse/DERBY-1610
     ByteArrayOutputStream baos;
     boolean isLengthAndNullabilityUnknown = false;
 
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     if (desiredLength != -1) {
         // allocate a stream based on a known amount of data
         baos = new ByteArrayOutputStream ((int) desiredLength);
@@ -1138,6 +1172,7 @@ byte[] getExtData (long desiredLength, boolean checkNullability) throws DRDAProt
     // set the amount to read for the first segment
     copySize = (int) Math.min(dssLength,desiredLength); //note: has already been adjusted for headers
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
 
     //if (checkNullability)  // don't count the null byte we've already read
     //copySize--;
@@ -1155,6 +1190,7 @@ byte[] getExtData (long desiredLength, boolean checkNullability) throws DRDAProt
       baos.write (buffer, pos, copySize);
       pos += copySize;
       desiredLength -= copySize;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
 
       // read the continuation header, if necessary
       if (readHeader)
@@ -1192,6 +1228,7 @@ private void readDSSContinuationHeader () throws DRDAProtocolException
     // it is a syntax error if the dss continuation header length
     // is less than or equal to two
     if (dssLength <= 2) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         agent.throwSyntaxrm(CodePoint.SYNERRCD_DSS_CONT_LESS_OR_EQUAL_2,
                                DRDAProtocolException.NO_CODPNT_ARG);
     }
@@ -1288,6 +1325,7 @@ private long packedNybblesToLong (byte[] buffer,
         value = value*10 + ((buffer[offset+i] & 0xF0) >>> 4);
       }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
       return value;
     }
 
@@ -1331,6 +1369,7 @@ private int[] computeMagnitude(int[] input)
      * @exception java.sql.SQLException wrapping any exception in decryption
      */
     protected String readEncryptedString (DecryptionManager decryptM, int securityMechanism,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                                          byte[] initVector, byte[] sourcePublicKey)
             throws DRDAProtocolException, java.sql.SQLException
     {
@@ -1341,6 +1380,7 @@ protected String readEncryptedString (DecryptionManager decryptM, int securityMe
         if (plainText == null)
             return null;
         else
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
             return ccsidManager.convertToJavaString(plainText);
     }
 
@@ -1357,6 +1397,7 @@ protected String readString (int length) throws DRDAProtocolException
     {
         ensureBLayerDataInBuffer (length, ADJUST_LENGTHS);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         String result = ccsidManager.convertToJavaString(buffer, pos, length);
         pos += length;
         return result;
@@ -1372,6 +1413,7 @@ protected String readString (int length) throws DRDAProtocolException
      * @exception DRDAProtocolException
      */
     protected void readString(DRDAString dst, int size, boolean unpad)
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
         throws DRDAProtocolException
     {
         ensureBLayerDataInBuffer(size, ADJUST_LENGTHS);
@@ -1405,6 +1447,7 @@ protected String readString (int length, String encoding)
         catch (java.io.UnsupportedEncodingException e) {
             agent.agentError("UnsupportedEncodingException in readString, encoding = " 
                     + encoding);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
             e.printStackTrace(agent.getServer().logWriter());
         }
         
@@ -1459,6 +1502,12 @@ protected byte[] readBytes (int length) throws DRDAProtocolException
     {
         byte[] b;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1533
+//IC see: https://issues.apache.org/jira/browse/DERBY-170
+//IC see: https://issues.apache.org/jira/browse/DERBY-428
+//IC see: https://issues.apache.org/jira/browse/DERBY-491
+//IC see: https://issues.apache.org/jira/browse/DERBY-492
+//IC see: https://issues.apache.org/jira/browse/DERBY-614
         if (length < DssConstants.MAX_DSS_LENGTH)
         {
             ensureBLayerDataInBuffer (length, ADJUST_LENGTHS);
@@ -1511,6 +1560,7 @@ protected void skipBytes () throws DRDAProtocolException
      */
     protected void skipDss() throws DRDAProtocolException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-170
         while (dssIsContinued)
         {
             skipBytes((int)dssLength);
@@ -1538,6 +1588,7 @@ protected void clearBuffer() throws DRDAProtocolException
      */
     protected String convertBytes(byte[] buf)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         return ccsidManager.convertToJavaString (buf, 0, buf.length);
     }
 
@@ -1638,6 +1689,7 @@ private void ensureBLayerDataInBuffer (int desiredDataSize, boolean adjustLen)
             ensureALayerDataInBuffer(desiredDataSize);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (adjustLen)
             adjustLengths(desiredDataSize);
     }
@@ -1736,6 +1788,12 @@ private void compressBLayerData (int continueDssHeaderCount)
             }
 
             newdssLength += (continueHeaderLength-2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1533
+//IC see: https://issues.apache.org/jira/browse/DERBY-170
+//IC see: https://issues.apache.org/jira/browse/DERBY-428
+//IC see: https://issues.apache.org/jira/browse/DERBY-491
+//IC see: https://issues.apache.org/jira/browse/DERBY-492
+//IC see: https://issues.apache.org/jira/browse/DERBY-614
 
             // calculate the number of bytes to shift
             if (i != (continueDssHeaderCount - 1))
@@ -1862,6 +1920,7 @@ private void fill (int minimumBytesNeeded) throws DRDAProtocolException
                 actualBytesRead = inputStream.read (
                   buffer, count, buffer.length - count);
             } catch (java.net.SocketTimeoutException ste) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2166
 
                 // Transport the timeout out through the layers. This
                 // exception is caught in DRDAConnThread.run();
@@ -1880,6 +1939,7 @@ private void fill (int minimumBytesNeeded) throws DRDAProtocolException
                                                "fill",
                                                5);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-170
             if (actualBytesRead != -1)
             {
                 count += actualBytesRead;
@@ -1887,6 +1947,7 @@ private void fill (int minimumBytesNeeded) throws DRDAProtocolException
             }
 
         } while ((totalBytesRead < minimumBytesNeeded) && (actualBytesRead != -1));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2166
 
         if (actualBytesRead == -1) 
         {
@@ -1896,6 +1957,7 @@ private void fill (int minimumBytesNeeded) throws DRDAProtocolException
                   "InputStream.read()", "insufficient data", "*");
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
         totalByteCount += totalBytesRead;
     }
 
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DDMWriter.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DDMWriter.java
index 5a97658b1d..6b424b225e 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DDMWriter.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DDMWriter.java
@@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.sanity.SanityManager;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     The DDMWriter is used to write DRDA protocol.   The DRDA Protocol is
     described in the DDMReader class.
     For more details, see DRDA Volume 3 (Distributed Data Management(DDM)
@@ -128,8 +129,11 @@ class DDMWriter
     // get one complete long, but we don't bother to synchronize, 
     // since this is just statistics.
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
     volatile long totalByteCount = 0;
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     DDMWriter (DRDAConnThread agent, DssTrace dssTrace)
     {
         // Create instances of the two ccsid managers and default to EBCDIC
@@ -137,16 +141,20 @@ class DDMWriter
         this.utf8CcsidManager = new Utf8CcsidManager();
         this.ccsidManager = this.ebcdicCcsidManager;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         this.buffer = ByteBuffer.allocate(DEFAULT_BUFFER_SIZE);
         this.agent = agent;
         this.prevHdrLocation = -1;
         this.previousCorrId = DssConstants.CORRELATION_ID_UNKNOWN;
         this.previousChainByte = DssConstants.DSS_NOCHAIN;
         this.isContinuationDss = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5
+//IC see: https://issues.apache.org/jira/browse/DERBY-5
         this.lastDSSBeforeMark = -1;
         reset(dssTrace);
         // create an encoder which inserts the charset's default replacement
         // character for characters it can't encode
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         encoder = NetworkServerControlImpl.DEFAULT_CHARSET.newEncoder()
             .onMalformedInput(CodingErrorAction.REPLACE)
             .onUnmappableCharacter(CodingErrorAction.REPLACE);
@@ -154,6 +162,7 @@ class DDMWriter
 
     // Switch the ccsidManager to the UTF-8 instance
     protected void setUtf8Ccsid() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         ccsidManager = utf8CcsidManager;
     }
     
@@ -216,6 +225,7 @@ protected byte[] getBufferContents(int startPos) {
      */
     protected void setCMDProtocol()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         isDRDAProtocol = false;
     }
 
@@ -276,6 +286,7 @@ private void markDssAsContinued(boolean forLob)
         // continuation bit defaults to '1' for lobs, so
         // we only have to switch it if we're not writing
         // lobs.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
             byte b = (byte) (buffer.get(dssLengthLocation) | 0x80);
             buffer.put(dssLengthLocation, b);
         }
@@ -308,6 +319,7 @@ protected void endDss(byte chainByte)
         endDss(true);
 
         // Now override default chain state.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         overrideChainByte(dssLengthLocation + 3, chainByte);
         previousChainByte = chainByte;
 
@@ -332,6 +344,9 @@ private void overrideChainByte(int pos, byte chainByte) {
      * and setting the chain bit.
      */
     protected void endDss() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         endDss(true);
     }
 
@@ -363,6 +378,7 @@ private void endDss (boolean finalizeLength)
      */
     protected void endDdmAndDss ()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         endDdm();   // updates last DDM object
         endDss();
     }
@@ -395,6 +411,7 @@ protected void endDdmAndDss ()
         start = start + dssLengthLocation;
         int length = buffer.position() - start;
         byte [] temp = new byte[length];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.position(start);
         buffer.get(temp);
         return temp;
@@ -411,6 +428,7 @@ protected void startDdm (int codePoint)
     {
         // save the location of the beginning of the collection so
         // that we can come back and fill in the length bytes
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         final int offset = buffer.position();
         markStack[top++] = offset;
         ensureLength (4); // verify space for length bytes and code point
@@ -425,6 +443,7 @@ protected void startDdm (int codePoint)
      */
     protected void clearDdm ()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.position(markStack[top--]);
     }
 
@@ -434,6 +453,8 @@ protected void clearDdm ()
      */
     protected void clearBuffer()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.clear();
         top = 0;
         dssLengthLocation = 0;
@@ -469,6 +490,7 @@ protected void endDdm ()
             // the extended length should be written right after the length and
             // the codepoint (2+2 bytes)
             final int extendedLengthLocation = lengthLocation + 4;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
 
             // shift the data to the right by the number of extended
             // length bytes needed.
@@ -477,6 +499,7 @@ protected void endDdm ()
 
             // write the extended length (a variable number of bytes in
             // big-endian order)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
             for (int pos = extendedLengthLocation + extendedLengthByteCount - 1;
                  pos >= extendedLengthLocation; pos--) {
                 buffer.put(pos, (byte) extendedLength);
@@ -492,6 +515,7 @@ protected void endDdm ()
         }
 
         // write the 2 byte length field (2 bytes before codepoint).
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.putShort(lengthLocation, (short) length);
     }
 
@@ -506,6 +530,7 @@ protected void endDdm ()
     */
     protected int getDSSLength()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         return buffer.position() - dssLengthLocation;
     }
  
@@ -518,6 +543,7 @@ protected int getDSSLength()
     */
     protected void truncateDSS(int value)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.position(dssLengthLocation + value);
     }
 
@@ -531,6 +557,7 @@ protected void truncateDSS(int value)
      */
     protected void writeByte (int value)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (SanityManager.DEBUG)
         {
             if (value > 255)
@@ -563,6 +590,7 @@ protected void writeNetworkShort (int value)
     protected void writeNetworkInt (int value)
     {
         ensureLength (4);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.putInt(value);
     }
 
@@ -599,6 +627,7 @@ protected void writeBytes (byte[] buf, int start, int length)
 
         }
         ensureLength (length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.put(buf, start, length);
     }
     /**
@@ -650,8 +679,10 @@ void writeCodePoint4Bytes (int codePoint, int value)
     void writeScalar1Byte (int codePoint, int value)
     {
         ensureLength (5);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.putShort((short) 0x0005);
         buffer.putShort((short) codePoint);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.put((byte) value);
     }
 
@@ -664,7 +695,9 @@ void writeScalar1Byte (int codePoint, int value)
     protected void writeScalar2Bytes (int codePoint, int value)
     {
         ensureLength (6);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.putShort((short) 0x0006);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.putShort((short) codePoint);
         buffer.putShort((short) value);
     }
@@ -672,11 +705,13 @@ protected void writeScalar2Bytes (int codePoint, int value)
     protected void writeScalar2Bytes ( int value)
     {
         ensureLength (2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.putShort((short) value);
     }
     
     protected void writeScalarStream (boolean chainedWithSameCorrelator,
                                       int codePoint,
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
                       EXTDTAInputStream in,
                                       boolean writeNullByte) 
         throws DRDAProtocolException
@@ -701,12 +736,14 @@ protected void writeScalarStream (boolean chainedWithSameCorrelator,
             
             if( SanityManager.DEBUG ){
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2054
             if( PropertyUtil.getSystemBoolean("derby.debug.suicideOfLayerBStreaming") )
                 throw new IOException();
                 }
 
             // read as many bytes as possible directly into the backing array
             final int offset = buffer.position();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
             final int bytesRead =
                 in.read(buffer.array(), offset,
                         Math.min(spareDssLength, buffer.remaining()));
@@ -734,6 +771,7 @@ protected void writeScalarStream (boolean chainedWithSameCorrelator,
         out.flush();
         
         }catch(IOException e){
+//IC see: https://issues.apache.org/jira/browse/DERBY-2933
         agent.markCommunicationsFailure (e,"DDMWriter.writeScalarStream()",
                          "",
                          e.getMessage(),
@@ -749,10 +787,12 @@ private void beginDss (boolean chainedToNextStructure,
                            int dssType)
     {
         beginDss(dssType, false);   // false => don't ensure length.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
 
         // always turn on continuation flags... this is helpful for lobs...
         // these bytes will get rest if dss lengths are finalized.
         buffer.putShort(dssLengthLocation, (short) 0xFFFF);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
 
         // Set whether or not this DSS should be chained to
         // the next one.  If it's chained, it has to be chained
@@ -761,6 +801,7 @@ private void beginDss (boolean chainedToNextStructure,
             dssType |= DssConstants.GDSCHAIN_SAME_ID;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.put(dssLengthLocation + 3, (byte) dssType);
     }
 
@@ -780,9 +821,13 @@ private int prepScalarStream( boolean chainedWithSameCorrelator,
                                    boolean writeNullByte) throws DRDAProtocolException
   {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
       ensureLength( DEFAULT_BUFFER_SIZE - buffer.position() );
       
       final int nullIndicatorSize = writeNullByte ? 1:0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
 
     
       // flush the existing DSS segment ,
@@ -803,9 +848,11 @@ private int prepScalarStream( boolean chainedWithSameCorrelator,
 
     // buildStreamDss should not call ensure length.
     beginDss(chainedWithSameCorrelator, DssConstants.GDSFMT_OBJDSS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
 
       writeLengthCodePoint(0x8004,codePoint);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
 
     // write the null byte, if necessary
     if (writeNullByte)
@@ -823,6 +870,8 @@ private int prepScalarStream( boolean chainedWithSameCorrelator,
   // this indicates there is a dss object already in the buffer.
     protected boolean doesRequestContainData()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         return buffer.position() != 0;
     }
 
@@ -830,6 +879,7 @@ protected boolean doesRequestContainData()
     // Writes out a scalar stream DSS segment, along with DSS continuation
     // headers if necessary.
     private void flushScalarStreamSegment ( boolean lastSegment,
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
                             OutputStream out)
         throws DRDAProtocolException
     {
@@ -841,6 +891,7 @@ private void flushScalarStreamSegment ( boolean lastSegment,
                 try {
                 // Mark current DSS as continued, set its chaining state,
                 // then send the data across.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     markDssAsContinued(true);   // true => for lobs
                     sendBytes (out,
                            false);
@@ -854,6 +905,7 @@ private void flushScalarStreamSegment ( boolean lastSegment,
 
 
             // Prepare a DSS continuation header for next DSS.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
             dssLengthLocation = buffer.position();
             buffer.putShort((short) 0xFFFF);
             isContinuationDss = true;
@@ -874,6 +926,9 @@ private void flushScalarStreamSegment ( boolean lastSegment,
   void writeLengthCodePoint (int length, int codePoint)
   {
     ensureLength (4);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     buffer.putShort((short) length);
     buffer.putShort((short) codePoint);
   }
@@ -887,6 +942,7 @@ void writeLengthCodePoint (int length, int codePoint)
     protected void writeScalarHeader (int codePoint, int dataLength)
     {
         ensureLength (dataLength + 4);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.putShort((short) (dataLength + 4));
         buffer.putShort((short) codePoint);
     }
@@ -922,6 +978,9 @@ void writeScalarPaddedString (int codePoint, String string, int paddedLength)
         ensureLength (paddedLength + 4);
         buffer.putShort((short) (paddedLength + 4));
         buffer.putShort((short) codePoint);
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         ccsidManager.convertFromJavaString(string, buffer);
         padBytes(ccsidManager.space, fillLength);
     }
@@ -940,6 +999,7 @@ protected void writeScalarPaddedString (DRDAString drdaString, int paddedLength)
         int fillLength = paddedLength - stringLength;
         ensureLength(paddedLength);
         buffer.put(drdaString.getBytes(), 0, stringLength);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         padBytes(ccsidManager.space, fillLength);
     }
 
@@ -971,6 +1031,8 @@ protected void writeScalarPaddedBytes (byte[] buf, int paddedLength, byte padByt
     {
         ensureLength (paddedLength);
         buffer.put(buf);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         padBytes(padByte, paddedLength - buf.length);
     }
 
@@ -982,6 +1044,7 @@ protected void writeScalarPaddedBytes (byte[] buf, int paddedLength, byte padByt
      */
     protected void writeScalarBytes (int codePoint, byte[] buf)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         ensureLength(buf.length + 4);
         buffer.putShort((short) (buf.length + 4));
         buffer.putShort((short) codePoint);
@@ -1030,6 +1093,7 @@ protected void writeInt (int v)
     protected void writeLong (long v)
     {
         ensureLength (8);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.putLong(v);
     }
 
@@ -1060,6 +1124,7 @@ protected void writeDouble (double v)
      */
     protected void writeBoolean (boolean v)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         writeByte(v ? 1 : 0);
     }
 
@@ -1135,6 +1200,8 @@ private int maxEncodedLength(String s) {
         // maxBytesPerChar() returns a float, which can only hold 24 bits of an
         // integer. Therefore, promote the float to a double so that all bits
         // are preserved in the intermediate result.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         return (int) (s.length() * (double) encoder.maxBytesPerChar());
     }
 
@@ -1249,8 +1316,12 @@ private static boolean isContinuationByte(byte b) {
      */
     protected void writeString(String s) throws DRDAProtocolException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         ensureLength(maxEncodedLength(s));
         CharBuffer input = CharBuffer.wrap(s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5331
+//IC see: https://issues.apache.org/jira/browse/DERBY-5331
         encoder.reset();
         CoderResult res = encoder.encode(input, buffer, true);
         if (res == CoderResult.UNDERFLOW) {
@@ -1272,6 +1343,7 @@ protected void padBytes (byte val, int length)
     {
         final int offset = buffer.position();
         final int end = offset + length;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         Arrays.fill(buffer.array(), offset, end, val);
         buffer.position(end);
     }
@@ -1297,6 +1369,7 @@ protected void flush () throws java.io.IOException
     protected void flush(OutputStream socketOutputStream)
         throws java.io.IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         final byte[] bytes = buffer.array();
         final int length = buffer.position();
         try {
@@ -1315,6 +1388,7 @@ protected void flush(OutputStream socketOutputStream)
             }
             reset(dssTrace);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
         totalByteCount += length;
     }
 
@@ -1347,6 +1421,7 @@ private void beginDss (int dssType, boolean ensureLen)
 
         // save length position, the length will be written at the end
         dssLengthLocation = buffer.position();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
 
         // Should this really only be for non-stream DSSes?
         if (ensureLen)
@@ -1386,6 +1461,7 @@ private void finalizeDssLength ()
     {
         // initial position in the byte buffer
         final int offset = buffer.position();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
 
         // calculate the total size of the dss and the number of bytes which would
         // require continuation dss headers.    The total length already includes the
@@ -1423,6 +1499,7 @@ private void finalizeDssLength ()
             // just move the current position pointer right away to where it's
             // supposed to be after we have finished the shifting.
             buffer.position(offset + shiftSize);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
 
             // Notes on the behavior of the Layer B segmenting loop below:
             //
@@ -1482,6 +1559,7 @@ private void finalizeDssLength ()
                     dataToShift = 32765;
                 int startOfCopyData = dataByte - dataToShift + 1;
                 // perform the shift directly on the backing array
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
                 final byte[] bytes = buffer.array();
                 System.arraycopy(bytes,startOfCopyData, bytes, 
                                  startOfCopyData + shiftSize, dataToShift);
@@ -1504,6 +1582,7 @@ private void finalizeDssLength ()
                 }
 
                 // insert the header's length bytes
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
                 buffer.putShort(dataByte + shiftSize - 1,
                                 (short) twoByteContDssHeader);
 
@@ -1524,6 +1603,7 @@ private void finalizeDssLength ()
         }
 
         // insert the length bytes in the 6 byte dss header.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         buffer.putShort(dssLengthLocation, (short) totalSize);
     }
 
@@ -1547,6 +1627,8 @@ protected void writeExtendedLength(long size)
      */
     private int calculateExtendedLengthByteCount (long ddmSize)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         if (ddmSize <= 0x7fff)
             return 0;
         // JCC does not support 2 at this time, so we always send
@@ -1595,6 +1677,7 @@ private void ensureLength (int length)
      *
      * @exception SQLException Thrown if # digits &gt; 31
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
     void writeBigDecimal(BigDecimal b, int precision, int scale)
     throws SQLException
     {
@@ -1603,6 +1686,8 @@ void writeBigDecimal(BigDecimal b, int precision, int scale)
 
         // The bytes are processed from right to left. Therefore, save starting
         // offset and use absolute positioning.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
         final int offset = buffer.position();
         // Move current position to the end of the encoded decimal.
         buffer.position(offset + encodedLength);
@@ -1611,8 +1696,11 @@ void writeBigDecimal(BigDecimal b, int precision, int scale)
         int declaredScale = scale;
 
         // packed decimal may only be up to 31 digits.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (declaredPrecision > 31) // this is a bugcheck only !!!
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
             clearDdm ();
             throw new java.sql.SQLException ("Packed decimal may only be up to 31 digits!");
         }
@@ -1626,6 +1714,7 @@ void writeBigDecimal(BigDecimal b, int precision, int scale)
         if (bigPrecision > 31)
         {
             clearDdm ();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             throw new SQLException ("The numeric literal \"" +
                              b.toString() +
                              "\" is not valid because its value is out of range.",
@@ -1660,6 +1749,7 @@ void writeBigDecimal(BigDecimal b, int precision, int scale)
         int bigIndex;
 
         byte signByte = (byte) ((b.signum() >= 0) ? 12 : 13);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
 
         if (bigScale >= declaredScale) {
           // If target scale is less than source scale,
@@ -1668,6 +1758,7 @@ void writeBigDecimal(BigDecimal b, int precision, int scale)
           // set start index in source big decimal to ignore excessive fraction.
           bigIndex = bigPrecision-1-(bigScale-declaredScale);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
           if (bigIndex >= 0) {
               // process the last nybble together with the sign nybble.
               signByte |= (unscaledStr.charAt(bigIndex) - zeroBase) << 4;
@@ -1685,6 +1776,7 @@ void writeBigDecimal(BigDecimal b, int precision, int scale)
 
           // process the sign nybble.
           buffer.put(offset + (packedIndex+1)/2, signByte);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
 
           for (packedIndex-=2, bigIndex-=2; bigIndex>=0; packedIndex-=2, bigIndex-=2)
               buffer.put(offset + (packedIndex+1)/2, (byte) 0);
@@ -1703,6 +1795,7 @@ void writeBigDecimal(BigDecimal b, int precision, int scale)
 
         // process the rest.
         for (; bigIndex>=0; packedIndex-=2, bigIndex-=2) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
             byte bt = (byte)
                 (((unscaledStr.charAt(bigIndex)-zeroBase) << 4) | // high nybble
                   (unscaledStr.charAt(bigIndex+1)-zeroBase));     // low nybble
@@ -1724,6 +1817,8 @@ void writeBigDecimal(BigDecimal b, int precision, int scale)
 
 
     private void sendBytes (java.io.OutputStream socketOutputStream) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     throws java.io.IOException{
     
     sendBytes(socketOutputStream,
@@ -1734,13 +1829,17 @@ private void sendBytes (java.io.OutputStream socketOutputStream)
 
   private void sendBytes (java.io.OutputStream socketOutputStream,
               boolean flashStream ) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
       throws java.io.IOException
   {
     resetChainState();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
     final byte[] bytes = buffer.array();
     final int length = buffer.position();
     try {
       socketOutputStream.write(bytes, 0, length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
       totalByteCount += length;
       if(flashStream)
       socketOutputStream.flush();
@@ -1749,6 +1848,7 @@ private void sendBytes (java.io.OutputStream socketOutputStream,
         if ((dssTrace != null) && dssTrace.isComBufferTraceOn()) {
             dssTrace.writeComBufferData (bytes,
                                            0,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
                                            length,
                                            DssTrace.TYPE_TRACE_SEND,
                                            "Reply",
@@ -1776,6 +1876,8 @@ protected void resetChainState()
     private int getCorrelationID() {
 
         int cId;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         if (previousCorrId != DssConstants.CORRELATION_ID_UNKNOWN) {
             if (previousChainByte == DssConstants.DSSCHAIN_SAME_ID)
             // then we have to use the last correlation id we sent.
@@ -1815,12 +1917,15 @@ protected void finalizeChain(byte currChainByte,
         // chain state (WITH_SAME_ID) with whatever the last
         // request dictates.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         if (prevHdrLocation != -1) {
         // Note: == -1 => the previous DSS was already sent; this
         // should only happen in cases where the buffer filled up
         // and we had to send it (which means we were probably
         // writing EXTDTA).  In such cases, proper chaining
         // should already have been handled @ time of send.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
             overrideChainByte(prevHdrLocation + 3, currChainByte);
         }
 
@@ -1837,6 +1942,7 @@ protected void finalizeChain(byte currChainByte,
             agent.trace("Sending data");
 
         resetChainState();
+//IC see: https://issues.apache.org/jira/browse/DERBY-706
         if (doesRequestContainData()) {
             try {
                 flush(socketOutputStream);
@@ -1860,8 +1966,10 @@ protected void finalizeChain(byte currChainByte,
     protected int markDSSClearPoint()
     {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5
         lastDSSBeforeMark = prevHdrLocation;
         return buffer.position();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
 
     }
 
@@ -1881,6 +1989,7 @@ protected void clearDSSesBackToMark(int mark)
 
         // Logical clear.
         buffer.position(mark);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
 
         // Because we've just cleared out the most recently-
         // written DSSes, we have to make sure the next thing
@@ -1889,6 +1998,8 @@ protected void clearDSSesBackToMark(int mark)
         // based on the chaining byte from the last remaining
         // DSS (where "remaining" means that it still exists
         // in the buffer after the clear).
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         if (lastDSSBeforeMark == -1)
         // we cleared out the entire buffer; reset corr id.
             nextCorrelationID = 1;
@@ -1896,6 +2007,8 @@ protected void clearDSSesBackToMark(int mark)
         // last remaining DSS had chaining, so we set "nextCorrelationID"
         // to be 1 greater than whatever the last remaining DSS had as
         // its correlation id.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2936
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             nextCorrelationID =
                 (buffer.getShort(lastDSSBeforeMark + 4) & 0xFFFF) + 1;
         }
@@ -1906,6 +2019,7 @@ protected void clearDSSesBackToMark(int mark)
     private static int peekStream(InputStream in) throws IOException{
         
     in.mark(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
 
     try{
         return in.read();
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAConnThread.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAConnThread.java
index 3f2cf03d38..ebcbcaaada 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAConnThread.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAConnThread.java
@@ -3681,6 +3681,7 @@ private void writeACCRDBRM(int svrcod) throws DRDAProtocolException
         writer.startDdm(CodePoint.ACCRDBRM);
         writer.writeScalar2Bytes(CodePoint.SVRCOD, svrcod);
         writer.writeScalarString(CodePoint.PRDID,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
                                  NetworkServerControlImpl.prdId());
         //TYPDEFNAM -required - JCC doesn't support QTDSQLJVM so for now we
         // just use ASCII, though we should eventually be able to use QTDSQLJVM
@@ -3695,6 +3696,8 @@ private void writeACCRDBRM(int svrcod) throws DRDAProtocolException
          // data caching.
          // Sending the session data on connection initialization was introduced
          // in Derby 10.7.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5847
+//IC see: https://issues.apache.org/jira/browse/DERBY-436
          if ((appRequester.getClientType() == AppRequester.DNC_CLIENT) &&
                  appRequester.greaterThanOrEqualTo(10, 7, 0)) {
              try {
@@ -3704,6 +3707,7 @@ private void writeACCRDBRM(int svrcod) throws DRDAProtocolException
                  errorInChain(se);
              }
          }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         finalizeChain();
     }
     
@@ -3711,6 +3715,8 @@ private void writeTYPDEFOVR() throws DRDAProtocolException
     {
         //TYPDEFOVR - required - only single byte and mixed byte are specified
         writer.startDdm(CodePoint.TYPDEFOVR);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5847
+//IC see: https://issues.apache.org/jira/browse/DERBY-436
         writer.writeScalar2Bytes(CodePoint.CCSIDSBC,
                                  NetworkServerControlImpl.CCSIDSBC);
         writer.writeScalar2Bytes(CodePoint.CCSIDMBC,
@@ -3719,6 +3725,8 @@ private void writeTYPDEFOVR() throws DRDAProtocolException
         if (database.sendTRGDFTRT)
         {
             // default to multibyte character
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
             writer.startDdm(CodePoint.PKGDFTCST);
             writer.writeShort(CodePoint.CSTMBCS);
             writer.endDdm();
@@ -3877,6 +3885,7 @@ private int parsePRPSQLSTT() throws DRDAProtocolException,SQLException
         boolean rtnsqlda = false;
         boolean rtnOutput = true;   // Return output SQLDA is default
         Pkgnamcsn pkgnamcsn = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
 
         Database databaseToSet = null;
 
@@ -3952,6 +3961,7 @@ private int parsePRPSQLSTT() throws DRDAProtocolException,SQLException
      * @throws SQLException
      */
     private String parsePRPSQLSTTobjects(DRDAStatement stmt) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         throws DRDAProtocolException, SQLException
     {
         String sqlStmt = null;
@@ -4071,6 +4081,7 @@ protected void parseSQLATTR(DRDAStatement stmt) throws DRDAProtocolException
 
         if (attrs.indexOf("WITH HOLD") != -1)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
             stmt.withHoldCursor = ResultSet.HOLD_CURSORS_OVER_COMMIT;
             validAttribute = true;
         }
@@ -4165,6 +4176,7 @@ private void parseEXCSQLSTT() throws DRDAProtocolException,SQLException
 
         codePoint = reader.getCodePoint();
         boolean outputExpected = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
         Pkgnamcsn pkgnamcsn = null;
         int numRows = 1;    // default value
         int blkSize =  0;
@@ -4180,6 +4192,8 @@ private void parseEXCSQLSTT() throws DRDAProtocolException,SQLException
             switch (codePoint)
             {
                 // optional
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
                 case CodePoint.RDBNAM:
                     setDatabase(CodePoint.EXCSQLSTT);
                     break;
@@ -4288,6 +4302,7 @@ private void parseEXCSQLSTT() throws DRDAProtocolException,SQLException
             if ( stmt == null  || !(stmt.wasExplicitlyPrepared()))
             {
                 stmt  = database.newDRDAStatement(pkgnamcsn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 stmt.setQryprctyp(CodePoint.QRYBLKCTL_DEFAULT);
                 needPrepareCall = true;
             }
@@ -4305,6 +4320,7 @@ private void parseEXCSQLSTT() throws DRDAProtocolException,SQLException
             stmt.setQryprctyp(CodePoint.QRYBLKCTL_DEFAULT);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         stmt.nbrrow = numRows;
         stmt.qryrowset = qryrowset;
         stmt.blksize = blkSize;
@@ -4312,6 +4328,7 @@ private void parseEXCSQLSTT() throws DRDAProtocolException,SQLException
         stmt.maxrslcnt = maxrslcnt;
         stmt.outovropt = outovropt;
         stmt.rslsetflg = rslsetflg;
+//IC see: https://issues.apache.org/jira/browse/DERBY-506
         if (pendingStatementTimeout >= 0) {
             stmt.getPreparedStatement().setQueryTimeout(pendingStatementTimeout);
             pendingStatementTimeout = -1;
@@ -4322,6 +4339,7 @@ private void parseEXCSQLSTT() throws DRDAProtocolException,SQLException
         database.setCurrentStatement(stmt);
         
         boolean hasResultSet;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1559
         if (reader.isChainedWithSameID()) 
         {
             hasResultSet = parseEXCSQLSTTobjects(stmt);
@@ -4332,6 +4350,8 @@ private void parseEXCSQLSTT() throws DRDAProtocolException,SQLException
                 // if we had parameters the callable statement would
                 // be prepared with parseEXCQLSTTobjects, otherwise we
                 // have to do it here
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
                 String prepareString = "call " + stmt.procName +"()";
                 if (SanityManager.DEBUG) {
                     trace ("$$$prepareCall is: "+prepareString);
@@ -4372,6 +4392,7 @@ private void parseEXCSQLSTT() throws DRDAProtocolException,SQLException
                 writer.endDdm();
                 writer.startDdm(CodePoint.FDODTA);
                 writeFDODTA(stmt);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
                 writer.endDdm();
                 writer.endDdmAndDss();
 
@@ -4381,6 +4402,7 @@ private void parseEXCSQLSTT() throws DRDAProtocolException,SQLException
                     writeEXTDTA(stmt);
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             else if (hasResultSet) {
             // DRDA spec says that we MUST return either an
             // SQLDTARD or an SQLCARD--the former when we have
@@ -4400,6 +4422,7 @@ else if (hasResultSet) {
         // are ready to send resultset info.
         stmt.finishParams();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         EnginePreparedStatement ps = stmt.getPreparedStatement();
         int rsNum = 0;
         do {
@@ -4431,6 +4454,7 @@ else if (hasResultSet) {
         else  if (! sendSQLDTARD)
         {
             long updateCount = ps.getLargeUpdateCount();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
             // The protocol wants us to send RDBUPDRM here, but we don't do
             // that because it used to cause protocol errors. DERBY-5847 has
@@ -4494,6 +4518,7 @@ private boolean parseEXCSQLSTTobjects(DRDAStatement stmt) throws DRDAProtocolExc
                     // optional
                     case CodePoint.TYPDEFNAM:
                         setStmtOrDbByteOrder(false, stmt, parseTYPDEFNAM());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1559
                         stmt.setTypDefValues();
                         break;
                     // optional
@@ -4507,7 +4532,9 @@ private boolean parseEXCSQLSTTobjects(DRDAStatement stmt) throws DRDAProtocolExc
                         gotSQLDTA = true;
                         break;
                     // optional
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     case CodePoint.EXTDTA:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1559
                         readAndSetAllExtParams(stmt, true);
                         stmt.ps.clearWarnings();
                         result = stmt.execute();
@@ -4528,6 +4555,7 @@ private boolean parseEXCSQLSTTobjects(DRDAStatement stmt) throws DRDAProtocolExc
             missingCodePoint(CodePoint.SQLDTA);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1559
         if (! gotEXTDTA) {
             stmt.ps.clearWarnings();
             result = stmt.execute();
@@ -4549,11 +4577,13 @@ private void writeSQLCINRD(DRDAStatement stmt) throws DRDAProtocolException,SQLE
         writer.createDssObject();
         writer.startDdm(CodePoint.SQLCINRD);
         if (sqlamLevel >= MGRLVL_7) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             writeSQLDHROW(rs.getHoldability());
         }
 
         ResultSetMetaData rsmeta = rs.getMetaData();
         int ncols = rsmeta.getColumnCount();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         writer.writeShort(ncols);   // num of columns
         if (sqlamLevel >= MGRLVL_7)
         {
@@ -4589,6 +4619,7 @@ private void writeSQLRSLRD(DRDAStatement stmt) throws DRDAProtocolException,SQLE
 
         for (int i = 0; i < numResults; i ++)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 writer.writeInt(i); // rsLocator
                 writeVCMorVCS(stmt.getResultSetCursorName(i));
                 writer.writeInt(1); // num of rows XXX resolve, it doesn't matter for now
@@ -4616,6 +4647,7 @@ private void writeRSLSETRM(DRDAStatement stmt) throws DRDAProtocolException,SQLE
         writer.startDdm(CodePoint.PKGSNLST);
         
         for (int i = 0; i < numResults; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
             writePKGNAMCSN(stmt.getResultSetPkgcnstkn(i).getBytes());
         }
         writer.endDdm();
@@ -4653,12 +4685,15 @@ private void parseSQLDTA(DRDAStatement stmt) throws DRDAProtocolException,SQLExc
     private void parseSQLDTA_work(DRDAStatement stmt) throws DRDAProtocolException,SQLException
     {
         String strVal;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         EnginePreparedStatement ps = stmt.getPreparedStatement();
         int codePoint;
         ParameterMetaData pmeta = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2121
 
         // Clear params without releasing storage
         stmt.clearDrdaParams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-815
 
         int numVars = 0;
         boolean rtnParam = false;
@@ -4678,10 +4713,12 @@ private void parseSQLDTA_work(DRDAStatement stmt) throws DRDAProtocolException,S
                         if (SanityManager.DEBUG) {
                             trace("num of vars in this group is: "+numVarsInGrp);
                         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                         reader.readByte();      // tripletType
                         reader.readByte();      // id
                         for (int j = 0; j < numVarsInGrp; j++)
                         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-815
                             final byte t = reader.readByte();
                             if (SanityManager.DEBUG)  {
                                 trace("drdaType is: "+ "0x" +
@@ -4698,6 +4735,7 @@ private void parseSQLDTA_work(DRDAStatement stmt) throws DRDAProtocolException,S
                     if (SanityManager.DEBUG) {
                         trace("numVars = " + numVars);
                     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     if (ps == null)     // it is a CallableStatement under construction
                     {
                         StringBuilder marks = new StringBuilder();  // construct parameter marks
@@ -4739,8 +4777,10 @@ private void parseSQLDTA_work(DRDAStatement stmt) throws DRDAProtocolException,S
                                 // The first exception is the most likely suspect
                                 throw se;
                             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-815
                             rtnParam = true;
                         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                         ps = (EnginePreparedStatement) cs;
                         stmt.ps = ps;
                     }
@@ -4751,6 +4791,7 @@ private void parseSQLDTA_work(DRDAStatement stmt) throws DRDAProtocolException,S
                     break;
                 // optional
                 case CodePoint.FDODTA:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     reader.readByte();  // row indicator
                     for (int i = 0; i < numVars; i++)
                     {
@@ -4775,10 +4816,14 @@ private void parseSQLDTA_work(DRDAStatement stmt) throws DRDAProtocolException,S
                         }
 
                         // not null, read and set it
+//IC see: https://issues.apache.org/jira/browse/DERBY-815
                         readAndSetParams(i, stmt, pmeta);
                     }
                     break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 case CodePoint.EXTDTA:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1559
+//IC see: https://issues.apache.org/jira/browse/DERBY-1559
                     readAndSetAllExtParams(stmt, false);
                     break;
                 default:
@@ -4830,7 +4875,10 @@ private Calendar getGMTCalendar() {
      * @throws SQLException
      */
     private void readAndSetParams(int i,
+//IC see: https://issues.apache.org/jira/browse/DERBY-815
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                                   DRDAStatement stmt,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2121
                                   ParameterMetaData pmeta)
                 throws DRDAProtocolException, SQLException
     {
@@ -4860,15 +4908,19 @@ private void readAndSetParams(int i,
                 ps.setBoolean(i+1, paramVal);
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             case DRDAConstants.DRDA_TYPE_NSMALL:
             {
                 short paramVal = (short) reader.readShort(getByteOrder());
                 if (SanityManager.DEBUG) {
                     trace("short parameter value is: "+paramVal);
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4889
                 ps.setShort(i+1, paramVal);
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case  DRDAConstants.DRDA_TYPE_NINTEGER:
             {
                 int paramVal = reader.readInt(getByteOrder());
@@ -4878,6 +4930,7 @@ private void readAndSetParams(int i,
                 ps.setInt(i+1, paramVal);
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DRDA_TYPE_NINTEGER8:
             {
                 long paramVal = reader.readLong(getByteOrder());
@@ -4887,6 +4940,7 @@ private void readAndSetParams(int i,
                 ps.setLong(i+1, paramVal);
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DRDA_TYPE_NFLOAT4:
             {
                 float paramVal = reader.readFloat(getByteOrder());
@@ -4896,6 +4950,7 @@ private void readAndSetParams(int i,
                 ps.setFloat(i+1, paramVal);
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DRDA_TYPE_NFLOAT8:
             {
                 double paramVal = reader.readDouble(getByteOrder());
@@ -4905,6 +4960,7 @@ private void readAndSetParams(int i,
                 ps.setDouble(i+1, paramVal);
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DRDA_TYPE_NDECIMAL:
             {
                 int precision = (paramLenNumBytes >> 8) & 0xff;
@@ -4916,12 +4972,14 @@ private void readAndSetParams(int i,
                 ps.setBigDecimal(i+1, paramVal);
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DRDA_TYPE_NDATE:
             {
                 String paramVal = reader.readStringData(10).trim();  //parameter may be char value
                 if (SanityManager.DEBUG) {
                     trace("ndate parameter value is: \""+paramVal+"\"");
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-157
                 try {
                     Calendar cal = getGMTCalendar();
                     ps.setDate(i+1, parseDate(paramVal, cal), cal);
@@ -4936,6 +4994,7 @@ private void readAndSetParams(int i,
                 }
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DRDA_TYPE_NTIME:
             {
                 String paramVal = reader.readStringData(8).trim();  //parameter may be char value
@@ -4951,6 +5010,7 @@ private void readAndSetParams(int i,
                 }
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DRDA_TYPE_NTIMESTAMP:
             {
                 // JCC represents ts in a slightly different format than Java standard, so
@@ -4971,6 +5031,7 @@ private void readAndSetParams(int i,
                 }
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DRDA_TYPE_NCHAR:
             case DRDAConstants.DRDA_TYPE_NVARCHAR:
             case DRDAConstants.DRDA_TYPE_NLONG:
@@ -4984,6 +5045,7 @@ private void readAndSetParams(int i,
                 ps.setString(i+1, paramVal);
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case  DRDAConstants.DRDA_TYPE_NFIXBYTE:
             {
                 byte[] paramVal = reader.readBytes();
@@ -5010,6 +5072,7 @@ private void readAndSetParams(int i,
                 ps.setObject(i+1, paramVal);
                 break;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
             case DRDAConstants.DRDA_TYPE_NLOBBYTES:
             case DRDAConstants.DRDA_TYPE_NLOBCMIXED:
             case DRDAConstants.DRDA_TYPE_NLOBCSBCS:
@@ -5018,6 +5081,7 @@ private void readAndSetParams(int i,
                  long length = readLobLength(paramLenNumBytes);
                  if (length != 0) //can be -1 for CLI if "data at exec" mode, see clifp/exec test
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-815
                     stmt.addExtPosition(i);
                  }
                  else   /* empty */
@@ -5030,6 +5094,7 @@ private void readAndSetParams(int i,
                  }
                  break;
              }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2506
                         case DRDAConstants.DRDA_TYPE_NLOBLOC:
                         {
                             //read the locator value
@@ -5068,6 +5133,7 @@ private void readAndSetParams(int i,
                             ps.setClob(i+1, clobFromLocator);
                             break;
                         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             default:
                 {
                 String paramVal = reader.readLDStringData(stmt.ccsidMBCEncoding);
@@ -5102,6 +5168,7 @@ private Object readUDT() throws DRDAProtocolException
 
 
     private long readLobLength(int extLenIndicator) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         throws DRDAProtocolException
     {
         switch (extLenIndicator)
@@ -5245,8 +5312,10 @@ private Timestamp parseTimestamp(String timeString, Calendar cal) {
     }
 
     private void readAndSetAllExtParams(final DRDAStatement stmt, final boolean streamLOB) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         throws SQLException, DRDAProtocolException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-815
         final int numExt = stmt.getExtPositionCount();
         for (int i = 0; i < numExt; i++)
                     {
@@ -5292,6 +5361,7 @@ private void readAndSetExtParam( int i, DRDAStatement stmt,
                 checkNullability = true;
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             final EXTDTAReaderInputStream stream =
                 reader.getEXTDTAReaderInputStream(checkNullability);
 
@@ -5314,9 +5384,12 @@ private void readAndSetExtParam( int i, DRDAStatement stmt,
 
             traceEXTDTARead(drdaType, i+1, stream, streamLOB, encoding);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             try {
                 switch (drdaType)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                     case  DRDAConstants.DRDA_TYPE_LOBBYTES:
                     case  DRDAConstants.DRDA_TYPE_NLOBBYTES:
                         setAsBinaryStream(stmt, i+1, stream, streamLOB);
@@ -5365,6 +5438,7 @@ private long parseEXCSQLIMM() throws DRDAProtocolException,SQLException
     {
         int codePoint;
         reader.markCollection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
         Pkgnamcsn pkgnamcsn = null;
         codePoint = reader.getCodePoint();
         while (codePoint != -1)
@@ -5396,6 +5470,7 @@ private long parseEXCSQLIMM() throws DRDAProtocolException,SQLException
         // initialize statement for reuse
         drdaStmt.initialize();
         String sqlStmt = parseEXECSQLIMMobjects();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         EngineStatement statement = drdaStmt.getStatement();
         statement.clearWarnings();
         if (pendingStatementTimeout >= 0) {
@@ -5454,6 +5529,7 @@ private boolean parseEXCSQLSET() throws DRDAProtocolException,SQLException
                     // NOTE: This codepoint is not in the DDM spec for 'EXCSQLSET',
                     // but since it DOES get sent by jcc1.2, we have to have
                     // a case for it...
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
                     Pkgnamcsn pkgnamcsn = parsePKGNAMCSN();
                     break;
                 default:
@@ -5549,6 +5625,8 @@ private void parseEXCSQLSETobjects()
 
         do
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
             correlationID = reader.readDssHeader();
             while (reader.moreDssData())
             {
@@ -5573,12 +5651,15 @@ private void parseEXCSQLSETobjects()
                             gotSqlStt = true;
                         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-506
                         if (sqlStmt.startsWith(TIMEOUT_STATEMENT)) {
                             String timeoutString = sqlStmt.substring(TIMEOUT_STATEMENT.length());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
                             pendingStatementTimeout = Integer.parseInt(timeoutString);
                             break;
                         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                         if (canIgnoreStmt(sqlStmt)) {
                         // We _know_ Derby doesn't recognize this
                         // statement; don't bother trying to execute it.
@@ -5689,6 +5770,7 @@ private Pkgnamcsn parsePKGNAMCSN() throws DRDAProtocolException
         if (reader.getDdmLength() == CodePoint.PKGNAMCSN_LEN)
         {
             // This is a scalar object with the following fields
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
             reader.readString(rdbnam, CodePoint.RDBNAM_LEN, true);
             if (SanityManager.DEBUG) {
                 trace("rdbnam = " + rdbnam);
@@ -5704,6 +5786,7 @@ private Pkgnamcsn parsePKGNAMCSN() throws DRDAProtocolException
                         
             // This check was added because of DERBY-1434  
             // check the client version first
+//IC see: https://issues.apache.org/jira/browse/DERBY-5565
             if (appRequester.greaterThanOrEqualTo(10,3,0) ) {
                 // check the database name
                 if (!rdbnam.toString().equals(database.getDatabaseName())) {
@@ -5711,6 +5794,7 @@ private Pkgnamcsn parsePKGNAMCSN() throws DRDAProtocolException
                 }
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             reader.readString(rdbcolid, CodePoint.RDBCOLID_LEN, true);
             if (SanityManager.DEBUG)  {
                 trace("rdbcolid = " + rdbcolid);
@@ -5764,6 +5848,7 @@ private Pkgnamcsn parsePKGNAMCSN() throws DRDAProtocolException
             }
 
             //RDBCOLID can be variable length in this format
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             length = reader.readNetworkShort();
             reader.readString(rdbcolid, length, true);
             if (SanityManager.DEBUG) {
@@ -5804,6 +5889,8 @@ private Pkgnamcsn parsePKGNAMCSN() throws DRDAProtocolException
             // The byte array returned by pkgcnstkn.getBytes() might
             // be modified by DDMReader.readString() later, so we have
             // to create a copy of the array.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
             byte[] token = new byte[pkgcnstkn.length()];
             System.arraycopy(pkgcnstkn.getBytes(), 0, token, 0, token.length);
 
@@ -5926,6 +6013,7 @@ private String parseCcsidMBC(int length) throws DRDAProtocolException
         if (length == 0) {
             // Can't return null here as that will indicate that the cp is 
             // missing, when it in fact was present, but contained an empty string
+//IC see: https://issues.apache.org/jira/browse/DERBY-5806
             return ""; 
         }
         byte [] byteStr = reader.readBytes(length);
@@ -5953,6 +6041,7 @@ private String parseCcsidMBC(int length) throws DRDAProtocolException
     private String parseCcsidSBC(int length) throws DRDAProtocolException
     {
         String strVal = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-706
         DRDAStatement  currentStatement;
         
         currentStatement = database.getCurrentStatement();
@@ -5997,6 +6086,8 @@ private String parseCcsidSBC(int length) throws DRDAProtocolException
      */
     private DRDAStatement parseCLSQRY() throws DRDAProtocolException, SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
         Pkgnamcsn pkgnamcsn = null;
         reader.markCollection();
         long qryinsid = 0;
@@ -6008,6 +6099,8 @@ private DRDAStatement parseCLSQRY() throws DRDAProtocolException, SQLException
             switch (codePoint)
             {
                 // optional
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
                 case CodePoint.RDBNAM:
                     setDatabase(CodePoint.CLSQRY);
                     break;
@@ -6023,6 +6116,7 @@ private DRDAStatement parseCLSQRY() throws DRDAProtocolException, SQLException
                 case CodePoint.MONITOR:
                     parseMONITOR();
                     break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 default:
                     invalidCodePoint(codePoint);
             }
@@ -6040,6 +6134,8 @@ private DRDAStatement parseCLSQRY() throws DRDAProtocolException, SQLException
         if (stmt == null)
         {
             //XXX should really throw a SQL Exception here
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
             invalidValue(CodePoint.PKGNAMCSN);
         }
 
@@ -6106,6 +6202,8 @@ else if (sendSQLERRRM)
         {
             writeSQLERRRM(severity);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
         writeSQLCARD(e, updateCount, 0);
     }
 
@@ -6160,8 +6258,10 @@ private int getSqlCode(SQLException e)
     }
 
     private void writeSQLCARD(SQLException e,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         long updateCount, long rowCount ) throws DRDAProtocolException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         writer.createDssObject();
         writer.startDdm(CodePoint.SQLCARD);
         writeSQLCAGRP(e, updateCount, rowCount);
@@ -6195,6 +6295,7 @@ private void writeNullSQLCARDobject()
     {
         writer.createDssObject();
         writer.startDdm(CodePoint.SQLCARD);
+//IC see: https://issues.apache.org/jira/browse/DERBY-825
         writeSQLCAGRP(nullSQLState, 0, 0, 0);
         writer.endDdmAndDss();
     }
@@ -6252,6 +6353,8 @@ private int getExceptionSeverity (SQLException e)
         int ec = e.getErrorCode();
         switch (ec)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
             case ExceptionSeverity.STATEMENT_SEVERITY:
             case ExceptionSeverity.TRANSACTION_SEVERITY:
                 severity = CodePoint.SVRCOD_ERROR;
@@ -6305,6 +6408,9 @@ private void writeSQLCAGRP(SQLException e, long updateCount, long rowCount)
     {
         int sqlcode = getSqlCode(e);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-825
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         if (e == null) {
             // Forwarding to the optimized version when there is no
             // exception object
@@ -6312,12 +6418,16 @@ private void writeSQLCAGRP(SQLException e, long updateCount, long rowCount)
             return;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (rowCount < 0 && updateCount < 0)
         {
             writer.writeByte(CodePoint.NULLDATA);
             return;
         }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         if (SanityManager.DEBUG && server.debugOutput() && sqlcode < 0) {
             trace("handle SQLException here");
             trace("reason is: "+e.getMessage());
@@ -6330,16 +6440,21 @@ private void writeSQLCAGRP(SQLException e, long updateCount, long rowCount)
         
         //null indicator
         writer.writeByte(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
 
         // SQLCODE
         writer.writeInt(sqlcode);
 
         // SQLSTATE
         writer.writeString(e.getSQLState());
+//IC see: https://issues.apache.org/jira/browse/DERBY-825
 
         // SQLERRPROC
         // Write the byte[] constant rather than the string, for efficiency
         writer.writeBytes( getProductIDBytes() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 
         // SQLCAXGRP
         writeSQLCAXGRP(updateCount, rowCount, buildSqlerrmc(e), e.getNextException());
@@ -6375,8 +6490,12 @@ private void writeSQLCAGRP(SQLException e, long updateCount, long rowCount)
      */
 
     private void writeSQLCAGRP(byte[] sqlState, int sqlcode, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                                long updateCount, long rowCount) throws DRDAProtocolException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
         if (rowCount < 0 && updateCount < 0) {
             writer.writeByte(CodePoint.NULLDATA);
             return;
@@ -6393,6 +6512,7 @@ private void writeSQLCAGRP(byte[] sqlState, int sqlcode,
 
         // SQLERRPROC
         writer.writeBytes( getProductIDBytes() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 
         // SQLCAXGRP (Uses null as sqlerrmc since there is no error)
         writeSQLCAXGRP(updateCount, rowCount, null, null);
@@ -6448,9 +6568,11 @@ private String buildSqlerrmc (SQLException se)
     {
         boolean severe = (se.getErrorCode() >=  ExceptionSeverity.SESSION_SEVERITY);    
         String sqlerrmc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
 
         // get exception which carries Derby messageID and args, per DERBY-1178
         StandardException ferry = StandardException.getArgumentFerry(se);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
 
         if (se instanceof DataTruncation) {
             // Encode DataTruncation in a special way.
@@ -6462,6 +6584,9 @@ private String buildSqlerrmc (SQLException se)
             // If this is not a Derby exception or is a severe excecption where
             // we have no hope of succussfully calling the SYSIBM.SQLCAMESSAGE send
             // preformatted message using the server locale
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
             sqlerrmc = buildPreformattedSqlerrmc(se);
         }
 
@@ -6499,6 +6624,7 @@ private String  buildPreformattedSqlerrmc(SQLException se) {
             sb.append("SQLSTATE: ");
             sb.append(se.getSQLState());
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         return sb.toString();
     }
 
@@ -6519,6 +6645,8 @@ private String buildTokenizedSqlerrmc(SQLException se) {
             StandardException ferry = StandardException.getArgumentFerry(se);
             if (ferry != null)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6802
+//IC see: https://issues.apache.org/jira/browse/DERBY-6823
                 sqlerrmc += MessageUtils.encodeMessageAndArgumentsAsSqlerrmc(
                                 ferry.getMessageId(),
                                 ferry.getArguments());
@@ -6615,6 +6743,9 @@ private void writeSQLCAXGRP(long updateCount,  long rowCount, String sqlerrmc,
         writer.writeByte(0);        // SQLCAXGRP INDICATOR
         if (sqlamLevel < 7)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
             writeRDBNAM(database.getDatabaseName());
             writeSQLCAERRWARN(updateCount, rowCount);
         }
@@ -6639,6 +6770,7 @@ private void writeSQLCAXGRP(long updateCount,  long rowCount, String sqlerrmc,
     private void writeSQLCAERRWARN(long updateCount, long rowCount) 
     {
         // SQL ERRD1 = Sqlca.HIGH_ORDER_ROW_COUNT
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         writer.writeInt((int)((rowCount>>>32)));
         // SQL ERRD2 = Sqlca.LOW_ORDER_ROW_COUNT
         writer.writeInt((int)(rowCount & 0x0000000ffffffffL));
@@ -6731,6 +6863,7 @@ private void writeSQLDIAGCI(SQLException nextException)
             // only send arguments for diagnostic level 0
             if (diagnosticLevel == CodePoint.DIAGLVL0) {
                 // we are only able to get arguments of Derby exceptions
+//IC see: https://issues.apache.org/jira/browse/DERBY-6488
                 StandardException ferry =
                         StandardException.getArgumentFerry(se);
                 if (ferry != null) {
@@ -6775,6 +6908,7 @@ private void writeSQLNUMGRP(SQLException nextException)
         for (se = nextException; se != null; se = se.getNextException()) {
             i++;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1313
         writer.writeShort(i);
     }
 
@@ -6827,6 +6961,7 @@ private void writeSQLDCGRP(long rowNum, int sqlCode, String sqlState, String dbn
         writer.writeString(sqlState);
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         writer.writeInt(0);                     // REASON_CODE
         writer.writeInt(0);                     // LINE_NUMBER
         writer.writeLong(rowNum);               // ROW_NUMBER
@@ -6878,6 +7013,7 @@ private void writeSQLDARD(DRDAStatement stmt, boolean rtnOutput, SQLException e)
     {
         PreparedStatement ps = stmt.getPreparedStatement();
         ResultSetMetaData rsmeta = ps.getMetaData();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2121
         ParameterMetaData pmeta = stmt.getParameterMetaData();
         int numElems = 0;
         if (e == null || e instanceof SQLWarning)
@@ -6896,6 +7032,7 @@ private void writeSQLDARD(DRDAStatement stmt, boolean rtnOutput, SQLException e)
         writeSQLCAGRP(e, 0, 0);
 
         if (sqlamLevel >= MGRLVL_7) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3311
             writeSQLDHROW(ps.getResultSetHoldability());
         }
 
@@ -6934,10 +7071,12 @@ private void writeQRYDSC(DRDAStatement stmt, boolean FDODSConly)
 
         ResultSet rs = null;
         ResultSetMetaData rsmeta = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2121
         ParameterMetaData pmeta = null;
         if (!stmt.needsToSendParamData) {
             rs = stmt.getResultSet();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (rs == null) {
             // this is a CallableStatement, use parameter meta data
             pmeta = stmt.getParameterMetaData();
@@ -7037,6 +7176,7 @@ private void writeQRYDSC(DRDAStatement stmt, boolean FDODSConly)
      * @throws SQLException
      */
     private void writeSQLDTAGRP(DRDAStatement stmt, ResultSetMetaData rsmeta, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2121
                                 ParameterMetaData pmeta,
                                 int colStart, int colEnd, boolean first)
         throws DRDAProtocolException, SQLException
@@ -7066,6 +7206,8 @@ private void writeSQLDTAGRP(DRDAStatement stmt, ResultSetMetaData rsmeta,
         for (int i = colStart; i <= colEnd; i++)
         {
             boolean nullable = hasRs ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-5847
+//IC see: https://issues.apache.org/jira/browse/DERBY-436
                 (rsmeta.isNullable(i) == ResultSetMetaData.columnNullable) :
                 (pmeta.isNullable(i) == ParameterMetaData.parameterNullable);
             int colType = (hasRs ? rsmeta.getColumnType(i) : pmeta.getParameterType(i));
@@ -7079,6 +7221,7 @@ private void writeSQLDTAGRP(DRDAStatement stmt, ResultSetMetaData rsmeta,
             {
                 precision = rsmeta.getPrecision(i);
                 scale = rsmeta.getScale(i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 stmt.setRsDRDAType(i,drdaType);
                 stmt.setRsPrecision(i, precision);
                 stmt.setRsScale(i,scale);
@@ -7088,6 +7231,7 @@ else if (isDecimal)
             {
                 if (stmt.isOutputParam(i))
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2381
                     precision = pmeta.getPrecision(i);
                     scale = pmeta.getScale(i);
                     ((CallableStatement) stmt.ps).registerOutParameter(i,Types.DECIMAL,scale);
@@ -7134,6 +7278,7 @@ else if (hasRs)
      */
     private void writeSQLDHROW(int holdability) throws DRDAProtocolException,SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (JVMInfo.JDK_ID < 2) //write null indicator for SQLDHROW because there is no holdability support prior to jdk1.3
         {
             writer.writeByte(CodePoint.NULLDATA);
@@ -7143,6 +7288,7 @@ private void writeSQLDHROW(int holdability) throws DRDAProtocolException,SQLExce
         writer.writeByte(0);        // SQLDHROW INDICATOR
 
         //SQLDHOLD
+//IC see: https://issues.apache.org/jira/browse/DERBY-3311
         writer.writeShort(holdability);
         
         //SQLDRETURN
@@ -7156,6 +7302,7 @@ private void writeSQLDHROW(int holdability) throws DRDAProtocolException,SQLExce
         //SQLDKEYTYPE
         writer.writeShort(0);
         //SQLRDBNAME
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         writer.writeShort(0);   //CCC on Windows somehow does not take any dbname
         //SQLDSCHEMA
         writeVCMorVCS(null);
@@ -7274,6 +7421,7 @@ private void writeQRYDTA (DRDAStatement stmt)
             writer.endDdmAndDss();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         if (!stmt.hasdata()) {
             final boolean qryclsOnLmtblkprc =
                 appRequester.supportsQryclsimpForLmtblkprc();
@@ -7343,6 +7491,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
 
         if (rs != null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             numCols = stmt.getNumRsCols();
             if (stmt.isScrollable()) {
                 hasdata = positionCursor(stmt, rs);
@@ -7353,6 +7502,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
         else    // it's for a CallableStatement
         {
             hasdata = stmt.hasOutputParams();
+//IC see: https://issues.apache.org/jira/browse/DERBY-815
             numCols = stmt.getDrdaParamCount();
         }
 
@@ -7367,6 +7517,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
             
             // Send ResultSet warnings if there are any
             SQLWarning sqlw = (rs != null)? rs.getWarnings(): null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1481
             if (rs != null) {
                 rs.clearWarnings();
             }
@@ -7376,7 +7527,9 @@ private boolean writeFDODTA (DRDAStatement stmt)
             // popped by client onto its rowUpdated state, i.e. this 
             // warning should not reach API level.
             if (rs != null && rs.rowUpdated()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1374
                 SQLWarning w = new SQLWarning("", SQLState.ROW_UPDATED,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1313
                         ExceptionSeverity.WARNING_SEVERITY);
                 if (sqlw != null) {
                     sqlw.setNextWarning(w);
@@ -7388,6 +7541,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
             // SQLCARD and a null data group. The SQLCARD has a warning
             // SQLSTATE of 02502
             if (rs != null && rs.rowDeleted()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1374
                 SQLWarning w = new SQLWarning("", SQLState.ROW_DELETED,
                         ExceptionSeverity.WARNING_SEVERITY);
                 if (sqlw != null) {
@@ -7402,6 +7556,9 @@ private boolean writeFDODTA (DRDAStatement stmt)
             final int sqlcagrpStart = writer.getBufferPosition();
 
             if (sqlw == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-825
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
                 writeSQLCAGRP(nullSQLState, 0, -1, -1);
             } else {
                 writeSQLCAGRP(sqlw, 1, -1);
@@ -7443,10 +7600,13 @@ private boolean writeFDODTA (DRDAStatement stmt)
 
                     if (SanityManager.DEBUG) {
                         trace("!!drdaType = " + java.lang.Integer.toHexString(drdaType) + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2941
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                                  " precision=" + precision +" scale = " + scale);
                     }
                     switch (ndrdaType)
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         case DRDAConstants.DRDA_TYPE_NLOBBYTES:
                         case  DRDAConstants.DRDA_TYPE_NLOBCMIXED:
                             EXTDTAInputStream extdtaStream=  
@@ -7465,6 +7625,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
                                 writer.writeInt(ival);
                             }
                             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         case DRDAConstants.DRDA_TYPE_NSMALL:
                             short sval = rs.getShort(i);
                             valNull = rs.wasNull();
@@ -7476,6 +7637,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
                                 writer.writeShort(sval);
                             }
                             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         case DRDAConstants.DRDA_TYPE_NINTEGER8:
                             long lval = rs.getLong(i);
                             valNull = rs.wasNull();
@@ -7487,6 +7649,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
                                 writer.writeLong(lval);
                             }
                             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         case DRDAConstants.DRDA_TYPE_NFLOAT4:
                             float fval = rs.getFloat(i);
                             valNull = rs.wasNull();
@@ -7498,6 +7661,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
                                 writer.writeFloat(fval);
                             }
                             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         case DRDAConstants.DRDA_TYPE_NFLOAT8:
                             double dval = rs.getDouble(i);
                             valNull = rs.wasNull();
@@ -7509,6 +7673,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
                                 writer.writeDouble(dval);
                             }
                             break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                         case DRDAConstants.DRDA_TYPE_NCHAR:
                         case DRDAConstants.DRDA_TYPE_NVARCHAR:
                         case DRDAConstants.DRDA_TYPE_NVARMIX:
@@ -7540,6 +7705,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
                     if (stmt.isOutputParam(i)) {
                         int[] outlen = new int[1];
                         drdaType = FdocaConstants.mapJdbcTypeToDrdaType( stmt.getOutputParamType(i), true, appRequester, outlen );
+//IC see: https://issues.apache.org/jira/browse/DERBY-2381
                         precision = stmt.getOutputParamPrecision(i);
                         scale = stmt.getOutputParamScale(i);
                                                 
@@ -7577,6 +7743,7 @@ private boolean writeFDODTA (DRDAStatement stmt)
             }
 
             // does all this fit in one QRYDTA
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             if (writer.getDSSLength() > blksize)
             {
                 splitQRYDTA(stmt, blksize);
@@ -7699,6 +7866,7 @@ private Object getObjectForWriteFdoca(CallableStatement cs,
                 return cs.getTime(index, getGMTCalendar());
             case DRDAConstants.DRDA_TYPE_NTIMESTAMP:
                 return cs.getTimestamp(index, getGMTCalendar());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
             case DRDAConstants.DRDA_TYPE_NLOBBYTES:
             case  DRDAConstants.DRDA_TYPE_NLOBCMIXED:
                 return EXTDTAInputStream.getEXTDTAStream(cs, index, drdaType);
@@ -7819,10 +7987,13 @@ private void doneData(DRDAStatement stmt, ResultSet rs)
                                 
                 // for scrollable cursors - calculate the row count
                 // since we may not have gone through each row
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
                 rs.last();
                 stmt.rowCount  = rs.getRow();
 
                                 // reposition after last or before first
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
                                 if (isAfterLast) {
                                     rs.afterLast();
                                 }
@@ -7830,8 +8001,10 @@ private void doneData(DRDAStatement stmt, ResultSet rs)
                                     rs.beforeFirst();
                                 } 
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             else  // non-scrollable cursor
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
                 final boolean qryclsOnLmtblkprc =
                     appRequester.supportsQryclsimpForLmtblkprc();
                 if (stmt.isRSCloseImplicit(qryclsOnLmtblkprc)) {
@@ -7848,11 +8021,14 @@ private void doneData(DRDAStatement stmt, ResultSet rs)
         boolean isQRYSCRAFT = (stmt.getQryscrorn() == CodePoint.QRYSCRAFT);
 
         // Using sqlstate 00000 or 02000 for end of data.
+//IC see: https://issues.apache.org/jira/browse/DERBY-825
                 writeSQLCAGRP((isQRYSCRAFT ? eod00000 : eod02000),
                               (isQRYSCRAFT ? 0 : 100), 0, stmt.rowCount);
                 
         writer.writeByte(CodePoint.NULLDATA);
         // does all this fit in one QRYDTA
+//IC see: https://issues.apache.org/jira/browse/DERBY-1454
+//IC see: https://issues.apache.org/jira/browse/DERBY-1454
         if (writer.getDSSLength() > blksize)
         {
             splitQRYDTA(stmt, blksize);
@@ -7870,14 +8046,18 @@ private boolean positionCursor(DRDAStatement stmt, ResultSet rs)
         boolean retval = false;
         switch (stmt.getQryscrorn())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
             case CodePoint.QRYSCRREL:
                                 int rows = (int)stmt.getQryrownbr();
+//IC see: https://issues.apache.org/jira/browse/DERBY-517
                                 if ((rs.isAfterLast() && rows > 0) || (rs.isBeforeFirst() && rows < 0)) {
                                     retval = false;
                                 } else {
                                     retval = rs.relative(rows);
                                 }
                                 break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             case CodePoint.QRYSCRABS:
                 // JCC uses an absolute value of 0 which is not allowed in JDBC
                 // We translate it into beforeFirst which seems to work.
@@ -7954,6 +8134,7 @@ private boolean positionCursor(DRDAStatement stmt, ResultSet rs)
      * @throws SQLException
      */
     private void writeSQLDAGRP(ResultSetMetaData rsmeta,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2121
                                ParameterMetaData pmeta,
                                int elemNum, boolean rtnOutput)
         throws DRDAProtocolException, SQLException
@@ -7978,6 +8159,8 @@ private void writeSQLDAGRP(ResultSetMetaData rsmeta,
         writer.writeShort(scale);
 
         boolean nullable = rtnOutput ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-5847
+//IC see: https://issues.apache.org/jira/browse/DERBY-436
          (rsmeta.isNullable(jdbcElemNum) == ResultSetMetaData.columnNullable) :
          (pmeta.isNullable(jdbcElemNum) == ParameterMetaData.parameterNullable);
         
@@ -8139,6 +8322,7 @@ private void writeVCMorVCS(String s)
      * @throws SQLException
      */
     private void writeSQLUDTGRP(ResultSetMetaData rsmeta,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2121
                                 ParameterMetaData pmeta,
                                 int jdbcElemNum, boolean rtnOutput)
         throws DRDAProtocolException,SQLException
@@ -8152,6 +8336,7 @@ private void writeSQLUDTGRP(ResultSetMetaData rsmeta,
             return;
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         String typeName = rtnOutput ?
             rsmeta.getColumnTypeName( jdbcElemNum ) : pmeta.getParameterTypeName( jdbcElemNum );
         String className = rtnOutput ?
@@ -8184,6 +8369,7 @@ private void writeSQLDOPTGRP(ResultSetMetaData rsmeta,
 
 
     private void writeSQLDXGRP(ResultSetMetaData rsmeta,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2121
                                ParameterMetaData pmeta,
                                int jdbcElemNum, boolean rtnOutput)
         throws DRDAProtocolException,SQLException
@@ -8207,6 +8393,8 @@ private void writeSQLDXGRP(ResultSetMetaData rsmeta,
         if (pmeta != null && !rtnOutput)
         {
             int mode = pmeta.getParameterMode(jdbcElemNum);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5847
+//IC see: https://issues.apache.org/jira/browse/DERBY-436
             if (mode ==  ParameterMetaData.parameterModeUnknown)
             {
                 // For old style callable statements. We assume in/out if it
@@ -8265,6 +8453,7 @@ private void writeSQLDXGRP(ResultSetMetaData rsmeta,
 
     protected void writeFdocaVal(int index, Object val, int drdaType,
                                  int precision, int scale, boolean valNull,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                                  DRDAStatement stmt, boolean isParam)
             throws DRDAProtocolException, SQLException
     {
@@ -8282,6 +8471,7 @@ protected void writeFdocaVal(int index, Object val, int drdaType,
                 case DRDAConstants.DRDA_TYPE_NSMALL:
                     // DB2 does not have a BOOLEAN java.sql.bit type,
                     // so we need to send it as a small
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     if (val instanceof Boolean)
                     {
                         writer.writeShort(((Boolean) val).booleanValue());
@@ -8291,6 +8481,7 @@ protected void writeFdocaVal(int index, Object val, int drdaType,
                         writer.writeShort(((Number) val).shortValue());
                     }
                     break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                 case  DRDAConstants.DRDA_TYPE_NINTEGER:
                     writer.writeInt(((Integer) val).intValue());
                     break;
@@ -8319,6 +8510,7 @@ protected void writeFdocaVal(int index, Object val, int drdaType,
                 case DRDAConstants.DRDA_TYPE_NTIMESTAMP:
                     writer.writeString(formatTimestamp((Timestamp) val));
                     break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                 case DRDAConstants.DRDA_TYPE_NCHAR:
                     writer.writeString(((String) val).toString());
                     break;
@@ -8334,6 +8526,7 @@ protected void writeFdocaVal(int index, Object val, int drdaType,
                 case DRDAConstants.DRDA_TYPE_NLOBCMIXED:
 
                     // do not send EXTDTA for lob of length 0, beetle 5967
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
                     if( ! ((EXTDTAInputStream) val).isEmptyStream() ){
                         stmt.addExtDtaObject(val, index);
                     
@@ -8350,12 +8543,14 @@ protected void writeFdocaVal(int index, Object val, int drdaType,
                 case  DRDAConstants.DRDA_TYPE_NFIXBYTE:
                     writer.writeBytes((byte[]) val);
                     break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                 case DRDAConstants.DRDA_TYPE_NVARBYTE:
                 case DRDAConstants.DRDA_TYPE_NLONGVARBYTE:
                         writer.writeLDBytes((byte[]) val, index);
                     break;
                 case DRDAConstants.DRDA_TYPE_NLOBLOC:
                 case DRDAConstants.DRDA_TYPE_NCLOBLOC:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3576
                     writer.writeInt(((EngineLOB)val).getLocator());
                     break;
                 case DRDAConstants.DRDA_TYPE_NUDT:
@@ -8499,6 +8694,7 @@ private void padInt(char[] buf, int offset, int length, int value) {
      */
     private void copyToRequired(int [] req)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         currentRequiredLength = req.length;
         if (currentRequiredLength > required.length) {
             required = new int[currentRequiredLength];
@@ -8572,6 +8768,7 @@ private void tooBig(int codePoint) throws DRDAProtocolException
      * @throws DRDAProtocolException
      */
     private void invalidClient(String prdid) throws DRDAProtocolException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5565
         Monitor.logMessage(new Date()
                 + " : "
                 + server.localizeMessage("DRDA_InvalidClient.S",
@@ -8598,6 +8795,7 @@ private void requiredValueNotFound(int codePoint) throws DRDAProtocolException {
      */
     private void badObjectLength(int codePoint) throws DRDAProtocolException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         throwSyntaxrm(CodePoint.SYNERRCD_OBJ_LEN_NOT_ALLOWED, codePoint);
     }
     /**
@@ -8726,6 +8924,7 @@ private void closeSession()
             xaProto.rollbackCurrentTransaction();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         server.removeFromSessionTable(session.connNum);
         try {
             session.close();
@@ -8852,7 +9051,9 @@ private long getTimeSlice()
      */
     protected  void trace(String value)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         if (SanityManager.DEBUG && server.debugOutput() == true) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3706
             server.consoleMessage(value, true);
         }
     }
@@ -8870,8 +9071,10 @@ protected  void trace(String value)
      * @param encoding the encoding of the data, if any
      */
     private void traceEXTDTARead(int drdaType, int index,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
                                  EXTDTAReaderInputStream stream,
                                  boolean streamLOB, String encoding) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         if (SanityManager.DEBUG && server.debugOutput() == true) {
             StringBuilder sb = new StringBuilder("Reading/setting EXTDTA: ");
             // Data: t<type>/i<ob_index>/<streamLOB>/<encoding>/
@@ -8899,6 +9102,7 @@ private void traceEXTDTARead(int drdaType, int index,
     public static void showmem() {
         Runtime rt = Runtime.getRuntime();
         Date d = new Date();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         rt.gc();
         System.out.println("total memory: "
                            + rt.totalMemory()
@@ -9044,6 +9248,7 @@ private void writeENDUOWRM(int opType)
 
   void writeEXTDTA (DRDAStatement stmt) throws SQLException, DRDAProtocolException
   {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
       ArrayList<Object> extdtaValues = stmt.getExtDtaObjects();
     // build the EXTDTA data, if necessary
     if (extdtaValues == null) {
@@ -9072,7 +9277,9 @@ void writeEXTDTA (DRDAStatement stmt) throws SQLException, DRDAProtocolException
         if (o instanceof EXTDTAInputStream) {
             EXTDTAInputStream stream = (EXTDTAInputStream) o;
                         
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
             try{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2941
                         stream.initInputStream();
             writer.writeScalarStream (chainedWithSameCorrelator,
                                       CodePoint.EXTDTA,
@@ -9106,6 +9313,7 @@ void writeEXTDTA (DRDAStatement stmt) throws SQLException, DRDAProtocolException
      * @exception DRDAProtocolException
      */
     private void checkWarning(Connection conn, Statement stmt, ResultSet rs,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                           long updateCount, boolean alwaysSend, boolean sendWarn)
         throws DRDAProtocolException, SQLException
     {
@@ -9161,6 +9369,7 @@ private void checkWarning(Connection conn, Statement stmt, ResultSet rs,
     }
 
     boolean hasSession() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
         return session != null;
     }
     
@@ -9280,6 +9489,7 @@ private int validateSecMecUSRSSBPWD() throws  DRDAProtocolException
             // 
             // if monitor is never setup by any ModuleControl, getMonitor
             // returns null and no Derby database has been booted. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             if (getMonitor() != null) {
                 databaseObj = (org.apache.derby.iapi.db.Database)
                     findService(Property.DATABASE_MODULE, dbName);
@@ -9292,6 +9502,7 @@ private int validateSecMecUSRSSBPWD() throws  DRDAProtocolException
 
                 // now try to find it again
                 databaseObj = (org.apache.derby.iapi.db.Database)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                     findService(Property.DATABASE_MODULE, dbName);
             }
 
@@ -9299,6 +9510,7 @@ private int validateSecMecUSRSSBPWD() throws  DRDAProtocolException
             // does not exist - we just return security mechanism not
             // supported down below as we could not verify we can handle
             // it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3184
             try {
                 if (databaseObj != null) {
                     authenticationService =
@@ -9325,6 +9537,7 @@ private int validateSecMecUSRSSBPWD() throws  DRDAProtocolException
 
         // SECMEC_USRSSBPWD target initialization
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5055
             myTargetSeed = DecryptionManager.generateSeed();
             database.secTokenOut = myTargetSeed;
         } catch (SQLException se) {
@@ -9344,6 +9557,7 @@ private int validateSecMecUSRSSBPWD() throws  DRDAProtocolException
      * the stream failed
      */
     private static void closeStream(InputStream stream) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5396
         try {
             if (stream != null) {
                 stream.close();
@@ -9361,6 +9575,7 @@ private static void closeStream(InputStream stream) throws SQLException {
         // Suppress the exception that may be thrown when reading the status
         // byte here, we want the embedded statement to fail while executing.
         stream.setSuppressException(true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
 
         final int byteArrayLength = 
             stream instanceof StandardEXTDTAReaderInputStream ?
@@ -9385,6 +9600,7 @@ private static void closeStream(InputStream stream) throws SQLException {
 
         // Check if the client driver encountered any errors when reading the
         // source on the client side.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         if (stream.isStatusSet() &&
                 stream.getStatus() != DRDAConstants.STREAM_OK) {
             // Create a stream that will just fail when accessed.
@@ -9427,6 +9643,7 @@ public int getCount(){
      * @throws SQLException if setting the stream fails
      */
     private static void setAsCharacterStream(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
                                          DRDAStatement stmt,
                                          int i,
                                          EXTDTAReaderInputStream extdtaStream,
@@ -9450,6 +9667,7 @@ private static void setAsCharacterStream(
             new InputStreamReader( is,
                                    encoding ) ;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         ps.setCharacterStream(i, streamReader);
     }
 
@@ -9485,6 +9703,7 @@ private static void setAsBinaryStream(DRDAStatement stmt,
                 ps.setBinaryStream(index, stream, length);
 
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
                 ps.setBinaryStream(index, stream);
             }
         } else {
@@ -9503,6 +9722,7 @@ private static void setAsBinaryStream(DRDAStatement stmt,
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAProtocolException.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAProtocolException.java
index 234f19a7f7..3df00298f5 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAProtocolException.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAProtocolException.java
@@ -33,10 +33,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import java.util.Hashtable;
 import org.apache.derby.shared.common.sanity.SanityManager;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class DRDAProtocolException extends Exception
 {
     
     /* Static values, used in constructor if there is no associated 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
        Error Code or the codepoint argument.
     */
     
@@ -109,6 +111,7 @@ class DRDAProtocolException extends Exception
        DRDAProtocolExceptionInfo for each of our messages.
     */
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     errorInfoTable = new Hashtable<String, DRDAProtocolExceptionInfo>();
     
     errorInfoTable.put(
@@ -197,12 +200,14 @@ class DRDAProtocolException extends Exception
     // condition detected at the target system.
     errorInfoTable.put(DRDA_AgentError,
                new DRDAProtocolExceptionInfo(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1456
                              CodePoint.AGNPRMRM,
                              CodePoint.SVRCOD_PRMDMG,
                              NO_ASSOC_ERRCD,
                              false));
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2166
     errorInfoTable.put(DRDA_Timeout,
                new DRDAProtocolExceptionInfo(
                              0,
@@ -227,6 +232,7 @@ class DRDAProtocolException extends Exception
      *
      */
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     DRDAProtocolException(String msgid,
                                     DRDAConnThread agent, 
                                     int cpArg, 
@@ -255,6 +261,7 @@ class DRDAProtocolException extends Exception
             this.svrcod = ((Integer)args[0]).intValue();
             this.rdbnam = (String)args[1];
             // retrieve the server diagnostic error message 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1456
             String srvdgn = (String)args[2];
             msg = "Execution failed because of Permanent Agent Error: SVRCOD = " +
                 java.lang.Integer.toHexString(this.svrcod) +
@@ -276,6 +283,7 @@ else if (msgid.equals(DRDA_Proto_RDBNFNRM))
                 + messageid +
                 "; CODPNT arg  = " + java.lang.Integer.toHexString(cpArg)  +
                 "; Error Code Value = " + java.lang.Integer.toHexString(errCdArg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2796
             if (msgid.equals(DRDA_Proto_SYNTAXRM)) {
                 msg += ". Plaintext connection attempt from an SSL enabled client?";
             }
@@ -306,11 +314,13 @@ else if (msgid.equals(DRDA_Proto_RDBNFNRM))
                                    agent.getSession().drdaID, 
                                    msg);
             NetworkServerControlImpl s = agent.getServer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1743
             s.consoleExceptionPrintTrace(this);
         }
     }
     
     // Constructor with no additional args
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     DRDAProtocolException(String msgid,
                                     DRDAConnThread agent, 
                                     int cpArg, 
@@ -335,7 +345,9 @@ protected static DRDAProtocolException newAgentError(DRDAConnThread agent,
         int svrcod, String rdbnam, String srvdgn)
     {
         if ( SanityManager.DEBUG )
+//IC see: https://issues.apache.org/jira/browse/DERBY-1751
             agent.trace("agentError in " + agent);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
         Object[] oa = {svrcod, rdbnam, srvdgn};
         return new DRDAProtocolException(DRDA_AgentError,
                                         agent,
@@ -394,6 +406,7 @@ protected void write(DDMWriter writer)
      */
     public String getMessage()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1456
         return msg;
     }
 }
@@ -404,6 +417,7 @@ public String getMessage()
  * *NOT* disconnect the connection.
  * See DRDAConnThread.run()
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2166
 class DRDASocketTimeoutException extends DRDAProtocolException {
     DRDASocketTimeoutException(DRDAConnThread t) {
         super(DRDA_Timeout,t,0,0);
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java
index 1e9bdeb325..c7be7e591a 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java
@@ -21,6 +21,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 package org.apache.derby.impl.drda;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class DRDAProtocolExceptionInfo {
     
     /*
@@ -53,10 +54,12 @@ class DRDAProtocolExceptionInfo {
     // Sends an originating Codepoint
     protected boolean sendsCodpntArg;
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     DRDAProtocolExceptionInfo(int errorCodePoint, int svrcod,  
                     int errCdCodePoint,
                     boolean sendsCodpntArg)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     this.errorCodePoint = errorCodePoint;
     this.svrcod = svrcod;
     this.errCdCodePoint = errCdCodePoint;
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAResultSet.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAResultSet.java
index bc744a15ec..4cf84b0688 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAResultSet.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAResultSet.java
@@ -29,6 +29,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.iapi.jdbc.EngineResultSet;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     DRDAResultSet holds result set information
 */
 class DRDAResultSet
@@ -92,6 +93,7 @@ class DRDAResultSet
     // emitted in the next QRYDTA response to a CNTQRY request.
     private byte []splitQRYDTA;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     DRDAResultSet()
     {
         state = NOT_OPENED;
@@ -124,6 +126,7 @@ void setResultSet(ResultSet value) throws SQLException
      */
     protected void setPkgcnstkn(ConsistencyToken pkgcnstkn)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
         this.pkgcnstkn = pkgcnstkn;
     }
 
@@ -230,6 +233,7 @@ protected  void setRsDRDAType(int index, int type)
      */
     protected int getRsDRDAType(int index)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2347
         if ((outovr_drdaType != null) && (outovr_drdaType[index-1] != 0)) {
             // Override with requested type.  0 means use default
             return outovr_drdaType[index-1];
@@ -256,6 +260,7 @@ protected int getRsLen(int index)
     protected void  addExtDtaObject (Object o, int jdbcIndex )
     {
         if (extDtaObjects == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             extDtaObjects = new java.util.ArrayList<Object>();
         extDtaObjects.add (o);
 
@@ -264,6 +269,7 @@ protected void  addExtDtaObject (Object o, int jdbcIndex )
         
         // need to record the 0 based position so subtract 1
         rsExtPositions.add(jdbcIndex - 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
     }
 
@@ -297,6 +303,7 @@ protected boolean isExtDtaValueNullable(int index)
 
         // if there is no type information, then we represent a CallableStatement
         // and all parameters are nullable
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         if ( rsDRDATypes == null ) { return true; }
         else if (FdocaConstants.isNullable(getRsDRDAType(colnum)))
             return true;
@@ -342,6 +349,7 @@ protected void close()  throws SQLException
      * 
      */
     protected void reset() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1002
         explicitlyClosed = false;
         state = NOT_OPENED;
         hasdata = true;
@@ -352,6 +360,7 @@ protected void reset() {
         
         outovr_drdaType = null;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         withHoldCursor = 0;
         scrollType = ResultSet.TYPE_FORWARD_ONLY;
         concurType = 0;
@@ -361,6 +370,7 @@ protected void reset() {
         blksize = 0;
         maxblkext = 0;
         outovropt = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         qryclsimp = CodePoint.QRYCLSIMP_NO;
         qryrelscr = false;
         qryrownbr = 0;
@@ -480,6 +490,7 @@ protected String toDebugString(String indent)
     {
         String s = indent + "***** DRDASResultSet toDebugString ******\n";
         s += indent + "State:" + getStateString(state)+ "\n";
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
         s += indent + "pkgcnstkn: {" + pkgcnstkn + "}\n"; 
         s += indent + "cursor Name: ";
         String cursorName = null;
@@ -525,6 +536,7 @@ private String getStateString( int i )
     protected void setOPNQRYOptions(int blksize, int qryblkctl,
             int maxblkext, int outovropt,int qryrowset,int qryclsimpl)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-343
         this.blksize = blksize;
         setQryprctyp(qryblkctl);
         this.maxblkext = maxblkext;
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAStatement.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAStatement.java
index 557bbe3658..455f9f318c 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAStatement.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAStatement.java
@@ -1648,6 +1648,7 @@ private  void parsePkgidToFindHoldability()
         if (isDynamicPkgid(pkgid))
         {       
             if(pkgid.charAt(4) == 'N')
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
                 withHoldCursor = ResultSet.CLOSE_CURSORS_AT_COMMIT;
             else  
                 withHoldCursor = ResultSet.HOLD_CURSORS_OVER_COMMIT;
@@ -1669,6 +1670,7 @@ protected ParameterMetaData getParameterMetaData() throws SQLException
         if (stmtPmeta != null)
             return stmtPmeta;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2121
         stmtPmeta = ps.getParameterMetaData();
         
         return stmtPmeta;
@@ -1684,6 +1686,7 @@ protected ParameterMetaData getParameterMetaData() throws SQLException
      */
     private boolean getMoreResults(int current) throws SQLException
     {       
+//IC see: https://issues.apache.org/jira/browse/DERBY-2121
         return getPreparedStatement().getMoreResults(current);
     }
 
@@ -1722,6 +1725,7 @@ private String getSQLText()
      * @exception SQLException
      */
     boolean isRSCloseImplicit(boolean lmtblkprcOK) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
         return
             (currentDrdaRs.qryclsimp == CodePoint.QRYCLSIMP_YES) &&
             !isScrollable() &&
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAString.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAString.java
index 4c5fa276de..8d2100419b 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAString.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAString.java
@@ -48,6 +48,8 @@ final class DRDAString {
      * @param w a <code>DDMWriter</code> which holds current CCSidManager
      * and which encoding is used
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
     DRDAString(DDMWriter w) {
         this.buffer = new byte[0];
         this.writer = w;
@@ -113,6 +115,8 @@ public boolean wasModified() {
     public String toString() {
         if (cachedString == null) {
             cachedString =
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
                 writer.getCurrentCcsidManager().convertToJavaString(buffer);
         }
         return cachedString;
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAXAProtocol.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAXAProtocol.java
index 1eaf2bab4d..d2a133df91 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAXAProtocol.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAXAProtocol.java
@@ -40,6 +40,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 
 class DRDAXAProtocol {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
     private DRDAConnThread connThread;
     private DDMReader reader;
@@ -49,6 +50,7 @@ class DRDAXAProtocol {
     private Xid xid;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     DRDAXAProtocol(DRDAConnThread connThread)
     {
         this.connThread = connThread;
@@ -75,6 +77,7 @@ protected void parseSYNCCTL() throws DRDAProtocolException
         boolean readXAFlags = false;
         Xid xid = null;
         // The value -1 means no value of timeout received
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
         long xaTimeout = -1;
         boolean readXATimeout = false;
 
@@ -85,12 +88,14 @@ protected void parseSYNCCTL() throws DRDAProtocolException
             {
                 case CodePoint.XID:
                     xid = parseXID();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                     break;
                 case CodePoint.XAFLAGS:
                     xaflags = parseXAFlags();
                     readXAFlags =true;
                     break;
                 case CodePoint.TIMEOUT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
                     xaTimeout = parseXATimeout();
                     readXATimeout = true;
                     break;
@@ -127,6 +132,7 @@ protected void parseSYNCCTL() throws DRDAProtocolException
             case CodePoint.SYNCTYPE_NEW_UOW:
                 // new unit of work for XA
                 // formatId -1 is just a local connection
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
                 startXATransaction(xid, xaflags, xaTimeout);
                 break;
             case CodePoint.SYNCTYPE_END_UOW:
@@ -140,6 +146,7 @@ protected void parseSYNCCTL() throws DRDAProtocolException
             case CodePoint.SYNCTYPE_MIGRATE:
                 // migrate to resync server sync type
                 connThread.codePointNotSupported(codePoint);                
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 break;
             case CodePoint.SYNCTYPE_REQ_COMMIT:
                 // request to commit sync type
@@ -232,6 +239,7 @@ private int parseXAFlags() throws DRDAProtocolException
      */
     private long parseXATimeout() throws DRDAProtocolException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2432
         return reader.readNetworkLong();
     }
 
@@ -268,6 +276,7 @@ private void startXATransaction(Xid xid, int xaflags, long xaTimeout)
                     // In JDBC spec the value 0 means the resource
                     // manager's default value.
                     xaResource.setTransactionTimeout(Integer.MAX_VALUE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 } else if (xaTimeout == -1) {
                     // The timeout value was not specified, so use the default
                     // timeout - see javadoc for XAResource.setTransactionTimeout
@@ -475,6 +484,7 @@ private void prepareXATransaction(Xid xid) throws DRDAProtocolException
         int xaRetVal;
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-960
             xaRetVal = xaResource.prepare(xid);
             if (SanityManager.DEBUG)
             {
@@ -511,6 +521,9 @@ private void forgetXATransaction(Xid xid) throws DRDAProtocolException
             xaRetVal = processXAException(xe);
         }
         writeSYNCCRD(CodePoint.SYNCTYPE_REQ_FORGET,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                      xaRetVal, null);
     }
 
@@ -714,6 +727,7 @@ private int processXAException(XAException xe)
      * @return The ResourceAdapter instance for
      *         the underlying database.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
     ResourceAdapter getResourceAdapter()
     {
         return ((XADatabase)connThread.getDatabase()).getResourceAdapter();
@@ -728,6 +742,7 @@ void rollbackCurrentTransaction()
     {
         if (xid != null) {
             boolean local  = ( xid.getFormatId() == -1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
             if (!local) {
                 try {
                     XAXactId xid_im = new XAXactId(xid);
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAXid.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAXid.java
index d1e9532834..49f09b7f58 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAXid.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAXid.java
@@ -34,6 +34,7 @@ class DRDAXid implements Xid
     private final byte[] branch_id;
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     DRDAXid(int formatid, byte[] globalid, byte[] branchid)
     {
 
@@ -80,6 +81,7 @@ public byte[] getBranchQualifier()
     public String toString()
     {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
        String s =  "{DRDAXid: " +
            "formatId("     + format_id   + "), " +
            "globalTransactionId(" +  convertToHexString(global_id) + ")" +
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/Database.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/Database.java
index fd6f5ef7fa..7b3bd9ea1a 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/Database.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/Database.java
@@ -84,9 +84,11 @@ class Database
      * 
      * @param dbName    database name
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     Database (String dbName)
     {
         setDatabaseName(dbName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.stmtTable = new Hashtable<Object, DRDAStatement>();
         initializeDefaultStatement();
     }
@@ -115,6 +117,7 @@ public void setDatabaseName(String dbName) {
     }
     
     public String getDatabaseName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         return this.dbName;
     }
     
@@ -136,11 +139,13 @@ private void initializeDefaultStatement()
     final void setConnection(EngineConnection conn)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
         if (this.conn != conn) {
             // Need to drop the pb session data when switching connections
             pbsd_ = null;
         }
         this.conn = conn;
+//IC see: https://issues.apache.org/jira/browse/DERBY-374
         if(conn != null)
             defaultStatement.setStatement(conn);
     }
@@ -205,6 +210,7 @@ protected DRDAStatement newDRDAStatement(Pkgnamcsn pkgnamcsn)
     throws SQLException
     {
         DRDAStatement stmt = getDRDAStatement(pkgnamcsn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1002
         if (stmt != null) {
             stmt.close();
             stmt.reset();
@@ -225,6 +231,7 @@ protected DRDAStatement newDRDAStatement(Pkgnamcsn pkgnamcsn)
      * @return DRDAStatement
      */
     protected DRDAStatement getDRDAStatement(Pkgnamcsn pkgnamcsn) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
         DRDAStatement newStmt =
             (DRDAStatement) stmtTable.get(pkgnamcsn.getStatementKey());
         if (newStmt != null) {
@@ -284,6 +291,7 @@ void makeDummyConnection()
     }
     
     // Create string to pass to DataSource.setConnectionAttributes
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     String appendAttrString(Properties p)
     {
         if (p == null)
@@ -305,6 +313,7 @@ String appendAttrString(Properties p)
      */
     protected void storeStatement(DRDAStatement stmt) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
         stmtTable.put(stmt.getPkgnamcsn().getStatementKey(), stmt);
     }
 
@@ -360,6 +369,7 @@ protected void close() throws SQLException
                 }
             
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             if (defaultStatement != null)
                 defaultStatement.close();
             if ((conn != null) && !conn.isClosed())
@@ -369,6 +379,7 @@ protected void close() throws SQLException
                 {
                     conn.rollback();
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 conn.close();
             }
         }
@@ -447,6 +458,7 @@ protected String buildRuntimeInfo(String indent, LocalizedResource localLangUtil
      */
     boolean supportsLocator() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2695
         if (!locatorSupportChecked) {
             // Check if locator procedures exist
             ResultSet rs = getConnection().getMetaData()
@@ -503,6 +515,7 @@ public void reset()
      */
     public PiggyBackedSessionData getPiggyBackedSessionData(
             boolean createOnDemand) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
         pbsd_ = PiggyBackedSessionData.getInstance(pbsd_, conn, createOnDemand);
         return pbsd_;
     }
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DecryptionManager.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DecryptionManager.java
index 778253bbce..0906e4307c 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DecryptionManager.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DecryptionManager.java
@@ -439,6 +439,7 @@ protected static byte[] generateSeed() throws SQLException {
         The String may be converted back to a byte array using fromHexString.
         <BR>
         For each byte (b) two characaters are generated, the first character
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         represents the high nibble (4 bits) in hexidecimal (<code>b &amp; 0xf0</code>),
         the second character represents the low nibble (<code>b &amp; 0x0f</code>).
         <BR>
@@ -471,6 +472,7 @@ protected static String toHexString(byte[] data, int offset, int length)
         Convert a string into a byte array in hex format.
         <BR>
         For each character (b) two bytes are generated, the first byte 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         represents the high nibble (4 bits) in hexidecimal (<code>b &amp; 0xf0</code>),
         the second byte 
         represents the low nibble (<code>b &amp; 0x0f</code>).
@@ -486,6 +488,7 @@ For each character (b) two bytes are generated, the first byte
     */
     protected static byte[] toHexByte(String str, int offset, int length)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         byte[] data = new byte[(length - offset) * 2];
         int end = offset+length;
 
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DssConstants.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DssConstants.java
index ea0e587f56..3b659e4fd8 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DssConstants.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DssConstants.java
@@ -23,6 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.derby.impl.drda;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     This class defines DSS constants that are shared in the classes implementing
     the DRDA protocol.
 */
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/DssTrace.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/DssTrace.java
index 09c219bb37..c77676fa8c 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/DssTrace.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/DssTrace.java
@@ -180,9 +180,13 @@ protected void startComBufferTrace (final String fileName) throws Exception
             // We don't try making the directory first because it would require
             // extra permissions if the directory already exists. DERBY-4128
             for (int attempt=0; attempt <2; attempt++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 try {
                     // The writer will be buffered for effeciency.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
                     comBufferWriter =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                         (AccessController.doPrivileged(
                             new PrivilegedExceptionAction<PrintWriter>() {
                                 public PrintWriter run()
@@ -209,9 +213,11 @@ public PrintWriter run()
                     // it is likely that the directory did not exist. 
                     //We will try to make it.
                     if (attempt == 0 && (e instanceof FileNotFoundException)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2556
                         final File traceDirectory = new File(fileName).getParentFile();
                         if (traceDirectory != null) {
                             AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6503
                                     new PrivilegedExceptionAction<Void>() {
                                         public Void run() throws IOException {
                                             // DERBY-4128: First try to create the
@@ -226,6 +232,7 @@ public Void run() throws IOException {
                                             // has been granted.
                                             boolean created = traceDirectory.mkdir();
                                             if (!created) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
                                                 created =
                                                         traceDirectory.mkdirs();
                                             }
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/EXTDTAInputStream.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/EXTDTAInputStream.java
index 2d75d398b2..232c185f46 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/EXTDTAInputStream.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/EXTDTAInputStream.java
@@ -45,6 +45,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  *  
  */
 class EXTDTAInputStream extends InputStream {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
     private InputStream binaryInputStream = null;
  
@@ -56,6 +57,7 @@ class EXTDTAInputStream extends InputStream {
     //
     
     /** ResultSet that contains the stream*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2941
     EngineResultSet rs;
     /** Column index starting with 1 */
     int columnNumber;
@@ -80,6 +82,7 @@ private EXTDTAInputStream(ResultSet rs,
 
     private EXTDTAInputStream(Clob clob, int ndrdaType ) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         _clob = clob;
         this.ndrdaType = ndrdaType;
     }
@@ -141,6 +144,7 @@ public static EXTDTAInputStream getEXTDTAStream(ResultSet rs, int column, int dr
      *             DRDAConstants.DRDA_TYPE_LOBCMIXED
      */
     public static EXTDTAInputStream getEXTDTAStream(CallableStatement cs, int column, int drdaType)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         throws SQLException
     {
 
@@ -158,6 +162,7 @@ public static EXTDTAInputStream getEXTDTAStream(CallableStatement cs, int column
             return new EXTDTAInputStream( clob, ndrdaType );
         default:
             badDRDAType( ndrdaType );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             return null;
         }
     }
@@ -180,6 +185,8 @@ public int read() throws IOException {
      * @see java.io.InputStream#available()
      */
     public int available() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         return binaryInputStream.available();
     }
 
@@ -191,6 +198,7 @@ public int available() throws IOException {
     public void close() throws IOException {
         
         if (binaryInputStream != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             binaryInputStream.close();
         binaryInputStream = null;
         
@@ -202,6 +210,8 @@ public void close() throws IOException {
      * @see java.lang.Object#equals(java.lang.Object)
      */
     public boolean equals(Object arg0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         return binaryInputStream.equals(arg0);
     }
 
@@ -211,6 +221,8 @@ public boolean equals(Object arg0) {
      * @see java.lang.Object#hashCode()
      */
     public int hashCode() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         return binaryInputStream.hashCode();
     }
 
@@ -220,6 +232,8 @@ public int hashCode() {
      * @see java.io.InputStream#mark(int)
      */
     public void mark(int arg0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         binaryInputStream.mark(arg0);
     }
 
@@ -229,6 +243,8 @@ public void mark(int arg0) {
      * @see java.io.InputStream#markSupported()
      */
     public boolean markSupported() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         return binaryInputStream.markSupported();
     }
 
@@ -238,6 +254,8 @@ public boolean markSupported() {
      * @see java.io.InputStream#read(byte[])
      */
     public int read(byte[] arg0) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         return binaryInputStream.read(arg0);
     }
 
@@ -247,6 +265,8 @@ public int read(byte[] arg0) throws IOException {
      * @see java.io.InputStream#read(byte[], int, int)
      */
     public int read(byte[] arg0, int arg1, int arg2) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         return binaryInputStream.read(arg0, arg1, arg2);
     }
 
@@ -256,6 +276,8 @@ public int read(byte[] arg0, int arg1, int arg2) throws IOException {
      * @see java.io.InputStream#reset()
      */
     public void reset() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1302
+//IC see: https://issues.apache.org/jira/browse/DERBY-326
         binaryInputStream.reset();
     }
 
@@ -265,6 +287,7 @@ public void reset() throws IOException {
      * @see java.io.InputStream#skip(long)
      */
     public long skip(long arg0) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2686
         if (arg0 < 0L) {
             return 0L;
         }
@@ -274,6 +297,7 @@ public long skip(long arg0) throws IOException {
 
     protected boolean isEmptyStream() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         return (length() == 0);
     }
     private long length() throws SQLException
@@ -293,24 +317,29 @@ private long length() throws SQLException
      *
      */
     public  void initInputStream()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     throws SQLException
     {
 
     InputStream is = null;
     Reader r = null;
     // BLOBS
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
     if (ndrdaType == DRDAConstants.DRDA_TYPE_NLOBBYTES) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         is = getBinaryStream();
         if (is == null) { return; }
     }
         // CLOBS
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
     else if (ndrdaType ==  DRDAConstants.DRDA_TYPE_NLOBCMIXED)
     {
         try {
             
             r = getCharacterStream();
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             if(r == null){
                     return;
             }
@@ -326,11 +355,14 @@ else if (ndrdaType ==  DRDAConstants.DRDA_TYPE_NLOBCMIXED)
             }
             
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         else { badDRDAType( ndrdaType ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2941
     if (! is.markSupported()) {
         is = new BufferedInputStream(is);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     this.binaryInputStream=is;
     }
     private InputStream getBinaryStream() throws SQLException
@@ -359,6 +391,7 @@ private static void badDRDAType( int drdaType )
     //
     @SuppressWarnings("deprecation")
     protected void finalize() throws Throwable{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     close();
     }
 
@@ -372,6 +405,7 @@ protected void finalize() throws Throwable{
      */
     public boolean isNull() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         if ( rs != null ) { return rs.isNull(columnNumber); }
         else { return (_clob == null) && (_blob == null); }
     }
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java
index 85b1b1a392..78253eb600 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java
@@ -43,6 +43,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * mechanism in DRDA to interrupt a running request, but it didn't seem like a
  * feasible approach in this case).
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
 abstract class EXTDTAReaderInputStream
         extends InputStream {
 
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/EbcdicCcsidManager.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/EbcdicCcsidManager.java
index 2afc82b7ed..29d84730c3 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/EbcdicCcsidManager.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/EbcdicCcsidManager.java
@@ -31,9 +31,11 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * be fine since this class is intended for converting
  * DDM Parameter data only.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class EbcdicCcsidManager extends CcsidManager
 {
     private static final int[] conversionArrayToEbcdic = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         0x0000,0x0001,0x0002,0x0003,0x0037,0x002d,0x002e,0x002f
         ,0x0016,0x0005,0x0025,0x000b,0x000c,0x000d,0x000e,0x000f
         ,0x0010,0x0011,0x0012,0x0013,0x003c,0x003d,0x0032,0x0026
@@ -115,6 +117,7 @@ class EbcdicCcsidManager extends CcsidManager
         //      'A',       'B',       'C',       'D',      'E',
           (byte)0xc1,(byte)0xc2,(byte)0xc3,(byte)0xc4,(byte)0xc5,
         //      'F',       'G',       'H',      'I',       'J',
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
           (byte)0xc6,(byte)0xc7,(byte)0xc8,(byte)0xc9,(byte)0xd1,
         //     'K',        'L',       'M',       'N',      'O',
           (byte)0xd2,(byte)0xd3,(byte)0xd4,(byte)0xd5,(byte)0xd6,
@@ -124,6 +127,7 @@ class EbcdicCcsidManager extends CcsidManager
       );
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
     byte[] convertFromJavaString (String sourceString)
     {
         ByteBuffer buf = ByteBuffer.allocate(sourceString.length());
@@ -142,6 +146,7 @@ void convertFromJavaString (String sourceString, ByteBuffer buffer)
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
     String convertToJavaString (byte[] sourceBytes)
     {
         int i = 0;
@@ -156,6 +161,7 @@ String convertToJavaString (byte[] sourceBytes)
         return new String (theChars);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
     String convertToJavaString (byte[] sourceBytes, int offset, int numToConvert)
     {
         int i = 0,j = 0;
@@ -171,6 +177,7 @@ String convertToJavaString (byte[] sourceBytes, int offset, int numToConvert)
     }
 
     int getByteLength(String str) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4746
         return str.length();
     }
 
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/FdocaConstants.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/FdocaConstants.java
index 0c15f67d41..5d3a936db5 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/FdocaConstants.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/FdocaConstants.java
@@ -105,6 +105,7 @@ class FdocaConstants
 
     protected static boolean isNullable(int fdocaType)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         return ( (fdocaType & 1) == 1);
     }
 
@@ -139,9 +140,11 @@ protected static int mapJdbcTypeToDrdaType(int jdbcType, boolean nullable, AppRe
     {
         int drdaType = 0;
         switch (jdbcType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
             case Types.BOOLEAN:
                 if ( appRequester.supportsBooleanValues() )
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                     drdaType = DRDAConstants.DRDA_TYPE_NBOOLEAN;
                     outlen[0] = 1;
                 }
@@ -150,6 +153,7 @@ protected static int mapJdbcTypeToDrdaType(int jdbcType, boolean nullable, AppRe
                     drdaType = DRDAConstants.DRDA_TYPE_NSMALL;
                     outlen[0] = 2;
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 break;
             case java.sql.Types.BIT:
             case java.sql.Types.TINYINT:
@@ -219,6 +223,7 @@ protected static int mapJdbcTypeToDrdaType(int jdbcType, boolean nullable, AppRe
                     drdaType = DRDAConstants.DRDA_TYPE_NLONG;
                     outlen[0] = LONGVARCHAR_MAX_LEN;
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
                 break;
             case java.sql.Types.LONGVARCHAR:
                     drdaType = DRDAConstants.DRDA_TYPE_NLONG;
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/LayerBStreamedEXTDTAReaderInputStream.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/LayerBStreamedEXTDTAReaderInputStream.java
index b01d6988b6..5debee9649 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/LayerBStreamedEXTDTAReaderInputStream.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/LayerBStreamedEXTDTAReaderInputStream.java
@@ -44,6 +44,7 @@ final class LayerBStreamedEXTDTAReaderInputStream extends EXTDTAReaderInputStrea
      * @exception DRDAProtocolException if thrown while initializing current 
      *                                  buffer.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
     LayerBStreamedEXTDTAReaderInputStream(final DDMReader reader,
                                           boolean readStatusByte)
         throws DRDAProtocolException
@@ -67,6 +68,7 @@ final class LayerBStreamedEXTDTAReaderInputStream extends EXTDTAReaderInputStrea
      * @see        java.io.InputStream#read()
      */
     public final int read() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             throws IOException {
         // Reuse the other read method for simplicity.
         byte[] b = new byte[1];
@@ -101,6 +103,7 @@ public final int read(final byte[] b,
                           int len) 
         throws IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         if (currentBuffer == null) {
             return -1;
         }
@@ -155,6 +158,7 @@ public final int read(final byte[] b,
      */
     public final int available() {
         int avail = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         if (currentBuffer != null) {
             avail = currentBuffer.available();
             if (readStatusByte && !reader.doingLayerBStreaming()) {
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java
index ec97cc6869..9f0c38fa01 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java
@@ -4051,9 +4051,11 @@ private void wrapSQLWarning(String messageKey)
      * @return a collection of network server properties and their current 
      *         values
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
     Properties getPropertyValues()
     {
         Properties retval = new Properties();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
         retval.put(Property.DRDA_PROP_PORTNUMBER, Integer.toString(portNumber));
         retval.put(Property.DRDA_PROP_HOSTNAME, hostArg);
         retval.put(Property.DRDA_PROP_KEEPALIVE, Boolean.toString(keepAlive));
@@ -4089,6 +4091,7 @@ Properties getPropertyValues()
         if (!getTraceAll())
         {
             synchronized(sessionTable) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 for (Session session : sessionTable.values())
                 {
                     if (session.isTraceOn())
@@ -4113,6 +4116,7 @@ Properties getPropertyValues()
      * @param clientSocket the socket to read from and write to
      */
     void addSession(Socket clientSocket) throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1817
 
         int connectionNumber = ++connNum;
 
@@ -4124,15 +4128,18 @@ void addSession(Socket clientSocket) throws Exception {
         // Note that we always re-fetch the tracing configuration because it
         // may have changed (there are administrative commands which allow
         // dynamic tracing reconfiguration).
+//IC see: https://issues.apache.org/jira/browse/DERBY-3701
         Session session = new Session(this,connectionNumber, clientSocket,
                                       getTraceDirectory(), getTraceAll());
 
         sessionTable.put(connectionNumber, session);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
 
         // Check whether there are enough free threads to service all the
         // threads in the run queue in addition to the newly added session.
         boolean enoughThreads;
         synchronized (runQueue) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1817
             enoughThreads = (runQueue.size() < freeThreads);
         }
         // No need to hold the synchronization on runQueue any longer than
@@ -4172,6 +4179,7 @@ void addSession(Socket clientSocket) throws Exception {
      *
      * @param thread the closed thread
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1817
     void removeThread(DRDAConnThread thread) {
         threadList.remove(thread);
     }
@@ -4186,6 +4194,7 @@ public String buildRuntimeInfo(LocalizedResource locallangUtil)
         String s = locallangUtil.getTextMessage("DRDA_RuntimeInfoBanner.I")+ "\n";
         int sessionCount = 0;
         s += locallangUtil.getTextMessage("DRDA_RuntimeInfoSessionBanner.I") + "\n";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (DRDAConnThread thread : threadList)
         {
             String sessionInfo = thread.buildRuntimeInfo("", locallangUtil);
@@ -4196,6 +4205,7 @@ public String buildRuntimeInfo(LocalizedResource locallangUtil)
             }
         }
         int waitingSessions = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Session session : runQueue)
         {
                 s += session.buildRuntimeInfo("", locallangUtil);
@@ -4221,8 +4231,10 @@ public String buildRuntimeInfo(LocalizedResource locallangUtil)
         return s;
     }
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
     long getBytesRead() {
         long count=0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (DRDAConnThread thread : threadList) {
             count += thread.getBytesRead();
         }
@@ -4261,6 +4273,7 @@ int getConnectionNumber() {
 
     public void setClientLocale(String locale)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         clientLocale = locale;
     }
 
@@ -4275,19 +4288,23 @@ private ProductVersionHolder getNetProductVersionHolder() throws Exception
     {
         ProductVersionHolder myPVH= null;
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             myPVH = AccessController.doPrivileged(
                 new PrivilegedExceptionAction<ProductVersionHolder>() {
                     public ProductVersionHolder run()
                             throws UnknownHostException, IOException {
                         InputStream versionStream =
                             getClass().getResourceAsStream(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                                 "/" + ProductGenusNames.NET_INFO);
                         return ProductVersionHolder.
                                 getProductVersionHolderFromMyEnv(versionStream);
                     }
                 });
         } catch (PrivilegedActionException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             Exception e1 = e.getException();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
             consolePropertyMessage("DRDA_ProductVersionReadError.S", e1.getMessage());
         }
         return myPVH;
@@ -4299,6 +4316,7 @@ public ProductVersionHolder run()
      */
     private static  Object getSystemModule( final String factoryInterface )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<Object>()
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
index f8007c95b7..85b9d437eb 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
@@ -52,10 +52,12 @@ class NetworkServerMBeanImpl implements NetworkServerMBean {
     
     NetworkServerMBeanImpl(NetworkServerControlImpl nsc) {
         this.server = nsc;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
         startTime = System.currentTimeMillis();
     }
     
     private static final SystemPermission CONTROL =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
         new SystemPermission(SystemPermission.SERVER,
                 SystemPermission.CONTROL);
     private static final SystemPermission MONITOR =
@@ -66,6 +68,8 @@ class NetworkServerMBeanImpl implements NetworkServerMBean {
      * Ensure the caller has permission to control the network server.
      */
     private static void checkControl() { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
+//IC see: https://issues.apache.org/jira/browse/DERBY-3491
         checkPermission(CONTROL);
     }
 
@@ -99,18 +103,21 @@ private static void checkPermission(SystemPermission permission)
     public String getDrdaHost() {
         // Since this is sensitive information require control permission.
         checkControl();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
 
         String host = getServerProperty(Property.DRDA_PROP_HOSTNAME);
         return host;
     }
     
     public boolean getDrdaKeepAlive() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
         checkMonitor();
         String on = getServerProperty(Property.DRDA_PROP_KEEPALIVE);
         return ( "true".equals(on) ? true : false);
     }
     
     public int getDrdaMaxThreads() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkMonitor();
         
         int maxThreads = 0; // default
@@ -140,6 +147,7 @@ public void setDrdaMaxThreads(int max)
     public int getDrdaPortNumber() {
         // Since this is sensitive information require control permission.
         checkControl();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
 
         int portNumber = NetworkServerControl.DEFAULT_PORTNUMBER; // the default
         String portString = getServerProperty(Property.DRDA_PROP_PORTNUMBER);
@@ -154,6 +162,7 @@ public int getDrdaPortNumber() {
     public String getDrdaSecurityMechanism() {
         // Since this is sensitive information require control permission.
         checkControl();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
 
         String secmec = getServerProperty(Property.DRDA_PROP_SECURITYMECHANISM);
         if (secmec == null) {
@@ -166,6 +175,7 @@ public String getDrdaSecurityMechanism() {
     public String getDrdaSslMode() {
         // Since this is sensitive information require control permission.
         checkControl();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
 
         // may be null if not set (?)
         String SSLMode = getServerProperty(Property.DRDA_PROP_SSL_MODE);
@@ -174,18 +184,21 @@ public String getDrdaSslMode() {
     
     
     public int getDrdaStreamOutBufferSize() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkMonitor();
         
         // TODO - Fix NetworkServerControlImpl so that this setting is included
         //        in the property values returned by getPropertyValues()?
         //String size = getServerProperty(Property.DRDA_PROP_STREAMOUTBUFFERSIZE);
         int size = PropertyUtil.getSystemInt(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3578
                 Property.DRDA_PROP_STREAMOUTBUFFERSIZE, 0);
         return size;
     }
 
        
     public int getDrdaTimeSlice() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkMonitor();
         
         // relying on server to return the default if not set
@@ -205,6 +218,7 @@ public void setDrdaTimeSlice(int timeSlice)
     }*/
     
     public boolean getDrdaTraceAll() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkMonitor();
         
         String on = getServerProperty(Property.DRDA_PROP_TRACEALL);
@@ -226,6 +240,7 @@ public void setDrdaTraceAll(boolean on)
     public String getDrdaTraceDirectory() {
         // Since this is sensitive information require control
         // (gives away information about the file system).
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkControl();
         
         String traceDirectory = null;
@@ -271,14 +286,17 @@ public String getSysInfo()
      **/
 
     public int getConnectionCount() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkMonitor();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
         return getActiveConnectionCount() + getWaitingConnectionCount();
     }
     
     public int getActiveConnectionCount() {
         checkMonitor();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
         return server.getActiveSessions();
     }
     
@@ -316,7 +334,9 @@ public long getBytesSent() {
     private long lastReceiveBytes = 0;
     private int receiveResult = 0;
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
     synchronized public int getBytesReceivedPerSecond(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkMonitor();
         
         long now = System.currentTimeMillis();
@@ -333,7 +353,9 @@ synchronized public int getBytesReceivedPerSecond(){
     private long lastSentBytes = 0;
     private int sentResult = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
     synchronized public int getBytesSentPerSecond(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkMonitor();
         
         long now = System.currentTimeMillis();
@@ -350,8 +372,10 @@ synchronized public int getBytesSentPerSecond(){
      * Return start time.
      */
     public long getStartTime() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkMonitor();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
         return startTime;
     }
 
@@ -359,6 +383,7 @@ public long getStartTime() {
      * Return time server has been running.
      */
     public long getUptime() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkMonitor();
         
         return System.currentTimeMillis() - startTime;
@@ -373,6 +398,7 @@ public long getUptime() {
      * @throws Exception if the ping fails.
      */
     public void ping() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
         checkMonitor();
         
         //String feedback = "Server pinged successfully.";
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/Pkgnamcsn.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/Pkgnamcsn.java
index 24b649e66f..5a0557435c 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/Pkgnamcsn.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/Pkgnamcsn.java
@@ -24,6 +24,7 @@
  * Class representing a PKGNAMCSN object (RDB Package Name,
  * Consistency Token, and Section Number).
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-212
 final class Pkgnamcsn {
     /** Database name. */
     private final String rdbnam;
@@ -49,6 +50,7 @@ final class Pkgnamcsn {
      * @param pkgsn RDB Package Section Number
      * @param pkgcnstkn RDB Package Consistency Token
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
     Pkgnamcsn(String rdbnam, String rdbcolid, String pkgid,
                      int pkgsn, ConsistencyToken pkgcnstkn) {
         this.rdbnam = rdbnam;
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/ReEncodedInputStream.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/ReEncodedInputStream.java
index 42007cec35..3d278b6864 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/ReEncodedInputStream.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/ReEncodedInputStream.java
@@ -52,6 +52,7 @@ public class ReEncodedInputStream extends InputStream {
     private ByteArrayInputStream encodedInputStream_;
     
     public ReEncodedInputStream(Reader reader) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     throws IOException {
     
     reader_ = reader;
@@ -70,6 +71,7 @@ private ByteArrayInputStream reEncode(Reader reader)
     {
     
         int count;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1396
         do{
             count = reader.read(decodedBuffer_, 0, BUFFERED_CHAR_LEN);
             
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/SQLTypes.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/SQLTypes.java
index e1664ef768..a58fdb5710 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/SQLTypes.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/SQLTypes.java
@@ -26,6 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.shared.common.reference.DRDAConstants;
 
 class SQLTypes {
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 
   // define final statics for the fdoca type codes here!!!
 
@@ -62,6 +63,7 @@ else if (length == 4)
       else
         return 0;
         //throw new BugCheckException ("Encountered unexpected float length");
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
     case DRDAConstants.DB2_SQLTYPE_DECIMAL:            // can map to either NUMERIC or DECIMAL!!! @sxg
     case DRDAConstants.DB2_SQLTYPE_ZONED:              // can map to either NUMERIC or DECIMAL!!! @sxg
     case DRDAConstants.DB2_SQLTYPE_NUMERIC:            // can map to either NUMERIC or DECIMAL!!! @sxg
@@ -99,6 +101,7 @@ else if (length == 4)
     case DRDAConstants.DB2_SQLTYPE_DBCLOB:  // large object character DBCS
       return java.sql.Types.CLOB;
     case DRDAConstants.DB2_SQLTYPE_BLOB:    // large object bytes
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         case DRDAConstants.DB2_SQLTYPE_BLOB_LOCATOR:
         case DRDAConstants.DB2_SQLTYPE_CLOB_LOCATOR:
         case DRDAConstants.DB2_SQLTYPE_DBCLOB_LOCATOR:
@@ -131,6 +134,7 @@ else if (length == 4)
 
     static protected int mapJdbcTypeToDB2SqlType (int jdbctype, boolean nullable, AppRequester appRequester,
                                                int[] outlen)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
      throws SQLException
   {
       int nullAddVal =0;
@@ -143,15 +147,18 @@ static protected int mapJdbcTypeToDB2SqlType (int jdbctype, boolean nullable, Ap
 
       switch(jdbctype)
       {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
           case Types.BOOLEAN:
               if ( appRequester.supportsBooleanValues() )
               {
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
                   return DRDAConstants.DB2_SQLTYPE_BOOLEAN + nullAddVal;
               }
               else
               {
                   return DRDAConstants.DB2_SQLTYPE_SMALL + nullAddVal;
               }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
           case java.sql.Types.BIT:
           case java.sql.Types.TINYINT:
           case java.sql.Types.SMALLINT:
@@ -179,6 +186,7 @@ static protected int mapJdbcTypeToDB2SqlType (int jdbctype, boolean nullable, Ap
 
           case java.sql.Types.VARCHAR:
           case java.sql.Types.VARBINARY:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
               return  DRDAConstants.DB2_SQLTYPE_VARCHAR + nullAddVal;
           case java.sql.Types.LONGVARBINARY:
               return DRDAConstants.DB2_SQLTYPE_LONG + nullAddVal;
@@ -191,6 +199,7 @@ static protected int mapJdbcTypeToDB2SqlType (int jdbctype, boolean nullable, Ap
               {
                   return DRDAConstants.DB2_SQLTYPE_LONG + nullAddVal;
               }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
           case java.sql.Types.BLOB:
               return DRDAConstants.DB2_SQLTYPE_BLOB + nullAddVal;
           case java.sql.Types.CLOB:
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/Session.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/Session.java
index c5df9dadea..0663cd3883 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/Session.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/Session.java
@@ -31,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     Session stores information about the current session
     It is used so that a DRDAConnThread can work on any session.
 */
@@ -86,15 +87,18 @@ class Session
      *
      * @exception throws IOException
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3701
     Session (NetworkServerControlImpl nsctrl, int connNum, Socket clientSocket, String traceDirectory,
             boolean traceOn) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3701
         this.nsctrl = nsctrl;
         this.connNum = connNum;
         this.clientSocket = clientSocket;
         this.traceOn = traceOn;
         if (traceOn)
             dssTrace = new DssTrace(); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         dbtable = new Hashtable<String, Database>();
         initialize(traceDirectory);
     }
@@ -110,6 +114,7 @@ protected void close() throws SQLException
             sessionInput.close();
             sessionOutput.close();
             clientSocket.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5418
             setTraceOff();
             if (dbtable != null)
                 for (Enumeration e = dbtable.elements() ; e.hasMoreElements() ;) 
@@ -144,6 +149,7 @@ protected void initTrace(String traceDirectory, boolean throwException)  throws
         
         if (dssTrace == null)
             dssTrace = new DssTrace();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3701
         try {
             dssTrace.startComBufferTrace(traceFileName);
             traceOn = true;
@@ -166,6 +172,7 @@ protected void initTrace(String traceDirectory, boolean throwException)  throws
      */
     protected void setTraceOn(String traceDirectory, boolean throwException) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         if (traceOn)
             return;
         initTrace(traceDirectory, throwException);    
@@ -211,6 +218,7 @@ protected void setTraceOff()
      */
     protected void addDatabase(Database d)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         dbtable.put(d.getDatabaseName(), d);
     }
 
@@ -272,6 +280,7 @@ protected void setState(int s)
      * @param traceDirectory    - directory for trace files
      */
     private void initialize(String traceDirectory)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3701
         throws Exception
     {
         sessionInput = clientSocket.getInputStream();
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/SignedBinary.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/SignedBinary.java
index 0fc95036df..f31af02b9f 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/SignedBinary.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/SignedBinary.java
@@ -23,6 +23,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 /**
  * Converters from signed binary bytes to Java <code>short</code>, <code>int</code>, or <code>long</code>.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
 class SignedBinary
 {
   // Hide the default constructor, this is a static class.
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/StandardEXTDTAReaderInputStream.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/StandardEXTDTAReaderInputStream.java
index 8f992a7a84..84870c0f65 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/StandardEXTDTAReaderInputStream.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/StandardEXTDTAReaderInputStream.java
@@ -40,6 +40,7 @@ final class StandardEXTDTAReaderInputStream extends EXTDTAReaderInputStream
      * @exception DRDAProtocolException if thrown while initializing current 
      *                                  buffer.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
     StandardEXTDTAReaderInputStream(final DDMReader reader,
                                     boolean readStatusByte)
         throws DRDAProtocolException
@@ -72,6 +73,7 @@ final class StandardEXTDTAReaderInputStream extends EXTDTAReaderInputStream
      * @see        java.io.InputStream#read()
      */
     public final int read() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             throws IOException {
         // Reuse the other read method for simplicity.
         byte[] b = new byte[1];
@@ -110,6 +112,7 @@ public final int read(final byte[] b,
             return -1;
         }
         // Adjust length to avoid reading the trailing status byte.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         len = (int)Math.min(remainingBytes, (long)len);
         int val = currentBuffer.read(b, off, len);
         if (val < 0) {
@@ -151,6 +154,7 @@ public final int available()
         }
         int inBuffer = currentBuffer.available();
         // Adjust for the status byte if required.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         if (readStatusByte && inBuffer > remainingBytes) {
             inBuffer--;
         }
@@ -177,6 +181,7 @@ final long getLength()
      * @throws IOException if fetching the buffer fails
      */
     private void nextBuffer()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             throws IOException {
         // Make sure we read the status byte off the wire if it was sent.
         long wireBytes = readStatusByte ? remainingBytes +1 : remainingBytes;
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/Utf8CcsidManager.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/Utf8CcsidManager.java
index 1da8a2078e..3c606a08c2 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/Utf8CcsidManager.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/Utf8CcsidManager.java
@@ -49,6 +49,7 @@ public byte[] convertFromJavaString(String sourceString){
         try {
             return sourceString.getBytes("UTF-8");
         } catch (UnsupportedEncodingException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
             if (SanityManager.DEBUG) {
                 SanityManager.THROWASSERT("Could not convert Java String to byte[] in UTF-8", e);
             }
@@ -60,6 +61,7 @@ public String convertToJavaString(byte[] sourceBytes) {
        try {
            return new String(sourceBytes,"UTF-8");
         } catch (UnsupportedEncodingException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
             if (SanityManager.DEBUG) {
                 SanityManager.THROWASSERT("Could not convert byte[] to Java String using UTF-8 encoding", e);
             }
@@ -72,8 +74,10 @@ public String convertToJavaString(byte[] sourceBytes) {
      */
     public String convertToJavaString(byte[] sourceBytes, int offset, int numToConvert) {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4746
             return new String(sourceBytes, offset, numToConvert, "UTF-8");
         } catch (UnsupportedEncodingException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
             if (SanityManager.DEBUG) {
                 SanityManager.THROWASSERT("Could not convert byte[] to Java String using UTF-8 encoding with offset",e);
             }
@@ -94,6 +98,7 @@ public void convertFromJavaString(String sourceString, ByteBuffer buffer) {
     }
 
     int getByteLength(String str) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4746
         try {
             return str.getBytes("UTF-8").length;
         } catch (UnsupportedEncodingException e) {
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/XADatabase.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/XADatabase.java
index 2db4c4ade0..a302d93f11 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/XADatabase.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/XADatabase.java
@@ -49,6 +49,8 @@ class XADatabase extends Database {
     private ResourceAdapter ra;
 
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-467
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     XADatabase (String dbName)
     {
         super(dbName);
@@ -60,9 +62,11 @@ class XADatabase extends Database {
      * @throws java.sql.SQLException
      */
     @Override
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
     synchronized void makeConnection(Properties p) throws SQLException
     {
         if (xaDataSource == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz;
             try {
                 if (JVMInfo.hasJNDI()) {
@@ -83,6 +87,7 @@ synchronized void makeConnection(Properties p) throws SQLException
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         xaDataSource.setDatabaseName(getShortDbName());
         appendAttrString(p);
         if (attrString != null)
@@ -93,7 +98,9 @@ synchronized void makeConnection(Properties p) throws SQLException
         if (conn == null)
         {
             xaConnection = xaDataSource.getXAConnection(userId,password);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
             ra = xaDataSource.getResourceAdapter();
+//IC see: https://issues.apache.org/jira/browse/DERBY-706
             setXAResource(xaConnection.getXAResource());
         }
         else // this is just a connection reset. Close the logical connection.
@@ -104,6 +111,7 @@ synchronized void makeConnection(Properties p) throws SQLException
         // Get a new logical connection.
         // Contract between network server and embedded engine
         // is that any connection returned implements EngineConnection.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
         conn = (EngineConnection) xaConnection.getConnection();
         // Client will always drive the commits so connection should
         // always be autocommit false on the server. DERBY-898/DERBY-899
@@ -131,6 +139,7 @@ protected XAResource getXAResource ()
      * @return The ResourceAdapter instance for
      *         the underlying database.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
     ResourceAdapter getResourceAdapter()
     {
         return this.ra;
diff --git a/java/org.apache.derby.server/org/apache/derby/impl/drda/memCheck.java b/java/org.apache.derby.server/org/apache/derby/impl/drda/memCheck.java
index da2bd68f11..002647a5ae 100644
--- a/java/org.apache.derby.server/org/apache/derby/impl/drda/memCheck.java
+++ b/java/org.apache.derby.server/org/apache/derby/impl/drda/memCheck.java
@@ -30,6 +30,7 @@ public class memCheck extends Thread {
 public memCheck () {}
 
 public  memCheck (int num) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5896
     delay = num;
 }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/BackgroundStreamDrainer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/BackgroundStreamDrainer.java
index fa3093b3e6..4f41065031 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/BackgroundStreamDrainer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/BackgroundStreamDrainer.java
@@ -42,6 +42,7 @@ public BackgroundStreamDrainer(InputStream in, String timemin)
         this.startTime = System.currentTimeMillis();;
         if (timemin != null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Integer i = Integer.valueOf(timemin);
             timeout = i.intValue();
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java
index 2d739403ef..b7b6f05bcc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/CopySuppFiles.java
@@ -69,8 +69,10 @@ public static void copyFiles(File outDir, String suppFiles)
 		}
                 // need to make a guess so we copy text files to local encoding
                 // on non-ascii systems...
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
 		        if ((fileName.indexOf("sql") > 0) || (fileName.indexOf("txt") > 0) || (fileName.indexOf(".view") > 0) || (fileName.indexOf(".policy") > 0) || (fileName.indexOf(".multi") > 0) || (fileName.indexOf(".properties") > 0))
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
                     BufferedReader inFile = new BufferedReader(new InputStreamReader(is, "UTF-8"));
                     PrintWriter pw = new PrintWriter
                        ( new BufferedWriter(new FileWriter(suppFile), 10000), true );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/FileCompare.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/FileCompare.java
index 01c828d624..08a9085ea5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/FileCompare.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/FileCompare.java
@@ -87,6 +87,7 @@ public boolean exec(String outfile, File outDir, PrintWriter pwDiff,
 	  try	
 	  {
         Class<?> c = Class.forName(NetServer.getDriverName(framework));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Object o = c.getConstructor().newInstance();
         driverVersionMajor = (Integer) c.getMethod("getMajorVersion").invoke(o);
         driverVersionMinor = (Integer) c.getMethod("getMinorVersion").invoke(o);
@@ -112,6 +113,7 @@ public boolean exec(String outfile, File outDir, PrintWriter pwDiff,
             topdir = canondir;
         else {
 			// if this is using product jars, use product_master first
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             String resourceName = "/" + ProductGenusNames.DBMS_INFO;
             InputStream is;
             if (JVMInfo.isModuleAware())
@@ -189,6 +191,7 @@ public boolean exec(String outfile, File outDir, PrintWriter pwDiff,
         // If the master is still not found, create an empty master
         if ( is == null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-689
 			is = new ByteArrayInputStream( new byte[] {} );
         }
 		// compress blanks in output columns to make up for column width differences
@@ -207,6 +210,7 @@ public boolean exec(String outfile, File outDir, PrintWriter pwDiff,
 		        System.out.println("SED Error: " + cfe.getMessage());
 		    }
 		}	
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
         else 
         {
             // read in in fixed format, but write out relying on default encoding
@@ -394,6 +398,7 @@ private void searchJvm(String prefix)
 	// the normal ibm13 search pattern: ibm13 then jdk13.
 
 	String newprefix;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
 	if ((jvmName.startsWith("j9") || (serverJvm != null && serverJvm.startsWith("j9")))
             && (!jvmName.startsWith("j9dee")))
 	{
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/HandleResult.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/HandleResult.java
index ec6a8dfafa..e1f7040dd5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/HandleResult.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/HandleResult.java
@@ -29,6 +29,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
   Class: HandleResult
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
   Purpose: To capture stdout and stderr to a file
   (PrintWriter is used for writing the output)
 */
@@ -41,6 +42,7 @@ public static void main(String[] args) throws Exception
 	}
 
 	public static String handleResult(int exitCode, InputStream stdout,
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
 	        InputStream stderr, PrintWriter printWriter)
 	        throws IOException
 	{
@@ -60,6 +62,7 @@ public static String handleResult(int exitCode, InputStream stdout,
         if (stdout != null)
         {
     		// reader for stdout
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
         	BufferedReader outReader;
         	if(encoding != null)
         		outReader = new BufferedReader(new InputStreamReader(stdout, encoding));
@@ -86,6 +89,7 @@ public static String handleResult(int exitCode, InputStream stdout,
         if (stderr != null)
         {
             // reader for stderr
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
         	BufferedReader errReader;
         	if(encoding != null)
         		errReader = new BufferedReader(new InputStreamReader(stderr, encoding));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
index 75fd1a2562..2f4c679689 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/JavaVersionHolder.java
@@ -39,14 +39,18 @@ public JavaVersionHolder(String javaVersion)
         throws java.lang.NumberFormatException
     {
         // handle early access versions of JDK 9
+//IC see: https://issues.apache.org/jira/browse/DERBY-6854
+//IC see: https://issues.apache.org/jira/browse/DERBY-6998
         if (javaVersion.startsWith( "9" ))
         {
             javaVersion = "1.9.0";
         }
 
         // handle JDK 10
+//IC see: https://issues.apache.org/jira/browse/DERBY-6998
         if (javaVersion.equals( "10" ))
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6998
             javaVersion = "1.10.0";
         }
 
@@ -62,6 +66,7 @@ public JavaVersionHolder(String javaVersion)
         majorVersion = javaVersion.substring(0, i);
         try
 	    {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
           Integer imajor = Integer.valueOf(majorVersion);
 		    major = imajor.intValue();
 		    if (j != -1)
@@ -100,6 +105,7 @@ else if (minorVersion.startsWith("2"))
 		        //System.out.println("minorVersion: " + minorVersion);
 		        try
 	            {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     Integer imajor = Integer.valueOf(majorVersion);
 		            major = imajor.intValue();
 		            Integer iminor = Integer.valueOf(minorVersion);
@@ -148,6 +154,7 @@ public int getMinorNumber()
 	 */
 	public	boolean	atLeast( int baseMajor, int baseMinor )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-955
 		if ( major < baseMajor ) { return false; }
 		if ( major > baseMajor ) { return true; }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/MultiTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/MultiTest.java
index 3f14c3b3ad..176b5fd2e7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/MultiTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/MultiTest.java
@@ -125,6 +125,7 @@ public static void main(String[] args)
 		suite.init();
 	
 		log = openFile(outputDir, testName + ".log");
+//IC see: https://issues.apache.org/jira/browse/DERBY-647
 
 		try
 		{
@@ -147,6 +148,7 @@ public static void main(String[] args)
 			String tester = "Tester" + (i+1);
 			try 
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-647
 				LocalizedOutput out = openFile(outputDir, tester + ".out");
 				testers[i] = new mtTester(tester, suite, out, log);
 			} catch (IOException e) {
@@ -162,6 +164,7 @@ public static void main(String[] args)
 		log.println("total memory is "+Runtime.getRuntime().totalMemory());
 		log.println("free memory  is "+Runtime.getRuntime().freeMemory());
 		// Delete the .out files for Testers that did not report errors.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1230
 		for (i = 0; i < max; i++)
 		{
 			if ( testers[i].noFailure() )
@@ -289,6 +292,7 @@ private static long execTesters(mtTester[] testers)
 		** Now stop everyone that hasn't already stopped.
 		* First get thread dumps for jdk 15.
 		*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-3503
 		TestUtil.dumpAllStackTracesIfSupported(log);
 		for (i = 0; i < MAX_WAIT_FOR_COMPLETION && (tg.isDestroyed() == false ); i++) 
 		{ 
@@ -388,6 +392,7 @@ private static LocalizedOutput openFile(String dir, String fileName)
 	{
 		
 		java.io.File file = new java.io.File(dir, fileName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-647
 
 		return new LocalizedOutput(new FileOutputStream(file));
 	}
@@ -412,6 +417,7 @@ private static void seqRunCases(Vector cases, String descr, String inputDir, Str
 		while (e.hasMoreElements())
 		{
 			testCase = (mtTestCase)e.nextElement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-647
 			String testName = testCase.getFile();
 			System.out.println("...running "+descr+" via "+testName);
 			String logFileName = 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/NetServer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/NetServer.java
index 84337f8965..a8de044644 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/NetServer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/NetServer.java
@@ -43,6 +43,8 @@ public class NetServer
     String javaCmd;
     String jvmflags;
     String framework;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 	String appsRequiredPassword;
 	int timeout=60;
     static String hostName;
@@ -71,7 +73,9 @@ public class NetServer
 
     
     static {
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
     	hostName=TestUtil.getHostName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 	m =  new Hashtable<String, Object[]>();
 	// Hashtable is keyed on framework name and has 
 	// an array of the framework prefix, suffix, driver, port  and 
@@ -83,21 +87,25 @@ public class NetServer
 	     "",                                            // suffix
 	     "com.ibm.db2.jcc.DB2Driver",                   //driver
 	     "1527",                                        // port
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	     serverArgs("start"),                        
 	     serverArgs("shutdown"),
 	     null});                                        //shutdown2
 
 	url = "jdbc:derby://" + hostName + ":1527/";  
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 
 	m.put("DerbyNetClient", new Object[]
 	    {url,                 //prefix
 	     "",                                            // suffix
 	     "org.apache.derby.jdbc.ClientDriver",           //driver
 	     "1527",                                        // port
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	     serverArgs("start"),                        
 	     serverArgs("shutdown"),
 	     null});                                        //shutdown2
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 	url = "jdbc:db2://" + hostName + ":50000/";
 	m.put("DB2jcc", new Object[]
 	    {url,                //prefix
@@ -128,6 +136,7 @@ public class NetServer
      */
     private static String[] serverArgs(String serverCommand)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         ArrayList<String> argList = new ArrayList<String>();
         boolean isModuleAware = JVMInfo.isModuleAware();
 
@@ -153,6 +162,8 @@ private static String[] serverArgs(String serverCommand)
     }
 
     public NetServer(File homeDir, String jvmName, String clPath,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 					 String javaCmd, String jvmflags, String framework,
 					 boolean startServer, String appsRequiredPassword)
 	throws Exception
@@ -164,6 +175,7 @@ public NetServer(File homeDir, String jvmName, String clPath,
         this.jvmflags = jvmflags;
 	this.framework = framework;
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-6400
     if (jvmflags != null && jvmflags.length() > 0)
     {
         int start=jvmflags.indexOf("-Dtimeout");
@@ -178,6 +190,8 @@ public NetServer(File homeDir, String jvmName, String clPath,
 
 	    // if authentication is required to shutdown server we need password
 	    // for user APP (the dbo).
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
     	this.appsRequiredPassword = appsRequiredPassword;
 	frameworkInfo =  (Object[]) m.get(framework);
 	
@@ -188,6 +202,7 @@ public NetServer(File homeDir, String jvmName, String clPath,
     }
     public void start() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
       if (! startServer)
 	  {
 		System.out.println("startServer = false. Bypass server startup");
@@ -210,6 +225,7 @@ public void start() throws Exception
 		else if (javaCmd != null)
 		    jvm.setJavaCmd(javaCmd);
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		Vector<String> jvmProps = new Vector<String>();
 		if ( (clPath != null) && (clPath.length()>0) )
 		    jvm.setClasspath(clPath);
@@ -226,6 +242,7 @@ else if (javaCmd != null)
         // For some platforms (like Mac) the process exec command
         // must be a string array; so we build this with a Vector
         // first because some strings (paths) could have spaces
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 	Vector<String> vCmd = jvm.getCommandLine();
 	for (int i = 0; i < startcmd.length; i++)
 	    vCmd.addElement(startcmd[i]);
@@ -266,6 +283,7 @@ else if (javaCmd != null)
  			}
  			else	
  			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
  				Socket s = new Socket(hostName, this.port);
  				s.close();
 				break;
@@ -300,6 +318,7 @@ public boolean  testNetworkServerConnection() throws Exception
 		
 		if (networkServer == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 			Class<?> serverClass = Class.forName(NETWORK_SERVER_CLASS_NAME);
 			Constructor<?> serverConstructor = serverClass.getConstructor();
 			networkServer = serverConstructor.newInstance();
@@ -321,6 +340,7 @@ public void stop() throws Exception
 						 + framework);
 	jvm jvm = null; // to quiet the compiler
 	jvm = jvm.getJvm(jvmName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 	Vector<String> jvmCmd = jvm.getCommandLine();
 	
 	Vector<String> connV = new Vector<String>();
@@ -333,6 +353,8 @@ public void stop() throws Exception
 		if (stopcmd1 == null)
 		    return;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 		if (appsRequiredPassword != null) {
 			String[] modifiedStopCmd = new String[stopcmd1.length + 4];
 			System.arraycopy(stopcmd1, 0, modifiedStopCmd, 0, stopcmd1.length);
@@ -354,6 +376,7 @@ public void stop() throws Exception
 		}		    
 		
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		Vector<String> stopV = new Vector<String>();
 		for (int i = 0; i < jvmCmd.size(); i++)
 		{
@@ -363,6 +386,7 @@ public void stop() throws Exception
 		Process prconn = Runtime.getRuntime().exec(connCmd);
 		// Give the server sixty seconds to shutdown.
 		TimedProcess tp = new TimedProcess(prconn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6400
 		tp.waitFor(timeout);
 		
 		String[] stopcmd2 = (String[]) frameworkInfo[STOP_CMD2_POS];
@@ -384,6 +408,7 @@ public void stop() throws Exception
 		// Try a TimedProcess as Phil did for the WLServer
 		tp = new TimedProcess(pr);
 		// In case the Server didn't shut down, force it to ...
+//IC see: https://issues.apache.org/jira/browse/DERBY-6400
 		tp.waitFor(timeout);
 		
 		// Finish and close the redirected out and err files
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
index 8fbcbae21a..fe459779d6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
@@ -78,6 +78,7 @@ public ProcessStreamResult(InputStream in, BufferedOutputStream bos,
         this.startTime = System.currentTimeMillis();
         if (timemin != null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Integer i = Integer.valueOf(timemin);
             timeout = i.intValue();
         }
@@ -99,6 +100,7 @@ public void run()
         
 		try
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
 			char[] ca = new char[1024];
 			int valid;
 			interrupted = false;
@@ -113,6 +115,7 @@ public void run()
 			
             // keep reading from the stream as long as we have not 
             // timed out
+//IC see: https://issues.apache.org/jira/browse/DERBY-1694
 			while (((valid = inStream.read(ca, 0, ca.length)) != -1) &&
                     !interrupted)
 			{
@@ -137,6 +140,7 @@ public void run()
 					}
 			    }
 */    			outStream.write(ca, 0, valid);
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
     			outStream.flush();
 			}
 		}
@@ -147,6 +151,7 @@ public void run()
 		}
 
         // if we timed out, then just leave
+//IC see: https://issues.apache.org/jira/browse/DERBY-1694
         if ( interrupted )
             return;
         
@@ -207,6 +212,7 @@ public boolean Wait() throws IOException
 			try
 			{
                 // find timeout in milliseconds
+//IC see: https://issues.apache.org/jira/browse/DERBY-1694
                 long timeoutms = timeout * 60 *1000L;
                 
                 if ( timeout > 0 )
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunClass.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunClass.java
index 18e1fa7aa4..7c78b786bd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunClass.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunClass.java
@@ -49,6 +49,7 @@ public void run()
 			    // we're invoking the test class's main method - which is always static
 			    // thus we can pass null, an underlying object argument would be 
 			    // ignored anyway. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 			    mainMethod.invoke(null, arguments);
 		    }
 		    catch (IllegalAccessException iae)
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunList.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunList.java
index 6e64f59028..9ab4312078 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunList.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunList.java
@@ -592,6 +592,7 @@ else if (otherSpecialProps.length()>0)
                 // if a test needs a jvm process started with more/other properties than these, 
                 // it will not run well with useprocess=false or not in the same way as with
                 // useprocess=true
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
                 String[] args = new String[7];
                 args[0] = str; // the test name
                 if ( ijdefaultResourcePackage != null )
@@ -608,6 +609,7 @@ else if (otherSpecialProps.length()>0)
                 else
                     args[4] = "";
                 args[5] = suite;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
                 args[6] = framework;
                 org.apache.derbyTesting.functionTests.harness.RunTest.main(args);
                 // Write any diff to the suite's output
@@ -638,6 +640,7 @@ else if (otherSpecialProps.length()>0)
         // directory for all test files (instead of creating each test's files in a new dir). 
         // NetworkServer will get started through RunTest if it's not running, but
         // at the end of a suite run, we need to make sure we shutdown network server
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
         if ((!useprocess) && ((framework !=null) && (framework.startsWith("DerbyNet"))))
         {
             try 
@@ -689,7 +692,9 @@ public static Properties locateSuiteProperties(String suiteName,
         {
             // Reset framework to the parent suite's framework, if any
             // because framework may have been set by previous suite
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
             testEncoding = parentProps.getProperty("derbyTesting.encoding");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1348
             upgradejarpath = parentProps.getProperty("derbyTesting.jar.path");
             framework = parentProps.getProperty("framework");
             serverJvm = parentProps.getProperty("serverJvm");
@@ -700,6 +705,7 @@ public static Properties locateSuiteProperties(String suiteName,
             // And do the same for encryption
             encryption = parentProps.getProperty("encryption");
             testEncryptionProvider = parentProps.getProperty("testEncryptionProvider");
+//IC see: https://issues.apache.org/jira/browse/DERBY-238
             testEncryptionAlgorithm = parentProps.getProperty("testEncryptionAlgorithm");
             // And do the same for jdk12test
             jdk12test = parentProps.getProperty("jdk12test");
@@ -707,7 +713,9 @@ public static Properties locateSuiteProperties(String suiteName,
 	        runwithj9 = parentProps.getProperty("runwithj9");
             runwithibmjvm = parentProps.getProperty("runwithibmjvm");
             String testJVM = jvmName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
             if (jvmName.startsWith("j9") && (!jvmName.startsWith("j9dee")))
+//IC see: https://issues.apache.org/jira/browse/DERBY-2224
             	testJVM = (jvmName.startsWith("j9_foundation") ? "foundation" : "j9");            
             runwithjvm = parentProps.getProperty("runwith" + testJVM);
             excludeJCC = parentProps.getProperty("excludeJCC");
@@ -733,13 +741,16 @@ private static void setTopSuiteProperties()
 		if (j9config != null)
 			if (j9config.equals("foun10")) 
 				jvmName="j9_foundation";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2224
 			else if (j9config.equals("foun11"))
 				jvmName="j9_foundation11";
 			else if (j9config.equals("max"))
 				jvmName="j9_13";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
 			else if (j9config.equals("dee"))
 				jvmName="j9dee15";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6998
         javaVersion = System.getProperty(SPEC_VERSION);
 		    
 		//System.out.println("RunList setTopSuiteProperties javaVersion: " + javaVersion);
@@ -752,6 +763,7 @@ else if (javaCmd.equals("jview"))
 
         String javavmVersion = javaVersion;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6998
 
         JavaVersionHolder jvh = new JavaVersionHolder(javavmVersion);
         majorVersion = jvh.getMajorVersion();
@@ -794,14 +806,18 @@ else if (javaCmd.equals("jview"))
 		useoutput = suiteProperties.getProperty("useoutput");
 		encryption = suiteProperties.getProperty("encryption");
 		testEncryptionProvider = suiteProperties.getProperty("testEncryptionProvider");
+//IC see: https://issues.apache.org/jira/browse/DERBY-238
 		testEncryptionAlgorithm = suiteProperties.getProperty("testEncryptionAlgorithm");
 		jdk12test = suiteProperties.getProperty("jdk12test");
 		jdk12exttest = suiteProperties.getProperty("jdk12exttest");
 		runwithibmjvm = suiteProperties.getProperty("runwithibmjvm");
 		runwithj9 = suiteProperties.getProperty("runwithj9");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1214
                 derbyTestingXaSingle = suiteProperties.getProperty("derbyTesting.xa.single");
         String testJVM = jvmName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
         if (jvmName.startsWith("j9") && (!jvmName.startsWith("j9dee")))
+//IC see: https://issues.apache.org/jira/browse/DERBY-2224
         	testJVM = (jvmName.startsWith("j9_foundation") ? "foundation" : "j9");
         runwithjvm = suiteProperties.getProperty("runwith" + testJVM);
 		excludeJCC = suiteProperties.getProperty("excludeJCC");
@@ -816,8 +832,11 @@ else if (javaCmd.equals("jview"))
 		bootcp = suiteProperties.getProperty("bootcp");
 		serverJvm = suiteProperties.getProperty("serverJvm");
 		serverJvmName = suiteProperties.getProperty("serverJvmName");
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 		hostName = suiteProperties.getProperty("hostName");
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
 		testEncoding = suiteProperties.getProperty("derbyTesting.encoding");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1348
 		upgradejarpath = suiteProperties.getProperty("derbyTesting.jar.path");
 		canondir = suiteProperties.getProperty("canondir");
 		mtestdir = suiteProperties.getProperty("mtestdir");
@@ -871,6 +890,7 @@ private static void setSuiteProperties(Properties p, String suiteName,
         // note that at this point, the parentproperties already should have appended the
         // jvmflags from the command line and the top suite properties file
         // only need to add the lower suite properties in the mix
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
         String totaljvmflags = jvmflags;
         String subjvmflags = p.getProperty("jvmflags");
         String parentjvmflags = parentProperties.getProperty("jvmflags");
@@ -878,6 +898,7 @@ private static void setSuiteProperties(Properties p, String suiteName,
         if ((subjvmflags != null) && (parentjvmflags != null) && (!subjvmflags.equals(parentjvmflags)))
         {
             //DERBY-4680 Make sure ^ does not get prepended to jvmflags
+//IC see: https://issues.apache.org/jira/browse/DERBY-4860
             if (subjvmflags != null &&  subjvmflags.length() > 0)
                 totaljvmflags = subjvmflags + "^" + totaljvmflags;
         }
@@ -925,16 +946,19 @@ private static void setSuiteProperties(Properties p, String suiteName,
         
         // derbyTesting.encoding may be set at the top, or just
         // set for individual suites
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
         if(parentProperties.getProperty("derbyTesting.encoding") != null)
 		    p.put("derbyTesting.encoding", testEncoding);
 		else
             testEncoding = p.getProperty("derbyTesting.encoding");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1348
         if(parentProperties.getProperty("derbyTesting.jar.path") != null)
 		    p.put("derbyTesting.jar.path", upgradejarpath);
 		else
             upgradejarpath = p.getProperty("derbyTesting.jar.path");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
         if ( hostName != null )
             p.put("hostName", hostName);
         else
@@ -952,6 +976,7 @@ private static void setSuiteProperties(Properties p, String suiteName,
             testEncryptionProvider = p.getProperty("testEncryptionProvider");
 
 	// Encryption algorithm may be set at the top or just for a subsuite
+//IC see: https://issues.apache.org/jira/browse/DERBY-238
 	    if ( parentProperties.getProperty("testEncryptionAlgorithm") != null )
 		    p.put("testEncryptionAlgorithm", testEncryptionAlgorithm);
 		else
@@ -977,7 +1002,9 @@ private static void setSuiteProperties(Properties p, String suiteName,
 
         // runwithjvm may be set at the top or just for a subsuite
 	    String testJVM = jvmName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
         if (jvmName.startsWith("j9") && (!jvmName.startsWith("j9dee")))
+//IC see: https://issues.apache.org/jira/browse/DERBY-2224
         	testJVM = (jvmName.startsWith("j9_foundation") ? "foundation" : "j9");
 	    if ( parentProperties.getProperty("runwith" + testJVM) != null )
 		    p.put("runwith" + testJVM, runwithjvm);
@@ -1124,6 +1151,7 @@ private static boolean shouldSkipTest()
 	if (runwithibmjvm != null) 
 	{ 
 	    if (runwithibmjvm.equals("")) { needIBMjvm = null; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	    else { needIBMjvm = Boolean.valueOf(runwithibmjvm); }
 	}
 	if (runwithibmjvm == null) { needIBMjvm = null; }
@@ -1223,6 +1251,7 @@ private static boolean shouldSkipTest()
 
 	if (excludeJCC != null)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 	    Class<?> c = null;
 	    Method m = null;
 	    Object o = null;
@@ -1232,6 +1261,7 @@ private static boolean shouldSkipTest()
 	    try	
 	    {
 		c = Class.forName("com.ibm.db2.jcc.DB2Driver");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		o = c.getConstructor().newInstance();
 		m = c.getMethod("getMajorVersion", null);
 		i = (Integer)m.invoke(o, null);
@@ -1672,7 +1702,9 @@ private static boolean isClientExclusionKeyword(String text) {
     private static void unloadEmbeddedDriver() {
         // Attempt to unload the embedded driver and engine
         // but only if we're not having a J2ME configuration i.e. no DriverManager, so check...
+//IC see: https://issues.apache.org/jira/browse/DERBY-1499
         if (TestUtil.HAVE_DRIVER_CLASS)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1379
         try {
             DriverManager.getConnection("jdbc:derby:;shutdown=true");
         } catch (SQLException se) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunSuite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunSuite.java
index 63d4df16af..028ab000b8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunSuite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunSuite.java
@@ -102,10 +102,12 @@ public static void main(String[] args) throws Exception
 		if (j9config != null) 
 			if (j9config.equals("foun10")) 
 				jvmName="j9_foundation";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2224
 			else if (j9config.equals("foun11")) 
 				jvmName="j9_foundation11";
 			else if (j9config.equals("max"))
 				jvmName="j9_13";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
 			else if (j9config.equals("dee"))
 				jvmName="j9dee15";
 
@@ -120,6 +122,7 @@ else if (j9config.equals("dee"))
 
 	    // suiteName may be one suite or a list of suites
         suitesToRun = new Vector<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // Get properties set in the suite's properties file
 		suiteProperties = getSuiteProperties(suiteName, true);
@@ -292,6 +295,7 @@ static Properties getSuiteProperties(String suiteName, boolean isTop)
             jvmName = p.getProperty("jvm");
 		    if ( (jvmName == null) || (jvmName.length()==0) )
 		    {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6998
 		        javaVersion = System.getProperty(RunList.SPEC_VERSION);
 		    }
 		    else
@@ -319,6 +323,7 @@ static Properties getSuiteProperties(String suiteName, boolean isTop)
             javaCmd = p.getProperty("javaCmd");
             jvmflags = p.getProperty("jvmflags");
             testJavaFlags = p.getProperty("testJavaFlags");
+//IC see: https://issues.apache.org/jira/browse/DERBY-238
             testSpecialProps = p.getProperty("testSpecialProps");
             classpath = p.getProperty("classpath");
             classpathServer = p.getProperty("classpathServer");
@@ -350,6 +355,7 @@ static Properties getSuiteProperties(String suiteName, boolean isTop)
             outputdir = p.getProperty("outputdir");
             canondir = p.getProperty("canondir");
             bootcp = p.getProperty("bootcp");
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
             hostName = p.getProperty("hostName");
             serverJvm = p.getProperty("serverJvm");
             systemdiff = p.getProperty("systemdiff");
@@ -359,6 +365,7 @@ static Properties getSuiteProperties(String suiteName, boolean isTop)
             reportstderr = p.getProperty("reportstderr");
             timeout = p.getProperty("timeout");
             shutdownurl = p.getProperty("shutdownurl");
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
             testEncoding = p.getProperty("derbyTesting.encoding");
         }
         suites = p.getProperty("suites");
@@ -397,6 +404,7 @@ private static void getSystemProperties()
 		// when the time comes to have this converted into actual jvm flags
 		// the ones given at the command line will overwrite whatever's in the suite
 		String jflags = sp.getProperty("jvmflags");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4860
 		if (jvmflags != null && jvmflags.length() > 0)
 		{
 		  //DERBY-4680 Make sure ^ does not get appended to jvmflags
@@ -422,13 +430,16 @@ private static void getSystemProperties()
 		String testprops = sp.getProperty("testSpecialProps");
 		if (testprops != null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4860
 		    if (testSpecialProps == null || testSpecialProps.length() == 0)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
 		        testSpecialProps = testprops;
 		    else // add to testSpecialProps
 		        testSpecialProps = testSpecialProps + "^" + testprops;
 		    suiteProperties.put("testSpecialProps", testSpecialProps);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		String clpth = isModuleAware ? JVMInfo.getSystemModulePath() : sp.getProperty("classpath");
 		if (clpth != null)
 		{
@@ -456,6 +467,7 @@ private static void getSystemProperties()
 		String encrypt = sp.getProperty("encryption");
 		if (encrypt != null)
 		    suiteProperties.put("encryption", encrypt);
+//IC see: https://issues.apache.org/jira/browse/DERBY-238
 		String encryptAlgorithm = sp.getProperty("testEncryptionAlgorithm");
 		if (encryptAlgorithm != null)
 		    suiteProperties.put("testEncryptionAlgorithm", encryptAlgorithm);
@@ -492,20 +504,24 @@ private static void getSystemProperties()
 		    bootcp = j9bootcp;
 		    suiteProperties.put("bootcp", bootcp);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 		String hostname = sp.getProperty("hostName");
 		if (hostname != null)
 			suiteProperties.put("hostName", hostname);
 		String serverJvm = sp.getProperty("serverJvm");
 		if (serverJvm != null)
 		    suiteProperties.put("serverJvm", serverJvm);
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
 		String cmlTestEncoding = sp.getProperty("derbyTesting.encoding");
 		if (cmlTestEncoding != null)
 		    suiteProperties.put("derbyTesting.encoding", cmlTestEncoding);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1348
                 String upgradejarpath = sp.getProperty("derbyTesting.jar.path");
                 if (upgradejarpath != null)
                     suiteProperties.put("derbyTesting.jar.path", upgradejarpath);
 		String testout = sp.getProperty("testoutname");
 		if (testout != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3294
 		    suiteProperties.put("testoutname", testout);
 		String mtdir = sp.getProperty("mtestdir"); // used by multi tests
 		if (mtdir != null)
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunTest.java
index 36c51fe1b8..0fe293d692 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunTest.java
@@ -190,6 +190,7 @@ public class RunTest
 	public static void main(String[] args)
 		throws Exception
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-323
 		Locale.setDefault(Locale.US);
 		skiptestReason.setLength(0); // 0 out for useprocess
 		// Determine the test type
@@ -213,6 +214,7 @@ public static void main(String[] args)
 		    System.exit(1);
 		}
 		// If useprocess=false RunList calls this main method with 7 arguments...
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
 		if (args.length == 7)
 		{
 		    defaultPackageName = args[1];
@@ -222,6 +224,7 @@ public static void main(String[] args)
 		    isSuiteRun = true;
 		    suiteName = args[5];
 		    //System.out.println("suiteName: " + suiteName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
 		    framework=args[6];		    
 		    // initializing startServer to true (which it would be if we'd
 		    // run with useprocess=true) or network server will not get started
@@ -248,6 +251,7 @@ public static void main(String[] args)
             System.setProperties(sp);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1605
         JavaVersionHolder	jvhs = getProperties(sp);
 		boolean				isJDBC4 = jvhs.atLeast( 1, 6 );
 
@@ -260,6 +264,8 @@ public static void main(String[] args)
 
         // Check for properties files, including derby.properties
         // and if needed, build the -p string to pass to the test
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
         AppsRequiredPassword creds = new AppsRequiredPassword();
         String propString = createPropString(creds);
 
@@ -286,6 +292,7 @@ public static void main(String[] args)
             // before going further, get the policy file copied and if
             // needed, modify it with the test's policy file
             composePolicyFile();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
             String spacedJvmFlags = jvmflags;
             // we now replace any '^' in jvmflags with ' '
             if ((jvmflags != null) && (jvmflags.indexOf("^")>0))
@@ -293,6 +300,7 @@ public static void main(String[] args)
                 spacedJvmFlags = spaceJvmFlags(jvmflags);   
             }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6400
             if (!(timeoutStr.isEmpty()) && !(timeoutStr==null) && (timeout >= 0)) {
                 if  (spacedJvmFlags != null)
                     spacedJvmFlags = "-Dtimeout=" + timeoutStr + " " + spacedJvmFlags;
@@ -312,6 +320,8 @@ public static void main(String[] args)
                 }
 
                 ns = new NetServer(baseDir, jvmnetjvm, classpathServer, null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
                                    spacedJvmFlags,framework, startServer,
                                    creds.password);
             }
@@ -333,6 +343,7 @@ public static void main(String[] args)
             // if useprocess=false and we're in a suite, start network server if it's not running 
             // and leave serverNeedsStopping=false, unless startServer=false, then, 
             // if network server is running, stop it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
             if ((!useprocess) && (isSuiteRun))
             {            	   
                 boolean started = false;
@@ -378,6 +389,7 @@ public static void main(String[] args)
         }
             
         // Stop the Network server if necessary
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
 		if (serverNeedsStopping)
 		{
 		    ns.stop();
@@ -398,6 +410,7 @@ public static void main(String[] args)
                     {
                         Sed sed = new Sed();
                         sed.exec(tmpOutFile,finalOutFile, isSed, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-955
                                         NetServer.isClientConnection(framework), isI18N, isJDBC4);
 		    }
 		    catch (ClassFormatError cfe)
@@ -468,6 +481,7 @@ public static void main(String[] args)
     		pwDiff.flush();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
         generateUTF8OutFile(finalOutFile);
         
 		// Cleanup files
@@ -495,6 +509,7 @@ private static void testRun(String propString, Properties sysProp)
         if ( useprocess )
 		{
             // Build the test command
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
             String[] testCmd = 
         		buildTestCommand(propString, systemHome, scriptPath);
             execTestProcess(testCmd);
@@ -516,6 +531,7 @@ private static void setDirectories(String scriptName, Properties sp)
         userdir = sp.getProperty("user.dir");
         
         // reset defaultPackageName (for useprocess=false)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
         if (useprocess == false)
           defaultPackageName = "/org/apache/derbyTesting/";
             
@@ -534,6 +550,9 @@ private static void setDirectories(String scriptName, Properties sp)
         int index = scriptName.lastIndexOf('/');
         if (index == -1) // no test directory was specified
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-918
+//IC see: https://issues.apache.org/jira/browse/DERBY-934
+//IC see: https://issues.apache.org/jira/browse/DERBY-797
             if ( (!testType.equals("sql")) && (!testType.equals("java")) && (!testType.equals("junit")))
             {
                 System.out.println("Test argument should be of the form: <dir>/<test>.<ext>");
@@ -564,6 +583,9 @@ private static void setDirectories(String scriptName, Properties sp)
         // Get the test name without the extension
         testBase = scriptFileName.substring(0, scriptFileName.lastIndexOf("."+testType));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-918
+//IC see: https://issues.apache.org/jira/browse/DERBY-934
+//IC see: https://issues.apache.org/jira/browse/DERBY-797
 		if (testType.equals("java") || testType.equals("junit"))
 		{
                     //get the javaPath
@@ -593,6 +615,7 @@ private static void setDirectories(String scriptName, Properties sp)
             
         if ( (outputdir == null) || (outputdir.length()==0) )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
         	if (File.separatorChar == '\\')
             {
                 //need to replace / in path with \ for windows
@@ -684,6 +707,9 @@ private static void setDirectories(String scriptName, Properties sp)
 
         // For certain test types, locate script file based on scriptName
         // Then determine the actual test name and directory
+//IC see: https://issues.apache.org/jira/browse/DERBY-918
+//IC see: https://issues.apache.org/jira/browse/DERBY-934
+//IC see: https://issues.apache.org/jira/browse/DERBY-797
         if ( (!testType.equals("java")) &&
              (!testType.equals("junit")) &&
              (!testType.equals("unit")) && 
@@ -703,6 +729,7 @@ private static void setDirectories(String scriptName, Properties sp)
 
             // Read the test file and copy it to the outDir
             // except for multi tests (for multi we just need to locate it)
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
             BufferedReader in = new BufferedReader(new InputStreamReader(is, "UTF-8"));
             if (upgradetest)
 		
@@ -754,6 +781,7 @@ private static void setDirectories(String scriptName, Properties sp)
     		baseDir = new File(userdir, commonDBHome);
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
         else if ( (!useprocess) && isSuiteRun && ((usesystem==null) || (usesystem.length()<=0)) )
         {
             String suite = (suiteName.substring(0,suiteName.indexOf(':')));
@@ -830,6 +858,7 @@ else if (useCommonDB == true)
         // this is probably always going to be testBase
         if ( testOutName == null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3294
             testOutName = testBase;
         }
 
@@ -837,6 +866,7 @@ else if (useCommonDB == true)
         tmpOutFile = new File(outDir, testOutName + ".tmp");
         // Always create a.tmpmstr copy of the master file in local encoding.
         // With network server, this gets adjusted for displaywidth 
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
         tempMasterName = testOutName+".tmpmstr";
 		UTF8OutName = testOutName+".utf8out";
 		// Define the .out file which will be created by massaging the tmp.out
@@ -870,6 +900,7 @@ else if (useCommonDB == true)
         // Delete any old .out or .tmp files
         if (tmpOutFile.exists())
             status = tmpOutFile.delete();
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
         tempMasterFile = new File(outDir, tempMasterName);
         if (tempMasterFile.exists())
             status = tempMasterFile.delete();
@@ -907,6 +938,7 @@ private static JavaVersionHolder getProperties(Properties sp)
         
         // before doing anything else, get jvmflags, evaluate any -D 
         // see if there is anything useful to the test harness in jvmflags
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
         if ((jvmflags != null) && (jvmflags.length() > 0))
         {
             StringTokenizer st = new StringTokenizer(jvmflags,"^");
@@ -924,6 +956,7 @@ private static JavaVersionHolder getProperties(Properties sp)
         }
         
         searchCP = sp.getProperty("ij.searchClassPath");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
 		String frameworkp = sp.getProperty("framework");
 		if (frameworkp != null)
 			framework = frameworkp;
@@ -933,15 +966,18 @@ private static JavaVersionHolder getProperties(Properties sp)
 			framework = "";
 		else
 			driverName = NetServer.getDriverName(framework);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1214
         String junitXAProp = sp.getProperty ("derbyTesting.xa.single");
         if (junitXAProp != null && junitXAProp.equals ("true")) {
             junitXASingle = true;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
         hostName = sp.getProperty("hostName");
         // force hostName to localhost if it is not set
         if (hostName == null)
            hostName="localhost";
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
         String generateUTF8OutProp = sp.getProperty("generateUTF8Out");
         if (generateUTF8OutProp != null && generateUTF8OutProp.equals("true"))
         	generateUTF8Out = true;
@@ -972,6 +1008,7 @@ private static JavaVersionHolder getProperties(Properties sp)
 		//System.out.println("jvmName is: " + jvmName);
 		if ( (jvmName == null) || (jvmName.length()==0) || (jvmName.equals("jview")))
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6998
 		    javaVersion = System.getProperty(RunList.SPEC_VERSION);
 		    //System.out.println("javaVersion is: " + javaVersion);
 		}
@@ -1006,10 +1043,12 @@ private static JavaVersionHolder getProperties(Properties sp)
                         {
                             jvmName = "j9_foundation";
                         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2224
                         else if (System.getProperty("com.ibm.oti.configuration").equals("foun11"))
                         {
                             jvmName = "j9_foundation11";
                         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
                         else if (System.getProperty("com.ibm.oti.configuration").equals("dee"))
                         {
                             jvmName = "j9dee15";
@@ -1040,10 +1079,14 @@ else if (System.getProperty("com.ibm.oti.configuration").equals("dee"))
 
         // create a JavaVersionHolder for the java.specification.version - 
         // used to control Sed-ing for JDBC4 & up
+//IC see: https://issues.apache.org/jira/browse/DERBY-6998
         String specversion = (sp.getProperty(RunList.SPEC_VERSION));
         JavaVersionHolder jvhs = new JavaVersionHolder(specversion);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1605
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
         testEncoding = sp.getProperty("derbyTesting.encoding");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1348
         upgradejarpath = sp.getProperty("derbyTesting.jar.path");
         if ((testEncoding != null) && (!jvmName.equals("jdk15")))
         {
@@ -1076,9 +1119,11 @@ else if (System.getProperty("com.ibm.oti.configuration").equals("dee"))
 		        upgradetest = true;
 		}
 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-2224
         if ( framework.equals("DerbyNet") && (! jvmName.startsWith("j9_foundation")))
 		{	
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 			Class<?> c = null;
 			Method m = null;
 			Object o = null;
@@ -1086,6 +1131,7 @@ else if (System.getProperty("com.ibm.oti.configuration").equals("dee"))
  			try	
 			{
 				c = Class.forName("com.ibm.db2.jcc.DB2Driver");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				o = c.getConstructor().newInstance();
 				m = c.getMethod("getMajorVersion", null);
 				i = (Integer)m.invoke(o, null);
@@ -1167,6 +1213,7 @@ else if (System.getProperty("com.ibm.oti.configuration").equals("dee"))
 		canonpath = sp.getProperty("canonpath");
 
 		testOutName = sp.getProperty("testoutname");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		useOutput = Boolean.valueOf(sp.getProperty("useoutput","true")).booleanValue();
 		outcopy = Boolean.valueOf(sp.getProperty("outcopy","false")).booleanValue();
 		mtestdir = sp.getProperty("mtestdir"); // used by multi tests
@@ -1191,6 +1238,7 @@ else if (System.getProperty("com.ibm.oti.configuration").equals("dee"))
 		// startServer should be false.
 		if (!hostName.equals("localhost"))
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-817
         	    startServer=false;
 		}
 		
@@ -1256,6 +1304,7 @@ else if (System.getProperty("com.ibm.oti.configuration").equals("dee"))
 
 		// Some tests will not run well in a suite with use process false 
 		// with some frameworks, so skip
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
 		if (!useprocess && !skiptest )
 		{
 		    String tsuiteName = null;
@@ -1298,6 +1347,7 @@ else if (System.getProperty("com.ibm.oti.configuration").equals("dee"))
 		if (uscdb != null && uscdb.equals("true"))
 			useCommonDB = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1605
 		return jvhs;
     }
 
@@ -1369,6 +1419,7 @@ else if (isClDef != null)
 
         // j9 will run out of memory with the default cache size (100), so
         // forcing it lower unless set in _derby.properties file for a specific test
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
         if (jvmName.startsWith("j9") && (!jvmName.equalsIgnoreCase("j9dee15")))
         {
             if (clp.getProperty("derby.language.statementCacheSize")==null)
@@ -1430,9 +1481,12 @@ else if (isClDef != null)
 
 //System.out.println("clPropFile: " + clPropFile.getPath());
             bos = new BufferedOutputStream(new FileOutputStream(clPropFile));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
             clp.store(bos, "Derby Properties");
         	bos.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
             String auth = clp.getProperty(
                 "derby.connection.requireAuthentication");
 
@@ -1459,6 +1513,7 @@ else if (isClDef != null)
         //    substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substituten
         //  No commas or semicolons can be allowed in the patterns/subsitutes.  //
        
+//IC see: https://issues.apache.org/jira/browse/DERBY-1462
         if ( testType.equals("multi") )
         	isSed = loadTestResource("multi/stress/" + testBase + "_sed.properties");
         else
@@ -1596,6 +1651,7 @@ else if (isClDef != null)
 		
 //System.out.println("appPropFile: " + appPropFile.getPath());
             bos = new BufferedOutputStream(new FileOutputStream(appPropFile));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
             ap.store(bos, "App Properties");
             bos.close();
             
@@ -1606,6 +1662,7 @@ else if (isClDef != null)
             String apppropsjvmflags = ap.getProperty("jvmflags");
             if (apppropsjvmflags != null)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4860
                 if (jvmflags != null && jvmflags.length() > 0)
                     jvmflags = apppropsjvmflags + "^" + jvmflags;
                 else
@@ -1652,6 +1709,7 @@ else if (encryption)
         		try
         		{
             		bos = new BufferedOutputStream(new FileOutputStream(appPropFile));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
             		ap.store(bos, "Test Properties");
             		bos.close();
                 }
@@ -1692,6 +1750,7 @@ else if (encryption)
                 jvmnet = true;
 
             String excludeJcc = ap.getProperty("excludeJCC");
+//IC see: https://issues.apache.org/jira/browse/DERBY-632
             if ( framework.equals("DerbyNet") )
             {	
                 try {
@@ -1710,8 +1769,10 @@ else if (encryption)
             {
             	if (jvmName.equals("j9_foundation"))
             		testJVM = "foundation";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2224
             	else if (jvmName.equals("j9_foundation11"))
             		testJVM = "foundation";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
                 else if (jvmName.equalsIgnoreCase("j9dee15"))
                     testJVM = "j9dee15";
             	else
@@ -1732,6 +1793,7 @@ else if (jvmName.equalsIgnoreCase("j9dee15"))
 				startServer =false;
 			
 	        //Check derbyTesting.encoding property
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
 	        if(testEncoding == null) {
 	            testEncoding = ap.getProperty("derbyTesting.encoding");
 	            // only bother if we have jdk15, otherwise we'll be skipping
@@ -1739,6 +1801,7 @@ else if (jvmName.equalsIgnoreCase("j9dee15"))
 	            {
 	                    jvmflags = (jvmflags==null?"":jvmflags+" ") 
 	                                + "-Dfile.encoding=" + testEncoding; 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
 	                    ap.put("file.encoding",testEncoding);
 	            }
 	        }
@@ -1754,6 +1817,7 @@ else if (jvmName.equalsIgnoreCase("j9dee15"))
 	        }
 
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
 	        if (NetServer.isJCCConnection(framework)
 	        		|| "true".equalsIgnoreCase(ap.getProperty("noSecurityManager")))
 	        	runWithoutSecurityManager = true;
@@ -1791,6 +1855,8 @@ else if ( outcopy == true )
                     copyOutDir = outDir;
                 else if ( (runDir != null) && (runDir.exists()) )
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1366
+//IC see: https://issues.apache.org/jira/browse/DERBY-577
                     copyOutDir = runDir;
                 }
                 else
@@ -1816,6 +1882,7 @@ else if ( (runDir != null) && (runDir.exists()) )
 				if(copySupportFiles)
 				   CopySuppFiles.copyFiles(copyOutDir, suppFiles);
     		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
     		else
     		{
 				// for useprocess false, set ext* (back) to null, or it
@@ -1848,6 +1915,7 @@ public static String setTestJavaFlags(String tflags)
         while (st.hasMoreTokens())
         {
 	        String token = st.nextToken();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
             if (! (token.startsWith("-"))) { sb.append(dintro); }
             sb.append(token);
             sb.append(" ");
@@ -2026,6 +2094,7 @@ private static void doCleanup(String javaVersion)
         //printWriter = null;
 
         //Always cleanup the script files - except when keepfiles is true
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
         if ( !(script == null) && (script.exists()) && (!keepfiles) )
         {
             status = script.delete();
@@ -2055,6 +2124,7 @@ private static void doCleanup(String javaVersion)
                 tmpOutFile = null;
             status = finalOutFile.delete();
             if (skiptest == false)
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
                 status = diffFile.delete();           
             // delete the copied (and for Network Server, modified) master file 
             tempMasterFile = new File(outDir, tempMasterName);
@@ -2083,8 +2153,10 @@ private static void doCleanup(String javaVersion)
 
                 // delete the directories where external input/output files 
                 // were created
+//IC see: https://issues.apache.org/jira/browse/DERBY-298
                 if (extInDir!=null) deleteFile(extInDir);
                 if (extOutDir!=null) deleteFile(extOutDir);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
                 if (extInOutDir!=null) deleteFile(extInOutDir);
             }
         }
@@ -2113,6 +2185,7 @@ public static void deleteFile(File f)
             System.out.println(f.getName() + " is null");
             return;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
         if (!f.exists())
         {
             System.out.println(f.getName() + " does not exist; harness error");
@@ -2127,6 +2200,7 @@ public static void deleteFile(File f)
 	    else
 	    {
 	        // Could not delete; this could be a non-empty directory
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
 	        if (!f.isDirectory())
 	        { 
 	            System.out.println("Could not delete file " + f.getName() + ", going on");
@@ -2214,6 +2288,7 @@ static void appendStderr(BufferedOutputStream bos, InputStream is)
     {
         PrintWriter tmpPw = new PrintWriter(bos);
         // reader for stderr
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
         BufferedReader errReader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
         String s = null;
         int lines = 0;
@@ -2248,6 +2323,7 @@ static void verifyTestType()
     }
 
 	public static void
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 	addStandardTestJvmProps(Vector<String> testJvmProps,String derbySystemHome,
 							String userDirName, jvm jvm)
 	{
@@ -2279,7 +2355,9 @@ private static String[] buildTestCommand(String propString,
         if ( (classpath != null) && (classpath.length()>0) )
             jvm.setClasspath(classpath);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		Vector<String> jvmProps = new Vector<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3294
 		if ( testType.equals("java"))
 		    addStandardTestJvmProps(jvmProps,systemHome,
 			    outDir.getCanonicalPath(),null);		    
@@ -2292,6 +2370,7 @@ else if ( (runDir != null) && (runDir.exists()) )
 		
         if ( (testJavaFlags != null) && (testJavaFlags.length()>0) )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             String parsedFlags = setTestJavaFlags(testJavaFlags);
             StringTokenizer st = new StringTokenizer(parsedFlags," ");
             while (st.hasMoreTokens())
@@ -2307,14 +2386,17 @@ else if ( (runDir != null) && (runDir.exists()) )
         if ( (framework != null) )
         {
             jvmProps.addElement("framework=" + framework);
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
             if ((hostName != null) && (!hostName.equals("localhost")))
             		jvmProps.addElement("hostName=" + hostName);
         }
         
         if (junitXASingle)
             jvmProps.addElement ("derbyTesting.xa.single=true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1214
 
         // if we're not jdk15, don't, we'll skip
+//IC see: https://issues.apache.org/jira/browse/DERBY-683
         if ((testEncoding != null) && (jvmName.equals("jdk15")))
         {
             jvmProps.addElement("derbyTesting.encoding=" + testEncoding);
@@ -2330,12 +2412,14 @@ else if ( (runDir != null) && (runDir.exists()) )
                         "-Dfile.encoding=UTF-8";
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1348
         if (upgradejarpath != null)
             jvmProps.addElement("derbyTesting.jar.path=" + upgradejarpath);
             
         if ( (jvmflags != null) && (jvmflags.length()>0) )
         {
             // We now replace any '^' in jvmflags with ' '
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
             if (jvmflags.indexOf("^")>0)
             {
                 jvmflags = spaceJvmFlags(jvmflags);
@@ -2351,6 +2435,7 @@ else if ( (runDir != null) && (runDir.exists()) )
             
             // MultiTest is special case, so pass on properties
             // related to encryption to MultiTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-236
             jvmProps.addElement("encryption="+encryption);
             Properties props = new Properties();
             // parse and get only the special properties that are needed for the url 
@@ -2363,14 +2448,17 @@ else if ( (runDir != null) && (runDir.exists()) )
         jvm.setD(jvmProps);
        
         // set security properties
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
         if (!runWithoutSecurityManager)
             jvm.setSecurityProps();
         else
         	System.out.println("-- SecurityManager not installed --");
 
         Vector<String> v = jvm.getCommandLine();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         boolean isModuleAware = JVMInfo.isModuleAware();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (isModuleAware)
         {
             v.add("-p");
@@ -2392,6 +2480,7 @@ else if ( (runDir != null) && (runDir.exists()) )
             // To get the same result for ibm141 & jdk14*, the harness needs to
             // force the console encoding to Cp1252 for ij tests - unless 
             // we're on non-ascii systems.
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
             String isNotAscii = System.getProperty("platform.notASCII");
             if (isI18N) {
                 // DERBY-244: Use UTF-8 console encoding for the i18n tests to
@@ -2401,6 +2490,7 @@ else if ( (runDir != null) && (runDir.exists()) )
                 v.addElement("-Dconsole.encoding=Cp1252" );
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             String executableClass = "org.apache.derby.tools." + ij;
             
             if (isModuleAware)
@@ -2426,6 +2516,7 @@ else if ( (runDir != null) && (runDir.exists()) )
         }
         else if ( testType.equals("java") )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             String testClass = (javaPath.length() > 0) ?
                 javaPath + "." + testBase : testBase;
 
@@ -2451,6 +2542,9 @@ else if (testType.equals("unit"))
             v.addElement("-p");
             v.addElement(propString);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-918
+//IC see: https://issues.apache.org/jira/browse/DERBY-934
+//IC see: https://issues.apache.org/jira/browse/DERBY-797
         else if (testType.equals("junit"))
         {
             v.addElement("junit.textui.TestRunner");
@@ -2485,6 +2579,7 @@ else if ( testType.equals("multi") )
 
     public static String spaceJvmFlags(String caretedJvmFlags)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1091
     	String spacedJvmFlags = "";
     	// there must at least be one
     	StringTokenizer st = new StringTokenizer(jvmflags,"^");
@@ -2679,6 +2774,7 @@ private static void execTestNoProcess(Properties sysProp,
         ptmp.put("derby.infolog.append", "true");
         // for framework tests, we may need to pick up the hostName 
         // passed on on command line to individual tests...
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
         if (framework.startsWith("DerbyNet"))
         	ptmp.put("hostName=", hostName);
         System.setProperties(ptmp);
@@ -2711,6 +2807,7 @@ private static void execTestNoProcess(Properties sysProp,
             ijarg[1] = propString;
             ijarg[2] = scriptPath;
             // direct the standard output and error to the print stream for the .tmp file
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
             PrintStream stdout = System.out;
             PrintStream stderr = System.err;
             System.setOut(ps);
@@ -2748,11 +2845,13 @@ private static void execTestNoProcess(Properties sysProp,
 			ptmp.put("usesystem", "");
 			System.setProperties(ptmp);
 			// Reset System.out and System.err
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
 			System.setOut(stdout);
 			System.setErr(stderr);
         }
         else if (testType.equals("java"))
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 	    if (javaPath == null)
 	            javaPath = "org.apache.derbyTesting.functionTests.tests." + testDirName;
 	    
@@ -2762,7 +2861,9 @@ else if (testType.equals("java"))
             Class[] classArray = new Class[1];
             classArray[0] = args.getClass();
             String testName = javaPath + "." + testBase;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Class<?> JavaTest = Class.forName(testName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
             PrintStream stdout = System.out;
             PrintStream stderr = System.err;
             System.setOut(ps);
@@ -2771,6 +2872,7 @@ else if (testType.equals("java"))
             Method testMain = JavaTest.getMethod("main", classArray);
             Object[] argObj = new Object[1];
             argObj[0] = args;
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 			RunClass testObject = new RunClass(testMain, argObj);
 			Thread testThread = new Thread(testObject);
 			try
@@ -2782,6 +2884,7 @@ else if (testType.equals("java"))
 				}
 				else
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 					testThread.join(timeout * 60 * 1000);
 				}
 			}
@@ -2800,6 +2903,7 @@ else if (testType.equals("java"))
 				// ignore the errors, they are expected.
 			}
 	        // Reset System.out and System.err
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
 	        System.setOut(stdout);
 	        System.setErr(stderr);
         }
@@ -2828,6 +2932,7 @@ else if (testType.equals("multi"))
         else if (testType.equals("unit"))
         {
             // direct the standard output and error to the print stream for the .tmp file
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
             PrintStream stdout = System.out;
             PrintStream stderr = System.err;
             System.setOut(ps);
@@ -2848,6 +2953,7 @@ else if (testType.equals("unit"))
         }
         else if (testType.equals("junit"))
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
             PrintStream stdout = System.out;
             PrintStream stderr = System.err;
             System.setOut(ps);
@@ -2874,8 +2980,10 @@ else if (testType.equals("junit"))
             // do if invoked in a separate process (useprocess=true).
            
             // Load the test class
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Class<?> testClass = Class.forName(testName);
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite junitTestSuite = null;
             
             try{
@@ -2900,6 +3008,7 @@ else if (testType.equals("junit"))
             }
             else{
                 System.out.println(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                     "Not able to extract JUnit BaseTestSuite from " +
                     "test class " + testName);
             }
@@ -2944,6 +3053,7 @@ static boolean verifyFramework (String framework) {
      * @return InputStream for the resource
      */
     public static InputStream loadTestResource(String loc) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return RunTest.class.getResourceAsStream(testResourceHome + loc); 
     }
     
@@ -2980,12 +3090,14 @@ private static boolean installSecurityManager() throws ClassNotFoundException, I
     {
     	// SecurityManager not currently work with older j9 and useProcess=false
     	// need to disable to allow tests to run.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2224
    	if (jvmName.startsWith("j9") && (!jvmName.equals("j9_foundation11")))
    		return false;
     	
     	boolean installedSecurityManager = false;
     	// Set up the SecurityManager in this JVM for this test.
     	boolean haveSecurityManagerAlready = System.getSecurityManager() != null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
         if (runWithoutSecurityManager)
         {
         	// Test doesn't run with a SecurityManager,
@@ -3000,6 +3112,7 @@ else if (!haveSecurityManagerAlready)
     	{
         	// Get the set of -D options that would be needed
         	// for a spawned VM and convert them to system properties.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             for (String dashDOpt : jvm.getSecurityProps(null))
     	    {
     	    	if ("java.security.manager".equals(dashDOpt))
@@ -3024,6 +3137,7 @@ else if (!haveSecurityManagerAlready)
     // It is assumed that if one runs with this property, keepfiles should be true.
     private static void generateUTF8OutFile(File FinalOutFile) throws IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
         if (generateUTF8Out) 
         {
             keepfiles=true;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/Sed.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/Sed.java
index ea2f3ca7b9..8a1e35bd1a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/Sed.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/Sed.java
@@ -43,6 +43,8 @@ public class Sed
 {
 	private	static	final	String	SQL_EXCEPTION_FILTERED_SUBSTITUTION = 
         "java.sql.SQLException:";
+//IC see: https://issues.apache.org/jira/browse/DERBY-939
+//IC see: https://issues.apache.org/jira/browse/DERBY-1616
 
     public Sed()
     {
@@ -55,6 +57,7 @@ public static void main(String[] args) throws Exception {
         }
         File src = new File(args[0]);
         File tgt = new File(args[1]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-955
         new Sed().exec(src,tgt,null, false, false,false);
     }
 
@@ -63,9 +66,11 @@ public static void main(String[] args) throws Exception {
 		(File srcFile, File dstFile, InputStream isSed, boolean isJCC, boolean isI18N, boolean isJDBC4)
         throws IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
     	String hostName = TestUtil.getHostName();
     	
         // Vector for storing lines to be deleted
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> deleteLines = new Vector<String>();
         deleteLines.addElement("^ij version.*$");
         deleteLines.addElement("^\\*\\*\\*\\* Test Run Started .* \\*\\*\\*\\*$");
@@ -84,9 +89,11 @@ public static void main(String[] args) throws Exception {
         deleteLines.addElement("^(.*at .*)\\(.*:[0-9].*\\)$");
         deleteLines.addElement("^(.*at .*)\\(*.java\\)$");
         deleteLines.addElement("^(.*at .*)\\(Compiled Code\\)$");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5186
         deleteLines.addElement("^.*at java.*\\<init\\>\\(.*\\(Compiled Code\\)\\)$");
         deleteLines.addElement("^(.*at .*)\\(Interpreted Code\\)$");
         deleteLines.addElement("^(.*at .*)\\(Unknown Source\\)$");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6881
         deleteLines.addElement("^(.*at .*)\\(.*Native Method\\)$");
         deleteLines.addElement("^\\tat $"); // rare case of incomplete stack trace line
         deleteLines.addElement("optimizer estimated cost");
@@ -109,17 +116,20 @@ public static void main(String[] args) throws Exception {
         deleteLines.addElement("^XSDB.*$");
 
 		// JUnit noise
+//IC see: https://issues.apache.org/jira/browse/DERBY-516
         deleteLines.addElement("^\\.*$");
         deleteLines.addElement("^Time: [0-9].*$");
         deleteLines.addElement("^OK \\(.*$");
 
         // Vectors for substitutions
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> searchStrings = new Vector<String>();
         searchStrings.addElement("^Transaction:\\(.*\\) *\\|"); 
         searchStrings.addElement("^Read [0-9]* of [0-9]* bytes$");
         searchStrings.addElement("Directory .*connect.wombat.seg0");
         //DERBY-4588 - filter out specific class and object id
         searchStrings.addElement("with class loader .*,");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4598
 
         //
         // Original comment:
@@ -128,6 +138,7 @@ public static void main(String[] args) throws Exception {
         // The db2-compatibility caused name collisions and was removed with DERBY-6977.
         //
         StringBuffer constraintNameFilter = new StringBuffer(); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6977
         constraintNameFilter.append("SQL[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-");
         // Filter for uuids
         StringBuffer uuidFilter = new StringBuffer();
@@ -139,6 +150,7 @@ public static void main(String[] args) throws Exception {
 
         // generated constraint names now end in a UUID (see DERBY-6977)
         constraintNameFilter.append(uuidFilter.toString());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6977
 
         searchStrings.addElement(constraintNameFilter.toString());
         searchStrings.addElement(uuidFilter.toString());
@@ -158,11 +170,13 @@ public static void main(String[] args) throws Exception {
         timestampFilter.append( "[0-9][0-9]:[0-9][0-9]:[0-9][0-9].[0-9]* *" );
         searchStrings.addElement( timestampFilter.toString() );
         // Filter remove transaction id's from deadlock messages
+//IC see: https://issues.apache.org/jira/browse/DERBY-6868
         searchStrings.addElement("^  Waiting XID : \\{.*\\}");
         searchStrings.addElement("^  Granted XID : .*$");
         searchStrings.addElement("^The selected victim is XID : .*");
         // Filters for build numbers
         searchStrings.addElement("(beta - )\\(([0-9]*)\\)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
         searchStrings.addElement("CostEstimateImpl: .*");
         // Filter for xa tests for the numbers representing the db name (it can change)
         searchStrings.addElement("^Transaction ([0-9])* : \\(([0-9]*)\\,([0-9a-f]*)\\,([0-9a-f]*)\\)");
@@ -186,10 +200,13 @@ public static void main(String[] args) throws Exception {
         // part of some JCC error messages.
         searchStrings.addElement("  DB2ConnectionCorrelator: [0-9A-Z.]*");
 		// Filter for SAX exception name diffs between jvms.
+//IC see: https://issues.apache.org/jira/browse/DERBY-563
         searchStrings.addElement("org.xml.sax.SAX.*$");
         // Filter out localhost, or hostName
         searchStrings.addElement(hostName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-955
 		if ( isJDBC4 )
 		{
 			// Filters for the sql exception class names which appear in
@@ -210,18 +227,22 @@ public static void main(String[] args) throws Exception {
 			searchStrings.addElement("java.sql.SQLTransientException:");
 
 			// The JDBC4 error from the driver is a little chattier
+//IC see: https://issues.apache.org/jira/browse/DERBY-955
 			searchStrings.addElement("No suitable driver found for [0-9A-Za-z:]*");			
 			searchStrings.addElement("No suitable driver;[0-9A-Za-z:=]*");			
 			searchStrings.addElement("SQL Exception: No suitable driver");			
 
 			// Timestamp diagnostic looks a little different under jdk16
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 			searchStrings.addElement("\\[\\.fffffffff\\]");			
 		}
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> subStrings = new Vector<String>();
         subStrings.addElement("Transaction:(XXX)|");
         subStrings.addElement("Read ... bytes");
         subStrings.addElement("Directory DBLOCATION/seg0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4598
         subStrings.addElement("with class loader XXXX, ");
         subStrings.addElement("xxxxGENERATED-IDxxxx");
         subStrings.addElement("xxxxFILTERED-UUIDxxxx");
@@ -234,6 +255,7 @@ public static void main(String[] args) throws Exception {
         subStrings.addElement("The selected victim is XID : VVV");
         // sub build numbers
         subStrings.addElement("$1(xxXXxxFILTERED-BUILD-NUMBERxxXXxx)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6259
         subStrings.addElement("CostEstimateImpl: xxXXxxFILTERED-INFORMATIONxxXXxx");
         // sub for db name in xa tests (it can change)
         subStrings.addElement("Transaction $1 : ($2,FILTERED,FILTERED)");
@@ -255,10 +277,13 @@ public static void main(String[] args) throws Exception {
         // ignore the 'DB2ConnectionCorrelator' thing altogether.
         subStrings.addElement("");
 		// Filter for SAX exception name diffs between jvms.
+//IC see: https://issues.apache.org/jira/browse/DERBY-563
         subStrings.addElement("xxxFILTERED-SAX-EXCEPTIONxxx'.");
         // Filter out localhost, or hostName
         subStrings.addElement("xxxFILTERED_HOSTNAMExxx");
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-955
 		if ( isJDBC4 )
 		{
 			subStrings.addElement(SQL_EXCEPTION_FILTERED_SUBSTITUTION);
@@ -276,10 +301,12 @@ public static void main(String[] args) throws Exception {
 			subStrings.addElement(SQL_EXCEPTION_FILTERED_SUBSTITUTION);
 			subStrings.addElement(SQL_EXCEPTION_FILTERED_SUBSTITUTION);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-955
 			subStrings.addElement("No suitable driver");
 			subStrings.addElement("No suitable driver");
 			subStrings.addElement("java.sql.SQLException: No suitable driver");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 			subStrings.addElement(".fffffffff");
 		}
 
@@ -293,6 +320,7 @@ public void execJCC(InputStream is, File dstFile)
     {
         // Vector for storing lines to be deleted
         Vector<String> deleteLines = new Vector<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // Vectors for substitutions
         Vector<String> searchStrings = new Vector<String>();
@@ -310,6 +338,7 @@ public void execJCC(InputStream is, File dstFile)
     }
 
     private void doWork(File srcFile, File dstFile, InputStream is,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> deleteLines,  Vector<String> searchStrings,
         Vector<String> subStrings, InputStream isSed)
         throws IOException
@@ -333,6 +362,7 @@ private void doWork(File srcFile, File dstFile, InputStream is,
             Properties sedp = new Properties();
 
             sedp.load(isSed);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6868
             for (String key : sedp.stringPropertyNames())
             {
                 if (key.equals("substitute"))
@@ -383,12 +413,14 @@ else if (key.equals("delete"))
             // read the file using the default encoding
             inFile = new BufferedReader(new FileReader(srcFile));
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
             inFile = new BufferedReader(new InputStreamReader(is, "UTF-8"));
         }
         outFile = new PrintWriter
         ( new BufferedWriter(new FileWriter(dstFile), 10000), true );
 
         // Attempt to compile the patterns for deletes
+//IC see: https://issues.apache.org/jira/browse/DERBY-6868
         List<Pattern> deletePatterns = deleteLines.stream()
                 .map(Pattern::compile).collect(Collectors.toList());
 
@@ -461,6 +493,7 @@ else if (key.equals("delete"))
             // Determine if this line should be deleted for delete pattern match
             if ( lineDeleted == false )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6868
                 final String s = str;
                 lineDeleted =
                     deletePatterns.stream().anyMatch(p -> p.matcher(s).find());
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java
index 9fa7fe18f0..6771518ba8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java
@@ -76,6 +76,7 @@ public String[] readFile(BufferedReader input) throws IOException
     {
 
         Vector<String> vec = new Vector<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         String aLine = "";
         //int count = 0;
@@ -123,6 +124,7 @@ public String[] diffFiles(  DiffBuffer file1,
         int currentLine1 = 0;
         int currentLine2 = 0;
         Vector<String> returnVec = new Vector<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         while ( file1.isValidOffset(currentLine1) &&
                 file2.isValidOffset(currentLine2))
@@ -256,6 +258,7 @@ public String[] diffFiles(  DiffBuffer file1,
         file1.close();
         file2.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         if (returnVec.isEmpty())
         {
             return null;
@@ -366,6 +369,7 @@ public void pause()
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     class DiffBuffer extends Vector<String>
     {
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SkipTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SkipTest.java
index 2747e1ba95..4477c16caf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SkipTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SkipTest.java
@@ -54,6 +54,7 @@ public static boolean skipIt(String listFileName, String testName)
         }
         
         // Create a BufferedReader to read the list of tests to skip
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
         BufferedReader listFile = new BufferedReader(new InputStreamReader(is, "UTF-8"));
         String str = "";
         // Read the list of tests to skip, compare to testName
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SpecialFlags.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SpecialFlags.java
index 8a4c9de824..1653da9378 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SpecialFlags.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SpecialFlags.java
@@ -106,6 +106,7 @@ public static void parse(String flags,
 	{
 	    // flags is a list of key-value pairs separated by a ^;
 	    // to be parsed and added to either ijProps or srvProps
+//IC see: https://issues.apache.org/jira/browse/DERBY-213
         if (flags == null)
             flags = "";
 	    StringTokenizer st = new StringTokenizer(flags, "^");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java
index 232aadc727..1c157d785a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SysInfoLog.java
@@ -75,7 +75,9 @@ else if (jvmName.startsWith("jdk13"))
                 }
 
 				Vector<String> v = javavm.getCommandLine();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 String mainClassName = "org.apache.derby.tools.sysinfo";
                 if (isModuleAware)
                 {
@@ -138,6 +140,7 @@ else if (jvmName.startsWith("jdk13"))
             pw.println(org.apache.derby.impl.tools.sysinfo.Main.javaSep);
             org.apache.derby.impl.tools.sysinfo.Main.reportCloudscape(pw);
             pw.println(org.apache.derby.impl.tools.sysinfo.Main.jbmsSep);
+//IC see: https://issues.apache.org/jira/browse/DERBY-920
             org.apache.derby.impl.tools.sysinfo.Main.reportDerby(pw);
             pw.println(org.apache.derby.impl.tools.sysinfo.Main.licSep);
             org.apache.derby.impl.tools.sysinfo.Main.printLicenseFile(pw);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/currentjvm.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/currentjvm.java
index 36cad04b69..1e68daf90f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/currentjvm.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/currentjvm.java
@@ -54,6 +54,7 @@ public currentjvm() { }
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/dbcleanup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/dbcleanup.java
index ba41fefb10..b083240083 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/dbcleanup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/dbcleanup.java
@@ -81,6 +81,7 @@ public static void doit(boolean dbIsNew) throws SQLException, IOException,
     		PrintStream stdout = System.out;
     		PrintStream stderr = System.err;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(driver);
             clazz.getConstructor().newInstance();
 
@@ -118,6 +119,7 @@ public static void doit(boolean dbIsNew) throws SQLException, IOException,
 
 		Enumeration schemalist = null;
 		Enumeration list = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		Vector<String> schemavec = new Vector<String>();
 		Vector<String> tablevec = null;
 		// get a list of the user schemas
@@ -144,6 +146,7 @@ public static void doit(boolean dbIsNew) throws SQLException, IOException,
 		String n = null;
 		boolean viewdependencyFound = false;
 		boolean tabledependencyFound = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		Vector<String> viewvec = null;
 		int count = 0;
 		for (schemalist = schemavec.elements(); schemalist.hasMoreElements();) {
@@ -169,6 +172,7 @@ public static void doit(boolean dbIsNew) throws SQLException, IOException,
 				}
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 			Vector<String> stmtvec = new Vector<String>();
 			try {
 				rs = s.executeQuery( " select stmtname " +
@@ -307,6 +311,7 @@ static  Vector<String> findTables(Connection conn, Statement s, char c, String s
 
 		ResultSet rs = null;
 		Vector<String> tableviewvec = new Vector<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 		try {
 			rs = s.executeQuery( " select t.tablename " +
@@ -333,6 +338,7 @@ static void dropAliases (Connection conn, char aliastype) throws Exception {
 		ResultSet rs = null;
 		Statement s = null;
 		String typestring = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		Vector<String> aliasvec = new Vector<String>();
 		String n = null;
 		int count = 0;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm13.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm13.java
index 4e4e2e9bdf..6ded2230f8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm13.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm13.java
@@ -53,6 +53,7 @@ public ibm13() { }
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm14.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm14.java
index 5ee4f2d043..a1d972f497 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm14.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm14.java
@@ -53,6 +53,7 @@ public ibm14() { }
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm15.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm15.java
index 29eb1bd706..95bb307809 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm15.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm15.java
@@ -53,6 +53,7 @@ public ibm15() { }
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm16.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm16.java
index 66d5631837..76a53c33a6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm16.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm16.java
@@ -53,6 +53,7 @@ public ibm16() { }
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm17.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm17.java
index 3af47ba78b..1d01b22790 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm17.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm17.java
@@ -53,6 +53,7 @@ public ibm17() { }
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm18.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm18.java
index 32a8096b6b..9a6e99c120 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm18.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/ibm18.java
@@ -53,6 +53,7 @@ public ibm18() { }
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_13.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_13.java
index 1c72d10e94..b982e18d2b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_13.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_13.java
@@ -68,6 +68,7 @@ public Vector<String> getCommandLine()
 
         StringBuffer sb = new StringBuffer();
         Vector<String> v = super.getCommandLine();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_22.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_22.java
index 9dd2936460..7757d6f844 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_22.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_22.java
@@ -68,6 +68,7 @@ public Vector<String> getCommandLine()
 
         StringBuffer sb = new StringBuffer();
         Vector<String> v = super.getCommandLine();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_foundation.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_foundation.java
index 32fad62e50..2ff5a27bff 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_foundation.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_foundation.java
@@ -64,6 +64,7 @@ public j9_foundation() {
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java
index 1de1f57a13..ab99bd3618 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9_foundation11.java
@@ -26,6 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
   <p>This class is for IBM's J9 jdk 1.3., foundation class library; v 2.4 (weme6.2)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4305
 
  */
 public class j9_foundation11 extends jvm {
@@ -53,6 +54,7 @@ public j9_foundation11() {
 	{
 		String wshome = guessWSHome();
 		// note, may have to use separator instead of hardcoding the slashes...
+//IC see: https://issues.apache.org/jira/browse/DERBY-4305
 		setJavaCmd(wshome+"/weme6.2/bin/j9");
 	}
 	else
@@ -64,6 +66,7 @@ public j9_foundation11() {
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
@@ -93,6 +96,7 @@ public void appendOtherFlags(StringBuffer sb)
             // note, assuming jclFoundation classes sit under weme6.2/lib/jclFoundation11
             //       and that jdbc.jar sits under weme6.2/lib
             // note, may have to switch to sep instead of hardcoding the slashes...
+//IC see: https://issues.apache.org/jira/browse/DERBY-4305
             sb.append(" -Xbootclasspath/a:" + wshome + "/weme6.2/lib/jclFoundation11/classes.zip"
                 + pathsep + wshome + "/weme6.2/lib/jclFoundation11/locale.zip"
                 + pathsep + wshome + "/weme6.2/lib/jdbc.jar");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9dee15.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9dee15.java
index ae961a0035..bf84458ab0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9dee15.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/j9dee15.java
@@ -68,6 +68,7 @@ public Vector<String> getCommandLine()
 
         StringBuffer sb = new StringBuffer();
         Vector<String> v = super.getCommandLine();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java
index 63193af9cc..3471fba0a1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk110.java
@@ -48,6 +48,7 @@ public jdk110() { }
 
 
     public Vector<String> getCommandLine() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6998
         StringBuffer sb = new StringBuffer();
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk13.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk13.java
index f4d8a43d53..0328775b08 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk13.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk13.java
@@ -55,6 +55,7 @@ public jdk13() { }
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
@@ -83,6 +84,7 @@ public void appendOtherFlags(StringBuffer sb)
           sb.append(" -mx");
           sb.append(mx);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (classpath!=null)
         {
           if (isModuleAware) { sb.append(" -p "); }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk14.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk14.java
index cab8301b2f..b23fbdd729 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk14.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk14.java
@@ -53,6 +53,7 @@ public jdk14() { }
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk15.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk15.java
index d20024adbc..ad2668a828 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk15.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk15.java
@@ -53,6 +53,7 @@ public jdk15() { }
     public Vector<String> getCommandLine()
     {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk16.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk16.java
index 2960d0bf48..c0af2f7453 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk16.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk16.java
@@ -48,6 +48,7 @@ public jdk16() { }
     
     public Vector<String> getCommandLine() {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk17.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk17.java
index 54926fe6c3..dc141efa8a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk17.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk17.java
@@ -48,6 +48,7 @@ public jdk17() { }
     
     public Vector<String> getCommandLine() {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk18.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk18.java
index 3dce85cd00..4e3c547883 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk18.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk18.java
@@ -48,6 +48,7 @@ public jdk18() { }
     
     public Vector<String> getCommandLine() {
         StringBuffer sb = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = super.getCommandLine();
         appendOtherFlags(sb);
         String s = sb.toString();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk19.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk19.java
index 7d3b6c80f3..9dd41d9854 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk19.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jdk19.java
@@ -74,6 +74,7 @@ public void appendOtherFlags(StringBuffer sb) {
             sb.append(mx);
         }
         if (classpath!=null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             if (JVMInfo.isModuleAware())
             {
                  sb.append(" -p ");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jvm.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jvm.java
index fa6c36073e..7b856ae148 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jvm.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/jvm.java
@@ -113,6 +113,7 @@ public abstract class jvm {
     public int imajor = 0;
     public int iminor = 0;
     String hostName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 
 	// security defaults relative to WS
 	// not used if jvmargs serverCodeBase are set
@@ -177,8 +178,10 @@ public jvm(long ms, long mx, String classpath, Vector<String> D) {
 	
     public Vector<String> getCommandLine()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<String> v = new Vector<String>();
         v.addElement(javaCmd);
+//IC see: https://issues.apache.org/jira/browse/DERBY-323
         v.addElement("-Duser.language=en");
         v.addElement("-Duser.country=US");
         if ( (flags != null) && (flags.length()>0) )
@@ -213,6 +216,7 @@ pass in class name for JVM.  If we can't find it, try
      */
     public static jvm getJvm(String jvmName) throws ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 	    jvm result = null;
         Class<?> clazz;
         try {
@@ -277,6 +281,7 @@ public void setVersion() throws Exception
 		int j = javaVersion.indexOf('.', i+1);
 		majorVersion = javaVersion.substring(0, i);
 		minorVersion = javaVersion.substring(i+1, j);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Integer minor = Integer.valueOf(minorVersion);
 		iminor = minor.intValue();
 		Integer major = Integer.valueOf(majorVersion);
@@ -305,6 +310,7 @@ protected static String guessWSHome()
 		// need to strip off the java directory  assuming it's something
 		// like ibm14/jre or ibm14
 		int havejre=jhome.indexOf(sep + "jre");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2265
 		if (havejre > 0)
 		{
 			wshome = jhome.substring(0,jhome.indexOf(sep + "jre"));
@@ -320,6 +326,7 @@ protected static String guessWSHome()
 
 	public static String findCodeBase(boolean[] isJar)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         String classpath = JVMInfo.isModuleAware() ?
             JVMInfo.getSystemModulePath() : System.getProperty("java.class.path");
 		char sep = '/';
@@ -331,6 +338,7 @@ public static String findCodeBase(boolean[] isJar)
 			String location = zip[i].getLocation().replace('\\','/');
 			if (location.indexOf("derbynet.jar") != -1)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
 				isJar[0] = true;
 				return location.substring(0,location.lastIndexOf(sep));
 			}
@@ -354,6 +362,7 @@ protected void setSecurityProps() throws java.io.IOException, ClassNotFoundExcep
 	}
 	
     static Vector<String> getSecurityProps(Vector<String> D)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             throws ClassNotFoundException, IOException
 	{
 		if (D == null)
@@ -365,6 +374,7 @@ static Vector<String> getSecurityProps(Vector<String> D)
 		String serverCodeBase = System.getProperty("serverCodeBase");
 		boolean[] isJar = new boolean[1];
 		if (serverCodeBase == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
 			serverCodeBase = findCodeBase(isJar);
    
         
@@ -390,6 +400,7 @@ static Vector<String> getSecurityProps(Vector<String> D)
 		D.addElement("java.security.manager");
 		D.addElement("java.security.policy=" + pf.getAbsolutePath());
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-1791
         Properties jusetup =
             SecurityManagerSetup.getPolicyFilePropertiesForOldHarness();
         // Take the definitions from the way JUnit tests
@@ -410,6 +421,7 @@ static Vector<String> getSecurityProps(Vector<String> D)
 		D.addElement("derbyTesting.serverhost=" + hostName);
 		// in the case of testing with a remote host, this is irrelevant, 
 		// when testing 'normal' it is also localhost:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1791
 		D.addElement("derbyTesting.clienthost=" + hostName);	 	
 		
 		return D;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/shutdown.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/shutdown.java
index 3e1d241b3c..8a5453b07c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/shutdown.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/shutdown.java
@@ -83,6 +83,7 @@ public static void doit() throws SQLException,
         PrintStream stdout = System.out;
     	PrintStream stderr = System.err;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(driver);
 		clazz.getConstructor().newInstance();
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/AllPackages.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/AllPackages.java
index e9394b8793..3e4fd612eb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/AllPackages.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/AllPackages.java
@@ -51,7 +51,9 @@ private AllPackages(String name) {
     public static Test suite() throws Exception {
 
         BaseTestSuite suite = new BaseTestSuite("AllPackages");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4638
         for (Iterator it = getTestClasses().iterator(); it.hasNext(); ) {
             Object testClass = it.next();
             if (testClass instanceof String) {
@@ -83,11 +85,13 @@ public static Test suite() throws Exception {
      */
     private static List getTestClasses() {
         ArrayList<Object> classes = new ArrayList<Object>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         classes.add(org.apache.derbyTesting.functionTests.tests.derbynet._Suite.class);
         classes.add(org.apache.derbyTesting.functionTests.tests.lang._Suite.class);
         
         if (shortCircuitFor_derby_7011()) { return classes; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-7011
 
         // DERBY-1903
         // For the largedata test, just run the lite version of the test as
@@ -96,6 +100,7 @@ private static List getTestClasses() {
              org.apache.derbyTesting.functionTests.tests.largedata.LobLimitsLiteTest.class);
         classes.add(org.apache.derbyTesting.functionTests.tests.jdbcapi._Suite.class);
         classes.add(org.apache.derbyTesting.functionTests.tests.store._Suite.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         classes.add(org.apache.derbyTesting.functionTests.tests.storetests._Suite.class);
         classes.add(org.apache.derbyTesting.functionTests.tests.tools._Suite.class);
         classes.add(org.apache.derbyTesting.functionTests.tests.engine._Suite.class);
@@ -135,6 +140,7 @@ private static List getTestClasses() {
 
         // Compatibility tests (MATS)
         classes.add("org.apache.derbyTesting.functionTests.tests.compatibility._Suite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2076
 
         return classes;
     }
@@ -149,8 +155,10 @@ private static Test addSuiteByReflection(String className) throws Exception
         try {
             return invokeSuite(Class.forName(className));
         } catch (LinkageError  e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("SKIPPED: " + className + " - " +
                     e.getMessage());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3521
         } catch (InvocationTargetException ite) {
             Throwable cause = ite.getCause();
             if (cause instanceof LinkageError) {
@@ -162,6 +170,7 @@ private static Test addSuiteByReflection(String className) throws Exception
                throw ite;
             }
         } catch (ClassNotFoundException ce) { // Do not add a suite not built.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("SKIPPED: Class not found: " + className +
                     " - " + ce.getMessage());
         }
@@ -176,6 +185,7 @@ private static Test addSuiteByReflection(String className) throws Exception
      */
     private static Test invokeSuite(Class<?> klass) throws Exception {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return (Test) klass.getMethod("suite").invoke(null);
         } catch (Exception e) {
             System.err.println("Failed to invoke class " + klass.getName());
@@ -192,6 +202,7 @@ private static Test invokeSuite(Class<?> klass) throws Exception {
      * test suites
      */
     public static String[] getTopLevelSuiteNames() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4638
         List testClasses = getTestClasses();
         String[] names = new String[testClasses.size()];
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/EncryptionSuite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/EncryptionSuite.java
index 93ae18454c..aeffba06af 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/EncryptionSuite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/EncryptionSuite.java
@@ -66,6 +66,7 @@ public EncryptionSuite(String name) {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Encrpytion Suite");
         
         // Encryption only supported for Derby in J2SE/J2EE environments.
@@ -94,6 +95,7 @@ private static Test encryptedSuite(String algorithm)
      */
     private static Test baseSuite(String algorithm)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("Encryption Algorithm: " + algorithm);
         
@@ -101,6 +103,7 @@ private static Test baseSuite(String algorithm)
         // no tests that were previously run under encryption converted.
         suite.addTestSuite(EncryptionSuite.class);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4038
         Properties sysProps = new Properties();
         sysProps.put("derby.optimizer.optimizeJoinOrder", "false");
         sysProps.put("derby.optimizer.ruleBasedOptimization", "true");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/XMLSuite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/XMLSuite.java
index 99a9471a4b..4b272134da 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/XMLSuite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/suites/XMLSuite.java
@@ -43,6 +43,7 @@ private XMLSuite(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("XML Suite");
         
         // Add all JUnit tests for XML.
@@ -50,7 +51,10 @@ public static Test suite()
         suite.addTest(org.apache.derbyTesting.functionTests.tests.lang.XMLBindingTest.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.lang.XMLMissingClassesTest.suite());
         suite.addTest(org.apache.derbyTesting.functionTests.tests.lang.XMLConcurrencyTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6810
+//IC see: https://issues.apache.org/jira/browse/DERBY-6810
         suite.addTest(org.apache.derbyTesting.functionTests.tests.lang.XMLXXETest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6821
         suite.addTest(org.apache.derbyTesting.functionTests.tests.lang.XMLOptimizerTraceTest.suite());
         
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java
index 43d9fbc9fe..2eab0b4439 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java
@@ -67,6 +67,7 @@ public class SerializeDataSources {
             "org.apache.derby.jdbc.EmbeddedDataSource40",
             "org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40",
             "org.apache.derby.jdbc.EmbeddedXADataSource40",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             "org.apache.derby.jdbc.BasicEmbeddedDataSource40",
             "org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40",
             "org.apache.derby.jdbc.BasicEmbeddedXADataSource40"
@@ -80,6 +81,7 @@ public class SerializeDataSources {
             "org.apache.derby.jdbc.ClientDataSource40",
             "org.apache.derby.jdbc.ClientConnectionPoolDataSource40",
             "org.apache.derby.jdbc.ClientXADataSource40",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             "org.apache.derby.jdbc.BasicClientDataSource40",
             "org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40",
             "org.apache.derby.jdbc.BasicClientXADataSource40"
@@ -104,6 +106,7 @@ private static int serializeDataSources(String versionString,
                                             String buildNumber,
                                             String[] dataSourceClasses)
             throws ClassNotFoundException, InstantiationException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
                    IllegalAccessException, IOException, NamingException,
                    NoSuchMethodException, InvocationTargetException {
         String modifiedVersionString = versionString.replaceAll(
@@ -114,6 +117,7 @@ private static int serializeDataSources(String versionString,
                 "_0_0", "_1_0");
         int dsCount = 0;
         for (String dsClassName : dataSourceClasses) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> dsClass;
             // Try to load the class.
             try {
@@ -124,6 +128,7 @@ private static int serializeDataSources(String versionString,
                 continue;
             }
             // Create new instance.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             DataSource ds = (DataSource)dsClass.getConstructor().newInstance();
             // Generate file name.
             File serialized = new File(dsClass.getSimpleName() + "-" +
@@ -137,6 +142,7 @@ private static int serializeDataSources(String versionString,
             oos.writeUTF(versionString);
             oos.writeUTF(buildNumber);
             oos.writeObject(ds);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             if (!(dsClassName.contains("Basic"))) {
                 Method getRef = Class.forName("javax.naming.Referenceable").
                         getMethod("getReference");
@@ -180,6 +186,7 @@ private static boolean printInfoFromSerializedFile(String fileName) {
             System.out.println("\tbuild  : " + buildNr);
             Object obj = ois.readObject();
             System.out.println("\tobject : " + obj);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             if (!(obj.getClass().getName().indexOf("Basic") > 0)) {
                 obj = ois.readObject();
                 System.out.println("\tobject : " + obj);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/AbstractCompatibilityTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/AbstractCompatibilityTest.java
index 2ccfbffbdb..0903c9a0e4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/AbstractCompatibilityTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/AbstractCompatibilityTest.java
@@ -228,6 +228,7 @@ protected    Object    getColumn( ResultSet rs, String columnName, int jdbcType
                 break;
 
             case Types.BIGINT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 retval = rs.getLong( columnName );
                 break;
 
@@ -261,6 +262,7 @@ protected    Object    getColumn( ResultSet rs, String columnName, int jdbcType
                 break;
 
             case Types.DOUBLE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 retval = rs.getDouble( columnName );
                 break;
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/ClientCompatibilityRunControl.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/ClientCompatibilityRunControl.java
index 9cbe5499aa..e1e9dd34a0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/ClientCompatibilityRunControl.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/ClientCompatibilityRunControl.java
@@ -84,6 +84,7 @@ public void testClient()
         // Fork the client test with a minimal classpath.
         String classpath = clientDist.getDerbyClientJarPath() +
                 File.pathSeparator + testingPath +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5897
                 File.pathSeparator + getJUnitPath();
         // If we are running the LOB tests we also need derby.jar, because the
         // test code being run references classes from the iapi package.
@@ -119,6 +120,7 @@ public void testClient()
      * @return A path.
      */
     private static String getJUnitPath() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5897
         URI uri = VersionCombinationConfigurator.getClassURI(
                 junit.framework.TestCase.class);
         return new File(uri).getPath();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/ClientCompatibilitySuite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/ClientCompatibilitySuite.java
index 8af674905e..3bf75ef262 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/ClientCompatibilitySuite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/ClientCompatibilitySuite.java
@@ -41,6 +41,7 @@ public ClientCompatibilitySuite(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Client compatibility suite");
         suite.addTest(JDBCDriverTest.suite());
         // Adding the LOB suite adds around 5 minutes to each client-server
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/JDBCDriverTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/JDBCDriverTest.java
index b38570d3cc..8df83da645 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/JDBCDriverTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/JDBCDriverTest.java
@@ -136,6 +136,7 @@ public class JDBCDriverTest
     {
         // 10.0 columns
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         1L,
         new DummyBlob( SAMPLE_BYTES ),
         SAMPLE_STRING,
@@ -187,6 +188,7 @@ public class JDBCDriverTest
         //                                                  -|-|-|-|-|-|-|-|-|-|R|A|-|-|-|-|-|-|-
         //                                                  -|-|-|-|-|-|-|-|-|-|-|R|-|-|-|-|-|-|-
         //                                                  -|-|-|-|-|-|-|-|-|-|-|Y|-|-|-|-|-|-|-
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         new T_CN( Types.BIGINT, new boolean[]             { Y,n,Y,n,n,n,n,Y,Y,Y,Y,n,Y,Y,Y,n,n,Y,n } ),
         new T_CN( Types.BLOB, new boolean[]               { n,Y,n,n,n,n,n,n,n,n,n,n,n,n,n,n,n,n,n } ),
         new T_CN( Types.CHAR, new boolean[]               { n,n,Y,n,n,n,n,n,n,n,Y,n,n,n,n,n,n,Y,n } ),
@@ -329,6 +331,7 @@ private void vet_isindex_column(boolean correctBehavior,
         }
         else
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             objectValue = expectedValue ? 1 : 0;
         }
         String stringValue = objectValue.toString();
@@ -670,6 +673,7 @@ private void datatypesTest()
 
         checkDBMetadata(tableName);
         stuffTable(tableName, types, rows);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         readTable(tableName, types, rows);
     }
 
@@ -779,6 +783,7 @@ private    PreparedStatement    makeInsert(String tableName,
     // Verify that we can select all legal datatypes in a table.
     //
     private void readTable(String tableName, TypeDescriptor[] types,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                            Object[][] rows)
             throws SQLException {
         PreparedStatement    ps = readTableQuery(tableName, types);
@@ -788,6 +793,7 @@ private void readTable(String tableName, TypeDescriptor[] types,
         rs.close();
         // Execute the statement again for each cast / coercion we check.
         checkRows( ps, types, rows );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         ps.close();
     }
@@ -878,6 +884,7 @@ private    void    checkRSMD( ResultSet rs )
      * @throws Exception
      */
     private void checkRows(PreparedStatement ps, TypeDescriptor[] types,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                            Object[][] rows)
             throws SQLException {
         int typeCount = types.length;
@@ -894,6 +901,7 @@ private void checkRows(PreparedStatement ps, TypeDescriptor[] types,
                 // Make sure we're using the correct type descriptor.
                 assertEquals(types[colIndex], type);
                 checkPlainGet(ps, colIndex, type, rows);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 checkCoercions(ps, type);
             }
         }
@@ -1069,6 +1077,7 @@ private    void    buildCoercionMap()
     }
     private    void    putCoercionIndex( int index )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         _coercionIndex.put( COERCIONS[ index ].getJdbcType(), index );
     }
 
@@ -1079,6 +1088,7 @@ private    int    getCoercionIndex( int jdbcType )
     {
         if ( _coercionIndex.isEmpty() ) { buildCoercionMap(); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return ((Integer) _coercionIndex.get( jdbcType )).intValue();
     }
 
@@ -1346,6 +1356,7 @@ public    T_CN( int jdbcType, boolean[] coercions )
      * whose names start with the string "test" in the named classes.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite testSuite = new BaseTestSuite("JDBCDriverTest suite");
         testSuite.addTestSuite(JDBCDriverTest.class);
         return TestConfiguration.defaultExistingServerDecorator(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java
index 1cc5901b8a..5f59891ce9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java
@@ -72,6 +72,7 @@ public class VersionCombinationConfigurator {
 
     private static final String EMB_DRIVER =
                                     "org.apache.derby.jdbc.EmbeddedDriver";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6126
 
     /** Name of the configuration, only used for informational purposes. */
     private final String name;
@@ -179,6 +180,7 @@ public int addTests(BaseTestSuite suite) {
                 continue;
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite clientSuites = new BaseTestSuite(
                     "Client runs against server " + serverVersion.toString());
             for (DerbyDistribution client : dists) {
@@ -287,6 +289,7 @@ private List<DerbyDistribution> filterVersions() {
      *      classes directory
      */
     private DerbyDistribution getRunningDistribution() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6126
         File libDir;
         try {
             libDir = getJarDirectoryOf(Class.forName(EMB_DRIVER));
@@ -301,6 +304,7 @@ private DerbyDistribution getRunningDistribution() {
                 sysinfo.getVersionString());
         DerbyDistribution dist = DerbyDistribution.newInstance(
                                                 version, libDir, testingDir);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5897
         if (dist == null) {
             throw new IllegalStateException(
                     "failed to get running distribution (programming error?)");
@@ -315,6 +319,7 @@ private DerbyDistribution getRunningDistribution() {
      * @throws IllegalStateException if the class isn't loaded from a JAR
      */
     private File getJarDirectoryOf(Class clazz) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6126
         File jarPath = new File(getClassURI(clazz));
         if (jarPath.isDirectory()) {
             throw new IllegalStateException("only running off jars is " +
@@ -364,6 +369,7 @@ private List<DerbyDistribution> sortAndFilterVersions(
      *      be obtained.
      */
     static URI getClassURI(final Class cl) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5897
         return AccessController.doPrivileged(new PrivilegedAction<URI>() {
             public URI run() {
                 CodeSource cs = cl.getProtectionDomain().getCodeSource();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionedNetworkServerTestSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionedNetworkServerTestSetup.java
index 8bfb772679..33e7a0d083 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionedNetworkServerTestSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionedNetworkServerTestSetup.java
@@ -88,6 +88,7 @@ public void setUp() {
                 (appendToClasspath == null
                             ? ""
                             : File.pathSeparator + appendToClasspath);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> cmd = new ArrayList<String>();
         cmd.add("org.apache.derby.drda.NetworkServerControl");
         cmd.add("start");
@@ -100,6 +101,7 @@ public void setUp() {
         Process proc = null;
         try {
             proc = BaseTestCase.execJavaCmd(null, classpath,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 cmd.toArray(new String[cmd.size()]), null);
         } catch (IOException ioe) {
             fail("failed to start server: " + ioe.getMessage());
@@ -170,6 +172,7 @@ public void tearDown() {
     private String shutDownInSeparateProcess() {
         int port = TestConfiguration.getCurrent().getPort();
         // java -classpath ... org.apache.derby.drda...
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> cmd = new ArrayList<String>();
         cmd.add("org.apache.derby.drda.NetworkServerControl");
         cmd.add("shutdown");
@@ -181,6 +184,7 @@ private String shutDownInSeparateProcess() {
         Process proc;
         try {
             proc = BaseTestCase.execJavaCmd(null, dist.getProductionClasspath(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                     cmd.toArray(new String[cmd.size()]), null);
         } catch (IOException ioe) {
             return "shutdown process failed to start: " + ioe.getMessage();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/_Suite.java
index 74039932fc..98203a46c2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/_Suite.java
@@ -91,6 +91,7 @@ private static int addVersionCombinations(BaseTestSuite suite) {
      */
     private static List<DerbyVersion> parseVersionList(String versions) {
         if (versions == null || versions.length() == 0) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return Collections.emptyList();
         }
         String[] vlist = versions.split(",");
@@ -121,16 +122,19 @@ public static Test suite() {
 
         // Don't run from the module path. Old clients and servers
         // should always be run from the classpath.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (JVMInfo.isModuleAware())
         {
             return new BaseTestSuite("tests.compatibility disabled when using a module path");
         }
         // DERBY-5889: Disabling tests on Windows where the old releases are
         // run off of UNC paths (network drives).
+//IC see: https://issues.apache.org/jira/browse/DERBY-5889
         if (suffersFromDerby5889()) {
             String msg = ("tests.compatibility disabled on Windows " +
                     "with UNC paths, see DERBY-5889");
             println(msg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(msg);
         }
         // DERBY-6610: the compatibility tests don't run with classes;
@@ -162,6 +166,7 @@ public static Test suite() {
      * residing on an UNC path (network drive).
      */
     public static boolean suffersFromDerby5889() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5889
         if (!isWindowsPlatform()) {
             return false;
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java
index 20b235c3c3..2dbb709a9f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java
@@ -49,6 +49,7 @@ public CheckToursDBTest(String name) {
     }
 
    public static Test basesuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(CheckToursDBTest.class, name);
         Test test = new SupportFilesSetup(suite, new String[] {
                 "functionTests/tests/demo/cupisle.gif",
@@ -58,9 +59,11 @@ public static Test basesuite(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3294
         if ( JDBC.vmSupportsJSR169())
             // Test executes PreparedStatement.setBigDecimal, which
             // is not supported with JSR169
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                         return new BaseTestSuite(
                 "empty CheckToursDBTest - *.setBigDecimal " +
                 "not supported with JSR169");
@@ -183,6 +186,7 @@ private void doUpdate() throws SQLException {
     public void insertMapsPrivileged() throws Exception {
         try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
                 public Object run() throws SQLException, FileNotFoundException,
                         IOException {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/_Suite.java
index 36f7c7ec71..d4b02c06d1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/_Suite.java
@@ -42,6 +42,7 @@ private _Suite(String name) {
     
     public static Test suite() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("demo");
         suite.addTest(CheckToursDBTest.suite());
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/BadConnectionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/BadConnectionTest.java
index b250b77245..3be9eda87a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/BadConnectionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/BadConnectionTest.java
@@ -99,6 +99,9 @@ public void testBadConnectionAttribute()
 		} catch (SQLException e)
 		{
 			assertSQLState("XJ05B", e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
             assertErrorCode(40000, e);
 		}
 	}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest.java
index 83ae9b414f..bcd4fa4ea2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ByteArrayCombinerStreamTest.java
@@ -46,6 +46,7 @@ public ByteArrayCombinerStreamTest(String name) {
 
     public void testCombineNullRead()
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         combiner = new ByteArrayCombinerStream(null, 0);
         assertEquals(-1, combiner.read());
     }
@@ -65,9 +66,11 @@ public void testCombineAvailableNull()
     public void testCombineAvailable4bytes()
             throws IOException {
         byte[] array = {65,66,77,79};
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> list = new ArrayList<byte[]>(1);
         list.add(array);
         combiner = new ByteArrayCombinerStream(list, 4);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         assertEquals(4, combiner.available());
     }
 
@@ -82,6 +85,7 @@ public void testCombineAvailable4bytes()
     public void testCombineWithExtraEmptyByteArray()
             throws IOException {
         byte[] array = {65,66,77,79};
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> list = new ArrayList<byte[]>(2);
         list.add(array);
         list.add(new byte[4]);
@@ -94,6 +98,7 @@ public void testCombineWithExtraEmptyByteArray()
 
     public void testCombineOneArray()
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> list = new ArrayList<byte[]>(1);
         list.add(defaultArray);
         combiner = new ByteArrayCombinerStream(list, defaultArray.length);
@@ -108,6 +113,7 @@ public void testCominbe100SmallArrays()
             throws IOException {
         int arrays = 100;
         byte[] array = {65,66,77,79};
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> list = new ArrayList<byte[]>(arrays);
         long length = 0;
         for (int i=0; i < arrays; i++) {
@@ -131,6 +137,7 @@ public void testCominbe100SmallArrays()
     public void testTruncateDataFromOneArray()
             throws IOException {
         int length = defaultArray.length -5;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> list = new ArrayList<byte[]>(1);
         list.add(defaultArray);
         byte[] targetArray = new byte[length];
@@ -146,6 +153,7 @@ public void testTruncateDataFromOneArray()
     public void testTruncateDataFromTwoArrays()
             throws IOException {
         int length = (defaultArray.length *2) -7;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> list = new ArrayList<byte[]>(2);
         list.add(defaultArray);
         list.add(defaultArray);
@@ -153,6 +161,7 @@ public void testTruncateDataFromTwoArrays()
         System.arraycopy(defaultArray, 0,
                          targetArray, 0, defaultArray.length);
         System.arraycopy(defaultArray, 0,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
                          targetArray, defaultArray.length,
                          length - defaultArray.length);
         byte[] resArray = new byte[length];
@@ -167,7 +176,9 @@ public void testTruncateDataFromTwoArrays()
      * the specified length.
      */
     public void testTooLittleDataNoCombine() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> list = new ArrayList<byte[]>(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         list.add(new byte[5]);
         try {
             combiner = new ByteArrayCombinerStream(list, 10);
@@ -183,6 +194,7 @@ public void testTooLittleDataNoCombine() {
      * the specified length.
      */
     public void testTooLittleDataWithCombine() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> list = new ArrayList<byte[]>(3);
         byte[] data = {65,66,67,68,69};
         list.add(data);
@@ -201,6 +213,7 @@ public void testTooLittleDataWithCombine() {
      * Make sure an exception is thrown if a negative length is specified.
      */
     public void testNegativeLengthArgument() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> list = new ArrayList<byte[]>(1);
         list.add(new byte[1234]);
         try {
@@ -224,6 +237,7 @@ public void testNegativeValueInDataCausesEndOfStream()
         byte[] data = {66,67,-123,68,69};
         byte[] targetData = {66,67,0,0,0};
         byte[] resData = new byte[5];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<byte[]> list = new ArrayList<byte[]>(1);
         list.add(data);
         combiner = new ByteArrayCombinerStream(list, data.length);
@@ -240,7 +254,9 @@ public void testNegativeValueInDataCausesEndOfStream()
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(ByteArrayCombinerStreamTest.class,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2054
                              "ByteArrayCombinerStreamTest");
     }
 } // End class ByteArrayCombinerStreamTest
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/CheckSecurityManager.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/CheckSecurityManager.java
index ea19d5de3c..40b334d75a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/CheckSecurityManager.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/CheckSecurityManager.java
@@ -68,6 +68,7 @@ public static void testIllegalDBCreate() throws Exception
 			//    We seem to be able to create the database.
 			// Ideally this test should attempt to create the database
 			// ../wombat;create=true and get the security exception.
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 			String hostName = TestUtil.getHostName();
 			String databaseURL;
 			if (hostName.equals("localhost"))
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ClientSideSystemPropertiesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ClientSideSystemPropertiesTest.java
index 60591c7433..cfbe2b6481 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ClientSideSystemPropertiesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ClientSideSystemPropertiesTest.java
@@ -86,6 +86,7 @@ private void checkTraceFileIsPresent() {
         //made in the privilege block below by looking inside the 
         //trace Directory and making sure the file count is greater than 0.
         AccessController.doPrivileged
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		    (new java.security.PrivilegedAction<Void>(){
 		    	public Void run(){
 		    		File dir = new File(getSystemProperty("derby.client.traceDirectory"));
@@ -106,6 +107,7 @@ public Void run(){
     protected void setUp() throws Exception
     {
     	AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     			new java.security.PrivilegedAction<Void>(){
     				public Void run(){
     					File dir = new File(getSystemProperty("derby.client.traceDirectory"));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DRDAProtocolTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DRDAProtocolTest.java
index d8fed38594..51ccf7b297 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DRDAProtocolTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DRDAProtocolTest.java
@@ -73,6 +73,7 @@ public void testNonEBCDICCharacters() throws SQLException {
      * @throws SQLException if database interaction fails
      */
     public void testMultipleConnections() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         Connection conn1 = openConnection("FIRSTDB1");
         conn1.setAutoCommit(false);
 
@@ -88,6 +89,7 @@ public void testMultipleConnections() throws SQLException {
         pSt1.close();
         st.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         Connection conn2 = openConnection("SECONDDB2");
         conn2.setAutoCommit(false);
         Statement st2 = conn2.createStatement();
@@ -114,6 +116,7 @@ public DRDAProtocolTest(String name) {
     public static Test suite() {
         Test test;
         test = TestConfiguration.clientServerSuite(DRDAProtocolTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         test = TestConfiguration.additionalDatabaseDecorator(test, "FIRSTDB1");
         test = TestConfiguration.additionalDatabaseDecorator(test, "SECONDDB2");
         return test;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStartTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStartTest.java
index 570e702f38..bf29da7d5c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStartTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetAutoStartTest.java
@@ -152,6 +152,7 @@ public void testStartNetworkServerTrueWithInvalidPort() throws Exception {
         final PrintStream realSystemErr = System.err;
         ByteArrayOutputStream serverOutputBOS = new ByteArrayOutputStream();
         final PrintStream serverOutputOut = new PrintStream( serverOutputBOS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         setSystemOut(new PrintStream(serverOutputOut));
         setSystemErr(new PrintStream(serverOutputOut));
 
@@ -170,6 +171,7 @@ public void testStartNetworkServerTrueWithInvalidPort() throws Exception {
             }
         } finally {
             // Restore the original out streams
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             setSystemOut(realSystemOut);
             setSystemErr(realSystemErr);
         }
@@ -226,6 +228,7 @@ private void startNetworkServerTrueHelper(boolean withport)
     public void testStartNetworkServerLogMessageOnDualStart()
             throws Exception {
         // first force English locale
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         LocaleTestSetup.setDefaultLocale(Locale.ENGLISH);
         int doubleport = TestConfiguration.getCurrent().getPort();
         // start a network server
@@ -293,6 +296,7 @@ static boolean checkLog( String logFileName, String[] expected)
             // System.out.println(logLine);
             for( int i = 0; i < expected.length; i++)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
                 if( (! found[i]) && logLine.contains( expected[i])) {
                     found[i] = true;
                 }
@@ -305,11 +309,13 @@ static boolean checkLog( String logFileName, String[] expected)
                 allFound = false;
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
         br.close();
         return allFound;
     } // end of checkLog
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DerbyNetAutoStartTest");
         suite.addTest(baseSuite("DerbyNetAutoStartTest:embedded"));
         return suite;
@@ -340,6 +346,7 @@ protected void tearDown() throws Exception {
         removeSystemProperty("derby.drda.startNetworkServer");
         removeSystemProperty("derby.drda.portNumber");
         // set the old locale back to the original
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         LocaleTestSetup.setDefaultLocale(oldLocale);
         oldLocale=null;
         super.tearDown();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServerTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServerTest.java
index cf4987d88f..2425592d9a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServerTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/DerbyNetNewServerTest.java
@@ -51,7 +51,9 @@ public DerbyNetNewServerTest(String name) {
 
     public static Test suite() {
         // Test does not run on J2ME
+//IC see: https://issues.apache.org/jira/browse/DERBY-5677
         if (JDBC.vmSupportsJDBC3() && Derby.hasServer()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(DerbyNetNewServerTest.class);
         } else {
             return new BaseTestSuite("DerbyNetNewServerTest.empty");
@@ -63,6 +65,7 @@ protected void setUp() throws Exception {
         // the network server in the previous test case has shut down
         // completely and released the network port before attempting to start
         // a new server.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5547
         NetworkServerTestSetup.waitForAvailablePort();
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java
index 18adb38d28..9e65c797eb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java
@@ -39,6 +39,7 @@ public class GetCurrentPropertiesTest extends BaseJDBCTestCase {
     // create own policy file
     private static final String POLICY_FILE_NAME =
         "org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
 
     public GetCurrentPropertiesTest(String name) {
         super(name);
@@ -46,6 +47,7 @@ public GetCurrentPropertiesTest(String name) {
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test test = new BaseTestSuite(GetCurrentPropertiesTest.class);
         test = TestConfiguration.clientServerDecorator(test);
 
@@ -53,6 +55,7 @@ public static Test suite()
         // Grant ALL FILES execute, and getPolicy permissions,
         // as well as write for the trace files.
         test = new SecurityManagerSetup(test, POLICY_FILE_NAME);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
 
         // return suite; to ensure that nothing interferes with setting of
         // properties, wrap in singleUseDatabaseDecorator 
@@ -83,6 +86,7 @@ public void test_01_propertiesBeforeConnection() throws Exception {
         p = NetworkServerTestSetup.getNetworkServerControl().getCurrentProperties();
 
         Enumeration expectedProps = expectedValues.propertyNames();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         while (expectedProps.hasMoreElements()) {
             String propName = (String)expectedProps.nextElement();
             String propVal = (String)p.get(propName);
@@ -157,12 +161,15 @@ public void test_03_propertiesTraceOn() throws Exception {
         expectedValues.setProperty("derby.drda.traceAll","true");
         p = NetworkServerTestSetup.getNetworkServerControl().getCurrentProperties();
         Enumeration expectedProps = expectedValues.propertyNames();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         while (expectedProps.hasMoreElements()) {
             String propName = (String) expectedProps.nextElement();
             String propVal = (String)p.get(propName);
             //for debug
             println(expectedValues.getProperty(propName));
             println(propVal);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             assertEquals
               (
                "Unexpected value for property " + propName,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java
index 41dac883d9..b5fa66ba49 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NSSecurityMechanismTest.java
@@ -126,6 +126,7 @@ public NSSecurityMechanismTest(String name)
     public static Test suite() 
     {
         BaseTestSuite suite = new BaseTestSuite("NSSecurityMechanismTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         BaseTestSuite clientSuite =
             new BaseTestSuite("NSSecurityMechanismTest - client");
@@ -271,6 +272,7 @@ public void testNetworkServerSecurityMechanism() throws SQLException, Exception
             // as it's the first in the array, it should use default setting
             if (derby_drda_securityMechanism != null)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5940
                 if (derby_drda_securityMechanism.equals(
                         "STRONG_PASSWORD_SUBSTITUTE_SECURITY") &&
                         !hasSufficientEntropy()) {
@@ -311,6 +313,7 @@ public void testNetworkServerSecurityMechanism() throws SQLException, Exception
             {
                 assertUSRSSBPWD_with_BUILTIN(testDERBY528ExpectedValues);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
             else
             {
                 // shutdown the database - this will prevent slow startup 
@@ -353,6 +356,7 @@ private boolean setSecurityMechanism(String derby_security_mechanism)
         try {
             // shut down the currently running
             // server, before setting the next security mechanism
+//IC see: https://issues.apache.org/jira/browse/DERBY-5677
             NetworkServerTestSetup.getNetworkServerControl().shutdown();
         } catch (Exception e) {
             if (!(e.getMessage().substring(0,17).equals("DRDA_InvalidValue")))
@@ -364,6 +368,7 @@ private boolean setSecurityMechanism(String derby_security_mechanism)
         // Before attempting to start a new server, wait for the previous
         // server to complete and release the server port.
         NetworkServerTestSetup.waitForAvailablePort();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5547
 
         setSystemProperty("derby.drda.securityMechanism",
                 derby_drda_securityMechanism);
@@ -374,6 +379,7 @@ private boolean setSecurityMechanism(String derby_security_mechanism)
 
             // For debugging, to make output come to console call start() with
             // new PrintWriter(System.out, true) instead of null.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5677
             NetworkServerTestSetup.getNetworkServerControl().start(null);
             NetworkServerTestSetup.waitForServerStart(
                     NetworkServerTestSetup.getNetworkServerControl());
@@ -448,6 +454,7 @@ private void assertConnectionUsingDataSource(String[] expectedValues)
     {
         if (usingDerbyNetClient())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             assertSecurityMechanismOK("sarah",null, SECMEC_USRIDONL,"SECMEC_USRIDONL:", expectedValues[1]);
         }
         assertSecurityMechanismOK("john","sarah", SECMEC_USRIDPWD,"SECMEC_USRIDPWD:", expectedValues[2]);
@@ -464,6 +471,7 @@ private void assertConnectionUsingDataSource(String[] expectedValues)
             // successful when client is running in a JVM where the JCE does
             // not support the DH (32 byte prime).
             // The test methods are implemented to work either way.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             assertSecurityMechanismOK("john","sarah",SECMEC_EUSRIDPWD,"SECMEC_EUSRIDPWD:", expectedValues[3]);
             assertSecurityMechanismOK("john","sarah",SECMEC_USRSSBPWD,"SECMEC_USRSSBPWD:", expectedValues[4]);
         }
@@ -473,6 +481,7 @@ private void assertSecurityMechanismOK(String user, String password,
         Short secmec, String msg, String expectedValue)
     {
         // Skip this USRSSBPWD on platforms that are short on entropy.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5940
         if (secmec.shortValue() == SECMEC_USRSSBPWD && !hasSufficientEntropy()){
             return;
         }
@@ -485,6 +494,7 @@ private void assertSecurityMechanismOK(String user, String password,
             conn = ds.getConnection(user, password);
             conn.close();
             // EUSRIDPWD is supported with some jvm( version)s, not with others
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             if (!(secmec.equals(SECMEC_EUSRIDPWD)))
             {
                 if (!expectedValue.equals("OK"))
@@ -509,6 +519,7 @@ private void assertSecurityMechanismOK(String user, String password,
             // Exceptions expected in certain cases depending on JCE used for 
             // running the test. So, instead of '08004' (connection refused),
             // or "OK", we may see 'not supported' (XJ112).
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             else if (secmec.equals(SECMEC_EUSRIDPWD)) 
             {
                 if (!(sqle.getSQLState().equals("XJ112")))
@@ -528,6 +539,7 @@ else if (secmec.equals(SECMEC_EUSRIDPWD))
     private void assertConnectionUsingDriverManager(
         String dbUrl, String msg, String expectedValue)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5940
         if (!hasSufficientEntropy() &&
                 dbUrl.indexOf("securityMechanism=8") != -1) {
             return;
@@ -581,6 +593,8 @@ else if (sqle.getSQLState().equals("XJ001"))
                 StringWriter sw = new StringWriter();
                 sqle.printStackTrace(new PrintWriter(sw));
                 if (!sw.toString().contains(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6789
+//IC see: https://issues.apache.org/jira/browse/DERBY-6702
                     "java.lang.InternalError: Unexpected CryptoAPI failure"))
                     assertSQLState(expectedValue, sqle);
                 else
@@ -823,6 +837,7 @@ private void assertAllCombinationsOfUserPasswordSecMecInputOK(
                             getExpectedValueFromAll(expectedValues, k, j, i));
                     // case - specify security mechanism on datasource
                     assertSecurityMechanismOK(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         USER_ATTRIBUTE[k],PWD_ATTRIBUTE[j], SECMEC_ATTRIBUTE[i], "TEST_DS (" + urlAttributes
                             + ",securityMechanism="+SECMEC_ATTRIBUTE[i]+")", 
                             getExpectedValueFromAll(expectedValues, k, j, i));
@@ -887,6 +902,8 @@ else if (USER_ATTR == 1 && PWD_ATTR == 0)
      * @param expectedValue expected sql state
      */
     private void getDataSourceConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1982
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         String user, String password, String expectedValue)
     {
         Connection conn;
@@ -962,6 +979,7 @@ private void assertSecMecWithConnPoolingOK(
         conn.close();
         conn = pc.getConnection();
         assertConnectionOK(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         pc.close();
         conn.close();
     }
@@ -972,6 +990,7 @@ private void assertSecMecWithConnPoolingOK(
      * @throws Exception if there is any error
      */
     private void assertConnectionOK(Connection conn)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3465
     throws SQLException
     {
         Statement stmt = conn.createStatement();
@@ -1034,6 +1053,7 @@ private void assertConnectionOK(Connection conn)
      * the security mechanism.
      */
     private void assertDerby1080Fixed(String expectedValue)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3465
             throws Exception {
         try
         {
@@ -1041,6 +1061,7 @@ private void assertDerby1080Fixed(String expectedValue)
             // datasource set security mechanism to use encrypted userid and
             // password.
             assertSecMecWithConnPoolingOK(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 "peter","neelima",SECMEC_EUSRIDPWD);
             if (!expectedValue.equals("OK"))
                 fail("expected SQLException if DERBY-1080 did not regress");
@@ -1073,17 +1094,22 @@ private void assertDerby1080Fixed(String expectedValue)
      * @throws Exception if there an unexpected error
      */
     private void assertUSRSSBPWD_with_BUILTIN(String[] expectedValues)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3465
             throws Exception {
         // Skip this security mechanism on platforms that are short on entropy,
         // otherwise this test will take a very long time to complete.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5940
         if (!hasSufficientEntropy()) {
             return;
         }
         // Turn on Derby BUILTIN authentication and attempt connecting with
         // USRSSBPWD security mechanism.
         println("Turning ON Derby BUILTIN authentication");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1982
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         Connection conn = getDataSourceConnectionWithSecMec(
             "neelima", "lee", SECMEC_USRSSBPWD);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         // Turn on BUILTIN authentication
         CallableStatement cs = conn.prepareCall(
@@ -1130,6 +1156,7 @@ private void assertUSRSSBPWD_with_BUILTIN(String[] expectedValues)
             "user=neelima;password=lee;securityMechanism=" +
             SECMEC_USRSSBPWD),"USRSSBPWD + BUILTIN (T1):", expectedValues[2]);
         assertSecurityMechanismOK(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             "neelima","lee",SECMEC_USRSSBPWD,
             "TEST_DS - USRSSBPWD + BUILTIN (T2):", expectedValues[2]);
         // Attempting to connect with some invalid user
@@ -1141,6 +1168,8 @@ private void assertUSRSSBPWD_with_BUILTIN(String[] expectedValues)
             "TEST_DS - USRSSBPWD + BUILTIN (T4):", expectedValues[3]);
 
         // Prepare to turn OFF Derby BUILTIN authentication
+//IC see: https://issues.apache.org/jira/browse/DERBY-1982
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         conn = getDataSourceConnectionWithSecMec("neelima", "lee",
             SECMEC_USRSSBPWD);
 
@@ -1197,6 +1226,7 @@ private javax.sql.DataSource getDS(String user, String password)
         attrs = addRequiredAttributes(attrs);
 
         DataSource ds = JDBCDataSource.getDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (String property : attrs.keySet()) {
             Object value = attrs.get(property);
             JDBCDataSource.setBeanProperty(ds, property, value);
@@ -1207,6 +1237,7 @@ private javax.sql.DataSource getDS(String user, String password)
     private HashMap<String, Object> addRequiredAttributes(
             HashMap<String, Object> attrs)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
         String hostName = TestConfiguration.getCurrent().getHostName();
         int port = TestConfiguration.getCurrent().getPort();
         /** 
@@ -1216,6 +1247,7 @@ private HashMap<String, Object> addRequiredAttributes(
         if (!hostName.equals("localhost"))
         {
             attrs.put("serverName", hostName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             attrs.put("portNumber", port);
         }
         else
@@ -1228,6 +1260,8 @@ private HashMap<String, Object> addRequiredAttributes(
     private javax.sql.ConnectionPoolDataSource getCPDS(
         String user, String password)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<String, Object> attrs = new HashMap<String, Object>();
         if (user != null)
             attrs.put("user", user);
@@ -1237,6 +1271,7 @@ private javax.sql.ConnectionPoolDataSource getCPDS(
         attrs = addRequiredAttributes(attrs);
         ConnectionPoolDataSource cpds = 
             J2EEDataSource.getConnectionPoolDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (String property : attrs.keySet()) {
             Object value = attrs.get(property);
             JDBCDataSource.setBeanProperty(cpds, property, value);
@@ -1260,6 +1295,7 @@ private void assertSQLState08001(String expectedValue, SQLException sqle)
     private boolean hasSufficientEntropy() {
         // The ARM platform is known to suffer from too little entropy
         // (unless there is significant disk activity).
+//IC see: https://issues.apache.org/jira/browse/DERBY-5940
         return !getSystemProperty("os.arch").equalsIgnoreCase("arm");
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVMTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVMTest.java
index bb473c8154..674234c96a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVMTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NSinSameJVMTest.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public class NSinSameJVMTest extends BaseJDBCTestCase {
     public NSinSameJVMTest(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3211
         super(name);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java
index f2291ba285..a23f372327 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetHarnessJavaTest.java
@@ -64,6 +64,7 @@ protected String getArea() {
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("derbynet: old harness java tests");
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetIjTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetIjTest.java
index a551c9dbef..770d0dcbf8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetIjTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetIjTest.java
@@ -48,6 +48,7 @@ public final class NetIjTest extends ScriptTestCase {
      * scripts (.sql files) - only run in client.
      */
     private static final String[] CLIENT_TESTS = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         "testclientij",
     };
 
@@ -70,6 +71,7 @@ public static void main(String[] args)
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("NetScripts");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // Set up the scripts run with the network client
         BaseTestSuite clientTests = new BaseTestSuite("NetScripts:client");
@@ -77,6 +79,8 @@ public static Test suite() {
 
         int port = TestConfiguration.getCurrent().getPort();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4223
+//IC see: https://issues.apache.org/jira/browse/DERBY-4217
         Properties prop = new Properties();
         prop.setProperty("ij.protocol",
                 "jdbc:derby://localhost:"+port+"/");
@@ -95,6 +99,8 @@ public static Test suite() {
      * A single JUnit test that runs a single derbynet script.
      */
     private NetIjTest(String netTest){
+//IC see: https://issues.apache.org/jira/browse/DERBY-4223
+//IC see: https://issues.apache.org/jira/browse/DERBY-4217
         super(netTest,true);
     }
 
@@ -104,6 +110,7 @@ private NetIjTest(String netTest){
      * that cleans the database.
      */
     private static Test getSuite(String[] list) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Net scripts");
         for (int i = 0; i < list.length; i++)
             suite.addTest(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
index e50cd5e581..aa0326d4a4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
@@ -52,6 +52,7 @@ public class NetworkServerControlApiTest extends BaseJDBCTestCase {
     private static final String NON_ASCII_PASSWORD = "l\u00F8yndom";
 
     private static final String POLICY_FILE_NAME =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
             "org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.policy";
     
     public NetworkServerControlApiTest(String name) {
@@ -70,6 +71,8 @@ public NetworkServerControlApiTest(String name) {
      */
     public void test_01_WrongUsage() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3543
+//IC see: https://issues.apache.org/jira/browse/DERBY-3542
         final String nsc = "org.apache.derby.drda.NetworkServerControl";
         // we'll assume that we get the full message if we get 'Usage'
         // because sometimes, the message gets returned with carriage return,
@@ -107,6 +110,7 @@ public void test_01_WrongUsage() throws Exception
      */
     public void test_02_TraceCommands() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3273
         NetworkServerControl nsctrl = NetworkServerTestSetup.getNetworkServerControl();
         String derbySystemHome = getSystemProperty("derby.system.home");
         nsctrl.setTraceDirectory(derbySystemHome);
@@ -146,6 +150,7 @@ public void xtestTraceSystemPropertiesNoPermission() throws SQLException{
         //access denied (java.io.FilePermission \\ read). I verified 
         // this manually when creating this fixture but do not know 
         // how to check in the test.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3701
         assertEquals(getSystemProperty("derby.drda.traceAll"),"true");
         assertEquals(getSystemProperty("derby.drda.traceDirectory"),"/");
         Connection conn = getConnection();
@@ -349,6 +354,7 @@ private String tryPingDbTest(int rc, String d, String u, String p)
      * @return InetAddress of host
      */
     private InetAddress privInetAddressGetByName(final String host)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
             throws UnknownHostException {
         try {
             return AccessController.doPrivileged(
@@ -380,22 +386,26 @@ private boolean fileExists(String filename) {
     private static Test decorateTest()
     {
         Test test = TestConfiguration.clientServerDecorator(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                 new BaseTestSuite(NetworkServerControlApiTest.class));
         //
         // Install a security manager using the initial policy file.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         return new SecurityManagerSetup(test, POLICY_FILE_NAME);
     }
     
     public static Test suite()
     {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("NetworkServerControlApiTest");
         
         // Need derbynet.jar in the classpath!
         if (!Derby.hasServer())
             return suite;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3701
         suite.addTest(decorateTest());
         
         suite = decorateSystemPropertyTests(suite);
@@ -409,6 +419,7 @@ public static Test suite()
 
     private static BaseTestSuite decorateSystemPropertyTests(
         BaseTestSuite suite) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         Properties traceProps = new Properties();
         traceProps.put("derby.drda.traceDirectory","/");
@@ -490,11 +501,13 @@ public void test_06_MaxThreads_Neg12() throws Exception {
                 "Invalid value, -12, for maxthreads.",
                 "Usage: NetworkServerControl <commands>",
                 "Commands:",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
                 "start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]",
                 "shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]",
                 "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5832
                 "logconnections { on|off } [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
@@ -540,11 +553,13 @@ public void test_09_MaxThreads_Invalid() throws Exception {
         assertExecJavaCmdAsExpected(new String[]{"Invalid value, a, for maxthreads.",
                 "Usage: NetworkServerControl <commands>",
                 "Commands:",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
                 "start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]",
                 "shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]",
                 "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5832
                 "logconnections { on|off } [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
@@ -629,11 +644,13 @@ public void test_17_TimeSlice_Neg12() throws Exception {
         assertExecJavaCmdAsExpected(new String[]{"Invalid value, -12, for timeslice.",
                 "Usage: NetworkServerControl <commands> ",
                 "Commands:",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
                 "start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]",
                 "shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]",
                 "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5832
                 "logconnections { on|off } [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
@@ -676,11 +693,13 @@ public void test_20_TimeSlice_a() throws Exception {
         assertExecJavaCmdAsExpected(new String[]{"Invalid value, a, for timeslice.",
                 "Usage: NetworkServerControl <commands> ",
                 "Commands:",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
                 "start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]",
                 "shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]",
                 "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5832
                 "logconnections { on|off } [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlClientCommandTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlClientCommandTest.java
index 88e3132535..f3dee3e8dc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlClientCommandTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlClientCommandTest.java
@@ -38,6 +38,7 @@ public NetworkServerControlClientCommandTest(String name) {
     }
     
     public void testPingWithoutArgs() throws InterruptedException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4260
         if (!hasDefaultDerbyPortUsing()) {
             /* If the port isn't the default one, we make sure that the test passes.
              * The -p parameter isn't specified here.
@@ -104,6 +105,7 @@ public void testPingWithDefinedHostAndPort() throws InterruptedException, IOExce
     
     public void testPingWithWrongHost() throws InterruptedException, IOException {
         String[] pingWithoutArgsCmd = new String[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5942
                 "org.apache.derby.drda.NetworkServerControl",
                 "ping", "-h", "nothere.invalid"};
                 
@@ -114,6 +116,7 @@ public void testPingWithWrongHost() throws InterruptedException, IOException {
     
     public void testPingWithBogusPort() throws InterruptedException, IOException {
         String currentHost = TestConfiguration.getCurrent().getHostName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4700
         String bogusPort = Integer.toString(
                 TestConfiguration.getCurrent().getBogusPort());
         String[] pingWithoutArgsCmd = new String[] {
@@ -150,11 +153,13 @@ private void assertFailedPing(String[] pingCmd,String expectedMessage) throws In
 
     public static Test suite() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("NetworkServerControlClientCommandTest");
 
         // need network server so we can compare command output 
         // and we don't run on J2ME because java command is different.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4260
         if (!Derby.hasServer() ||
                 JDBC.vmSupportsJSR169())
             return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/OutBufferedStreamTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/OutBufferedStreamTest.java
index 7fa1514af5..b4831332e4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/OutBufferedStreamTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/OutBufferedStreamTest.java
@@ -68,6 +68,8 @@ public OutBufferedStreamTest(String name) {
      * @return the testsuite
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3812
+//IC see: https://issues.apache.org/jira/browse/DERBY-3796
         Properties properties = new Properties();
         properties.setProperty("derby.drda.streamOutBufferSize", "131072");
 
@@ -166,4 +168,4 @@ private static ByteArrayInputStream createOriginalDataInputStream(int length) {
         return new ByteArrayInputStream(originalValue);
 
     }
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/PrepareStatementTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/PrepareStatementTest.java
index 84676c7943..2ec98383e2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/PrepareStatementTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/PrepareStatementTest.java
@@ -80,6 +80,7 @@ public static Test suite()
     {
         if ( JDBC.vmSupportsJSR169())
             // see DERBY-2233 for details
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                         return new BaseTestSuite(
                 "empty PrepareStatementTest - client not supported on JSR169");
         else
@@ -108,6 +109,7 @@ public void testBasicPrepare() throws Exception
 
         // Rows to be inserted in table t1 for this test
         final Integer[][] t1_rows = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             {99, 5, 9},
             {2, 6, 10},
             {7, 5, 8}
@@ -200,6 +202,7 @@ public void testParameterTypes() throws Exception
 
         // Values to be inserted
         Object[][] t2_rows = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             {1, 2, 3L, 4.0F,
              5.0, 6.0, new BigDecimal("77.77"),
              new BigDecimal("8.100"), "column9string       ",
@@ -223,6 +226,7 @@ public void testParameterTypes() throws Exception
             + "?, ? ,? , ?)");
         pSt.setShort(1, ((Integer )t2_rows[0][0]).shortValue());
         pSt.setInt(2, ((Integer )t2_rows[0][1]).intValue());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         pSt.setLong(3, ((Long)t2_rows[0][2]).longValue());
         pSt.setFloat(4, ((Float )t2_rows[0][3]).floatValue());
         pSt.setDouble(5, ((Double )t2_rows[0][4]).doubleValue());
@@ -315,6 +319,7 @@ public void testParameterTypes() throws Exception
         assertUpdateCount(pSt, 2);
         pSt.close();
         pSt = prepareStatement("select * from d2558 where i = ?");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         pSt.setObject(1,3,java.sql.Types.INTEGER,0);
         try {
             // There's only 1 parameter marker, so this should fail:
@@ -534,6 +539,7 @@ public void testBigDecimalSetObjectWithScale() throws Exception
         rs.next();
         // Check that the correct scale was set
         BigDecimal expected
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             = bdFromString.setScale(scale, RoundingMode.DOWN);
         BigDecimal actual = (BigDecimal)rs.getObject(1);
         assertEquals("Actual value: " + actual
@@ -722,6 +728,7 @@ public void testSplitQRYDTABlock() throws Exception
         assertUpdateCount(ps, 0);
         ps.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5099
         String workString = Formatters.repeatChar("a", 150);
         ps = prepareStatement("insert into jira614 values (?)");
         ps.setString(1, workString);
@@ -748,6 +755,7 @@ public void testSplitQRYDTABlock() throws Exception
         Statement stmt = createStatement();
         stmt.execute("create table jira614_a (c1 int)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5099
         ps = prepareStatement("insert into jira614_a values (?)");
         for (int row = 1; row <= 5; ++row)
         {
@@ -756,6 +764,7 @@ public void testSplitQRYDTABlock() throws Exception
         }
 
         // 2: get the first statement into a splitQRYDTA state:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5099
         rs = stmt.executeQuery("select * from jira614");
         rowNum = 0;
         while (rs.next())
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.java
index 026e773249..7468fda59d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ProtocolTest.java
@@ -153,6 +153,7 @@ public void testProtocolSequence()
 
     /** Cleans up test resources. */
     public void tearDown()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5732
             throws Exception {
         commandSequence = null;
         adapter.close();
@@ -433,6 +434,7 @@ private int getInt(StreamTokenizer tkn) throws IOException
                 return convertHex(str, ln(tkn));
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return Double.valueOf(tkn.nval).intValue() * mult;
     }
 
@@ -849,6 +851,7 @@ private void deleteDatabase(String name) {
      */
     public static Test suite()
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Derby DRDA protocol tests");
         // Process the list of files and create test cases for the sub-tests.
         // NOTE: We cannot assume anything about the order in which the tests
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java
index 457a382429..645c67b349 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.java
@@ -41,6 +41,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class RuntimeInfoTest extends BaseJDBCTestCase {
 
 	private static String[] RuntimeinfoCmd = new String[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5514
             "-Demma.verbosity.level=silent",
 			"org.apache.derby.drda.NetworkServerControl", "runtimeinfo",
 			"-p", String.valueOf(TestConfiguration.getCurrent().getPort()) };
@@ -52,6 +53,7 @@ public class RuntimeInfoTest extends BaseJDBCTestCase {
 	
     private static final String POLICY_FILE_NAME =
         "org/apache/derbyTesting/functionTests/tests/derbynet/RuntimeInfoTest.policy";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
 
     private static final Locale englishLocale = new Locale("en", "US");
     private static final Locale germanLocale = new Locale("de", "DE");
@@ -74,6 +76,7 @@ public RuntimeInfoTest(String name) {
 	 */
 	public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("RuntimeInfoTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // Run testRunTests in both English and German locale
         suite.addTest(decorateTest(englishLocale, "testRunTests"));
@@ -291,11 +294,13 @@ private static Test decorateTest(Locale serverLocale, String testName) {
         test = TestConfiguration.singleUseDatabaseDecorator(test);
         test = new LocaleTestSetup(test, serverLocale);
         // Install a security manager using the initial policy file.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         return new SecurityManagerSetup(test, POLICY_FILE_NAME);
     }
 	
 	private static final HashMap<Locale, HashMap<String, String>> outputs;
 	static {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		HashMap<String, String> englishOutputs = new HashMap<String, String>();
 		englishOutputs.put("RuntimeInfoWithActiveConn",
 				"--- Derby Network Server Runtime Information ---\n" + 
@@ -327,9 +332,11 @@ private static Test decorateTest(Locale serverLocale, String testName) {
         englishOutputs.put("sedSessionNumberReplace", "$1##");
 		englishOutputs.put("RuntimeInfoLocaleString", "\tStmt ID\t\tSQLText\n\t-------------\t-----------\n\n\n\nSession");
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		HashMap<String, String> germanOutputs = new HashMap<String, String>();
 		germanOutputs.put("RuntimeInfoWithActiveConn",
 				"--- Laufzeitinformationen zu Derby Network Server ---\n" + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5832
 				"---------- Sessioninformationen ---------------\n" + 
                 "Sessionnummer:##\n" +
 				"\n" + 
@@ -358,6 +365,7 @@ private static Test decorateTest(Locale serverLocale, String testName) {
         germanOutputs.put("sedSessionNumberReplace", "$1##");
 		germanOutputs.put("RuntimeInfoLocaleString", "\tAnwsg-ID\t\tSQL-Text\n\t-------------\t-----------\n\n\n\nSessionnummer");
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		outputs = new HashMap<Locale, HashMap<String, String>>();
 		outputs.put(englishLocale, englishOutputs);
 		outputs.put(germanLocale, germanOutputs);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
index 80b4afcd0d..04976213dc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
@@ -57,6 +57,7 @@ public static Test suite()
     {
         //NetworkServerTestSetup.setWaitTime(10000L);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("SSLTest");
         
         // Server booting requires that we run from the jar files
@@ -93,6 +94,7 @@ private static Test decorateTest(String testName)
             new NetworkServerTestSetup(sslTest,
                                        startupProperties,
                                        startupArgs,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3504
                                        true);
         
         Test testSetup =
@@ -121,6 +123,7 @@ private static Test decorateTest(String testName)
      */
     private static  String[]  getStartupProperties()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return new String[] {
             "javax.net.ssl.keyStore=extinout/SSLTestServerKey.key",
             "javax.net.ssl.keyStorePassword=qwerty",
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
index fa4ddbde4b..d6f555d4f3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
@@ -142,6 +142,8 @@ public  static  final   class   Outcome
     }
 
     public SecureServerTest(String fixture) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
         super(fixture);
     }
 
@@ -159,11 +161,13 @@ public static Test suite()
         //NetworkServerTestSetup.setWaitTime( 10000L );
         
         BaseTestSuite      suite = new BaseTestSuite("SecureServerTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // Server booting requires that we run from the jar files
         if ( !TestConfiguration.loadingFromJars() ) { return suite; }
         
         // Need derbynet.jar in the classpath!
+//IC see: https://issues.apache.org/jira/browse/DERBY-2366
         if (!Derby.hasServer())
             return suite;
 
@@ -184,6 +188,8 @@ public static Test suite()
         // this wildcard port is rejected by the server right now
         //suite.addTest( decorateTest( false,  true, null, IPV6W, RUNNING_SECURITY_BOOTED ) );
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
         suite.addTest( makeDerby6619Test() );
         return suite;
     }
@@ -224,14 +230,17 @@ public static Test suite()
         String[]        startupProperties = getStartupProperties( authenticationRequired, customDerbyProperties );
         String[]        startupArgs = getStartupArgs( unsecureSet, wildCardHost );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2714
         NetworkServerTestSetup networkServerTestSetup =
                 new NetworkServerTestSetup
             (
              secureServerTest,
              startupProperties,
              startupArgs,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3504
              secureServerTest._outcome.serverShouldComeUp()
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-2714
 
         secureServerTest.nsTestSetup = networkServerTestSetup;
 
@@ -241,6 +250,7 @@ public static Test suite()
         // if using the custom derby.properties, copy the custom properties to a visible place
         if ( customDerbyProperties != null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2435
             testSetup = new SupportFilesSetup
                 (
                  testSetup,
@@ -268,9 +278,11 @@ public static Test suite()
     private static  String[]    getStartupArgs( boolean setUnsecureOption, String wildCardHost )
     {
         ArrayList<String> list = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         if ( setUnsecureOption )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2378
             list.add( "-noSecurityManager" );
         }
         
@@ -291,6 +303,7 @@ private static  String[]    getStartupArgs( boolean setUnsecureOption, String wi
     private static  String[]  getStartupProperties( boolean authenticationRequired, String customDerbyProperties )
     {
         ArrayList<String> list = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         if ( authenticationRequired )
         {
@@ -301,13 +314,18 @@ private static  String[]  getStartupProperties( boolean authenticationRequired,
 
         if ( customDerbyProperties != null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2435
             list.add( "derby.system.home=extinout" );
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return list.toArray(new String[list.size()]);
     }
     
     // Policy which lacks the permission to set the context class loader.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
     final static String POLICY6619 =
             "org/apache/derbyTesting/functionTests/" +
             "tests/derbynet/SecureServerTest.policy";
@@ -342,16 +360,21 @@ public void testServerStartup()
     {	
         String      myName = toString();
         boolean     serverCameUp = serverCameUp();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6225
         String      serverOutput = getServerOutput();
         boolean     outputOK = ( serverOutput.indexOf( _outcome.expectedServerOutput() ) >= 0 );
 
         assertEquals( myName + ": serverCameUp = " + serverCameUp, _outcome.serverShouldComeUp(), serverCameUp );
 
         assertWarningDerby6619("user.dir", false); // standard class loader
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6067
         if (!(runsWithEmma() || runsWithJaCoCo())) {
             // With Emma we run without the security manager, so we can't
             // assert on seeing it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5514
             assertTrue( myName + "\nExpected: " +
                         _outcome.expectedServerOutput() +
                         "\nBut saw: " + serverOutput , outputOK );
@@ -368,6 +391,7 @@ public void testServerStartup()
         //
         runsysinfo();
         enableTracing();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3708
         setTraceDirectory();
         disableTracing();
         
@@ -376,6 +400,7 @@ public void testServerStartup()
 
     private void disableTracing() throws Exception {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5504
         String traceOffOutput = runServerCommand(
                 new String[] { "trace", "off" });
 
@@ -387,6 +412,7 @@ private void disableTracing() throws Exception {
 
     private void setTraceDirectory() throws Exception {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5504
         String  traceDirectoryOutput = runServerCommand(
                 new String[] { "tracedirectory", "trace" });
         println( "Output for tracedirectory trace command:\n\n" + traceDirectoryOutput );
@@ -427,6 +453,7 @@ private void    connectToServer()
     private void    runsysinfo()
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5504
         String          sysinfoOutput = runServerCommand(
                 new String[] { "sysinfo" } );
 
@@ -437,6 +464,7 @@ private void    runsysinfo()
     private void    enableTracing()
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5504
         String          traceOnOutput = runServerCommand(
                 new String[] { "trace",  "on" } );
 
@@ -455,6 +483,7 @@ private void    enableTracing()
     public String toString()
     {
         StringBuilder    buffer = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         buffer.append( "SecureServerTest( " );
         buffer.append( "Opened = " ); buffer.append( _unsecureSet);
@@ -482,7 +511,9 @@ private String    runServerCommand( String[] commandSpecifics )
     {
         String          portNumber = Integer.toString( getTestConfiguration().getPort() );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> cmdList = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5504
         cmdList.add("-Demma.verbosity.level=silent");
         cmdList.add("org.apache.derby.drda.NetworkServerControl");
         cmdList.add("-p");
@@ -497,6 +528,7 @@ private String    runServerCommand( String[] commandSpecifics )
                 cmdList.toString());
         
         // Ensure it completes without failures.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
         assertEquals(0, spawned.complete());
         
         return spawned.getFullServerOutput();
@@ -518,6 +550,7 @@ private boolean serverCameUp()
     {
         return NetworkServerTestSetup.pingForServerUp(
             NetworkServerTestSetup.getNetworkServerControl(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3504
             nsTestSetup.getServerProcess().getProcess(), true);
     }
 
@@ -530,6 +563,8 @@ private boolean serverCameUp()
 
     private void assertWarningDerby6619(String logLocation, boolean expected)
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
 
         final String logFileName =
                 getSystemProperty(logLocation) + File.separator + "derby.log";
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java
index 9c30ce7197..570c8ca4ca 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.java
@@ -56,6 +56,7 @@ public class ServerPropertiesTest  extends BaseJDBCTestCase {
     
     //create own policy file
     private static final String POLICY_FILE_NAME =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         "org/apache/derbyTesting/functionTests/tests/derbynet/ServerPropertiesTest.policy";
     private int[] portsSoFar;
     private int basePort;
@@ -67,6 +68,7 @@ public ServerPropertiesTest(String name) {
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ServerPropertiesTest");
           
         if (!Derby.hasServer()) return suite;
@@ -77,6 +79,7 @@ public static Test suite()
         // this fixture doesn't use a client/server setup, instead does the 
         // relevant starting/stopping inside the test
         // Add security manager policy that allows executing java commands
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         suite.addTest(decorateTest("ttestSetPortPriority", 
                 new String[] {}, new String[] {}, false));
         
@@ -98,6 +101,9 @@ public static Test suite()
                 };
         // fixture hits error DRDA_MissingNetworkJar (Cannot find derbynet.jar) so,
         // only run with jars
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
+//IC see: https://issues.apache.org/jira/browse/DERBY-4319
+//IC see: https://issues.apache.org/jira/browse/DERBY-5192
         if (TestConfiguration.loadingFromJars()) 
             suite.addTest(decorateTest("ttestDefaultProperties", 
                 badServerProperties, new String[] {}, true));
@@ -121,6 +127,7 @@ public static Test suite()
     
     public void tearDown() throws Exception {
         super.tearDown();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         if (portsSoFar != null)
         {
             for (int i = 0 ; i < portsSoFar.length ; i++)
@@ -142,6 +149,7 @@ public void tearDown() throws Exception {
      * </p>
      */
     private static Test decorateTest(String testName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
             String[] startupProperties, String[] startupArgs,
             boolean startServer)
     {
@@ -153,11 +161,13 @@ private static Test decorateTest(String testName,
             startupProps = startupProperties;
         if (startupArgs == null)
             startupArgs = new String[]{};
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         NetworkServerTestSetup networkServerTestSetup;
         if (startServer)
         {
             // start networkServer as a process
             networkServerTestSetup = new NetworkServerTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3504
                 spt, startupProps, startupArgs, true);
         }
         else
@@ -177,12 +187,14 @@ private static Test decorateWithPolicy(Test test) {
         //
         // Install a security manager using the initial policy file.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         return new SecurityManagerSetup(test, POLICY_FILE_NAME);
     }
     
     private static Properties getTheProperties() {
         Properties p;
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
             p = NetworkServerTestSetup.getNetworkServerControl().getCurrentProperties();
         } catch (Exception e) {
             p = null; // should be ok to set to null (to satisfy compiler)
@@ -190,6 +202,7 @@ private static Properties getTheProperties() {
             e.printStackTrace();
             fail("unexpected exception getting properties from server");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-858
         return p;
     }
 
@@ -240,6 +253,7 @@ private boolean canPingServer(int port, boolean expectServerUp)
     throws SQLException {
         
         boolean serverUp = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         try {
             serverUp = NetworkServerTestSetup.pingForServerUp(
                 NetworkServerTestSetup.getNetworkServerControl(port), null,
@@ -257,6 +271,7 @@ private String shutdownServer(int port, boolean specifyPort)
         try {
             if (specifyPort)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
                 NetworkServerControl nsctrl = 
                     NetworkServerTestSetup.getNetworkServerControl(port);
                 nsctrl.shutdown();
@@ -284,6 +299,7 @@ public String startServer(int port, boolean specifyPort)
         try {
             if (specifyPort)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
                 NetworkServerControl nsctrl = 
                     NetworkServerTestSetup.getNetworkServerControl(port);
                 // For debugging, to make output come to console uncomment:
@@ -294,6 +310,7 @@ public String startServer(int port, boolean specifyPort)
             }
             else
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
                 NetworkServerControl nsctrl = 
                     NetworkServerTestSetup.getNetworkServerControlDefault();
                 // For debugging, to make output come to console uncomment:
@@ -306,6 +323,7 @@ public String startServer(int port, boolean specifyPort)
             return "failed to start server with port " + port;
         }
         // check that we have this server up now
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         if (!canPingServer(port, true)) {
             return "Cannot ping server started with port set to " + port;
         }
@@ -328,6 +346,7 @@ public void checkWhetherNeedToShutdown(int[] ports, String failReason) {
     * @throws IOException
     */
    private void  assertSuccessfulCmd(String expectedString, String[] Cmd) throws InterruptedException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
        assertExecJavaCmdAsExpected(new String[] {expectedString}, Cmd, 0);
    }
 
@@ -335,6 +354,7 @@ private void  assertSuccessfulCmd(String expectedString, String[] Cmd) throws In
      *  Test port setting priority
      */
     public void ttestSetPortPriority() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
     throws SQLException, InterruptedException, IOException {
         // default is 1527. The test harness configuration would
         // use the API and add the port number. We want to test all
@@ -350,6 +370,7 @@ public void ttestSetPortPriority()
         //    appropriate than shutting down the default server.
         // we really expect the server to be down, let's
         // not do any waiting around
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         NetworkServerTestSetup.setWaitTime(0);
         if (canPingServer(basePort, false)) {
             // for now, shutdown
@@ -360,6 +381,7 @@ public void ttestSetPortPriority()
         // Wait until the server has shut down completely and released the
         // port.
         NetworkServerTestSetup.waitForAvailablePort();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5547
 
         /* 
          * The port should be default, but it might not be, so the second argument
@@ -373,9 +395,12 @@ public void ttestSetPortPriority()
         final Properties derbyProperties = new Properties();
         derbyProperties.put("derby.drda.portNumber", 
                 Integer.toString(firstAlternatePort));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         final String derbyHome = getSystemProperty("derby.system.home");
         boolean b = AccessController.doPrivileged
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         (new java.security.PrivilegedAction<Boolean>(){
             public Boolean run(){
                 boolean fail = false;
@@ -387,6 +412,7 @@ public Boolean run(){
                 } catch (IOException ioe) {
                     fail = true;
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 return fail;
             }
         });
@@ -402,6 +428,7 @@ public Boolean run(){
         final int secondAlternatePort = TestConfiguration.getCurrent().getNextAvailablePort();
         // Now set system properties.
         setSystemProperty("derby.drda.portNumber", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Integer.toString(secondAlternatePort));
         actionResult = startServer(secondAlternatePort, false);
         checkWhetherNeedToShutdown( new int[] {basePort, firstAlternatePort, secondAlternatePort},
@@ -422,6 +449,7 @@ public Boolean run(){
             "org.apache.derby.drda.NetworkServerControl", "-p",
             String.valueOf(fourthAlternatePort).toString(), 
             "-noSecurityManager", "start"};
+//IC see: https://issues.apache.org/jira/browse/DERBY-3829
         execJavaCmd(commandArray);
         
         if (!canPingServer(fourthAlternatePort, true)) {
@@ -436,6 +464,7 @@ public Boolean run(){
                 String.valueOf(fourthAlternatePort).toString(), 
                 "-noSecurityManager", "shutdown"};
         execJavaCmd(commandArray);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3829
 
         if (canPingServer(fourthAlternatePort, false)) {
             actionResult = "Can still ping server specified with -p";
@@ -460,6 +489,7 @@ public Boolean run(){
         checkWhetherNeedToShutdown ( new int[] {basePort, firstAlternatePort},
             actionResult);
         // remove derby.properties
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         if (!PrivilegedFileOpsForTests.delete(
                 new File(derbyHome, "derby.properties"))) {
             checkWhetherNeedToShutdown ( new int[] {basePort, firstAlternatePort},
@@ -480,6 +510,7 @@ public void ttestDefaultProperties() throws SQLException
     {
         //check that default properties are used
         verifyProperties(new String[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-858
                 "derby.drda.maxThreads=0", 
                 "derby.drda.sslMode=off", 
                 "derby.drda.keepAlive=true", 
@@ -501,6 +532,7 @@ public void testToggleTrace()
     throws SQLException, IOException, InterruptedException
     {        
         // we only care about the traceAll property, the rest will be unchanged
+//IC see: https://issues.apache.org/jira/browse/DERBY-858
         String expectedTraceOff = "derby.drda.traceAll=false";
         String expectedTraceOn = "derby.drda.traceAll=true";     
         
@@ -527,6 +559,7 @@ public void testToggleLogConnections()
     throws SQLException, IOException, InterruptedException
     {
         // only care about the LogConnections property; the rest is unchanged
+//IC see: https://issues.apache.org/jira/browse/DERBY-858
         String expectedLogConnectionsOff = "derby.drda.logConnections=false";
         String expectedLogConnectionsOn = "derby.drda.logConnections=true";
         
@@ -536,6 +569,7 @@ public void testToggleLogConnections()
 
         String[] cmd = new String[] {
             "org.apache.derby.drda.NetworkServerControl", "logconnections", "on","-p",String.valueOf(port) };
+//IC see: https://issues.apache.org/jira/browse/DERBY-5888
         assertSuccessfulCmd("Log Connections turned on.", cmd);
         verifyProperties(expectedLogConnectionsOn);     
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java
index 9b8906f2fb..c295c1e7cd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/ShutDownDBWhenNSShutsDownTest.java
@@ -46,9 +46,11 @@ public class ShutDownDBWhenNSShutsDownTest extends BaseJDBCTestCase {
      * Only run the fixtures in network server mode as that's what they are testing.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ShutDownDBWhenNSShutsDownTest");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2063
         suite.addTest(TestConfiguration.clientServerDecorator(
            new ShutDownDBWhenNSShutsDownTest(
                    "testEngineShutdownDoesNotTakeDownNSManualReload")));
@@ -81,6 +83,7 @@ public ShutDownDBWhenNSShutsDownTest(String name) {
      */
     public void testEngineShutdownDoesNotTakeDownNSManualReload() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2063
         scenarioEngineShutdownDoesNotTakeDownNS(true);
     }
  
@@ -126,7 +129,10 @@ private void scenarioEngineShutdownDoesNotTakeDownNS(
 
         // shut down the engine
         TestConfiguration.getCurrent().shutdownEngine();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
         if (loadEmbeddedDriver)
         {
@@ -147,6 +153,7 @@ private void scenarioEngineShutdownDoesNotTakeDownNS(
      * This fixture must be run with a clientServerDecorator().
      */
     public void testDatabasesShutDownWhenNSShutdownAPI()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2063
             throws Exception
     {
         // Check that the databases will not be shutdown when the server is
@@ -188,6 +195,7 @@ private void shutdownServerCheckDBShutDown(boolean dbShutDown)
         createDatabase();
         
         NetworkServerControl server = NetworkServerTestSetup.getNetworkServerControl();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2063
 
         // shut down the server
         server.shutdown();
@@ -195,13 +203,16 @@ private void shutdownServerCheckDBShutDown(boolean dbShutDown)
         // check if db.lck exists
         String fileName = getSystemProperty("derby.system.home") +
                 java.io.File.separator +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
                 TestConfiguration.getCurrent().getDefaultDatabaseName() +
                 java.io.File.separator + "db.lck";
 
         File lockFile = new File(fileName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         boolean fileNotFound = false;
         int i = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1563
         do {
             Thread.sleep(500);
             fileNotFound = !PrivilegedFileOpsForTests.exists(lockFile);
@@ -212,6 +223,7 @@ private void shutdownServerCheckDBShutDown(boolean dbShutDown)
     }
 
     private void createDatabase() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection conn = getConnection();
         conn.setAutoCommit(false);
         Statement st = conn.createStatement();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java
index 189e714e69..e5bfce2b0b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SqlExceptionTest.java
@@ -83,6 +83,7 @@ public void testNextException() {
         SQLException javae = sqle.getSQLException();
         
         assertEquals(sqle, javae.getCause());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
         assertEquals(nexte, javae.getCause().getCause());
         assertEquals(nexte, javae.getNextException());
         
@@ -98,6 +99,7 @@ public void testNextException() {
         
         assertNotNull(javae.getNextException());
         assertEquals(javae.getNextException().getSQLState(), "08000");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
         assertEquals(internalException, javae.getCause().getCause());
     }
 
@@ -312,6 +314,7 @@ private SQLException recreateSQLException(SQLException se)
     public static Test suite() {
     	if ( JDBC.vmSupportsJSR169())
     		// see DERBY-2157 for details
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                         return new BaseTestSuite(
                 "empty SqlExceptionTest - client not supported on JSR169");
     	else
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreamingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreamingTest.java
index 47a9a11b98..8593d2522b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreamingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SuicideOfStreamingTest.java
@@ -84,6 +84,7 @@ public void setUp()
      * Unset the debug property.
      */
     public void tearDown()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2054
             throws Exception {
         removeSystemProperty("derby.debug.suicideOfLayerBStreaming");
         super.tearDown();
@@ -134,6 +135,7 @@ public static Test suite() {
             //      may be required.
             return new CleanDatabaseTestSetup(
                     TestConfiguration.clientServerDecorator(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                         new BaseTestSuite(SuicideOfStreamingTest.class,
                                       "SuicideOfStreamingTest")));
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java
index 468a7686d3..c65d580f53 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.java
@@ -41,6 +41,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class SysinfoTest extends BaseJDBCTestCase {
 
     private static final String POLICY_FILE_NAME=
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         "org/apache/derbyTesting/functionTests/tests/derbynet/SysinfoTest.policy";
     private ArrayList<String> OUTPUT;
 
@@ -59,6 +60,7 @@ public SysinfoTest(String name) {
         /**
          * Output from sysinfo without the extra properties. 
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> OUTPUT1 = new ArrayList<String>();
         OUTPUT1.add("--------- Derby Network Server Information --------");
         OUTPUT1.add("derby.drda.maxThreads=0");
@@ -78,6 +80,7 @@ public SysinfoTest(String name) {
         /**
          * Output by sysinfo with the extra properties.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> OUTPUT2 = new ArrayList<String>(OUTPUT1);
         OUTPUT2.add("--------- Derby Network Server Information --------"); 
         OUTPUT2.add("derby.drda.securityMechanism=USER_ONLY_SECURITY"); 
@@ -98,6 +101,7 @@ public SysinfoTest(String name) {
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("SysinfoTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // we need to be able to run the server
         if (!Derby.hasServer()) return suite;
@@ -121,6 +125,7 @@ public static Test suite() {
             suite.addTest(decorateTest());
 
         useProperties = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5014
         Properties sysprops = new Properties();
         if (!TestConfiguration.loadingFromJars())
             sysprops.put("sysinfotest.classesdir", findClassDir());
@@ -148,6 +153,7 @@ private static Test decorateTest() {
         Test test = TestConfiguration.clientServerSuite(SysinfoTest.class);
 
         // Install a security manager using the initial policy file.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         return TestConfiguration.singleUseDatabaseDecorator(
                 new SecurityManagerSetup(test, POLICY_FILE_NAME));
     }
@@ -197,6 +203,9 @@ public void testSysinfoLocale() throws Exception {
         Process p = execJavaCmd(SysInfoLocaleCmd);
         String s = readProcessOutput(p);
         print("testSysinfoLocale", s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-858
+//IC see: https://issues.apache.org/jira/browse/DERBY-858
+//IC see: https://issues.apache.org/jira/browse/DERBY-858
         assertMatchingStringExists(s);
     }
 
@@ -219,6 +228,7 @@ public void tearDown() throws Exception {
     }
 
     private static String findClassDir() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         URL url = SecurityManagerSetup.getURL("org.apache.derbyTesting." +
                     "functionTests.tests.derbynet.SysinfoTest");
         return url.getPath();
@@ -235,6 +245,7 @@ private static String findClassDir() {
      * @param actualOutput Actual sysinfo output 
      */
     private void assertMatchingStringExists(String actualOutput) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (String s : OUTPUT) {
             assertTrue("cannot find " + s + " in actualOutput:" + actualOutput,
                     actualOutput.indexOf(s) >=0);            
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/Utf8CcsidManagerClientTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/Utf8CcsidManagerClientTest.java
index 3b2167edac..1ac13b1404 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/Utf8CcsidManagerClientTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/Utf8CcsidManagerClientTest.java
@@ -50,6 +50,7 @@ public Utf8CcsidManagerClientTest(String name) throws Exception {
 
         // Set up a dummy Agent since testInvalidCharacters require one for
         // generating exceptions.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5771
         PrintWriter pw = new PrintWriter(new TestNullOutputStream());
         agent = new NetAgent(null, new LogWriter(pw, 0));
     }
@@ -98,6 +99,7 @@ public void testConvertFromJavaStringWithOffset() throws Exception {
         buffer[2] = additionalBytes[2];
         
         // Offset 3 bytes and convert the 4 chars in ucs2String
+//IC see: https://issues.apache.org/jira/browse/DERBY-5068
         ByteBuffer wrapper = ByteBuffer.wrap(buffer);
         wrapper.position(3);
         ccsidManager.startEncoding();
@@ -131,6 +133,7 @@ public void testConvertToJavaString() throws Exception {
     public void testInvalidCharacters() {
         // Codepoints 0xD800 - 0xDFFF arent legal
         String invalidString = "\uD800";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5068
 
         ccsidManager.startEncoding();
         try {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/Utf8CcsidManagerTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/Utf8CcsidManagerTest.java
index 62e3a17e3b..bce3f90581 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/Utf8CcsidManagerTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/Utf8CcsidManagerTest.java
@@ -88,6 +88,7 @@ public void testConvertToJavaString() throws Exception {
         assertEquals(ucs2String, convertedString);
         
         // Convert just the two characters as offset above and compare
+//IC see: https://issues.apache.org/jira/browse/DERBY-4746
         String convertedOffset = ccsidManager.convertToJavaString(utf8Bytes, 3, 6);
         assertEquals(offsetUcs2String, convertedOffset);
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
index 85704553de..23bee8e3ef 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
@@ -43,26 +43,43 @@ private _Suite(String name) {
 
     public static Test suite() throws Exception {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("derbynet");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2100
         suite.addTest(PrepareStatementTest.suite());
         suite.addTest(ShutDownDBWhenNSShutsDownTest.suite());
         suite.addTest(DRDAProtocolTest.suite());
         suite.addTest(ClientSideSystemPropertiesTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2305
         suite.addTest(BadConnectionTest.suite());
         suite.addTest(NetHarnessJavaTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2196
         suite.addTest(SecureServerTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3829
         suite.addTest(SysinfoTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2274
         suite.addTest(SSLTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3834
         suite.addTest(RuntimeInfoTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2505
         suite.addTest(NetIjTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3211
         suite.addTest(NSinSameJVMTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3273
         suite.addTest(NetworkServerControlClientCommandTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         suite.addTest(ServerPropertiesTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3571
         suite.addTest(LOBLocatorReleaseTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3796
         suite.addTest(OutBufferedStreamTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3717
         suite.addTest(GetCurrentPropertiesTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-728
         suite.addTest(Utf8CcsidManagerTest.suite());
         suite.addTest(DerbyNetAutoStartTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3838
 
         // Disabled due to "java.sql.SQLSyntaxErrorException: The class
         // 'org.apache.derbyTesting.functionTests.tests.derbynet.checkSecMgr'
@@ -75,17 +92,25 @@ public static Test suite() throws Exception {
         {
             // this test refers to ConnectionPooledDataSource class
             // thus causing class not found exceptions with JSR169
+//IC see: https://issues.apache.org/jira/browse/DERBY-1982
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
             suite.addTest(NSSecurityMechanismTest.suite());
             // Test does not run on J2ME    
+//IC see: https://issues.apache.org/jira/browse/DERBY-4765
             suite.addTest(DerbyNetNewServerTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2031
             suite.addTest(ProtocolTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
             suite.addTest(NetworkServerControlApiTest.suite());
         }
 
         // These tests references a client class directly
         // thus causing class not found exceptions if the
         // client code is not in the classpath.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2213
         if (Derby.hasClient()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2054
             suite.addTest(ByteArrayCombinerStreamTest.suite());
             suite.addTest(SqlExceptionTest.suite());
             suite.addTest(Utf8CcsidManagerClientTest.suite());
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/dblook_test_net.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/dblook_test_net.java
index 564f8808fd..b5f37f2ef6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/dblook_test_net.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/derbynet/dblook_test_net.java
@@ -36,6 +36,7 @@ public static void main (String [] args) {
 		new dblook_test_net().doTest();
 		System.out.println("\n[ Done. ]\n");
 		renameDbLookLog("dblook_test_net");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3458
 
 	}
 
@@ -50,6 +51,7 @@ protected void doTest() {
 		try {
 
 			createTestDatabase(dbCreationScript_1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 
 			// Don't let error stream ruin the diff.
 			System.err.close();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ErrorStreamTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ErrorStreamTest.java
index bd686122d7..e62d2a10b6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ErrorStreamTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ErrorStreamTest.java
@@ -108,6 +108,7 @@ public static Test suite() {
     }
 
     public void setUp() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3202
         bootDerby();
         // Shutdown engine so we can change properties for error stream
         getTestConfiguration().shutdownEngine();
@@ -116,8 +117,10 @@ public void setUp() throws Exception {
 
     public void tearDown() throws Exception {
         resetProps();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6380
         closeStreams();
         nullFields();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5725
         super.tearDown();
     }
 
@@ -145,6 +148,7 @@ public void testDefault() throws IOException, SQLException {
         getTestConfiguration().shutdownEngine();
 
         boolean deleted = deleteFile(derbyLog);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3202
         assertTrue("File " + derbyLog + " could not be deleted", deleted);
     }
 
@@ -169,6 +173,7 @@ public void testFile() throws IOException, SQLException {
      * Test the derby.stream.error.file property with wrong input.
      */
     public void testWrongFile() throws IOException, SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3202
         setSystemProperty(FILE_PROP, getCanonicalPath(new File(
               new File(getSystemProperty("derby.system.home"), "foo"),
               makeStreamFilename("file")))); // erroneous path
@@ -354,6 +359,7 @@ public void testMethodOverField() throws IOException, SQLException {
      * Test the derby.stream.error.style=rollingFile property.
      */
     public void testStyleRollingFile() throws IOException, SQLException  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
         setSystemProperty(STYLE_PROP, ROLLING_FILE_STYLE);
         
         File derby0log = new File(getSystemProperty("derby.system.home"), DERBY_0_LOG);
@@ -518,6 +524,9 @@ public void testRollingFileStyleOverFile() throws IOException, SQLException {
         File derby0log = new File(getSystemProperty("derby.system.home"), DERBY_0_LOG);
         
         setSystemProperty(FILE_PROP, getCanonicalPath(fileStreamFile));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3202
+//IC see: https://issues.apache.org/jira/browse/DERBY-3202
+//IC see: https://issues.apache.org/jira/browse/DERBY-3202
 
         bootDerby();
         getTestConfiguration().shutdownEngine();
@@ -556,6 +565,7 @@ public void testRollingFileStyleOverMethod() throws IOException, SQLException {
         assertIsEmpty(errStreamFile);
 
         boolean deleted = deleteFile(derby0log);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
         assertTrue("File " + derby0log + " could not be deleted", deleted);    
      }
 
@@ -584,6 +594,8 @@ public void testRollingFileStyleOverField() throws IOException, SQLException {
         assertIsEmpty(errStreamFile);
 
         boolean deleted = deleteFile(derby0log);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
+//IC see: https://issues.apache.org/jira/browse/DERBY-6380
         assertTrue("File " + derby0log + " could not be deleted", deleted);
     }
 
@@ -602,6 +614,7 @@ private static String makeStreamFilename(String type) {
 
     private void openStreams() throws IOException{
         String systemHome = getSystemProperty("derby.system.home");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6380
         String logFilesHome=systemHome + File.separatorChar + LOGFILESDIR;
         makeDirIfNotExisting(systemHome);
         makeDirIfNotExisting(logFilesHome);
@@ -638,6 +651,7 @@ private void closeStreams() throws IOException {
 
     private static void assertNotDirectory(final File f) throws IOException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             AccessController.doPrivileged(
                     new PrivilegedExceptionAction<Void>() {
                 public Void run() throws IOException {
@@ -653,6 +667,7 @@ public Void run() throws IOException {
     }
 
     private static void assertIsEmpty(final File f) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         String path = getCanonicalPath(f);
         assertTrue(path + " doesn't exist",
                 PrivilegedFileOpsForTests.exists(f));
@@ -666,6 +681,7 @@ private static void assertNotEmpty(final File f) throws IOException {
             AccessController.doPrivileged(
                     new PrivilegedExceptionAction<Void>() {
                 public Void run() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3202
                     assertTrue("assertNotEmpty failed: " + f.getCanonicalPath()
                           + " does not exist.", f.exists());
                     FileInputStream fis = new FileInputStream(f);
@@ -683,6 +699,7 @@ public Void run() throws IOException {
     }
 
     private static void assertFileSize(final File f, final int size) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
         try {
             AccessController.doPrivileged(
                     new PrivilegedExceptionAction<Void>() {
@@ -698,6 +715,7 @@ public Void run() throws IOException {
     }
 
     private static void assertIsExisting(final File f) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         String path = getCanonicalPath(f);
         assertTrue(path + " doesn't exist",
                 PrivilegedFileOpsForTests.exists(f));
@@ -729,6 +747,7 @@ public String run() throws IOException {
     }
 
     private static void makeDirIfNotExisting(final String filename) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
                 File f = new File(filename);
@@ -743,6 +762,7 @@ public Void run() {
     private static FileOutputStream newFileOutputStream(final File f)
     throws FileNotFoundException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return AccessController.doPrivileged(
                   new PrivilegedExceptionAction<FileOutputStream>() {
                 public FileOutputStream run() throws FileNotFoundException {
@@ -760,6 +780,7 @@ private static void resetProps() {
         removeSystemProperty(FILE_PROP);
         removeSystemProperty(METHOD_PROP);
         removeSystemProperty(FIELD_PROP);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6350
         removeSystemProperty(STYLE_PROP);        
     }
 
@@ -802,6 +823,7 @@ private void bootDerby() throws SQLException {
      * </p>
      */
     public void runBareOverridable() throws Throwable {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6380
         PrintStream out = System.out;
         TestConfiguration config = getTestConfiguration();
         boolean stopAfterFirstFail = config.stopAfterFirstFail();
@@ -813,6 +835,7 @@ public void runBareOverridable() throws Throwable {
         catch (Throwable running) {
             PrintWriter stackOut = null;
             try{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6380
                 copyFileToFail(LOGFILESDIR);
                 nullFields();
                 deleteFile(LOGFILESDIR);
@@ -855,6 +878,7 @@ public void runBareOverridable() throws Throwable {
             // attempt to clean up
             // first ensure we have the engine shutdown, or some
             // files cannot be cleaned up.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6380
             getTestConfiguration().shutdownEngine();
             File origLogFilesDir = new File(DEFAULT_DB_DIR, LOGFILESDIR);
             nullFields();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java
index 0b9822d419..3c681adfc1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java
@@ -109,6 +109,8 @@ public void testInterruptLockWaiter() throws Exception {
         }
         assertSQLState(INTERRUPTED, (SQLException) e1);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4967
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         if (hasInterruptibleIO()) {
             println("Skipping assert for t1.InterruptFlagSetOnThrow due " +
                     " to interruptible IO.");
@@ -161,6 +163,8 @@ public void run() {
                 runWaiter();
             } catch (Throwable t) {
                 throwable = t;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4967
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 InterruptFlagSetOnThrow = interrupted(); // clears also
             }
         };
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ModuleLoadingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ModuleLoadingTest.java
index ea26e092ba..f446cec5a5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ModuleLoadingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ModuleLoadingTest.java
@@ -39,6 +39,7 @@ public ModuleLoadingTest(String name) {
 
     public static Test suite() {
         BaseTestSuite ts = new BaseTestSuite();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // Run concurrentLoadingOfSortFactory in a separate database so that
         // the sort factory isn't already loaded.
@@ -68,6 +69,7 @@ public void concurrentLoadingOfSortFactory() throws Throwable {
         final int[] activeThreads = new int[1];
         // List of exceptions/throwables thrown by the forked threads.
         final ArrayList<Throwable> exceptions = new ArrayList<Throwable>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         Thread[] threads = new Thread[numThreads];
 
@@ -132,6 +134,7 @@ private void _run() throws Exception {
         // At least one of the threads failed. Re-throw the first error
         // reported.
         if (!exceptions.isEmpty()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             throw exceptions.get(0);
         }
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ReadMeFilesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ReadMeFilesTest.java
index 0b37c47ea4..53c3559c1a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ReadMeFilesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ReadMeFilesTest.java
@@ -57,6 +57,7 @@ public ReadMeFilesTest(String name) {
 
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("ReadMeFilesTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         //DERBY-5232 (Put a stern README file in log and seg0 directories 
         // to warn users of corrpution they will cause if they touch files 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/RestrictiveFilePermissionsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/RestrictiveFilePermissionsTest.java
index 53b837caa9..5cf4448b20 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/RestrictiveFilePermissionsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/RestrictiveFilePermissionsTest.java
@@ -104,6 +104,7 @@ public static Test suite() throws Exception {
         // setting of the property derby.storage.useDefaultFilePermissions.
         // The extra setup file is for testJarFiles.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite totalSuite =
             new BaseTestSuite("RestrictiveFilePermissionsTest");
 
@@ -115,6 +116,7 @@ public static Test suite() throws Exception {
             new SystemPropertyTestSetup(
                 TestConfiguration.singleUseDatabaseDecorator(
                     new SupportFilesSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                         new BaseTestSuite(
                             RestrictiveFilePermissionsTest.class,
                             "haveWeGotAllCreatedFilesSuite"),
@@ -127,6 +129,7 @@ public static Test suite() throws Exception {
 
         // For server started from command line, we should still get secure
         // permissions.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5677
         if (Derby.hasServer()) {
             totalSuite.addTest(
                 new NetworkServerTestSetup(
@@ -173,6 +176,7 @@ public void setUp() throws Exception {
     public void testDerbyDotLog() throws Exception {
         File derbydotlog = new File(home, derbyDotLog);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
         checkAccessToOwner(derbydotlog, POSITIVE);
     }
 
@@ -188,6 +192,7 @@ public void testServiceProperties() throws Exception {
         File servProp = new File(home, dbName + "/" + "service.properties");
 
         checkAccessToOwner(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             servProp, POSITIVE);
     }
 
@@ -200,6 +205,7 @@ public void testTmpDirectory() throws Exception {
                          "on commit preserve rows not logged").executeUpdate();
 
         checkAccessToOwner(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             tmp, true, POSITIVE);
     }
 
@@ -209,6 +215,7 @@ public void testLockFiles() throws Exception {
         File dbexLck = new File(home, dbName + "/" + "dbex.lck");
 
         checkAccessToOwner(dbLck, POSITIVE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
         if (PrivilegedFileOpsForTests.exists(dbexLck)) {
             checkAccessToOwner(dbexLck, POSITIVE);
@@ -248,6 +255,7 @@ public void testExportedFiles() throws Exception {
         File exp = new File(home, dbName + "/" + exportFileName);
 
         checkAccessToOwner(exp, POSITIVE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
         // Make a lob table and insert one row
         s.executeUpdate("create table lobtable(i int, c clob)");
@@ -274,6 +282,7 @@ public void testExportedFiles() throws Exception {
 
         // Check resuling exported files
         checkAccessToOwner(exp2, POSITIVE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
         checkAccessToOwner(expLob, POSITIVE);
     }
@@ -334,6 +343,10 @@ public void testTruncateTable() throws Exception {
         File seg0 = new File(home, dbName + "/" + "seg0");
 
         checkAccessToOwner(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             seg0, true, POSITIVE);
     }
 
@@ -364,6 +377,7 @@ public void testBackupRestoreFiles() throws Exception {
         File fbd = new File(fullBackupDir);
         checkAccessToOwner(
             fbd, true, POSITIVE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
         // DERBY-6258: When taking a backup, a file called BACKUP.HISTORY
         // is created in the original database directory. Verify that its
@@ -385,6 +399,7 @@ public void testBackupRestoreFiles() throws Exception {
 
         checkAccessToOwner(
             db, true, POSITIVE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
         con.close();
 
@@ -397,6 +412,7 @@ public void testBackupRestoreFiles() throws Exception {
         final File newDb = new File(home, dbName2);
 
         checkAccessToOwner(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             newDb, true, POSITIVE);
         con2.close();
 
@@ -436,6 +452,7 @@ public void testJarFiles() throws Exception {
         File jarsDir = new File(home, dbName + "/" + "jar");
 
         checkAccessToOwner(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             jarsDir, true, POSITIVE);
     }
 
@@ -455,6 +472,7 @@ public void doTestCliServerIsRestrictive() throws Exception {
         File traceDirF = new File(traceDir);
 
         checkAccessToOwner(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             traceDirF, true, POSITIVE);
         nsctrl.shutdown();
         assertDirectoryDeleted(traceDirF);
@@ -474,6 +492,7 @@ public void doTestNonCliServerIsLax() throws Exception {
 
         checkAccessToOwner(
             traceDirF, true, NEGATIVE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
 
         nsctrl.shutdown();
         assertDirectoryDeleted(traceDirF);
@@ -482,6 +501,7 @@ public void doTestNonCliServerIsLax() throws Exception {
 
     public void dotestEmbeddedIsLax() throws Exception {
         File derbydotlogF = new File(home, derbyDotLog + ".lax");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
         checkAccessToOwner(derbydotlogF, NEGATIVE);
     }
 
@@ -495,6 +515,7 @@ public void dotestEmbeddedIsLax() throws Exception {
 
     // Members used by limitAccessToOwner
     private static final Set<PosixFilePermission> UNWANTED_PERMISSIONS =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6865
             Collections.unmodifiableSet(EnumSet.of(
                     PosixFilePermission.GROUP_EXECUTE,
                     PosixFilePermission.GROUP_READ,
@@ -539,7 +560,9 @@ private static boolean checkAccessToOwner(
         // manager.
         if (doContents) {
             // visit immediately contained file in this directory also
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             checkAccessToOwner(file, false, expectedOutcome);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6865
             for (File f : PrivilegedFileOpsForTests.listFiles(file)) {
                 checkAccessToOwner(f, false, expectedOutcome);
             }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ShutdownWithoutDeregisterPermissionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ShutdownWithoutDeregisterPermissionTest.java
index dc28a6d341..71637ddbae 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ShutdownWithoutDeregisterPermissionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/ShutdownWithoutDeregisterPermissionTest.java
@@ -69,6 +69,7 @@ public void testShutdownWithoutPermission() throws SQLException {
         while (found == null && drivers.hasMoreElements()) {
             Driver driver = drivers.nextElement();
             if (driver.getClass().getName().startsWith(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                     "org.apache.derby.iapi.jdbc.AutoloadedDriver")) {
                 found = driver;
             }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java
index 16ff2085c8..7e4eec9c4d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/engine/_Suite.java
@@ -45,11 +45,13 @@ private _Suite(String name) {
 
     public static Test suite() throws Exception {
         BaseTestSuite suite = new BaseTestSuite("engine");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(ErrorStreamTest.suite());
         suite.addTest(LockInterruptTest.suite());
         // for now disable on IBM 1.7 DERBY-5434
         if (!(isIBMJVM() && isJava7()))
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
             suite.addTest(RestrictiveFilePermissionsTest.suite());
         suite.addTest(ModuleLoadingTest.suite());
         suite.addTest(ReadMeFilesTest.suite());
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java
index 4672283a72..e1f9f6dc7e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/DefaultLocale.java
@@ -30,6 +30,7 @@ public class DefaultLocale {
 
 	static {
 		savedLocale=java.util.Locale.getDefault().toString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
 		setDefaultLocale("rr", "TT");
 	}
 
@@ -46,6 +47,7 @@ public static void checkDefaultLocale() throws SQLException
 	// used in urlLocale test
 	public static void checkRDefaultLocale() throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-834
 		String dbLocale = org.apache.derby.iapi.db.Factory.getDatabaseOfConnection().getLocale().toString();
 		//System.out.println(savedLocale);
 		//System.out.println(dbLocale);
@@ -70,6 +72,7 @@ public static void setDefaultLocale(final String Locale, final String Code)
 		// called through a SQL statement and thus a generated
 		// class. The generated class on the stack has no permissions
 		// granted to it. Needs write permission on user.language
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         LocaleTestSetup.setDefaultLocale(
                 new java.util.Locale(Locale.trim(), Code.trim()));
 	}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java
index dfe593a881..063c002c05 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.java
@@ -38,6 +38,7 @@ private I18NImportExport(String i18NImportExport){
     
     public static Test suite() {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("I18NImportExport");
         suite.addTest(
                 new CleanDatabaseTestSetup(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/JapanCodeConversionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/JapanCodeConversionTest.java
index e0df37a227..ffb5d3ce99 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/JapanCodeConversionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/JapanCodeConversionTest.java
@@ -51,6 +51,7 @@ public static Test suite() {
                 (String[]) null);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(
             "JapanCodeConversionTest - skipped because of " +
             "missing support for EUC_JP and SJIS");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java
index 705f8671f6..8bcbbd2085 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedAttributeScriptTest.java
@@ -60,6 +60,7 @@ public static void main(String[] args)
     public static Test suite() {
 
         BaseTestSuite suite = new BaseTestSuite("LocalizedScripts");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // Note that it doesn't really make sense to run with network 
         // server/client, as LocalizedConnectionAttributes.sql has a hardcoded
@@ -69,6 +70,7 @@ public static Test suite() {
         // statement automatically invokes DriverManager.
         if (JDBC.vmSupportsJSR169())
             return suite;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite localizedTests =
             new BaseTestSuite("LocalizedScripts:embedded");
         localizedTests.addTest(getSuite());
@@ -98,6 +100,7 @@ private LocalizedAttributeScriptTest(String localizedTest){
      * that cleans the database.
      */
     private static Test getSuite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("localized scripts");
         Properties uiProps = new Properties();
 
@@ -115,6 +118,7 @@ public void tearDown() throws Exception {
         // not be saved in the 'fail' directory.
         // We can't rely on an additionalDatabaseDecorator because 'detest'
         // is not just a logical, but a physical db name.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         removeDirectory(
             TestConfiguration.getCurrent().getDatabasePath("detest"));
         super.tearDown();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java
index f2afb84e1e..06316d745b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplayScriptTest.java
@@ -63,6 +63,7 @@ public static void main(String[] args)
     public static Test suite() {
         
         BaseTestSuite suite = new BaseTestSuite("LocalizedDisplay");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // This test will fail with JSR169, because lack of support for 
         // rs.getBigDecimal() will prevent the localization of numeric and
@@ -80,6 +81,7 @@ public static Test suite() {
             return suite;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite localizedEmbeddedTests =
             new BaseTestSuite("LocalizedDisplay:embedded");
 
@@ -94,6 +96,7 @@ public static Test suite() {
         // resulting in localized display by default, and thus a diff with the
         // master.
         // Set up the script's run with the network client
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite localizedTests =
             new BaseTestSuite("LocalizedDisplay:client");
 
@@ -121,10 +124,12 @@ private LocalizedDisplayScriptTest(String localizedTest){
      * that cleans the database.
      */
     private static Test getSuite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("localized Display");
         Properties uiProps = new Properties();
         uiProps.put("derby.ui.locale","es_AR");
         uiProps.put("derby.ui.codeset", ENCODING);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6356
         suite.addTest(new TimeZoneTestSetup(new SystemPropertyTestSetup(
                 new LocalizedDisplayScriptTest("LocalizedDisplay"), uiProps), 
                 "America/Los_Angeles"));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java
index b0b26f078d..88cced505f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/UrlLocaleTest.java
@@ -56,6 +56,7 @@ public void tearDown() throws Exception {
         // Reregister driver for any subsequent tests
         String driverClass =
                 TestConfiguration.getCurrent().getJDBCClient().getJDBCDriverName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(driverClass);
         clazz.getConstructor().newInstance();
     }
@@ -70,6 +71,7 @@ public void testURLLocale()  throws SQLException, MalformedURLException {
         s.executeUpdate("call checkRDefaultLoc()");
         
             // create a swiss database
+//IC see: https://issues.apache.org/jira/browse/DERBY-6246
         String url = getReadWriteJDBCURL("swissdb");
         url += ";create=true;territory=fr_CH";
         Connection locConn = DriverManager.getConnection(url);
@@ -81,6 +83,7 @@ public void testURLLocale()  throws SQLException, MalformedURLException {
         
         //-- create a Hindi in India database (hi_IN)
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6246
         url = getReadWriteJDBCURL("hindi");
         url += ";create=true;territory=hi_IN";
         locConn = DriverManager.getConnection(url);
@@ -91,6 +94,7 @@ public void testURLLocale()  throws SQLException, MalformedURLException {
         locConn.close();
        //- now try one with a variant
        // -- create a English in Israel database for JavaOS en_IL_JavaOS
+//IC see: https://issues.apache.org/jira/browse/DERBY-6246
         url = getReadWriteJDBCURL("Israel");
         url += ";create=true;territory=en_IL_JavaOS";
         locConn = DriverManager.getConnection(url);
@@ -102,6 +106,7 @@ public void testURLLocale()  throws SQLException, MalformedURLException {
         
         // now try with just a language - we support this
         // as some vms do.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6246
         url = getReadWriteJDBCURL("bacon");
         url += ";create=true;territory=da";
         locConn = DriverManager.getConnection(url);
@@ -120,8 +125,10 @@ public void testURLLocale()  throws SQLException, MalformedURLException {
      */
     public void testUrlLocaleNegative() throws SQLException {
         //Connection without territory specified in territory attribute        
+//IC see: https://issues.apache.org/jira/browse/DERBY-6255
         String url = getReadWriteJDBCURL("fail1");
         url += ";create=true;territory=";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6255
         checkInvalidTerritoryFormat(url);
         //- database will not have been created so this connection will fail
         url = getReadWriteJDBCURL("fail1");
@@ -132,6 +139,7 @@ public void testUrlLocaleNegative() throws SQLException {
             assertSQLState("XJ004", se);
           }
         //Invalid territory specification
+//IC see: https://issues.apache.org/jira/browse/DERBY-6255
         checkInvalidTerritoryFormat("en_");
         checkInvalidTerritoryFormat("en_d");
         checkInvalidTerritoryFormat("en-US");
@@ -192,6 +200,7 @@ public void messageLocale_Germany() throws SQLException {
         //create a database with a locale that has a small
         // number of messages. Missing ones will default to
         // the locale of the default locale: German;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6255
         String url = getReadWriteJDBCURL("qqPPdb");
         url += ";create=true;territory=qq_PP_testOnly";
         Connection locConn = DriverManager.getConnection(url);
@@ -211,6 +220,7 @@ public void messageLocale_Germany() throws SQLException {
         // Expect WARNING to be in German (default) because there is no 
         //qq_PP message. Index is a duplicate
         s.executeUpdate("create index i2_b on t2(i)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6255
         SQLWarning sqlw = s.getWarnings();
         assertSQLState("01504", sqlw);
         assertTrue("Expected German warning with Duplikat", 
@@ -265,6 +275,7 @@ public void messageLocale_Germany() throws SQLException {
   
     private void checkInvalidTerritoryFormat(String territory) {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6255
             String url = getReadWriteJDBCURL("fail3");
             url += ";create=true;territory=" + territory;
             DriverManager.getConnection(url);
@@ -282,6 +293,7 @@ private void checkInvalidTerritoryFormat(String territory) {
      */
     private static String getReadWriteJDBCURL(String dbname)
    {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6246
         return TestConfiguration.getCurrent().
         getJDBCUrl(SupportFilesSetup.getReadWriteFileName(dbname));
     }
@@ -300,6 +312,7 @@ private static void createLocaleProcedures(Connection conn) throws SQLException
                     "style java language java external name " +
                     "'org.apache.derbyTesting.functionTests.tests.i18n." +
                     "DefaultLocale.checkRDefaultLocale'");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6255
         s.executeUpdate("create procedure checkDefaultLoc() parameter " +
                 "style java language java external name " +
                 "'org.apache.derbyTesting.functionTests.tests.i18n." +
@@ -307,8 +320,10 @@ private static void createLocaleProcedures(Connection conn) throws SQLException
     }
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite();
         suite.addTestSuite(UrlLocaleTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6255
         suite.addTest(new LocaleTestSetup(
                 new UrlLocaleTest("messageLocale_unknown"),
                 new Locale("rr", "TT")));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java
index 0ab891d7a1..ef3fce8ca7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/_Suite.java
@@ -49,6 +49,7 @@ private _Suite(String name) {
 	public static Test suite() {
 
         BaseTestSuite suite = new BaseTestSuite("i18n");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // Also, none of these tests will run with JSR169.
         if (JDBC.vmSupportsJSR169())
@@ -56,8 +57,11 @@ public static Test suite() {
         suite.addTest(LocalizedAttributeScriptTest.suite());
         suite.addTest(LocalizedDisplayScriptTest.suite());
         suite.addTest(JapanCodeConversionTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6244
         suite.addTest(CaseI_tr_TRTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6246
         suite.addTest(UrlLocaleTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4035
         suite.addTest(I18NImportExport.suite());
         suite.addTest(ImportExportProcedureESTest.suite());
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/AbortTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/AbortTest.java
index a24db9108d..480fa064ab 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/AbortTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/AbortTest.java
@@ -83,6 +83,7 @@ public AbortTest(String name, boolean hasSecurityManager)
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite( "AbortTest" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest( baseSuite( true ) );
         suite.addTest( baseSuite( false ) );
@@ -145,6 +146,7 @@ public  void    test_basic() throws Exception
         println( "AbortTest( " + _hasSecurityManager + " )" );
         assertEquals( _hasSecurityManager, (System.getSecurityManager() != null) );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         physical();
         pooled();
         xa();
@@ -221,6 +223,7 @@ public  void    vet( Connection conn0, Connection conn1, Connection conn2 ) thro
         }
 
         if ( _hasSecurityManager ) { missingPermission( wrapper1 ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         else { noSecurityManager( wrapper1, conn2 ); }
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobClobTestSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobClobTestSetup.java
index 4ef4d86bdd..ecf482cce4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobClobTestSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobClobTestSetup.java
@@ -112,6 +112,7 @@ protected void tearDown()
      */
     public static Blob getSampleBlob(Connection con) 
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1459
 		InputStream blobInput = new ByteArrayInputStream(blobData, 0, blobData.length);
         PreparedStatement pStmt = 
             con.prepareStatement("update BLOBCLOB set BLOBDATA = ? where ID = ?");
@@ -142,6 +143,7 @@ public static Blob getSampleBlob(Connection con)
      */
     public static Clob getSampleClob(Connection con) 
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1459
 		Reader clobInput = new StringReader(clobData);
         PreparedStatement pStmt = 
             con.prepareStatement("update BLOBCLOB set CLOBDATA = ? where ID = ?");
@@ -168,6 +170,7 @@ public static Clob getSampleClob(Connection con)
      * @return an integer that represents an unique ID value.
      */
     public static int getID() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2444
         return ID++;
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobSetMethodsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobSetMethodsTest.java
index 48bebeb802..2d1c2e5cda 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobSetMethodsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobSetMethodsTest.java
@@ -55,6 +55,7 @@ protected void setUp() throws Exception {
      * Create test suite.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
         return TestConfiguration.defaultSuite (BlobSetMethodsTest.class);
     }
 
@@ -163,6 +164,7 @@ public void testSetBytesSmallBlob () throws SQLException {
             assertEquals (data1 [i], data2 [i]);
 
         //test truncate on small size blob
+//IC see: https://issues.apache.org/jira/browse/DERBY-2345
         blob = con.createBlob();
         data = new byte [100];
         for (int i = 0; i < 100; i++) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
index c121595989..72834f14f7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
@@ -53,6 +53,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * d) Whether the method is exempted in the NetworkClient
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
 class ExemptBlobMD {
     // The Name of the method
     private String methodName_;
@@ -136,6 +137,7 @@ public class BlobTest
     //on a LOB.
     
     private static final ExemptBlobMD [] emd = new ExemptBlobMD [] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
         new ExemptBlobMD( "getBinaryStream", new Class[] { long.class,long.class }
                                                                    ,true,true ),
         new ExemptBlobMD( "setBinaryStream", new Class[] { long.class },false,true ),
@@ -168,11 +170,14 @@ public void setUp()
 
         // Life span of Blob objects are limited by the transaction.  Need
         // autocommit off so Blob objects survive closing of result set.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         getConnection().setAutoCommit(false);
     }
 
     protected void tearDown() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3098
         if (blob != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2707
             blob.free();
             blob = null;
         }
@@ -184,7 +189,9 @@ protected void tearDown() throws Exception {
      * Builds the HashSet which will be used to test whether the given methods
      * can be exempted or not
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
     void buildHashSet() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4877
         Class<Blob> iface = Blob.class;
         for(int i=0;i<emd.length;i++) {
             try {
@@ -209,6 +216,8 @@ void buildHashSet() {
     public void testFreeandMethodsAfterCallingFree()
         throws SQLException {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-3098
         blob = BlobClobTestSetup.getSampleBlob(getConnection());
         
         //call the buildHashSetMethod to initialize the
@@ -216,6 +225,7 @@ public void testFreeandMethodsAfterCallingFree()
         //from throwing a SQLException after free has been called
         //on the Clob object.
         buildHashSet();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
 
         blob.free();
         //testing the idempotence of the free() method
@@ -375,6 +385,7 @@ Object getNullValueForType(Class type)
             return Boolean.FALSE;
         }
         if (type == Character.TYPE) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             return (char) 0;
         }
         if (type == Byte.TYPE) {
@@ -406,6 +417,7 @@ Object getNullValueForType(Class type)
      * @throws Exception
      */
     public void testGetBinaryStreamLong()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2444
     throws Exception {
         byte[] BYTES1 = {
             0x65, 0x66, 0x67, 0x68, 0x69,
@@ -433,6 +445,7 @@ public void testGetBinaryStreamLong()
         InputStream is_2 = new java.io.ByteArrayInputStream(BYTES1,1,5);
 
         assertEquals(is_2,is_1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
 
         rs.close();
         st.close();
@@ -448,6 +461,7 @@ public void testGetBinaryStreamLong()
      * @throws SQLException if something goes wrong
      */
     public void testGetBinaryStreamLongLastByte()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4060
             throws IOException, SQLException {
         int length = 5000;
         // Insert a Blob
@@ -558,6 +572,7 @@ public void testGetBinaryStreamLongExceptionConditions()
         catch(SQLException sqle) {
             // The SQLState for the exception thrown when pos > length of Blob
             // is XJ076
+//IC see: https://issues.apache.org/jira/browse/DERBY-2444
             assertSQLState("XJ087", sqle);
         }
 
@@ -595,6 +610,7 @@ public void testGetBinaryStreamLongExceptionConditions()
      * This is a repro for DERBY-4061, where we ended up with an infinite loop.
      */
     public void testGetBinaryStreamLongDrain()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4061
             throws IOException, SQLException {
         initializeLongBlob(); // Ignoring id for now, use instance variable.
         InputStream in = blob.getBinaryStream(2000, 5000);
@@ -618,6 +634,7 @@ public void testGetBinaryStreamCreateBlob() throws Exception {
          //The bytes that will be used
          //to do the inserts into the
          //Blob.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
          byte[] bytes1 = {
             0x65, 0x66, 0x67, 0x68, 0x69,
             0x69, 0x68, 0x67, 0x66, 0x65
@@ -701,6 +718,7 @@ public void testGetBinaryStreamBlobUpdates() throws Exception {
      * byte array in memory.
      */
     public void testSetBytesReturnValueSmall()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3871
             throws SQLException {
         Blob myBlob = getConnection().createBlob();
         byte[] byteBatch = new byte[] {
@@ -774,6 +792,7 @@ public void testSetBytesReturnValueLargeStateChange()
     public void testLockingAfterFree() throws SQLException
     {
         int id = initializeLongBlob();  // Opens blob object
+//IC see: https://issues.apache.org/jira/browse/DERBY-3098
         executeParallelUpdate(id, true); // Test that timeout occurs
         
         // Test that update goes through after the blob is closed
@@ -924,10 +943,12 @@ private void executeParallelUpdate(int id, boolean timeoutExpected)
      * @throws IOException if writing to the destination stream fails
      */
     public static void transferAlphabetData(OutputStream writer, long length)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3871
             throws IOException {
         byte[] buffer = new byte[8*1024];
         int bytesRead = 0;
         LoopingAlphabetStream contents = new LoopingAlphabetStream(length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3871
         while ((bytesRead = contents.read(buffer)) > 0) {
             writer.write(buffer, 0, bytesRead);
         }
@@ -943,6 +964,7 @@ public static void transferAlphabetData(OutputStream writer, long length)
      * @throws IOException if reading from the stream fails
      */
     public static int getLastByteInStream(InputStream is, int expectedCount)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4060
             throws IOException {
         int read = 0;
         byte[] buf = new byte[256];
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java
index 2c655f28ee..8aedc70690 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/CallableStatementTest.java
@@ -86,6 +86,7 @@ protected void setUp()
     protected void tearDown()
         throws Exception {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2707
         cStmt.close();
         cStmt = null;
 
@@ -93,7 +94,9 @@ protected void tearDown()
     }
    
     public void testNamedParametersAreNotSupported()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1147
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         DatabaseMetaData met = getConnection().getMetaData();
         assertFalse("Named parameters are not supported, but the metadata " +
                     "says they are", met.supportsNamedParameters());
@@ -160,6 +163,7 @@ public void testGetNStringStringNotImplemented()
     
     public void testGetCharacterStreamIntOnInvalidTypeDOUBLE() 
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1147
         cStmt.setDouble(2, 3.3);
         cStmt.execute();
         try {
@@ -199,6 +203,7 @@ public void testGetCharacterStreamIntOnInParameterOfInvalidType()
      */
     public void testGetCharacterStreamIntOnInParameterOfValidType()
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         cStmt = CallableStatementTestSetup.getBinaryDirectProcedure(getConnection());
         cStmt.setString(1, "A string");
         cStmt.execute();
@@ -223,6 +228,7 @@ public void testGetCharacterStreamIntOnInParameterOfValidType()
      */
     public void testGetCharacterStreamIntVARCHAR()
         throws IOException, SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         cStmt = CallableStatementTestSetup.getIntToStringFunction(getConnection());
         cStmt.setInt(2, 4509);
         assertFalse("No resultsets should be returned", cStmt.execute());
@@ -254,6 +260,7 @@ public void testGetCharacterStreamIntVARCHAR()
     public void testGetCharacterStreamIntVARBINARYDirect()
         throws IOException, SQLException {
         String data = "This is the test string.";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         cStmt = CallableStatementTestSetup.getBinaryDirectProcedure(getConnection());
         cStmt.setString(1, data);
         assertFalse("No resultsets should be returned", cStmt.execute());
@@ -293,6 +300,7 @@ public void testGetCharacterStreamIntVARBINARYDirect()
      */
     public void testGetCharacterStreamIntVARBINARYFromDb()
         throws IOException, SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         cStmt = CallableStatementTestSetup.getBinaryFromDbFunction(getConnection());
         cStmt.setInt(2, CallableStatementTestSetup.STRING_BYTES_ID);
         assertFalse("No resultsets should be returned", cStmt.execute());
@@ -324,6 +332,7 @@ public void testGetCharacterStreamIntVARBINARYFromDb()
      */
     public void testGetCharacterStreamIntOnVARBINARYWithNull()
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         cStmt = CallableStatementTestSetup.getBinaryFromDbFunction(getConnection());
         cStmt.setInt(2, CallableStatementTestSetup.SQL_NULL_ID);
         assertFalse("No resultsets should be returned", cStmt.execute());
@@ -339,6 +348,7 @@ public void testGetCharacterStreamIntOnVARBINARYWithNull()
      */
     public void testGetCharacterStreamIntOnVARCHARWithNull()
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         cStmt = CallableStatementTestSetup.getVarcharFromDbFunction(getConnection());
         cStmt.setInt(2, CallableStatementTestSetup.SQL_NULL_ID);
         assertFalse("No resultsets should be returned", cStmt.execute());
@@ -385,6 +395,7 @@ public void testGetNCharacterStreamStringNotImplemented()
     public void testSetBlobNotImplemented()
         throws SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             cStmt.setBlob("some-parameter-name", (Blob)null);
             fail("CallableStatement.setBlob(String, Blob) " +
                  "should not be implemented");
@@ -396,6 +407,7 @@ public void testSetBlobNotImplemented()
     public void testSetClobNotImplemented()
         throws SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             cStmt.setClob("some-parameter-name", (Clob)null);
             fail("CallableStatement.setClob(String, Clob) " +
                  "should not be implemented");
@@ -418,6 +430,7 @@ public void testSetNCharacterStreamNotImplemented()
     public void testSetNClobNClobNotImplemented()
         throws SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             cStmt.setNClob("some-parameter-name", (NClob)null);
             fail("CallableStatement.setNClob(String, NClob) " +
                  "should not be implemented");
@@ -483,6 +496,7 @@ public void testSetSQLXMLNotImplemented()
 
     /** Helper method for testIsWrapperFor*Statement test cases. */
     private void testIsWrapperForXXXStatement(Class klass) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1536
         assertTrue("The CallableStatement is not a wrapper for "
                        + klass.getName(),
                    cStmt.isWrapperFor(klass));
@@ -505,6 +519,7 @@ public void testIsNotWrapperForResultSet() throws SQLException {
     }
 
     public void testIsWrapperForSelf() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5872
         assertTrue(cStmt.isWrapperFor(cStmt.getClass()));
     }
 
@@ -524,6 +539,7 @@ public void testUnwrapCallableStatement() throws SQLException {
     }
 
     public void testUnwrapAsSelf() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5872
         PreparedStatement cs = cStmt.unwrap(cStmt.getClass());
         assertSame("Unwrap returned wrong object.", cStmt, cs);
     }
@@ -548,8 +564,10 @@ public void testUnwrapResultSet() {
      */
 
     public void testSetCharacterStream() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
         try {
             cStmt.setCharacterStream("Some String",null,0L);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
             fail("CallableStatement.setCharacterStream() " +
                  "should not be implemented");
         }
@@ -572,6 +590,7 @@ public void testSetCharacterStream() throws SQLException {
     public void testSetAsciiStream() throws SQLException {
         try {
             cStmt.setAsciiStream("Some String",null,0L);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
             fail("CallableStatement.setAsciiStream() " +
                  "should not be implemented");
         }
@@ -594,6 +613,7 @@ public void testSetAsciiStream() throws SQLException {
     public void testSetBinaryStream() throws SQLException {
         try {
             cStmt.setBinaryStream("Some String",null,0L);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
             fail("CallableStatement.setBinaryStream() " +
                  "should not be implemented");
         }
@@ -608,6 +628,7 @@ public void testSetBinaryStream() throws SQLException {
      */
     public  void    testJDBC4_1() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         Connection  conn = getConnection();
         
         vetDataTypeCount( conn );
@@ -671,6 +692,7 @@ public  void    testJDBC4_1() throws Exception
         cs.registerOutParameter( param++, Types.VARCHAR );
         cs.registerOutParameter( param++, Types.VARBINARY );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         _nullOutArgs = false;
         cs.execute();
         examineJDBC4_1extensions( new Wrapper41( cs ), _nullOutArgs );
@@ -774,6 +796,7 @@ public  void    test_4959() throws Exception
      */
     public  static  void    allTypesProc
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
          Long[] bigintarg,
          Blob[] blobarg,
          Boolean[] booleanarg,
@@ -801,6 +824,7 @@ public  void    test_4959() throws Exception
         float   floatValue = 1.0F;
         String lobValue = "abc";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         bigintarg[0] = _nullOutArgs ? null : (long) intValue;
         blobarg[0] = _nullOutArgs ? null : new HarmonySerialBlob( BINARY_VALUE );
         booleanarg[0] = _nullOutArgs ? null : Boolean.TRUE;
@@ -844,9 +868,12 @@ public  void    test_4959() throws Exception
      * Return suite with all tests of the class.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("CallableStatementTest suite");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         suite.addTest(baseSuite("CallableStatementTest:embedded"));
         suite.addTest(TestConfiguration.clientServerDecorator(
             baseSuite("CallableStatementTest:client")));
@@ -857,6 +884,7 @@ public static Test suite() {
     }
 
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite(CallableStatementTest.class, name);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
index 8023e80162..ade4ad7542 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
@@ -46,6 +46,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derbyTesting.functionTests.util.streams.CharAlphabet;
 import org.apache.derbyTesting.functionTests.util.streams.LoopingAlphabetReader;
 import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
 class ExemptClobMD {
     /** The Name of the method. */
     private String methodName_;
@@ -158,11 +159,14 @@ public void setUp()
         throws SQLException {
         // Life span of Clob objects are limited by the transaction.  Need
         // autocommit off so Clob objects survive closing of result set.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
         getConnection().setAutoCommit(false);
     }
 
     protected void tearDown() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3098
         if (clob != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2707
             clob.free();
             clob = null;
         }
@@ -175,6 +179,7 @@ protected void tearDown() throws Exception {
      * can be exempted or not
      */
     void buildHashSet() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4877
         Class<Clob> iface = Clob.class;
         for(int i=0;i<emd.length;i++) {
             try {
@@ -215,15 +220,18 @@ public void testFreeAfterImplicitFree()  throws SQLException
      *
      */
     public void testFreeandMethodsAfterCallingFree()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3098
           throws IllegalAccessException, InvocationTargetException, SQLException
     {
         clob = BlobClobTestSetup.getSampleClob(getConnection());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
 
         //call the buildHashSetMethod to initialize the
         //HashSet with the method signatures that are exempted
         //from throwing a SQLException after free has been called
         //on the Clob object.
         buildHashSet();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1328
 
         InputStream asciiStream = clob.getAsciiStream();
         Reader charStream = clob.getCharacterStream();
@@ -246,6 +254,7 @@ public void testFreeandMethodsAfterCallingFree()
      * get the list of methods present in the interface
      * @param LOB an instance of the Clob interface implementation
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
     void buildMethodList(Object LOB)
             throws IllegalAccessException, InvocationTargetException {
         //If the given method throws the correct exception
@@ -303,6 +312,7 @@ else if(c != 1)
     boolean checkIfExempted(Method m) {
         ExemptClobMD md = excludedMethodSet.get(m);
         boolean isExempted = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         if (md != null) {
             if (usingDerbyNetClient()) {
                 isExempted = md.getIfClientFramework();
@@ -326,6 +336,7 @@ boolean checkIfExempted(Method m) {
      *               LOB object
      */
     boolean checkIfMethodThrowsSQLException(Object LOB,Method method)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
             throws IllegalAccessException, InvocationTargetException {
         try {
             method.invoke(LOB,getNullValues(method.getParameterTypes()));
@@ -371,6 +382,7 @@ Object getNullValueForType(Class type) {
             return Boolean.FALSE;
         }
         if (type == Character.TYPE) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             return (char) 0;
         }
         if (type == Byte.TYPE) {
@@ -401,6 +413,7 @@ Object getNullValueForType(Class type) {
      * @throws Exception
      */
     public void testGetCharacterStreamLong()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2444
     throws Exception {
         String str1 = "This is a test String. This is a test String";
 
@@ -426,6 +439,7 @@ public void testGetCharacterStreamLong()
         Reader r_2 = new java.io.StringReader(str2);
 
         assertEquals(r_2,r_1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
 
         rs.close();
         st.close();
@@ -438,6 +452,7 @@ public void testGetCharacterStreamLong()
      * This case fills the Clob with latin lowercase characters.
      */
     public void testGetCharacterStreamLongLastCharLatin()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4060
             throws IOException, SQLException {
         CharAlphabet alphabet = CharAlphabet.modernLatinLowercase();
         // Insert a Clob
@@ -629,6 +644,7 @@ public void testGetCharacterStreamLongExceptionConditions()
         catch(SQLException sqle) {
             // The SQLState for the exception thrown when pos > length of Clob
             // is XJ076
+//IC see: https://issues.apache.org/jira/browse/DERBY-2444
             assertSQLState("XJ087", sqle);
         }
 
@@ -673,6 +689,7 @@ public void testGetAsciiStreamCreateClob() throws Exception {
          //to do the inserts into the
          //Clob.
          String str = "Hi I am the insert String";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
 
          //Create the InputStream that will
          //be used for comparing the Stream
@@ -680,6 +697,7 @@ public void testGetAsciiStreamCreateClob() throws Exception {
          //the update.
          ByteArrayInputStream str_is = new ByteArrayInputStream
                  (str.getBytes("US-ASCII"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3774
 
          //create the empty Clob.
          Clob clob = getConnection().createClob();
@@ -815,6 +833,7 @@ public void testGetCharacterStreamClobUpdates() throws Exception {
          //should reflect the same extension
          //in the InputStream also.
          clob.setString((str1.length())+1, str2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
 
          //Now get the reader from the Clob after
          //the update has been done.
@@ -835,6 +854,7 @@ public void testLockingAfterFree() throws SQLException
     {
         int id = initializeLongClob();  // Opens clob object
         executeParallelUpdate(id, true); // Test that timeout occurs
+//IC see: https://issues.apache.org/jira/browse/DERBY-3098
 
         // Test that update goes through after the clob is closed
         clob.free();
@@ -888,6 +908,7 @@ public void testLockingAfterFreeWithDirtyReads() throws SQLException
 
     /** Inserts, fetches and checks the length of a Clob using a stream. */
     public void testInsertAndFetchZeroLength()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             throws IOException, SQLException {
         insertAndFetchTest(0);
     }
@@ -1056,6 +1077,7 @@ private void executeParallelUpdate(int id, boolean timeoutExpected)
      * @throws IOException if reading from the stream fails
      */
     public static char getLastCharInStream(Reader reader, int expectedCount)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4060
             throws IOException {
         int read = 0;
         final char[] buf = new char[256];
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java
index c2e7dd0786..47515baf24 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionMethodsTest.java
@@ -69,6 +69,7 @@ public static   final   class DirectExecutor implements Executor
     {
         public void execute(Runnable r)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
             r.run();
         }
     }
@@ -99,6 +100,7 @@ public ConnectionMethodsTest(String name) {
 
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("ConnectionMethodsTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(baseSuite("ConnectionMethodsTest:embedded"));
 
@@ -109,6 +111,7 @@ public static Test suite() {
     }
 
     public static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite(ConnectionMethodsTest.class, name);
 
@@ -117,7 +120,9 @@ public static Test baseSuite(String name) {
             protected void decorateSQL(Statement s) throws SQLException {
                 s.execute("create table clobtable2(n int,clobcol CLOB)");
                 s.execute("create table blobtable2(n int,blobcol BLOB)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
                 s.execute("create table abort_table(a int)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
                 s.execute("create schema foo");
                 s.execute("create table foo.set_schema_table( a int )");
             }
@@ -227,6 +232,8 @@ public void testCreateBlob() throws   SQLException,
         blob = conn.createBlob();
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4877
+//IC see: https://issues.apache.org/jira/browse/DERBY-4877
             is = AccessController.doPrivileged(
                     new PrivilegedExceptionAction<FileInputStream>() {
                 public FileInputStream run() throws FileNotFoundException {
@@ -242,6 +249,8 @@ public FileInputStream run() throws FileNotFoundException {
 
         OutputStream os = blob.setBinaryStream(1);
         ArrayList<Integer> beforeUpdateList = new ArrayList<Integer>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4877
+//IC see: https://issues.apache.org/jira/browse/DERBY-4877
 
         int actualLength = 0;
         c = is.read();
@@ -265,6 +274,8 @@ public FileInputStream run() throws FileNotFoundException {
         //Get the InputStream from this Blob.
         InputStream in = blob.getBinaryStream();
         ArrayList<Integer> afterUpdateList = new ArrayList<Integer>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4877
+//IC see: https://issues.apache.org/jira/browse/DERBY-4877
 
         b = in.read();
 
@@ -396,6 +407,7 @@ public void testAbortPhysical() throws Exception
         if ( !TestConfiguration.loadingFromJars() ) { return; }
 
         Connection conn0 = openUserConnection( "user0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         Connection conn1 = openUserConnection( "user1");
         Connection conn2 = openUserConnection( "user2");
 
@@ -448,6 +460,7 @@ public void testAbortXA() throws Exception
         // the jar file containing this method.
         //
         if ( !TestConfiguration.loadingFromJars() ) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
 
         XADataSource xads = J2EEDataSource.getXADataSource();
         
@@ -500,6 +513,7 @@ public void abortVetter( Connection conn0, Connection conn1, Connection conn2 )
         ps.execute();
         ps.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         ps = prepareStatement( conn1, "select * from app.abort_table");
         ResultSet rsconn1 = ps.executeQuery();
         assertTrue(rsconn1.next());
@@ -547,6 +561,7 @@ public Object    run() throws Exception
         }
         catch (SQLException se)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
             assertSQLState( CLOSED_CONNECTION, se );
         }
 
@@ -564,6 +579,7 @@ public Object    run() throws Exception
      */
     public void testGetSetSchema() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         Connection  conn = getConnection();
         println( "Testing get/setSchema() on a " + conn.getClass().getName() );
         Wrapper41Conn   wrapper = new Wrapper41Conn( conn );
@@ -618,6 +634,7 @@ public void testGetSetSchema() throws Exception
      */
     public void testGetSetNetworkTimeout() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         Connection  conn = getConnection();
         println( "Testing get/setNetoworkTimeout() on a " + conn.getClass().getName() );
         Wrapper41Conn   wrapper = new Wrapper41Conn( conn );
@@ -645,6 +662,7 @@ public void testGetSetNetworkTimeout() throws Exception
         
         try {
             wrapper.getNetworkTimeout();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
             fail( "Should raise an Unimplemented Feature exception." );
         }
         catch (SQLException se)
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
index a41d7a5bcf..392852b0b3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
@@ -79,8 +79,10 @@ public ConnectionTest(String name) {
      */
     public void embeddedCreateBlob()
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
             Blob blob = getConnection().createBlob();
             //Check if the blob is empty
+//IC see: https://issues.apache.org/jira/browse/DERBY-1255
             if(blob.length() > 0)
                 fail("The new Blob should not have more than zero bytes " +
                         "contained in it");
@@ -100,6 +102,7 @@ public void embeddedCreateBlob()
      */
     public void embeddedCreateClob()
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
             Clob clob = getConnection().createClob();
             //check if the Clob is empty
             if(clob.length() > 0)
@@ -108,8 +111,10 @@ public void embeddedCreateClob()
     }
 
     public void testCreateArrayNotImplemented()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1238
         throws SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
             getConnection().createArrayOf(null, null);
             fail("createArrayOf(String,Object[]) should not be implemented");
         } catch (SQLFeatureNotSupportedException sfnse) {
@@ -120,6 +125,7 @@ public void testCreateArrayNotImplemented()
     public void testCreateNClobNotImplemented()
         throws SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
             getConnection().createNClob();
             fail("createNClob() should not be implemented");
         } catch (SQLFeatureNotSupportedException sfnse) {
@@ -138,8 +144,10 @@ public void testCreateSQLXMLNotImplemented()
     }
 
     public void testCreateStructNotImplemented()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1238
         throws SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
             getConnection().createStruct(null, null);
             fail("createStruct(String,Object[]) should not be implemented");
         } catch (SQLFeatureNotSupportedException sfnse) {
@@ -150,6 +158,7 @@ public void testCreateStructNotImplemented()
     public void testGetClientInfo()
         throws SQLException {
         assertTrue("getClientInfo() must return an empty Properties object", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
                    getConnection().getClientInfo().isEmpty());
     }
     
@@ -230,6 +239,7 @@ public void xtestIsValidWithTimeout() throws SQLException {
      * @exception SQLException if an error occurs
      */
     public void testGetTypeMapReturnsEmptyMap() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         assertTrue(getConnection().getTypeMap().isEmpty());
     }
     
@@ -238,6 +248,7 @@ public void testGetTypeMapReturnsEmptyMap() throws SQLException {
      * @exception SQLException if an error occurs
      */
     public void testGetTypeMapReturnsAsExpected() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         Statement s = getConnection().createStatement();
         int ret;
         try {
@@ -254,6 +265,7 @@ public void testGetTypeMapReturnsAsExpected() throws SQLException {
         PreparedStatement ps = getConnection().prepareStatement(
                 "INSERT INTO T1(A1) VALUES (?)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         ArrayList<String> lst = new ArrayList<String>();
         lst.add("First element");
         lst.add("Second element");
@@ -262,6 +274,7 @@ public void testGetTypeMapReturnsAsExpected() throws SQLException {
         ps.execute();     
         
         Map<String, Class<?>> map = getConnection().getTypeMap();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5143
         try {
             map.put("JAVA_UTIL_LIST", List.class);
             fail("returned map should be immutable");
@@ -277,6 +290,7 @@ public void testGetTypeMapReturnsAsExpected() throws SQLException {
         // Create a non-empty map to test setTypeMap(). setTypeMap() raises
         // a feature not supported exception if the map isn't empty.
         map = new HashMap<String, Class<?>>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         map.put("JAVA_UTIL_LIST", List.class);
         
         try {
@@ -322,6 +336,7 @@ public void testSetClientInfoProperties()
         try {
             getConnection().setClientInfo(p);
             fail("setClientInfo(String,String) should throw "+
+//IC see: https://issues.apache.org/jira/browse/DERBY-1380
                  "SQLClientInfoException");
         } catch (SQLClientInfoException cie) {
             assertSQLState("SQLStates must match", "XCY02", cie);
@@ -341,6 +356,7 @@ public void testSetClientInfoProperties()
     public void testSetClientInfoString()
         throws SQLException {
         getConnection().setClientInfo(null, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
 
         try {
             getConnection().setClientInfo("foo", null);
@@ -351,6 +367,7 @@ public void testSetClientInfoString()
         try {
             getConnection().setClientInfo("name", "value");
             fail("setClientInfo(String,String) should throw "+
+//IC see: https://issues.apache.org/jira/browse/DERBY-1380
                  "SQLClientInfoException");
         } catch (SQLClientInfoException cie) {
             assertSQLState("SQLState must match 'unsupported'",
@@ -365,6 +382,7 @@ public void testSetClientInfoString()
     
     public void testUnwrapValid()
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection unwrappedCon = getConnection().unwrap(Connection.class);
         assertSame("Unwrap returned wrong object.", getConnection(), unwrappedCon);
     }
@@ -387,6 +405,7 @@ public void testUnwrapInvalid()
      * Create suite containing client-only tests.
      */
     private static BaseTestSuite clientSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite clientSuite = new BaseTestSuite(name);
         return clientSuite; 
     }
@@ -397,6 +416,7 @@ private static BaseTestSuite clientSuite(String name) {
     private static BaseTestSuite embeddedSuite(String name) {
         BaseTestSuite embeddedSuite = new BaseTestSuite(name);
         embeddedSuite.addTest(new ConnectionTest(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1255
                     "embeddedCreateBlob"));
         embeddedSuite.addTest(new ConnectionTest(
                     "embeddedCreateClob"));
@@ -410,6 +430,7 @@ private static BaseTestSuite embeddedSuite(String name) {
      */
     public static Test suite() {
         BaseTestSuite connSuite = new BaseTestSuite("ConnectionTest suite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         BaseTestSuite embedded = new BaseTestSuite("ConnectionTest:embedded");
         embedded.addTestSuite(ConnectionTest.class);
@@ -419,6 +440,8 @@ public static Test suite() {
         // repeat the embedded tests obtaining a connection from
         // an XA data source.
         embedded = new BaseTestSuite("ConnectionTest:embedded XADataSource");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         embedded.addTestSuite(ConnectionTest.class);
         embedded.addTest(embeddedSuite("ConnectionTest:embedded-only XADataSource"));
         connSuite.addTest(TestConfiguration.connectionXADecorator(embedded));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java
index 98215116d8..b7d3a3a323 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/DataSourceTest.java
@@ -63,6 +63,8 @@ public DataSourceTest(String name) {
      * Create a default DataSource
      */
     public void setUp() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         ds = JDBCDataSource.getDataSource();
     }
     
@@ -73,10 +75,12 @@ public void setUp() {
      */
     public void tearDown() throws Exception {
         ds = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2707
         super.tearDown();
     }
 
     public void testIsWrapperForDataSource() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1536
         assertTrue(ds.isWrapperFor(DataSource.class));
     }
 
@@ -282,6 +286,7 @@ public void testConnectionErrorEvent() throws SQLException, Exception
     	//As per the JDBC definition, an exception and hence an event is raised
     	//for isValid only if the param value is illegal
     	assertFalse(aes12.didConnectionErrorEventHappen());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         aes12.resetState();
         Class<?> clazz;
         if (usingEmbedded())
@@ -305,6 +310,7 @@ public void testConnectionErrorEvent() throws SQLException, Exception
      */
     public void test_jdbc4_1() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         DataSource  ds = JDBCDataSource.getDataSource();
         ConnectionPoolDataSource cpds = J2EEDataSource.getConnectionPoolDataSource();
         XADataSource xads = J2EEDataSource.getXADataSource();
@@ -335,7 +341,9 @@ private void    vetDSjdbc4_1( CommonDataSource cds ) throws Exception
      */
     public static Test suite() {
         // Use explicit ordering of fixtures until fix of DERBY-5988
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite s = new BaseTestSuite("datasourcetestsuite-embedded");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5988
         s.addTest(new DataSourceTest("testIsNotWrapperForPoolDataSource"));
         s.addTest(new DataSourceTest("testIsNotWrapperForXADataSource"));
         s.addTest(new DataSourceTest("testUnwrapConnectionPoolDataSource"));
@@ -346,6 +354,7 @@ public static Test suite() {
         s.addTest(new DataSourceTest("testUnwrapResultSet"));
         s.addTest(new DataSourceTest("testUnwrapDataSource"));
         s.addTest(new DataSourceTest("test_jdbc4_1"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite ns = new BaseTestSuite("datasourcetestsuite-net");
         ns.addTest(new DataSourceTest("testIsNotWrapperForPoolDataSource"));
         ns.addTest(new DataSourceTest("testIsNotWrapperForXADataSource"));
@@ -358,6 +367,7 @@ public static Test suite() {
         ns.addTest(new DataSourceTest("testUnwrapDataSource"));
         ns.addTest(new DataSourceTest("test_jdbc4_1"));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite totalsuite = new BaseTestSuite("datasourcetest");
         totalsuite.addTest(new CleanDatabaseTestSetup(s));
         totalsuite.addTest(TestConfiguration.clientServerDecorator(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java
index 36d28e6345..026e9721cf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby2017LayerBTest.java
@@ -288,6 +288,7 @@ public void testFailedStreamInsertCharAutoCommitRollbackOnError()
     }
 
     public void testFailedStreamInsertBinary()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             throws IOException, SQLException {
         byte[][] INSERT = generateDefaultInsert();
         String[][] MASTER = generateMaster(INSERT, new int[] {3, 4});
@@ -421,6 +422,7 @@ private void doInsertTest(String[] INSERT, String[][] MASTER,
      */
     private void doInsertTest(byte[][] INSERT, String[][] MASTER,
                               boolean autoCommit, boolean rollbackOnError)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             throws IOException, SQLException {
         // A few sanity checks.
         assertEquals("Expects 7 rows", 7, INSERT.length);
@@ -490,6 +492,8 @@ private void doInsertTest(byte[][] INSERT, String[][] MASTER,
 
         // Select data in the table, compare to MASTER
         ResultSet rs = stmt.executeQuery("select * from t2017_binary");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4912
+//IC see: https://issues.apache.org/jira/browse/DERBY-4912
         JDBC.assertUnorderedResultSet(rs, MASTER);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby3650Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby3650Test.java
index 5dec58d4b0..c702ed0ea5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby3650Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Derby3650Test.java
@@ -568,6 +568,7 @@ private static void initializeBlobTables(Statement stmt)
 
     
     protected static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(Derby3650Test.class);
         return new CleanDatabaseTestSetup(
@@ -595,6 +596,7 @@ protected void decorateSQL(Statement stmt) throws SQLException
 
     public static Test suite() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Derby3650Test");
         suite.addTest(baseSuite("Derby3650Test:embedded"));
         suite.addTest(TestConfiguration.clientServerDecorator(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40Test.java
index e0e251c41e..5c0e587f87 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40Test.java
@@ -71,6 +71,7 @@ public static Test suite()
     {
         if (JDBC.vmSupportsJSR169())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(
                 "DriverTest40 tests java.sql.Driver, not supported with JSR169");
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40UnbootedTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40UnbootedTest.java
index 8f5332fad5..2db4ef3f04 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40UnbootedTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Driver40UnbootedTest.java
@@ -75,6 +75,7 @@ public static Test suite()
     {
         if (JDBC.vmSupportsJSR169())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(
                 "DriverTest tests java.sql.Driver, not supported with JSR169");
         }
@@ -136,6 +137,7 @@ public void test_notBooted() throws Exception
     {
         if ( !getTestConfiguration().loadingFromJars() ) { return ; }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5504
         String[] command = {
             "-Demma.verbosity.level=silent",
             getClass().getName()
@@ -147,6 +149,7 @@ public void test_notBooted() throws Exception
         
         // Ensure it completes without failures.
         assertEquals(0, spawned.complete());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
 
         assertEquals( SUCCESS, spawned.getFullServerOutput() );
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java
index 4ea3f84dad..51d3c34701 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/JDBC4FromJDBC3DataSourceTest.java
@@ -68,6 +68,7 @@ public JDBC4FromJDBC3DataSourceTest(String name)
     public static Test suite()
     {
         // Only run this test if we have a JDBC 4 JVM on full SE
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         if (JDBC.vmSupportsJDBC4() && JDBC.vmSupportsJNDI())
         {
             return TestConfiguration.forceJDBC3Suite(
@@ -75,6 +76,7 @@ public static Test suite()
         }
 
         // Else return empty suite.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite("JDBC 4 from JDBC 3 Data Sources");
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LobSortTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LobSortTest.java
index dc94ca1ff8..5ddf31b26b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LobSortTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LobSortTest.java
@@ -195,9 +195,11 @@ private void fetchIterateGetLengthClob(String sql)
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4245
         Properties props = new Properties();
         // Adjust sort buffer size to trigger the bug situation with less data.
         props.setProperty("derby.storage.sortBufferMax", "4");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(LobSortTest.class,
                                         "LobSortTestEmbedded");
         return new CleanDatabaseTestSetup(
@@ -221,6 +223,7 @@ protected void decorateSQL(Statement s)
                 ps.setInt(4, 0);
                 ps.setInt(5, rnd.nextInt());
                 ps.executeUpdate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4245
                 for (int i=0; i < 100; i++) {
                     CharAlphabet ca = getCharAlphabet(1 + rnd.nextInt(3));
                     int length = (int)(rnd.nextDouble() * 64.0 * 1024.0);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LobStreamTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LobStreamTest.java
index 452c081eac..7f7864730e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LobStreamTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LobStreamTest.java
@@ -46,6 +46,7 @@ public LobStreamTest(String testName) {
     }
 
     protected void setUp() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
         Connection conn = getConnection();
         blob = conn.createBlob();
         in = blob.getBinaryStream();
@@ -54,6 +55,7 @@ protected void setUp() throws Exception {
 
     protected void tearDown() throws Exception {
         blob.free();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
         blob = null;
         super.tearDown();
     }
@@ -153,6 +155,8 @@ public void testReadWriteThreeParameter() throws IOException {
             int count = in.read(b, offset, 100);
             for (int j=0; j<count; j++) {
                 int value = b[j + offset] & 0xFF;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
                 assertEquals("Output does not match input",
                                         (((i * 100) + j) % 255), value);
             }
@@ -254,6 +258,9 @@ public void testSkip() throws IOException {
         while (i < 8000) {
             if ((i%255) < 100) {
                 int value = in.read();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
                 assertEquals("Output does not match input", i%255, value);
                 i++;
             } else {
@@ -308,6 +315,7 @@ public void testWriteWithInvalidParameterValues() throws IOException {
         // offset + length > b.length
         try {
             out.write(b, 50, 100);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             fail("length + offset > b.length should cause exception");
         } catch (Exception e) {
             assertTrue("Expected IndexOutOfBoundException",
@@ -362,6 +370,8 @@ public void testReadWithInvalidParameterValues() throws IOException {
         byte[] b = null;
         try {
             in.read(b, 100, 20);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             fail("byte[] = null should cause exception");
         } catch (Exception e) {
             assertTrue("Expected NullPointerException",
@@ -372,6 +382,8 @@ public void testReadWithInvalidParameterValues() throws IOException {
         b = new byte[100];
         try {
             int count = in.read(b, 0, 200);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             fail("length > b.length should cause exception");
         } catch (Exception e) {
             assertTrue("Expected IndexOutOfBoundException",
@@ -381,6 +393,8 @@ public void testReadWithInvalidParameterValues() throws IOException {
         // offset > b.length
         try {
             in.read(b, 150, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             fail("offset > b.length should cause exception");
         } catch (Exception e) {
             assertTrue("Expected IndexOutOfBoundException",
@@ -390,6 +404,7 @@ public void testReadWithInvalidParameterValues() throws IOException {
         // offset + length > b.length
         try {
             int count = in.read(b, 50, 100);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             fail("offset + length > b.length should cause exception");
         } catch (Exception e) {
             assertTrue("Expected IndexOutOfBoundException",
@@ -399,6 +414,8 @@ public void testReadWithInvalidParameterValues() throws IOException {
         // offset is negative
         try {
             in.read(b, -50, 100);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             fail("negative offset should cause exception");
         } catch (Exception e) {
             assertTrue("Expected IndexOutOfBoundException",
@@ -408,6 +425,8 @@ public void testReadWithInvalidParameterValues() throws IOException {
         //length is negative
         try {
             in.read(b, 0, -100);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             fail("negative length should cause exception");
         } catch (Exception e) {
             assertTrue("Expected IndexOutOfBoundException",
@@ -418,6 +437,8 @@ public void testReadWithInvalidParameterValues() throws IOException {
         in.close();
         try {
             in.read(b, 0, 100);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
             fail("Stream should be closed");
         } catch (Exception e) {
             assertTrue("Expected IOException", e instanceof IOException);
@@ -432,6 +453,7 @@ public void testReadWithInvalidParameterValues() throws IOException {
     public static Test suite() {
         //testing only embedded driver generic test suite testing both
         //client and ebedded is present in jdbcapi/LobStreamsTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite ts  = new BaseTestSuite("LobStreamTest");
         ts.addTest(TestConfiguration.embeddedSuite(LobStreamTest.class));
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java
index d096c72ba5..b5e92d580b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/LoginTimeoutTest.java
@@ -110,6 +110,7 @@ public  SluggishAuthenticator() {}
         {
             // sleepy...
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
                 long    sleepTime = secondsToSleep * MILLIS_PER_SECOND;
                 printText( "SluggishAuthenticator going to sleep for " + sleepTime + " milliseconds." );
                 Thread.sleep( secondsToSleep * MILLIS_PER_SECOND );
@@ -212,6 +213,7 @@ public  String  toString()
     public static Test suite()
     {
         BaseTestSuite  suite = new BaseTestSuite();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         Test embedded = new BaseTestSuite(
             LoginTimeoutTest.class, "embedded LoginTimeoutTest" );
@@ -220,6 +222,7 @@ public static Test suite()
         embedded = new SystemPropertyTestSetup( embedded, systemProperties() );
         suite.addTest( embedded );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6272
         if (Derby.hasServer() && Derby.hasClient()) {
             Test clientServer = new BaseTestSuite(
                     LoginTimeoutTest.class, "client/server LoginTimeoutTest");
@@ -273,9 +276,11 @@ private static  String[]    systemPropertiesArray()
     public  void    testBasic() throws Exception
     {
         SluggishAuthenticator.debugPrinting = TestConfiguration.getCurrent().isVerbose();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
 
         // make sure the database is created in order to eliminate asymmetries
         // in running the tests
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         Connection  conn = openDefaultConnection( RUTH, RUTH_PASSWORD );
         conn.close();
         
@@ -289,6 +294,7 @@ public  void    testBasic() throws Exception
     }
     private void    vetConnector( Connector connector, boolean shouldSucceed ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         try {
             // sometimes this succeeds when we expect not, see DERBY-6250,
             // give more time to the slug sleep
@@ -323,6 +329,7 @@ private void    tryTimeout( Connector connector, boolean shouldSucceed ) throws
         try {
             Connection  conn = connector.getConnection( RUTH, RUTH_PASSWORD );
             println( "    Got a " + conn.getClass().getName() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
             conn.close();
             if ( !shouldSucceed )   
             {
@@ -351,6 +358,7 @@ private void    tryTimeout( Connector connector, boolean shouldSucceed ) throws
     private void    vetExceptionPassthrough() throws Exception
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
             println( "Verifying that exceptions are not swallowed by the embedded login timer." );
             // set a long timeout which we won't exceed
             DriverManager.setLoginTimeout( LONG_TIMEOUT );
@@ -359,6 +367,7 @@ private void    vetExceptionPassthrough() throws Exception
             SluggishAuthenticator.returnValue = false;
 
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
                 Connection conn = openDefaultConnection( RUTH, RUTH_PASSWORD );
                 conn.close();
                 fail( "Didn't expect to get a connection!" );
@@ -393,11 +402,13 @@ private void    vetServerTimeouts() throws Exception
         Connector   connector = new DriverManagerConnector( this );
 
         vetServerTimeout( controlConnection, connector, 1, FAIL );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         vetServerTimeout( controlConnection, connector, LONG_TIMEOUT, SUCCEED );
         vetServerTimeout( controlConnection, connector, 0, SUCCEED );
 
         // reset server timeout to default
         setServerTimeout( controlConnection, 0 );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         controlConnection.close();
     }
     private void    vetServerTimeout
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ParameterMetaDataWrapperTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ParameterMetaDataWrapperTest.java
index 1fa4768904..76a0813ade 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ParameterMetaDataWrapperTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ParameterMetaDataWrapperTest.java
@@ -68,6 +68,8 @@ protected void tearDown()
         throws Exception {
         if(ps != null && !ps.isClosed())
             ps.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         ps = null;
         pmd = null;
         
@@ -75,6 +77,7 @@ protected void tearDown()
     }
 
     public void testIsWrapperForParameterMetaData() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1536
         assertTrue(pmd.isWrapperFor(ParameterMetaData.class));
     }
 
@@ -100,6 +103,8 @@ public void testUnwrapResultSet() {
      * Return suite with all tests of the class.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         return TestConfiguration.defaultSuite(
             ParameterMetaDataWrapperTest.class);
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java
index 1d18789aeb..bdbfb8f838 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest.java
@@ -123,6 +123,7 @@ public PreparedStatementTest(String name) {
      */
     public void setUp() 
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         key = requestKey();
         //create the statement object
         s = createStatement();
@@ -133,6 +134,7 @@ public void setUp()
         ps = prepareStatement("select count(*) from sys.systables");
         
         // Prepare misc statements.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psFetchBlob = prepareStatement("SELECT dBlob FROM " +
                 BLOBTBL + " WHERE sno = ?");
         psInsertBlob = prepareStatement("INSERT INTO " + BLOBTBL +
@@ -155,12 +157,15 @@ public void setUp()
     public void tearDown() 
         throws Exception {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2674
         s.close();
         ps.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2707
         s = null;
         ps = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psFetchBlob.close();
         psFetchClob.close();
         psInsertBlob.close();
@@ -177,10 +182,13 @@ public void tearDown()
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("PreparedStatementTest suite");
 
         suite.addTest(baseSuite("PreparedStatementTest:embedded"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         suite.addTest(
                 TestConfiguration.connectionXADecorator(
                         baseSuite("PreparedStatementTest:embedded XADataSource")));
@@ -188,11 +196,13 @@ public static Test suite() {
         suite.addTest(TestConfiguration.clientServerDecorator(
             baseSuite("PreparedStatementTest:client")));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5851
         suite.addTest(TestConfiguration.clientServerDecorator(
                         TestConfiguration.connectionCPDecorator( baseSuite
                                 ("PreparedStatementTest:logical"))));
 
         // Tests for the client side JDBC statement cache.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4843
         suite.addTest(TestConfiguration.clientServerDecorator(
                 statementCachingSuite()));
 
@@ -205,6 +215,7 @@ public static Test suite() {
     }
 
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(PreparedStatementTest.class);
         return new CleanDatabaseTestSetup(suite) {
@@ -225,9 +236,11 @@ protected void decorateSQL(Statement stmt) throws SQLException
      * Returns a suite for tests that need JDBC statement caching to be enabled.
      */
     private static Test statementCachingSuite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("JDBC statement caching suite");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4843
         suite.addTest(new PreparedStatementTest("cpTestIsPoolableHintFalse"));
         suite.addTest(new PreparedStatementTest("cpTestIsPoolableHintTrue"));
         return TestConfiguration.connectionCPDecorator(
@@ -376,6 +389,7 @@ public void testSetSQLXML() throws SQLException{
     //interface
 
     public void testIsWrapperForStatement() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1536
         assertTrue(ps.isWrapperFor(Statement.class));
     }
 
@@ -392,6 +406,7 @@ public void testIsNotWrapperForResultSet() throws SQLException {
     }
 
     public void testIsWrapperForSelf() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5872
         assertTrue(ps.isWrapperFor(ps.getClass()));
     }
 
@@ -406,6 +421,7 @@ public void testUnwrapPreparedStatement() throws SQLException {
     }
 
     public void testUnwrapAsSelf() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5872
         PreparedStatement ps2 = ps.unwrap(ps.getClass());
         assertSame("Unwrap returned wrong object.", ps, ps2);
     }
@@ -469,6 +485,7 @@ public void testSetClob()
         is.reset();
         
         //initially insert the data
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psInsertClob.setInt(1, key);
         psInsertClob.setClob(2, is, str.length());
         psInsertClob.executeUpdate();
@@ -510,6 +527,7 @@ public void testSetClobLengthless()
         // Life span of Clob objects are the transaction.  Need autocommit off
         // to have Clob objects survive execution of next statement.
         getConnection().setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
 
         //Create the Clob and insert data into it.
         Clob insertClob = getConnection().createClob();
@@ -543,6 +561,7 @@ public void testSetBlob()
             throws IOException, SQLException {
         // Life span of Blob objects are limited by the transaction.  Need
         // autocommit off so Blob objects survive execution of next statement.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
         getConnection().setAutoCommit(false);
         
         //insert default values into the table
@@ -550,6 +569,7 @@ public void testSetBlob()
         is.reset();
         
         //initially insert the data
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psInsertBlob.setInt(1, key);
         psInsertBlob.setBlob(2, is, BYTES.length);
         psInsertBlob.executeUpdate();
@@ -586,6 +606,7 @@ public void testSetBlobLengthless()
             throws IOException, SQLException {
         // Life span of Blob objects are the transaction.  Need autocommit off
         // to have Blob objects survive execution of next statement.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         getConnection().setAutoCommit(false);
         // Create Blob to be inserted
         Blob insertBlob = getConnection().createBlob();
@@ -620,6 +641,7 @@ public void testSetBlobLengthless()
     
     public void testSetPoolable() throws SQLException {
         // Set the poolable statement hint to false
+//IC see: https://issues.apache.org/jira/browse/DERBY-2674
         ps.setPoolable(false);
         assertFalse("Expected a non-poolable statement", ps.isPoolable());
         // Set the poolable statement hint to true
@@ -662,6 +684,7 @@ public void testSetPoolableOnClosed() throws SQLException {
      */
     public void testIsPoolableDefault() throws SQLException {
         // By default a prepared statement is poolable
+//IC see: https://issues.apache.org/jira/browse/DERBY-2674
         assertTrue("Expected a poolable statement", ps.isPoolable());
     }
 
@@ -673,6 +696,7 @@ public void testIsPoolableDefault() throws SQLException {
      * @throws SQLException if something goes wrong...
      */
     public void cpTestIsPoolableHintFalse()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4843
             throws SQLException {
         getConnection().setAutoCommit(false);
         // Create a table, insert a row, then create a statement selecting it.
@@ -706,6 +730,7 @@ public void cpTestIsPoolableHintFalse()
      */
     public void cpTestIsPoolableHintTrue()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         getConnection().setAutoCommit(false);
         // Create a table, insert a row, then create a statement selecting it.
         Statement stmt = createStatement();
@@ -772,6 +797,7 @@ public void testSetCharacterStream() throws Exception {
         is.reset();
         
         //initially insert the data
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psInsertClob.setInt(1, key);
         psInsertClob.setCharacterStream(2, is, str.length());
         psInsertClob.executeUpdate();
@@ -792,6 +818,7 @@ public void testSetCharacterStream() throws Exception {
         //Hence closing the ResultSet after
         //accessing the Clob object.
         //follows the same pattern as testSetBinaryStream().
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
         rs.close();
     }
 
@@ -800,6 +827,7 @@ public void testSetCharacterStreamLengthless()
         // Insert test data.
         String testString = "Test string for setCharacterStream\u1A00";
         Reader reader = new StringReader(testString);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psInsertClob.setInt(1, key);
         psInsertClob.setCharacterStream(2, reader);
         psInsertClob.execute();
@@ -834,6 +862,7 @@ public void testSetAsciiStream() throws Exception {
         is.reset();
         
         //initially insert the data
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psInsertClob.setInt(1, key);
         psInsertClob.setAsciiStream(2, is, BYTES.length);
         psInsertClob.executeUpdate();
@@ -854,12 +883,14 @@ public void testSetAsciiStream() throws Exception {
             assertEquals("Error in inserting data into the Clob",BYTES[i],bytes1[i]);
         }
         psInsertClob.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
 
         //Since auto-commit is true in this test
         //this will invalidate the clob object
         //Hence closing the ResultSet after
         //accessing the Clob object.
         //follows the same pattern as testSetBinaryStream().
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
         rs.close();
     }
 
@@ -890,6 +921,7 @@ public void testSetAsciiStreamLengthless()
 
         // Cleanup
         isRetrieved.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psInsertClob.close();
     }
 
@@ -908,9 +940,13 @@ public void testSetBinaryStream() throws Exception {
         
         InputStream is = new java.io.ByteArrayInputStream(BYTES);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
         is.reset();
         
         //initially insert the data
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psInsertBlob.setInt(1, key);
         psInsertBlob.setBinaryStream(2, is, BYTES.length);
         psInsertBlob.executeUpdate();
@@ -927,11 +963,13 @@ public void testSetBinaryStream() throws Exception {
         } catch(IOException ioe) {
             fail("IOException while reading the Clob from the database");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
         rs.close(); // Because of autocommit, this will invalidate blobRetrieved
         
         for(int i=0;i<BYTES.length;i++) {
             assertEquals("Error in inserting data into the Blob",BYTES[i],bytes1[i]);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psInsertBlob.close();
     }
 
@@ -962,6 +1000,7 @@ public void testSetBinaryStreamLengthless()
 
         // Cleanup
         isRetrieved.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1473
         psInsertBlob.close();
     }
 
@@ -1208,6 +1247,7 @@ public void testSetAsciiStreamLengthlessOnLongVarCharDontTruncate() {
     public void testLargeUpdate_jdbc4_2() throws Exception
     {
         Connection  conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         largeUpdate_jdbc4_2( conn );
     }
@@ -1220,6 +1260,7 @@ public  static  void    largeUpdate_jdbc4_2( Connection conn )
         // in an insane production build.
         //
         if (!SanityManager.DEBUG)    { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 
         println( "Running large update test for JDBC 4.2" );
         
@@ -1348,8 +1389,10 @@ private void assertInternalDerbyIOExceptionState(
         // being reported. We can use getCause because we always run with
         // Java SE 6 or later.
         Throwable cause = getLastSQLException(sqle).getCause();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         assertEquals("org.apache.derby.shared.common.error.StandardException",
                      cause.getClass().getName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
         cause = cause.getCause();
         assertTrue("Exception not a DerbyIOException",
                    cause instanceof DerbyIOException);
@@ -1376,6 +1419,7 @@ public  static  class   PreparedStatementWrapper    extends StatementTest.Statem
 
         public  PreparedStatementWrapper( PreparedStatement wrappedPreparedStatement )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             super( wrappedPreparedStatement );
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest42.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest42.java
index fd1fd69810..c5de8a8fd5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest42.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/PreparedStatementTest42.java
@@ -65,6 +65,7 @@ public class PreparedStatementTest42 extends BaseJDBCTestCase
     {
         JDBCType.ARRAY,
         JDBCType.DATALINK,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         JDBCType.DISTINCT,
         JDBCType.LONGNVARCHAR,
         JDBCType.NCHAR,
@@ -81,6 +82,7 @@ public class PreparedStatementTest42 extends BaseJDBCTestCase
 
     private static  final   int[]  ILLEGAL_SQL_TYPES = new int[]
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
         Types.ARRAY,
         Types.DATALINK,
         Types.DISTINCT,
@@ -104,6 +106,7 @@ public class PreparedStatementTest42 extends BaseJDBCTestCase
 
     private static  ColumnDesc[]    _columnDescs =
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         new ColumnDesc( JDBCType.BIGINT, "bigint", 0L, 1L, null ),
         new ColumnDesc( JDBCType.BLOB, "blob", makeBlob( "01234" ), makeBlob( "56789" ), null ),
         new ColumnDesc( JDBCType.BOOLEAN, "boolean", Boolean.FALSE, Boolean.TRUE, null ),
@@ -112,6 +115,7 @@ public class PreparedStatementTest42 extends BaseJDBCTestCase
         new ColumnDesc( JDBCType.CLOB, "clob", makeClob( "01234" ), makeClob( "56789" ), null ),
         new ColumnDesc( JDBCType.DATE, "date", new Date( 0L ), new Date( 1L ), null ),
         new ColumnDesc( JDBCType.DECIMAL, "decimal", new BigDecimal( 0 ), new BigDecimal( 1 ), null ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         new ColumnDesc( JDBCType.DOUBLE, "double", 0.0, 1.0, null ),
         new ColumnDesc( JDBCType.FLOAT, "float", 0.0, 1.0, null ),
         new ColumnDesc( JDBCType.INTEGER, "int", 0, 1, null ),
@@ -180,6 +184,7 @@ public  static  final   class   ColumnDesc
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("PreparedStatementTest42");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest( TestConfiguration.defaultSuite( PreparedStatementTest42.class ) );
 
@@ -201,10 +206,12 @@ public  void    test_01_setObject() throws Exception
     {
         Connection conn = getConnection();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         setupPrice( conn );
         makeTable( conn );
         populateTable( conn );
         vetTableContents( conn );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         updateColumns( conn );
     }
     private void    makeTable( Connection conn ) throws Exception
@@ -227,6 +234,7 @@ private void    makeTable( Connection conn ) throws Exception
     private void    populateTable( Connection conn ) throws Exception
     {
         PreparedStatement   insert = prepareInsert( conn );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         for ( int rowIdx = 0; rowIdx < ColumnDesc.VALUE_COUNT; rowIdx++ )
         {
@@ -249,6 +257,7 @@ private void    populateTable( Connection conn ) throws Exception
         {
             try {
                 insert.setObject( 1, null, ILLEGAL_JDBC_TYPES[ i ] );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 fail( "setObject() should have failed." );
             }
             catch (SQLException se) { assertUnimplemented( se ); }
@@ -264,6 +273,7 @@ private static void    assertUnimplemented( SQLException se ) throws Exception
     }
     private PreparedStatement   prepareInsert( Connection conn ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         StringBuilder   columnBuffer = new StringBuilder();
         StringBuilder   valuesBuffer = new StringBuilder();
 
@@ -324,6 +334,7 @@ private void    vetTableContents( Connection conn ) throws Exception
     // test the behavior of the new ResultSet methods added by JDBC 4.2
     private void    updateColumns( Connection conn ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         PreparedStatement forUpdatePS = conn.prepareStatement
             ( "select * from allTypes for update", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE );
         ResultSet   updateRS = null;
@@ -381,6 +392,7 @@ private void    updateColumns( Connection conn ) throws Exception
         vetTable( conn, 1, 1 );
 
         // verify that ResultSet.updateObject() fails on bad SQLTypes
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         prepTable( conn, 0 );
         updateRS = forUpdatePS.executeQuery();
         updateRS.next();
@@ -453,6 +465,7 @@ private void    vetTable( Connection conn, int rowIdx, int expectedRowCount ) th
     public  void    test_02_registerObject() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         registerObjectTest( conn );
     }
@@ -569,6 +582,7 @@ private static void    vetProc( Connection conn ) throws Exception
         catch (SQLException se) { assertUnimplemented( se ); }
  
         // Make sure that the pre-JDBC4.2 overloads throw the correct exception too
+//IC see: https://issues.apache.org/jira/browse/DERBY-6089
         valueIdx = 1;
         param = 1;
         cs.setInt( param++, valueIdx );
@@ -618,6 +632,7 @@ private  static void    vetCS( CallableStatement cs, int valueIdx )
     public  void    test_03_setObject() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         callableStatementSetObjectTest( conn );
     }
@@ -821,6 +836,7 @@ public void test_04_targetTypeIsNull() throws Exception
     public  static  void    packAllTypes
         (
          int valueIdx,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
          Long    bigintValue,
          Blob   blobValue,
          Boolean booleanValue,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetMetaDataTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetMetaDataTest.java
index f2a572ba6e..133c9571f6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetMetaDataTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetMetaDataTest.java
@@ -68,6 +68,8 @@ protected void tearDown() throws Exception {
             rs.close();
         if(ps != null && !ps.isClosed())
             ps.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         ps = null;
         rs = null;
         rsmd = null;
@@ -77,6 +79,7 @@ protected void tearDown() throws Exception {
     }
 
     public void testIsWrapperForResultSetMetaData() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1536
         assertTrue(rsmd.isWrapperFor(ResultSetMetaData.class));
     }
 
@@ -102,6 +105,8 @@ public void testUnwrapResultSet() {
      * Return suite with all tests of the class.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         return TestConfiguration.defaultSuite(ResultSetMetaDataTest.class);
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
index ef6e76f675..886f27f4c9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/ResultSetTest.java
@@ -60,6 +60,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class ResultSetTest  extends Wrapper41Test
 {
     private static final byte[] BYTES1 = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             0x65, 0x66, 0x67, 0x68, 0x69,
             0x69, 0x68, 0x67, 0x66, 0x65
         };
@@ -71,6 +72,7 @@ public class ResultSetTest  extends Wrapper41Test
 
     private static final String str1 =
         "I am the main Input string and I will be Updated";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
 
     private static final String str2 = "I am the string used to update";
 
@@ -98,9 +100,11 @@ public ResultSetTest(String name) {
 
     protected void setUp()
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         key = requestKey();
         stmt = createStatement(ResultSet.TYPE_FORWARD_ONLY,
                 ResultSet.CONCUR_UPDATABLE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
 
         rs = stmt.executeQuery("SELECT * FROM SYS.SYSTABLES");
 
@@ -111,6 +115,7 @@ protected void setUp()
     protected void tearDown()
         throws Exception {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2707
         rs.close(); 
         stmt.close();
 
@@ -254,6 +259,7 @@ public void testUpdateNCharacterStreamStringLengthlessNotImplemented()
     public void testUpdateNClobIntNotImplemented()
         throws SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             rs.updateNClob(1, (NClob)null);
             fail("ResultSet.updateNClob(int, NClob) " +
                  "should not be implemented");
@@ -276,6 +282,7 @@ public void testUpdateNClobIntLengthlessNotImplemented()
     public void testUpdateNClobStringNotImplemented()
         throws SQLException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             rs.updateNClob("some-column-name", (NClob)null);
             fail("ResultSet.updateNClob(String, NClob) " +
                  "should not be implemented");
@@ -405,6 +412,16 @@ public void testUpdateBinaryStream()
      */
 
     public void testUpdateAsciiStream()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
     throws Exception {
         //create the table
         stmt.execute("create table UpdateTestTable_ResultSet (sno int, " +
@@ -420,6 +437,8 @@ public void testUpdateAsciiStream()
 
         //Input Stream inserted initially
         InputStream is = new java.io.ByteArrayInputStream(BYTES1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
 
         //InputStream that is used for update
         InputStream is_for_update = new
@@ -440,6 +459,7 @@ public void testUpdateAsciiStream()
         ResultSet rs1 = stmt.executeQuery
                 ("select * from UpdateTestTable_ResultSet for update");
         rs1.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         rs1.updateAsciiStream(2,is_for_update,(int)BYTES2.length);
         rs1.updateRow();
         rs1.close();
@@ -456,6 +476,7 @@ public void testUpdateAsciiStream()
         is_ret.read(bytes_ret);
         is_ret.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         for(int i=0;i<BYTES2.length;i++) {
             assertEquals("Error in updateAsciiStream",BYTES2[i],bytes_ret[i]);
         }
@@ -537,6 +558,7 @@ public void testUpdateBinaryStreamStringParameterName()
 
         //Input Stream inserted initially
         InputStream is = new java.io.ByteArrayInputStream(BYTES1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
 
         //InputStream that is used for update
         InputStream is_for_update = new
@@ -616,6 +638,7 @@ public void testUpdateBinaryStreamLengthless()
      * specifying length of inputstream.
      */
     public void testUpdateBinaryStreamLengthlessBlob()
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
             throws IOException, SQLException {
         InputStream is1 = new java.io.ByteArrayInputStream(BYTES1);
         // InputStream used for update.
@@ -694,6 +717,7 @@ public void testUpdateAsciiStreamStringParameterName()
 
         //Input Stream inserted initially
         InputStream is = new java.io.ByteArrayInputStream(BYTES1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
 
         //InputStream that is used for update
         InputStream is_for_update = new
@@ -724,6 +748,14 @@ public void testUpdateAsciiStreamStringParameterName()
         rs1.next();
         InputStream is_ret = rs1.getAsciiStream(1);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
         is_ret.read(bytes_ret);
         is_ret.close();
 
@@ -857,6 +889,8 @@ public void testUpdateCharacterStreamStringParameterName()
         char [] c_ret = new char[str_for_update.length()];
 
         r_ret.read(c_ret);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
 
         String str_ret = new String(c_ret);
 
@@ -952,6 +986,7 @@ public void testUpdateClob()
 
         //1 Input Stream for insertion
         InputStream is1 = new java.io.ByteArrayInputStream(BYTES1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
 
         //2 Input Stream for insertion
         InputStream is2 = new java.io.ByteArrayInputStream(BYTES2);
@@ -1040,6 +1075,7 @@ public void testUpdateClobLengthless()
      * @throws Exception
      */
     public void testUpdateClobwithLengthofIS()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
             throws Exception {
         Reader r1 = new java.io.StringReader(str1);
         // InputStream for insertion.
@@ -1172,6 +1208,7 @@ public void testUpdateBlobLengthless()
      * @throws an Exception
      */
     public void testUpdateBlobWithLengthofIS()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
             throws Exception {
         InputStream is1 = new java.io.ByteArrayInputStream(BYTES1);
         // InputStream for insertion.
@@ -1242,6 +1279,7 @@ public void testUpdateClobStringParameterName()
         // Life span of Clob objects are limited by the transaction.  Need
         // autocommit off so Clob objects survive execution of next statement.
         getConnection().setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
 
         //Byte array in which the returned bytes from
         //the Database after the update are stored. This
@@ -1253,6 +1291,7 @@ public void testUpdateClobStringParameterName()
 
         //1 Input Stream for insertion
         InputStream is1 = new java.io.ByteArrayInputStream(BYTES1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
 
         //2 Input Stream for insertion
         InputStream is2 = new java.io.ByteArrayInputStream(BYTES2);
@@ -1337,6 +1376,7 @@ public void testUpdateClobLengthlessParameterName()
      * @throws an Exception
      */
     public void testUpdateClobStringParameterNameWithLengthofIS()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
             throws Exception {
         Reader r1 = new java.io.StringReader(str1);
         // InputStream for insertion.
@@ -1375,6 +1415,10 @@ public void testUpdateBlobStringParameterName()
         // Life span of Blob objects are limited by the transaction.  Need
         // autocommit off so Blob objects survive execution of next statement.
         getConnection().setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
+//IC see: https://issues.apache.org/jira/browse/DERBY-2496
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
 
         //Byte array in which the returned bytes from
         //the Database after the update are stored. This
@@ -1386,6 +1430,8 @@ public void testUpdateBlobStringParameterName()
 
         //1 Input Stream for insertion
         InputStream is1 = new java.io.ByteArrayInputStream(BYTES1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
 
         //2 Input Stream for insertion
         InputStream is2 = new java.io.ByteArrayInputStream(BYTES2);
@@ -1431,6 +1477,7 @@ public void testUpdateBlobStringParameterName()
 
         rs1 = fetch("dBlob", key2);
         rs1.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1417
         assertEquals(blob, rs1.getBlob(1)); 
         rs1.close();
     }
@@ -1471,6 +1518,7 @@ public void testUpdateBlobWithStreamLengthlessParameterName()
      */
     public void testGetHoldability() throws SQLException, Exception {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2854
         Connection conn = getConnection();
         
         conn.setAutoCommit(false);
@@ -1522,6 +1570,7 @@ public void testGetHoldability() throws SQLException, Exception {
                 cs.setInt(1, holdabilities[procHoldability]);
                 cs.execute();
                 rs = cs.getResultSet();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
                 assertSame(cs, rs.getStatement());
                 int holdability = rs.getHoldability();
                 assertEquals("holdability of ResultSet from stored proc: " + holdabilityString(holdability), holdabilities[procHoldability], holdability);
@@ -1744,7 +1793,9 @@ public void testWrapper() throws SQLException {
      ************************************************************************/
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite rsSuite = new BaseTestSuite("ResultSetTest suite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
         rsSuite.addTest(decorateTestSuite(TestConfiguration.defaultSuite
             (ResultSetTest.class,false)));
         return rsSuite;
@@ -1843,6 +1894,7 @@ private ResultSet fetch(String colName, int key)
      *
      */
     private static String holdabilityString(int holdability) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2854
         switch (holdability) {
         case ResultSet.HOLD_CURSORS_OVER_COMMIT:
             return "HOLD_CURSORS_OVER_COMMIT";
@@ -1906,6 +1958,7 @@ public static void getResultSetWithHoldability(int holdability,
      */
     public void testDerby1368() throws SQLException, IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1368
         testDerby1368(true);
         testDerby1368(false);
     }
@@ -1976,6 +2029,7 @@ public  void    testJDBC4_1() throws Exception
         PreparedStatement   ps = prepareStatement
             (
              conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4951
              "create function makeBlob( ) returns blob\n" +
              "language java parameter style java no sql deterministic\n" +
              "external name 'org.apache.derbyTesting.functionTests.tests.jdbc4.ResultSetTest.makeBlob'\n"
@@ -2042,6 +2096,7 @@ public  void    testJDBC4_1() throws Exception
              "values\n" +
              "(\n" +
              "    1,\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4951
              "    makeBlob(  ),\n" +
              "    true,\n" +
              "    'a',\n" +
@@ -2056,6 +2111,7 @@ public  void    testJDBC4_1() throws Exception
              "    1.0,\n" +
              "    1.0,\n" +
              "    1,\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              "    ?,\n" +
              "    ?,\n" +
              "    'a',\n" +
@@ -2067,6 +2123,7 @@ public  void    testJDBC4_1() throws Exception
         ps.executeUpdate();
         ps.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         ps = prepareStatement
             (
              conn,
@@ -2114,6 +2171,7 @@ private void    vetDataTypeCount( Connection conn ) throws Exception
      */
     public  static  final   Blob    makeBlob()  throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4951
         return new HarmonySerialBlob( BINARY_VALUE );
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java
index 558e419a9a..c9784fb447 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/RowIdNotImplementedTest.java
@@ -145,6 +145,7 @@ public void testRowIdInResultSetUpdateRowIdString()
 
     public void testRowIdInDatabaseMetaDataRowIdLifeTime() 
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         DatabaseMetaData meta = getConnection().getMetaData();
         RowIdLifetime rowIdLifetime = meta.getRowIdLifetime();
         assertEquals("RowIdLifetime should be ROWID_UNSUPPORTED",
@@ -183,6 +184,8 @@ private ResultSet getResultSet()
      * @return test suite.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         return TestConfiguration.defaultSuite(RowIdNotImplementedTest.class);
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java
index 20fe6c9365..43adfa66cb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/SetObjectUnsupportedTest.java
@@ -90,6 +90,7 @@ public void testUnsupportedSetObject() throws SQLException {
         } catch (SQLFeatureNotSupportedException e) {
             // expected exception
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1476
         ps.close();
     }
 
@@ -167,9 +168,12 @@ public void testUnsupportedSetNullWithTypeName() throws SQLException {
      * Create a suite with all tests.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("SetObjectUnsupportedTest suite");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         suite.addTest(baseSuite(false, "SetObjectUnsupportedTest:prepared"));
         suite.addTest(baseSuite(true, "SetObjectUnsupportedTest:callable"));
 
@@ -193,10 +197,12 @@ public static Test suite() {
      * @return a test suite
      */
     static Test baseSuite(boolean callable, String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         for (TypeInfo typeInfo : TYPES) {
             suite.addTest(new SetObjectUnsupportedTest
                           ("testUnsupportedSetObject", typeInfo, callable));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1476
             suite.addTest(new SetObjectUnsupportedTest
                           ("testUnsupportedSetObjectWithScale",
                            typeInfo, callable));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java
index 10e93de98a..5e7b960ffb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementEventsTest.java
@@ -91,6 +91,7 @@ public StatementEventsTest(String name) {
      * @param xa if <code>true</code>, use XA
      */
     private void setXA(boolean xa) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1503
         this.xa = xa;
     }
 
@@ -125,7 +126,11 @@ public String getName() {
      */
     public void setUp() throws SQLException {
         if (xa) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             XADataSource ds = J2EEDataSource.getXADataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3306
+//IC see: https://issues.apache.org/jira/browse/DERBY-3412
             J2EEDataSource.setBeanProperty(ds, "createDatabase", "create");
             pooledConnection = ds.getXAConnection();
         } else {
@@ -156,6 +161,8 @@ public void statementErrorOccurred(StatementEvent event) {
     protected void tearDown() throws Exception {
         connection.close();
         pooledConnection.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         connection = null;
         pooledConnection = null;
         closedStatement = null;
@@ -171,6 +178,7 @@ protected void tearDown() throws Exception {
      * @return a test suite
      */
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suites = new BaseTestSuite(name);
         boolean[] truefalse = new boolean[] { true, false };
         for (boolean xa : truefalse) {
@@ -183,8 +191,11 @@ private static Test baseSuite(String name) {
 
     /** Create a test suite with all tests in the class. */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("StatementEventsTest suite");
         suite.addTest(baseSuite("StatementEventsTest:embedded"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         suite.addTest(TestConfiguration.clientServerDecorator(
               baseSuite("StatementEventsTest:client")));
         return suite;
@@ -199,6 +210,7 @@ private Suite(boolean xa, boolean callable) {
             super(StatementEventsTest.class);
 
             // Iterate over the sorted fixtures and tinker with them
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             for (Enumeration<?> i = tests(); i.hasMoreElements(); ) {
                 StatementEventsTest test =
                         (StatementEventsTest) i.nextElement();
@@ -273,6 +285,7 @@ public void testRemoveNullListener() throws SQLException {
      * Test how the listener behaves if it is added twice.
      */
     public void testDoubleAddListener() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2091
         SimpleListener listener = new SimpleListener();
         pooledConnection.addStatementEventListener(listener);
         pooledConnection.addStatementEventListener(listener);
@@ -565,6 +578,7 @@ public void statementErrorOccurred(StatementEvent e) {
      */
     public void testAddRemoveListenerOnClosedObject() throws SQLException {
         // Add a listener that we can try to remove later after closing.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2091
         SimpleListener listener = new SimpleListener();
         pooledConnection.addStatementEventListener(listener);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java
index f260c058f7..4324c36094 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTest.java
@@ -68,6 +68,7 @@ public StatementTest(String name) {
      */
     protected void setUp() 
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         getConnection().setAutoCommit(false);
         // Create a default statement.
         stmt = createStatement();
@@ -85,6 +86,8 @@ protected void tearDown()
         // Close default statement
         if (stmt != null) {
             stmt.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             stmt = null;
         }
 
@@ -148,6 +151,7 @@ public void testIsClosedWhenClosingConnection()
         // Close the connection. We must commit/rollback first, or else a
         // "Invalid transaction state" exception is raised.
         rollback();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection con = getConnection();
         con.close();
         assertTrue("Connection should be closed after close()", 
@@ -177,6 +181,7 @@ public void testIsClosedWhenClosingConnectionInInvalidState()
             con.close();
             fail("Invalid transaction state exception was not thrown");
         } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2065
             String expectedState =
                 SQLStateConstants.INVALID_TRANSACTION_STATE_ACTIVE_SQL_TRANSACTION;
             assertSQLState(expectedState, sqle);
@@ -208,6 +213,8 @@ public void testStatementExecuteAfterConnectionClose()
         try {
             stmt.executeQuery("select count(*) from stmtTable");
         } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-843
+//IC see: https://issues.apache.org/jira/browse/DERBY-1198
             assertEquals("Unexpected SQL state for performing " +
                     "operations on a closed statement.",
                     SQLStateConstants.CONNECTION_EXCEPTION_CONNECTION_DOES_NOT_EXIST,
@@ -218,6 +225,7 @@ public void testStatementExecuteAfterConnectionClose()
     }
 
     public void testIsWrapperForStatement() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1536
         assertTrue(stmt.isWrapperFor(Statement.class));
     }
 
@@ -269,6 +277,7 @@ public void testUnwrapResultSet() throws SQLException {
      * Tests isPoolable, setPoolable, and the default poolability.
      */
     public void testPoolable() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1235
         assertFalse("Statement cannot be poolable by default", 
                     stmt.isPoolable()); 
         stmt.setPoolable(true);
@@ -286,6 +295,8 @@ public  void    test_jdbc4_1_queryTimeoutException() throws Exception
     {
         SQLException    se = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         PreparedStatement ps = prepareStatement
             (
              "select columnnumber from sys.syscolumns c, sys.systables t\n" +
@@ -315,6 +326,7 @@ public  void    test_jdbc4_1_queryTimeoutException() throws Exception
      */
     public void testCompletionClosure_jdbc4_1_implicitRSClosure() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         Connection  conn = getConnection();
         conn.setHoldability( ResultSet.CLOSE_CURSORS_AT_COMMIT );
         conn.setAutoCommit( true );
@@ -365,6 +377,7 @@ public void testCompletionClosure_jdbc4_1_implicitRSClosure() throws Exception
     public void testLargeUpdate_jdbc4_2() throws Exception
     {
         Connection  conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         largeUpdate_jdbc4_2( conn );
     }
@@ -376,6 +389,7 @@ public  static  void    largeUpdate_jdbc4_2( Connection conn )
         // This test makes use of a debug entry point which is a NOP
         // in an insane production build.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         if (!SanityManager.DEBUG)    { return; }
         else { println( "Running largeUpdate_jdbc4_2() on debug code." ); }
 
@@ -395,11 +409,13 @@ public  static  void    largeUpdate_jdbc4_2( Connection conn )
         largeUpdateTest( sw, (long) Integer.MAX_VALUE );
         largeUpdateTest( sw, 0L);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         largeBatchTest( sw, (long) Integer.MAX_VALUE );
         largeBatchTest( sw, 0L);
 
         largeMaxRowsTest( sw,  ((long) Integer.MAX_VALUE) + 1L );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         largeBatchUpdateExceptionTest( sw, ((long) Integer.MAX_VALUE) + 1L );
     }
     private static  void    largeUpdateTest( StatementWrapper sw, long rowCountBase )
@@ -409,12 +425,14 @@ private static  void    largeUpdateTest( StatementWrapper sw, long rowCountBase
         // This test makes use of a debug entry point which is a NOP
         // in an insane production build.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         if (!SanityManager.DEBUG)    { return; }
         else { println( "Running largeUpdateTest() on debug code." ); }
 
         // poke the rowCountBase into the engine. all returned row counts will be
         // increased by this amount
         setRowCountBase( sw.getWrappedStatement(), false, rowCountBase );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         largeUpdateTest( sw, rowCountBase, 1L );
         largeUpdateTest( sw, rowCountBase, 3L );
@@ -462,6 +480,7 @@ private static  void    vetUpdateSize( StatementWrapper sw, long expected, long
         assertEquals( longAnswer, sw.getLargeUpdateCount() );
     }
     private static  void    largeBatchTest( StatementWrapper sw, long rowCountBase )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         throws Exception
     {
         //
@@ -469,6 +488,7 @@ private static  void    largeBatchTest( StatementWrapper sw, long rowCountBase )
         // in an insane production build.
         //
         if (!SanityManager.DEBUG)    { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 
         println( "Large batch test with rowCountBase = " + rowCountBase );
         
@@ -476,6 +496,7 @@ private static  void    largeBatchTest( StatementWrapper sw, long rowCountBase )
         // increased by this amount
         sw.getWrappedStatement().clearBatch();
         setRowCountBase( sw.getWrappedStatement(), false, rowCountBase );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         long[]  expectedResult = new long[] { rowCountBase + 1L, rowCountBase + 1L, rowCountBase + 2L };
 
@@ -495,6 +516,7 @@ private static  void    createBatch( StatementTest.StatementWrapper sw )
         sw.getWrappedStatement().addBatch( "insert into bigintTable( col2 ) values ( 3 ), ( 4 )" );
     }
     private static  void    largeMaxRowsTest( StatementWrapper sw, long maxRows )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         throws Exception
     {
         //
@@ -502,6 +524,7 @@ private static  void    largeMaxRowsTest( StatementWrapper sw, long maxRows )
         // in an insane production build.
         //
         if (!SanityManager.DEBUG)    { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 
         println( "Large max rows test with maxRows = " + maxRows );
 
@@ -511,6 +534,7 @@ private static  void    largeMaxRowsTest( StatementWrapper sw, long maxRows )
         sw.getWrappedStatement().execute( "insert into bigintTable( col2 ) values ( 1 ), ( 2 ), ( 3 ), ( 4 ), ( 5 )" );
         
         setRowCountBase( sw.getWrappedStatement(), usingDerbyNetClient(), maxRows - expectedRowCount );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         sw.setLargeMaxRows( maxRows );
         
@@ -519,12 +543,14 @@ private static  void    largeMaxRowsTest( StatementWrapper sw, long maxRows )
         while( rs.next() ) { rowCount++; }
         rs.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         setRowCountBase( sw.getWrappedStatement(), usingDerbyNetClient(), 0L );
         
         assertEquals( expectedRowCount, rowCount );
         assertEquals( maxRows, sw.getLargeMaxRows() );
     }
     private static  void    largeBatchUpdateExceptionTest( StatementWrapper sw, long rowCountBase )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         throws Exception
     {
         //
@@ -532,6 +558,7 @@ private static  void    largeBatchUpdateExceptionTest( StatementWrapper sw, long
         // in an insane production build.
         //
         if (!SanityManager.DEBUG)    { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
 
         println( "Large batch update exception test with rowCountBase = " + rowCountBase );
         
@@ -576,10 +603,12 @@ else if ( usingDerbyNetClient() )
     {
         if ( onClient )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
             ClientStatement.setFetchedRowBase( rowCountBase );
         }
         else
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             stmt.execute( "call setRowCountBase( " + rowCountBase + " )" );
         }
     }
@@ -601,6 +630,7 @@ private static  int[]   squashLongs( long[] longs )
      * Create test suite for StatementTest.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("StatementTest suite");
         // Decorate test suite with a TestSetup class.
         suite.addTest(new StatementTestSetup(
@@ -628,6 +658,7 @@ public  static  class   StatementWrapper
 
         public  StatementWrapper( Statement wrappedStatement )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             _wrappedStatement = wrappedStatement;
         }
 
@@ -636,6 +667,7 @@ public  StatementWrapper( Statement wrappedStatement )
         // New methods added by JDBC 4.2
         public  long[] executeLargeBatch() throws SQLException
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             return ((long[]) invoke
                 (
                  "executeLargeBatch",
@@ -658,6 +690,7 @@ public  long executeLargeUpdate( String sql, int autoGeneratedKeys) throws SQLEx
                 (
                  "executeLargeUpdate",
                  new Class[] { String.class, Integer.TYPE },
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                  new Object[] { sql, autoGeneratedKeys }
                  )).longValue();
         }
@@ -681,6 +714,7 @@ public  long executeLargeUpdate( String sql, String[] columnNames ) throws SQLEx
         }
         public  long getLargeMaxRows() throws SQLException
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             return ((Long) invoke
                 (
                  "getLargeMaxRows",
@@ -699,10 +733,12 @@ public  long getLargeUpdateCount() throws SQLException
         }
         public  void setLargeMaxRows( long max ) throws SQLException
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             invoke
                 (
                  "setLargeMaxRows",
                  new Class[] { Long.TYPE },
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                  new Object[] { max }
                  );
         }
@@ -735,6 +771,7 @@ protected Object  invoke( String methodName, Class[] argTypes, Object[] argValue
     /** Set the base which is used for returned row counts and fetched row counters */
     public  static  void    setRowCountBase( long newBase )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6206
         EmbedResultSet.setFetchedRowBase( newBase );
         RowUtil.setRowCountBase( newBase );
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTestSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTestSetup.java
index c00533ceb6..c0f8ea6ebf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTestSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/StatementTestSetup.java
@@ -70,6 +70,7 @@ protected void setUp()
                     sqle.getSQLState());
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         try {
             stmt.execute("drop function delay_st");
         }
@@ -87,6 +88,7 @@ protected void setUp()
         assertEquals("Number of rows are not as expected", 
                 2, rs.getInt(1));
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         stmt.execute
             (
              "create function delay_st(seconds integer, value integer) returns integer\n" +
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
index 742c91f843..be62277413 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/TestDbMetaData.java
@@ -45,6 +45,7 @@ public class TestDbMetaData extends BaseJDBCTestCase {
     private DatabaseMetaData meta;
 
     public TestDbMetaData(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1989
         super(name);
     }
 
@@ -73,12 +74,14 @@ private static void createFunctions(Statement s) throws SQLException {
         s.execute("CREATE FUNCTION DUMMY4 ( X VARCHAR(128), Y INTEGER ) "+
                   "RETURNS INTEGER PARAMETER STYLE JAVA NO SQL LANGUAGE "+
                   "JAVA EXTERNAL NAME 'java.some.func'");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
         s.execute("CREATE FUNCTION DUMMY5 ( X BOOLEAN ) "+
                   "RETURNS BOOLEAN PARAMETER STYLE JAVA NO SQL LANGUAGE "+
                   "JAVA EXTERNAL NAME 'java.some.func'");
     }
 
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite testSuite = new BaseTestSuite(name);
         testSuite.addTestSuite(TestDbMetaData.class);
         return new CleanDatabaseTestSetup(testSuite) {
@@ -89,7 +92,10 @@ protected void decorateSQL(Statement s) throws SQLException {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestDbMetaData suite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         suite.addTest(baseSuite("TestDbMetaData:embedded"));
         suite.addTest(TestConfiguration.clientServerDecorator(
             baseSuite("TestDbMetaData:client")));
@@ -102,6 +108,7 @@ public void testSupportsStoredFunctionsUsingCallSyntax()
     }
 
     public void testAutoCommitFailureClosesAllResultSets() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3422
         if (usingEmbedded()) {
             assertTrue(meta.autoCommitFailureClosesAllResultSets());
         } else {
@@ -135,6 +142,7 @@ private void assertGetFunctionsRs(ResultSet rs) throws SQLException {
                 Types.SMALLINT, Types.VARCHAR };
         JDBC.assertDatabaseMetaDataColumns(rs, ColTypes, new String[] {
             "FUNCTION_CAT", "FUNCTION_SCHEM", "FUNCTION_NAME", "REMARKS",
+//IC see: https://issues.apache.org/jira/browse/DERBY-2983
             "FUNCTION_TYPE", "SPECIFIC_NAME" });
     }
     
@@ -146,6 +154,7 @@ private void assertGetFunctionsRs(ResultSet rs) throws SQLException {
         { null, "APP", "DUMMY2", "java.some.func", FUNCTION_NO_TABLE_VALUE, GENERIC_NAME },
         { null, "APP", "DUMMY3", "java.some.func", FUNCTION_NO_TABLE_VALUE, GENERIC_NAME },
         { null, "APP", "DUMMY4", "java.some.func", FUNCTION_NO_TABLE_VALUE, GENERIC_NAME },
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
         { null, "APP", "DUMMY5", "java.some.func", FUNCTION_NO_TABLE_VALUE, GENERIC_NAME },
         { null, "SYSCS_UTIL", "SYSCS_CHECK_TABLE",
           "org.apache.derby.catalog.SystemProcedures.SYSCS_CHECK_TABLE",
@@ -225,6 +234,7 @@ public void testGetFunctionsDummySchema() throws SQLException {
 
     public void testGetFunctionsFromSysSchemas() throws SQLException {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         getSysFunctions();
         // Any function in a schema starting with "SYS"
         ResultSet rs = meta.getFunctions(null, "SYS%", null);
@@ -298,6 +308,8 @@ public void testGetFunctionsNoSchemaNoCatalog() throws SQLException {
         // NO catalog (none)
         ResultSet rs = meta.getFunctions("", "", null);
         assertGetFunctionsRs(rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2744
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         JDBC.assertEmpty(rs);
     }
 
@@ -319,6 +331,7 @@ public void testGetFunctionColumnsStartingWithDUMMY() throws SQLException {
         ResultSet rs = meta.getFunctionColumns(null, null, "DUMMY%", null);
         assertGetFunctionColumnsRs(rs);
         Object[][] expectedRows = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             { null, "APP", "DUMMY1", "", 4, 5,
               "SMALLINT", 5, 2, 0,
               10, 1, null, null, 0,
@@ -381,6 +394,7 @@ public void testGetFunctionColumnsForDummyFunctions() throws SQLException {
         ResultSet rs = meta.getFunctionColumns(null, null, "DUMMY%", "");
         assertGetFunctionColumnsRs(rs);
         Object[][] expectedRows = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             { null, "APP", "DUMMY1", "", 4, 5,
               "SMALLINT", 5, 2, 0,
               10, 1, null, null, 0,
@@ -464,6 +478,10 @@ public void testGetSchemasMatchingBLAH() throws SQLException {
         // set when a schema is passed with no match
         ResultSet rs = meta.getSchemas(null, "BLAH");
         assertGetSchemasRs(rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2744
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
+//IC see: https://issues.apache.org/jira/browse/DERBY-2744
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         JDBC.assertEmpty(rs);
     }
 
@@ -487,6 +505,7 @@ public void testStoredProcEscapeSyntax() throws SQLException {
             success = false;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1989
         assertEquals("supportsStoredFunctionsUsingCallSyntax() returned " +
                      "value which doesn't match actual behaviour.",
                      success, meta.supportsStoredFunctionsUsingCallSyntax());
@@ -505,6 +524,7 @@ public void testAutoCommitFailure() throws SQLException {
 
         // IMPORTANT: use auto-commit
         getConnection().setAutoCommit(true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3422
 
         ResultSet[] rss = new ResultSet[2];
         // Use different statements so that both result sets are kept open
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/TestJDBC40Exception.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/TestJDBC40Exception.java
index ee75fa959d..5d838bf30f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/TestJDBC40Exception.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/TestJDBC40Exception.java
@@ -47,6 +47,8 @@ public TestJDBC40Exception(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         Test suite = TestConfiguration.defaultSuite(TestJDBC40Exception.class);
         return DatabasePropertyTestSetup.setLockTimeouts(suite, -1, 2);
     }
@@ -61,6 +63,7 @@ protected void setUp() throws SQLException {
     }
 
     protected void tearDown() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2707
         Statement s = createStatement();
         s.execute("drop table EXCEPTION_TABLE1");
         s.close();
@@ -121,6 +124,7 @@ public void testConnectionException() throws SQLException {
         // DERBY-3075
         if (usingDerbyNetClient()) {
         	DataSource ds = JDBCDataSource.getDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         	JDBCDataSource.setBeanProperty(ds, "portNumber", 0);
         	try {
         		ds.getConnection();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java
index 1e3064699f..bace943ba9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/UnsupportedVetter.java
@@ -69,18 +69,22 @@ public class UnsupportedVetter	extends BaseJDBCTestCase
 	//
 	private	static	Exclusions[]	rawExcludables = new Exclusions[]
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 		    new Exclusions
 		    (
 				java.sql.Connection.class,
 				new MD[]
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1380
 						new MD( "createArrayOf", new Class[] { String.class, Object[].class } ),
 						new MD( "createNClob", new Class[] { } ),
 						new MD( "createSQLXML", new Class[] { } ),
 						new MD( "createStruct", new Class[] { String.class, Object[].class } ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
 						new MD( "getNetworkTimeout", new Class[] { }, JDBC.vmSupportsJDBC41() ),
 						new MD( "getTypeMap", new Class[] { } ),
 						new MD( "prepareStatement", new Class[] { String.class, int[].class } ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 						new MD( "prepareStatement", new Class[] { String.class, String[].class } ),
 						new MD( "setNetworkTimeout", new Class[] { java.util.concurrent.Executor.class, int.class }, JDBC.vmSupportsJDBC41() ),
 						new MD( "setTypeMap", new Class[] { Map.class } ),
@@ -90,6 +94,7 @@ public class UnsupportedVetter	extends BaseJDBCTestCase
 				java.sql.Statement.class,
 				new MD[]
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 						new MD( "cancel", new Class[] { } ),
 				    new MD( "execute", new Class[] { String.class, int[].class } ),
 						new MD( "execute", new Class[] { String.class, String[].class } ),
@@ -111,9 +116,11 @@ public class UnsupportedVetter	extends BaseJDBCTestCase
 						new MD( "setNClob", new Class[] { int.class, java.io.Reader.class, long.class } ),
 						new MD( "setNString", new Class[] { int.class, String.class } ),
 						new MD( "setRef", new Class[] { int.class, Ref.class } ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                         new MD( "setRowId", new Class[] { int.class, RowId.class } ),
 						new MD( "setSQLXML", new Class[] { int.class, SQLXML.class } ),
 					    new MD( "setURL", new Class[] { int.class, URL.class } ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 					    new MD( "setNull", new Class[] { int.class, int.class, String.class } ),
 					    new MD( "setUnicodeStream", new Class[] { int.class, InputStream.class, int.class } ),
 						} ),
@@ -127,6 +134,7 @@ public class UnsupportedVetter	extends BaseJDBCTestCase
 					// JDBC SPEC. HOWEVER, DERBY DOES NOT IMPLEMENT THEM IN ONE
 					// OR THE OTHER OF OUR CLIENTS.
 					//
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 					new FD( "getBlob", new Class[] { int.class } ),
 					new FD( "getClob", new Class[] { int.class } ),
 					
@@ -159,6 +167,7 @@ public class UnsupportedVetter	extends BaseJDBCTestCase
 					new MD( "getNString", new Class[] { int.class } ),
 					new MD( "getNString", new Class[] { String.class } ),
 					new MD( "getObject", new Class[] { String.class } ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
 					new MD( "getObject", new Class[] { String.class, Class.class }, JDBC.vmSupportsJDBC41() ),
 					new MD( "getRef", new Class[] { int.class } ),
 					new MD( "getRef", new Class[] { String.class } ),
@@ -174,9 +183,11 @@ public class UnsupportedVetter	extends BaseJDBCTestCase
 					new MD( "getTimestamp", new Class[] { String.class, java.util.Calendar.class } ),
 					new MD( "getURL", new Class[] { int.class } ),
 					new MD( "getURL", new Class[] { String.class } ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                     new MD( "registerOutParameter", new Class[] { String.class, int.class } ),
                     new MD( "registerOutParameter", new Class[] { String.class, int.class, int.class } ),
                     new MD( "registerOutParameter", new Class[] { String.class, int.class, String.class } ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
                     new MD( "registerOutParameter", new Class[] { int.class, int.class, String.class } ),
                     makeMD( "registerOutParameter", new String[] { "java.lang.String", "java.sql.SQLType" }, JDBC.vmSupportsJDBC42() ),
                     makeMD( "registerOutParameter", new String[] { "java.lang.String", "java.sql.SQLType", "int" }, JDBC.vmSupportsJDBC42() ),
@@ -184,6 +195,7 @@ public class UnsupportedVetter	extends BaseJDBCTestCase
 						new MD( "setArray", new Class[] { int.class, java.sql.Array.class } ),
 						new MD( "setAsciiStream", new Class[] { String.class, java.io.InputStream.class } ),
 						new MD( "setAsciiStream", new Class[] { String.class, java.io.InputStream.class, int.class } ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-1445
                                                 new MD( "setAsciiStream", new Class[] { String.class, java.io.InputStream.class, long.class } ),
 						new MD( "setBigDecimal", new Class[] { String.class, java.math.BigDecimal.class } ),
 						new MD( "setBinaryStream", new Class[] { String.class, java.io.InputStream.class } ),
@@ -271,12 +283,14 @@ public class UnsupportedVetter	extends BaseJDBCTestCase
 						new MD( "getRowId", new Class[] { String.class } ),
 						new MD( "getSQLXML", new Class[] { int.class } ),
 						new MD( "getSQLXML", new Class[] { String.class } ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 						new MD( "getUnicodeStream", new Class[] { int.class } ),
 						new MD( "getUnicodeStream", new Class[] { String.class } ),
 						new MD( "refreshRow", new Class[] { } ),
 						new MD( "updateArray", new Class[] { int.class, java.sql.Array.class } ),
 						new MD( "updateArray", new Class[] { String.class, java.sql.Array.class } ),
 						new MD( "updateNCharacterStream", new Class[] { int.class, java.io.Reader.class } ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 						new MD( "updateNCharacterStream", new Class[] { int.class, java.io.Reader.class, long.class } ),
 						new MD( "updateNCharacterStream", new Class[] { String.class, java.io.Reader.class } ),
 						new MD( "updateNCharacterStream", new Class[] { String.class, java.io.Reader.class, long.class } ),
@@ -306,6 +320,7 @@ public class UnsupportedVetter	extends BaseJDBCTestCase
     // Returns null if the JVM doesn't.
     //
     private static  MD  makeMD
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         ( String methodName, String[] argClassNames, boolean requiredAtThisLevel )
     {
         // return null if the class names can't be resolved
@@ -356,12 +371,16 @@ public	void	testSupportedMethods()
 		throws Exception
 	{
     getTestConfiguration().setVerbosity( true );
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6854
 
     // do not run on java 9. it introduces classes and methods not found in java 8.
     if (vmAtLeast(1, 9)) { return; }
 
     if ( savedVerbosity ) { println( "Supports JDBC 4.2 = " + JDBC. vmSupportsJDBC42() ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 		HashSet<String>	vanishedMethodList = new HashSet<String>();
 		HashSet<String>	unsupportedList = new HashSet<String>();
 		HashSet<String>	notUnderstoodList = new HashSet<String>();
@@ -380,6 +399,8 @@ public	void	testSupportedMethods()
 		printUnsupportedList( unsupportedList );
 		printNotUnderstoodList( notUnderstoodList );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
+//IC see: https://issues.apache.org/jira/browse/DERBY-6854
     assertEquals( "vanishedMethodList", 0, vanishedMethodList.size() );
     assertEquals( "unsupportedList", 0, unsupportedList.size() );
     assertEquals( "notUnderstoodList", 0, notUnderstoodList.size() );
@@ -392,6 +413,8 @@ public	void	testSupportedMethods()
 		( HashSet<String> unsupportedList, HashSet<String> notUnderstoodList )
 		throws Exception
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
 		DataSource			ds = JDBCDataSource.getDataSource();
 		Connection			conn = ds.getConnection();
 
@@ -407,8 +430,11 @@ public	void	testSupportedMethods()
 		( HashSet<String> unsupportedList, HashSet<String> notUnderstoodList )
 		throws Exception
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
 		ConnectionPoolDataSource	ds = J2EEDataSource.getConnectionPoolDataSource();
 		PooledConnection			pc = ds.getPooledConnection
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
 			(getTestConfiguration().getUserName(),
                     getTestConfiguration().getUserPassword());
 		Connection					conn = pc.getConnection();
@@ -426,8 +452,11 @@ public	void	testSupportedMethods()
 		( HashSet<String> unsupportedList, HashSet<String> notUnderstoodList )
 		throws Exception
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
 		XADataSource				ds = J2EEDataSource.getXADataSource();
 		XAConnection				xaconn = ds.getXAConnection
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
 			(getTestConfiguration().getUserName(),
                     getTestConfiguration().getUserPassword());
 		Connection					conn = xaconn.getConnection();
@@ -473,6 +502,7 @@ public	void	testSupportedMethods()
 		vetObject( dbmd, unsupportedList, notUnderstoodList );
 		vetObject( stmt, unsupportedList, notUnderstoodList );
 		vetObject( csmd, unsupportedList, notUnderstoodList );
+//IC see: https://issues.apache.org/jira/browse/DERBY-1265
 		vetObject( cs, unsupportedList, notUnderstoodList );
 		vetObject( rsmd, unsupportedList, notUnderstoodList );
 		vetObject( rs, unsupportedList, notUnderstoodList );
@@ -549,6 +579,7 @@ private	void	initializeExcludableMap( HashSet<String> vanishedMethodList )
 		for ( int i = 0; i < count; i++ )
 		{
 			Exclusions		exclusions = rawExcludables[ i ];
+//IC see: https://issues.apache.org/jira/browse/DERBY-4877
 			Class<?>		iface = exclusions.getInterface();
 			MD[]			mds = exclusions.getExcludedMethods();
 			int				exclusionCount = mds.length;
@@ -558,8 +589,10 @@ private	void	initializeExcludableMap( HashSet<String> vanishedMethodList )
 			{
 				MD		md = mds[ j ];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 if ( md == null ) { continue; }
                 if ( !md.requiredAtThisLevel() ) { continue; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
 
 				//
 				// If we are strictly enforcing the JDBC standard,
@@ -567,8 +600,10 @@ private	void	initializeExcludableMap( HashSet<String> vanishedMethodList )
 				// doesn't implement.
 				//
 				if ( STRICT_ENFORCEMENT && !md.isOptional()  ) { continue; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 
 				Method	method = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 
 				try {
 					method = iface.getMethod( md.getMethodName(), md.getArgTypes() );
@@ -645,6 +680,7 @@ private	void	initializeExcludableMap( HashSet<String> vanishedMethodList )
 		  HashSet<String> unsupportedList, HashSet<String> notUnderstoodList )
 		throws Exception
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1265
 		Method[]	methods = sortMethods( iface );
 		int			methodCount = methods.length;
 
@@ -661,6 +697,7 @@ private	void	initializeExcludableMap( HashSet<String> vanishedMethodList )
 	// order. Class.getMethods() does not do us this favor.
 	//
 	private	Method[]	sortMethods( Class iface )
+//IC see: https://issues.apache.org/jira/browse/DERBY-1265
 		throws Exception
 	{
 		Method[]			raw = iface.getMethods();
@@ -692,6 +729,7 @@ private	Method[]	sortMethods( Class iface )
 		}
 		catch (Throwable e)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 			if ( !( e instanceof InvocationTargetException ) )
 			{
 				recordUnexpectedError( candidate, iface, method, notUnderstoodList, e );
@@ -706,6 +744,7 @@ private	Method[]	sortMethods( Class iface )
 
 					if ( !isExcludable )
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 					    StackTraceElement[] stack = 
 						cause.getStackTrace();
 						int i = 0;
@@ -740,6 +779,7 @@ else if ( cause instanceof ArrayIndexOutOfBoundsException )
 				}
 				else
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 					recordUnexpectedError( candidate, iface, method, notUnderstoodList, cause );
 				}
 				
@@ -751,6 +791,7 @@ else if ( cause instanceof ArrayIndexOutOfBoundsException )
 	// Record an unexpected error.
 	//
 	private	void	recordUnexpectedError
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 		( Object candidate, Class iface, Method method,
 		  HashSet<String> notUnderstoodList, Throwable cause )
 		throws Exception
@@ -763,6 +804,7 @@ else if ( cause instanceof ArrayIndexOutOfBoundsException )
 	// Returns true if this method is allowed to raise SQLFeatureNotSupportedException.
 	//
 	private	boolean	isExcludable(Method method )
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 		throws Exception
 	{
 		Class				iface = method.getDeclaringClass();
@@ -810,6 +852,7 @@ private Object getNullValueForType(Class type)
             return Boolean.FALSE;
         }
         if (type == Character.TYPE) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             return (char) 0;
         }
         if (type == Byte.TYPE) {
@@ -842,6 +885,7 @@ private	void	printUnsupportedList( HashSet<String> unsupportedList )
 		int			count = unsupportedList.size();
 
 		if ( count == 0 ) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1265
 
 		println( "--------------- UNSUPPORTED METHODS ------------------" );
 		println( "--" );
@@ -863,6 +907,7 @@ private	void	printVanishedMethodList( HashSet<String> vanishedMethodList )
 		int			count = vanishedMethodList.size();
 
 		if ( count == 0 ) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 
 		println( "--------------- VANISHED METHODS ------------------" );
 		println( "--" );
@@ -884,6 +929,7 @@ private	void	printNotUnderstoodList( HashSet<String> notUnderstoodList )
 		int			count = notUnderstoodList.size();
 
 		if ( count == 0 ) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1265
 
 		println( "\n\n" );
 		println( "--------------- NOT UNDERSTOOD METHODS ------------------" );
@@ -922,6 +968,7 @@ public	static	class	MD
 		/** Construct from methodName and argument types. */
 		public	MD( String methodName, Class[] argTypes )
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
             this( methodName, argTypes, true );
 		}
 		public	MD( String methodName, Class[] argTypes, boolean requiredAtThisLevel )
@@ -946,6 +993,7 @@ public	MD( String methodName, Class[] argTypes, boolean requiredAtThisLevel )
 		public	String	toString()
 		{
 			StringBuffer	buffer = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1253
 
 			buffer.append( _methodName );
 			buffer.append( "( " );
@@ -1092,6 +1140,8 @@ protected void tearDown() throws Exception {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         return TestConfiguration.defaultSuite(UnsupportedVetter.class);
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java
index 83b8542a18..53e1c78ccf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/VerifySignatures.java
@@ -107,6 +107,7 @@ public class VerifySignatures extends BaseTestCase {
      * Creates a new instance.
      */
     public VerifySignatures(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         super(name);
     }
 
@@ -129,6 +130,7 @@ public void testAllJDBCObjects()
         collectClassesFromConnectionPoolDataSource(classes);
         collectClassesFromXADataSource(classes);
         addClass(classes,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
                  DriverManager.getDriver(TestConfiguration.getCurrent().getJDBCUrl()).getClass(),
                  java.sql.Driver.class);
 
@@ -146,6 +148,7 @@ public void testAllJDBCObjects()
                 }
             }
             for (Method method : methods) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
                 checkImplementationMethod(pair.derbyImplementation,
                         method);
             }
@@ -175,11 +178,15 @@ public void testAllJDBCObjects()
     private static void collectClassesFromDataSource(Set<ClassInfo> classes)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         DataSource ds = JDBCDataSource.getDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2089
         JDBCDataSource.setBeanProperty(ds, "connectionAttributes",
                                        "create=true");
         addClass(classes, ds.getClass(), javax.sql.DataSource.class);
         collectClassesFromConnection(ds.getConnection
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
                                      (TestConfiguration.getCurrent().getUserName(),
                                              TestConfiguration.getCurrent().getUserPassword()),
                                      classes);
@@ -197,11 +204,14 @@ private static void collectClassesFromDataSource(Set<ClassInfo> classes)
         collectClassesFromConnectionPoolDataSource(Set<ClassInfo> classes)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         ConnectionPoolDataSource cpds = J2EEDataSource.getConnectionPoolDataSource();
         addClass(classes,
                  cpds.getClass(), javax.sql.ConnectionPoolDataSource.class);
 
         PooledConnection pc =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
             cpds.getPooledConnection(TestConfiguration.getCurrent().getUserName(),
                     TestConfiguration.getCurrent().getUserPassword());
         addClass(classes, pc.getClass(), javax.sql.PooledConnection.class);
@@ -222,9 +232,12 @@ private static void collectClassesFromDataSource(Set<ClassInfo> classes)
     private static void collectClassesFromXADataSource(Set<ClassInfo> classes)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         XADataSource xads = J2EEDataSource.getXADataSource();
         addClass(classes, xads.getClass(), javax.sql.XADataSource.class);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         XAConnection xaconn = xads.getXAConnection(TestConfiguration.getCurrent().getUserName(),
                 TestConfiguration.getCurrent().getUserPassword());
         addClass(classes, xaconn.getClass(), javax.sql.XAConnection.class);
@@ -381,7 +394,9 @@ private static Set<Class> getAllInterfaces(Class iface) {
      * @param ifaceMethod The method that should be implemented.
      */
     private static void checkImplementationMethod(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4877
             Class<?> derbyImplementation, Method ifaceMethod)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         throws NoSuchMethodException
     {
         
@@ -391,6 +406,7 @@ private static void checkImplementationMethod(
             Method impMethod =
                 derbyImplementation.getMethod(ifaceMethod.getName(),
                                               ifaceMethod.getParameterTypes());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             StringBuilder sb = new StringBuilder();
             Class[] pts = ifaceMethod.getParameterTypes();
             sb.append("(");
@@ -452,6 +468,7 @@ private static Class findCompatibleClass(Class exception, Class[] declared)
         private static Set<Class> getInterfacesToCheck() {
 
             Set<Class> jdbcInterfaces = new HashSet<Class>(Arrays.asList(JDBC_INTERFACES));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
 
             // Remove the interfaces that we know we haven't checked.
 
@@ -477,6 +494,7 @@ private static Set<Class> getInterfacesToCheck() {
             jdbcInterfaces.remove(javax.sql.ConnectionEventListener.class);
             jdbcInterfaces.remove(javax.sql.StatementEventListener.class);
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
             return jdbcInterfaces;
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41.java
index a00cf5e948..268f6b6ad7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41.java
@@ -57,9 +57,13 @@ public  class   Wrapper41
 
     public Wrapper41( Object wrapped ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         if ( wrapped instanceof EmbedResultSet ) { _embedded = (EmbedResultSet) wrapped; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         else if ( wrapped instanceof EmbedCallableStatement ) { _embedCallableStatement = (EmbedCallableStatement) wrapped; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         else if ( wrapped instanceof BrokeredCallableStatement ) { _brokeredCallableStatement = (BrokeredCallableStatement) wrapped; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         else if ( wrapped instanceof ClientResultSet ) { _netclient = (ClientResultSet) wrapped; }
         else if ( wrapped instanceof ClientCallableStatement ) { _callableStatement = (ClientCallableStatement) wrapped; }
         else if ( wrapped instanceof LogicalCallableStatement ) { _logicalCallableStatement = (LogicalCallableStatement) wrapped; }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Conn.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Conn.java
index a88eff883d..2179b47813 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Conn.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Conn.java
@@ -56,8 +56,10 @@ public  class   Wrapper41Conn
 
     public Wrapper41Conn( Object wrapped ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         if ( wrapped instanceof EmbedConnection ) { _embedded = (EmbedConnection) wrapped; }
         else if ( wrapped instanceof BrokeredConnection ) { _brokeredConnection = (BrokeredConnection) wrapped; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         else if ( wrapped instanceof NetConnection) { _netclient = (NetConnection) wrapped; }
         else if ( wrapped instanceof LogicalConnection ) { _logicalConnection = (LogicalConnection) wrapped; }
         else { throw nothingWrapped(); }
@@ -80,6 +82,7 @@ public  void    abort( Executor executor ) throws SQLException
 
     public  String    getSchema() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         if ( _embedded != null ) { return _embedded.getSchema(); }
         else if ( _netclient != null ) { return _netclient.getSchema(); }
         else if ( _brokeredConnection != null ) { return _brokeredConnection.getSchema(); }
@@ -98,6 +101,7 @@ public  void    setSchema( String schemaName ) throws SQLException
 
     public  int    getNetworkTimeout() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         if ( _embedded != null ) { return _embedded.getNetworkTimeout(); }
         else if ( _netclient != null ) { return _netclient.getNetworkTimeout(); }
         else if ( _brokeredConnection != null ) { return _brokeredConnection.getNetworkTimeout(); }
@@ -124,6 +128,7 @@ public Connection   getWrappedObject() throws SQLException
     {
         if ( _embedded != null ) { return _embedded; }
         else if ( _netclient != null ) { return _netclient; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         else if ( _brokeredConnection != null ) { return _brokeredConnection; }
         else if ( _logicalConnection != null ) { return _logicalConnection; }
         else { throw nothingWrapped(); }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41DataSource.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41DataSource.java
index d14f7e733e..f9bbd65932 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41DataSource.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41DataSource.java
@@ -67,6 +67,7 @@ public  class   Wrapper41DataSource
     public Wrapper41DataSource( Object wrapped ) throws Exception
     {
         if (JDBC.vmSupportsJNDI()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             if ( wrapped instanceof EmbeddedDataSource  ) {
                 _embedded = (EmbeddedDataSource) wrapped; }
             else if ( wrapped instanceof EmbeddedConnectionPoolDataSource ) {
@@ -81,6 +82,7 @@ else if ( wrapped instanceof ClientXADataSource ) {
                 _cxads = (ClientXADataSource) wrapped; }
             else { throw nothingWrapped(); }
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             if ( wrapped instanceof BasicEmbeddedDataSource40  ) {
                 _basicembedded = (BasicEmbeddedDataSource40 ) wrapped; }
             else if ( wrapped instanceof BasicClientDataSource40 ) {
@@ -106,6 +108,7 @@ public  Logger    getParentLogger() throws SQLException
             else if ( _cxads != null ) {return _cxads.getParentLogger(); }
             else { throw nothingWrapped(); }
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             if ( _basicembedded != null ) {
                 return _basicembedded.getParentLogger(); }
             else if ( _basicnetclient != null) {
@@ -122,6 +125,7 @@ else if ( _basicnetclient != null) {
 
     public CommonDataSource   getWrappedObject() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         if (JDBC.vmSupportsJNDI()) {
             if ( _embedded != null ) { return _embedded; }
             else if ( _netclient != null ) { return _netclient; }
@@ -131,6 +135,7 @@ public CommonDataSource   getWrappedObject() throws SQLException
             else if ( _cxads != null ) { return _cxads; }
             else { throw nothingWrapped(); }
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             if ( _basicembedded != null ) { return _basicembedded; }
             else if ( _basicnetclient != null ) { return _basicnetclient; }
             else { throw nothingWrapped(); }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Driver.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Driver.java
index fdee47d9cb..c9352b7d2f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Driver.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Driver.java
@@ -56,9 +56,12 @@ public  class   Wrapper41Driver
 
     public Wrapper41Driver( Object wrapped ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
         if ( wrapped instanceof AutoloadedDriver ) { _embedded = (AutoloadedDriver) wrapped; }
         else if ( wrapped instanceof InternalDriver ) { _driver40 = (InternalDriver) wrapped; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         else if ( wrapped instanceof ClientDriver ) { _netclient = (ClientDriver) wrapped; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         else if ( wrapped instanceof ClientAutoloadedDriver )
         { _netautoloaded = (ClientAutoloadedDriver) wrapped; }
         else { throw nothingWrapped( wrapped ); }
@@ -73,8 +76,10 @@ else if ( wrapped instanceof ClientAutoloadedDriver )
     public  Logger    getParentLogger() throws SQLException
     {
         if ( _embedded != null ) { return _embedded.getParentLogger(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         else if ( _driver40 != null ) { return _driver40.getParentLogger(); }
         else if ( _netclient != null ) { return _netclient.getParentLogger(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         else if ( _netautoloaded != null ) { return _netautoloaded.getParentLogger(); }
         else { throw nothingWrapped( null ); }
     }
@@ -88,6 +93,7 @@ public  Logger    getParentLogger() throws SQLException
     public Driver   getWrappedObject() throws SQLException
     {
         if ( _embedded != null ) { return _embedded; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         else if ( _driver40 != null ) { return _driver40; }
         else if ( _netclient != null ) { return _netclient; }
         else { throw nothingWrapped( null ); }
@@ -101,6 +107,7 @@ public Driver   getWrappedObject() throws SQLException
 
     private SQLException nothingWrapped( Object wrapped )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         String  wrappedString = (wrapped == null ? "NULL" : wrapped.getClass().getName() );
         return new SQLException( "Nothing wrapped: " + wrappedString );
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Test.java
index 01f778d3fd..3f31f220e7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41Test.java
@@ -91,6 +91,7 @@ public  class   Wrapper41Test   extends BaseJDBCTestCase
     protected void examineJDBC4_1extensions( Wrapper41 wrapper, boolean rowOfNulls ) throws Exception
     {
         println( "Vetting a " + wrapper.getWrappedObject().getClass().getName() + ". rowOfNulls = " + rowOfNulls );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
 
         _byteArrayClass = Class.forName( "[B" );
         _rowOfNulls = rowOfNulls;
@@ -119,6 +120,7 @@ protected void examineJDBC4_1extensions( Wrapper41 wrapper, boolean rowOfNulls )
     private void    vetWrappedNull( Wrapper41 wrapper ) throws Exception
     {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 wrapper.getObject( 1, (Class<?>) null );
                 fail( "Did not expect to get a result for a null class type." );
             }
@@ -131,6 +133,7 @@ private void    vetWrappedNull( Wrapper41 wrapper ) throws Exception
             if ( wrapper.getWrappedObject() instanceof CallableStatement ) { return; }
             
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 wrapper.getObject( "BIGINTCOL", (Class<?>) null );
                 fail( "Did not expect to get a result for a null class type." );
             }
@@ -146,6 +149,7 @@ private void    vetWrappedInteger( Wrapper41 wrapper, int colID, String colName
              wrapper,
              colID,
              colName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "1",
              new Class[] { String.class, BigDecimal.class, Byte.class, Short.class, Integer.class, Long.class, Number.class, Object.class }
              );
@@ -171,6 +175,7 @@ private void    vetWrappedInteger( Wrapper41 wrapper, int colID, String colName
              wrapper,
              colID,
              colName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              new Class[] { Date.class, Time.class, Timestamp.class, Blob.class, Clob.class, _byteArrayClass, getClass() }
              );
     }
@@ -181,6 +186,7 @@ private void    vetWrappedBlob( Wrapper41 wrapper ) throws Exception
              wrapper,
              2,
              "BLOBCOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : BINARY_VALUE,
              new Class[] { Blob.class, Object.class, _byteArrayClass, String.class,  }
              );
@@ -211,6 +217,7 @@ private void    vetWrappedBoolean( Wrapper41 wrapper ) throws Exception
              wrapper,
              3,
              "BOOLEANCOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "true",
              new Class[] { String.class, Boolean.class, Object.class }
              );
@@ -219,6 +226,7 @@ private void    vetWrappedBoolean( Wrapper41 wrapper ) throws Exception
              wrapper,
              3,
              "BOOLEANCOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "1",
              new Class[] { BigDecimal.class, Byte.class, Short.class, Integer.class, Long.class }
              );
@@ -227,6 +235,8 @@ private void    vetWrappedBoolean( Wrapper41 wrapper ) throws Exception
              wrapper,
              3,
              "BOOLEANCOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "1.0",
              new Class[] { Float.class, Double.class }
              );
@@ -236,6 +246,7 @@ private void    vetWrappedBoolean( Wrapper41 wrapper ) throws Exception
              wrapper,
              3,
              "BOOLEANCOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              new Class[] { Date.class, Time.class, Timestamp.class, Blob.class, Clob.class, _byteArrayClass, getClass() }
              );
     }
@@ -246,6 +257,7 @@ private void    vetWrappedString( Wrapper41 wrapper, int colID, String colName )
              wrapper,
              colID,
              colName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "a",
              new Class[] { String.class, Object.class }
              );
@@ -302,6 +314,7 @@ private void    vetWrappedBinary( Wrapper41 wrapper, int colID, String colName )
              wrapper,
              colID,
              colName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "de",
              new Class[] { String.class }
              );
@@ -310,6 +323,7 @@ private void    vetWrappedBinary( Wrapper41 wrapper, int colID, String colName )
              wrapper,
              colID,
              colName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : BINARY_VALUE,
              new Class[] { _byteArrayClass, Object.class }
              );
@@ -334,6 +348,7 @@ private void    vetWrappedClob( Wrapper41 wrapper ) throws Exception
              wrapper,
              6,
              "CLOBCOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "abc",
              new Class[] { String.class, Clob.class, Object.class }
              );
@@ -349,6 +364,7 @@ private void    vetWrappedClob( Wrapper41 wrapper ) throws Exception
                  BigDecimal.class, Byte.class, Short.class, Integer.class, Long.class,
                  Float.class, Double.class,
                  Date.class, Time.class, Timestamp.class,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
                  _byteArrayClass
              }
              );
@@ -366,6 +382,7 @@ private void    vetWrappedDate( Wrapper41 wrapper ) throws Exception
              wrapper,
              7,
              "DATECOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "1994-02-23",
              new Class[] { String.class, Date.class, Object.class }
              );
@@ -374,6 +391,7 @@ private void    vetWrappedDate( Wrapper41 wrapper ) throws Exception
              wrapper,
              7,
              "DATECOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "1994-02-23 00:00:00.0",
              new Class[] { Timestamp.class }
              );
@@ -400,6 +418,7 @@ private void    vetWrappedFloatingPoint( Wrapper41 wrapper, int colID, String co
              wrapper,
              colID,
              colName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "1.0",
              new Class[] { String.class, Float.class, Double.class, BigDecimal.class, Number.class, Object.class }
              );
@@ -408,6 +427,7 @@ private void    vetWrappedFloatingPoint( Wrapper41 wrapper, int colID, String co
              wrapper,
              colID,
              colName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "1",
              new Class[] { Byte.class, Short.class, Integer.class, Long.class }
              );
@@ -416,6 +436,9 @@ private void    vetWrappedFloatingPoint( Wrapper41 wrapper, int colID, String co
              wrapper,
              colID,
              colName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : "true",
              new Class[] { Boolean.class }
              );
@@ -425,6 +448,7 @@ private void    vetWrappedFloatingPoint( Wrapper41 wrapper, int colID, String co
              wrapper,
              colID,
              colName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              new Class[] { Date.class, Time.class, Timestamp.class, Blob.class, Clob.class, _byteArrayClass, getClass() }
              );
     }
@@ -437,6 +461,7 @@ private void    vetWrappedTime( Wrapper41 wrapper ) throws Exception
              wrapper,
              16,
              "TIMECOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : expectedTime.toString(),
              new Class[] { String.class, Time.class, Object.class }
              );
@@ -445,6 +470,7 @@ private void    vetWrappedTime( Wrapper41 wrapper ) throws Exception
              wrapper,
              16,
              "TIMECOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : timeToTimestamp(expectedTime).toString(),
              new Class[] { Timestamp.class }
              );
@@ -472,6 +498,7 @@ private void    vetWrappedTimestamp( Wrapper41 wrapper ) throws Exception
              wrapper,
              17,
              "TIMESTAMPCOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : expectedTimestamp,
              new Class[] { String.class, Timestamp.class, Object.class }
              );
@@ -482,6 +509,7 @@ private void    vetWrappedTimestamp( Wrapper41 wrapper ) throws Exception
              wrapper,
              17,
              "TIMESTAMPCOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : expectedTime,
              new Class[] { Time.class }
              );
@@ -492,6 +520,7 @@ private void    vetWrappedTimestamp( Wrapper41 wrapper ) throws Exception
              wrapper,
              17,
              "TIMESTAMPCOL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
              _rowOfNulls ? null : expectedDate,
              new Class[] { Date.class }
              );
@@ -506,18 +535,24 @@ private void    vetWrappedTimestamp( Wrapper41 wrapper ) throws Exception
                  Boolean.class,
                  BigDecimal.class, Byte.class, Short.class, Integer.class, Long.class,
                  Float.class, Double.class,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
                  Blob.class, Clob.class, _byteArrayClass, getClass()
              }
              );
     }
 
     private void    vetWrapperOK
+//IC see: https://issues.apache.org/jira/browse/DERBY-4951
         ( Wrapper41 wrapper, int colID, String colName, Object expectedValue, Class[] supportedCoercions )
         throws Exception
     {
         int coercionCount = supportedCoercions.length;
         for ( int i = 0; i < coercionCount; i++ )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Class<?> candidate = supportedCoercions[ i ];
             vetCandidate( candidate, expectedValue, wrapper.getObject( colID, candidate ) );
             
@@ -533,6 +568,7 @@ private void vetCandidate( Class<?> candidate, Object expectedValue, Object actu
         throws Exception
     {
         if ( actualValue != null ) { assertTrue( candidate.getName(), candidate.isAssignableFrom( actualValue.getClass( ) ) ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
 
         if ( expectedValue == null )
         {
@@ -546,6 +582,7 @@ private void vetCandidate( Class<?> candidate, Object expectedValue, Object actu
         if ( actualValue instanceof Blob )
         {
             Blob    blob = (Blob) actualValue;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4951
             vetBytes( (byte[]) expectedValue, blob.getBytes( 1L, (int) blob.length() ) );
             return;
         }
@@ -561,6 +598,7 @@ else if ( actualValue instanceof Clob )
         }
         else { actualString = actualValue.toString(); }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4951
         assertEquals( candidate.getName(), (String) expectedValue, actualString );
     }
     private void    vetBytes( byte[] expected, byte[] actual ) throws Exception
@@ -584,12 +622,14 @@ private void    vetBytes( byte[] expected, byte[] actual ) throws Exception
         throws Exception
     {
         // null can be coerced to anything
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         if ( _rowOfNulls ) { return; }
         
         int coercionCount = unsupportedCoercions.length;
         for ( int i = 0; i < coercionCount; i++ )
         {
             Class<?> candidate = unsupportedCoercions[ i ];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
             try {
                 wrapper.getObject( colID, candidate );
@@ -655,6 +695,7 @@ protected CallableStatement    prepareCall( Connection conn, String text )
      */
     private static Timestamp timeToTimestamp(Time time) {
         // Create a calendar object representing the time value
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         Calendar timeCal = Calendar.getInstance();
         timeCal.setTime(time);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java
index ac34c55af4..787d041abb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/XA40Test.java
@@ -73,6 +73,8 @@ public XA40Test(String name) {
      */
     public void setUp() 
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         xads = J2EEDataSource.getXADataSource();
         xac = xads.getXAConnection();
         xar = xac.getXAResource();
@@ -98,6 +100,8 @@ protected void tearDown() throws Exception {
         if (xac != null) {
             xac.close();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         con = null;
         xads = null;
         xac = null;
@@ -116,6 +120,7 @@ protected void tearDown() throws Exception {
     public void testStatementPoolable() throws SQLException {
         Statement s = con.createStatement();
         if (usingEmbedded()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
             assertTrue("s must be an instance of BrokeredStatement, " +
                        "but is " + s.getClass(), 
                        (s instanceof BrokeredStatement));
@@ -141,6 +146,7 @@ public void testPreparedStatementPoolable() throws SQLException {
             con.prepareStatement("CREATE TABLE foo(i int)");
         if (usingEmbedded()) {
             assertTrue("ps must be an instance of " + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
                        "BrokeredPreparedStatement, " +
                        "but is " + ps.getClass(), 
                        (ps instanceof BrokeredPreparedStatement));
@@ -166,6 +172,7 @@ public void testCallableStatementPoolable() throws SQLException {
             con.prepareCall("CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE(?)");
         if (usingEmbedded()) {
             assertTrue("cs must be an instance of " + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
                        "BrokeredCallableStatement, " +
                        "but is " + cs.getClass(), 
                        (cs instanceof BrokeredCallableStatement));
@@ -186,6 +193,7 @@ public void testCallableStatementPoolable() throws SQLException {
      */
     public void testLargeUpdate_jdbc4_2() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         StatementTest.largeUpdate_jdbc4_2( con );
     }
 
@@ -196,8 +204,10 @@ public void testLargeUpdate_jdbc4_2() throws Exception
      */
     public void test_registerOutParameter_jdbc4_2() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6614
         if (JDBC.vmSupportsJDBC42())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             Class<?>   klass = Class.forName( "org.apache.derbyTesting.functionTests.tests.jdbc4.PreparedStatementTest42" );
             Method  method = klass.getMethod( "registerObjectTest", new Class<?>[] { Connection.class } );
 
@@ -209,6 +219,8 @@ public void test_registerOutParameter_jdbc4_2() throws Exception
      * Create test suite for XA40Test.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         return TestConfiguration.defaultSuite(XA40Test.class);
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
index 23a248eca0..1caa6030d8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbc4/_Suite.java
@@ -45,6 +45,7 @@ private _Suite(String name) {
 	public static Test suite() throws SQLException {
 
         BaseTestSuite suite = new BaseTestSuite("jdbc4");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // These really need to run standalone.
 		//suite.addTestSuite(AutoloadBooting.class);
@@ -62,25 +63,39 @@ public static Test suite() throws SQLException {
 		suite.addTest(SetObjectUnsupportedTest.suite());
 		suite.addTest(StatementEventsTest.suite());
 		suite.addTest(StatementTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1989
 		suite.addTest(TestDbMetaData.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1988
 		suite.addTest(TestJDBC40Exception.suite());
 		suite.addTest(UnsupportedVetter.suite());
 		suite.addTest(XA40Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2855
 		suite.addTest(ConnectionMethodsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         suite.addTest(VerifySignatures.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
         suite.addTest (LobStreamTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4245
         suite.addTest(LobSortTest.suite());
         suite.addTest (BlobSetMethodsTest.suite());
         suite.addTest (JDBC4FromJDBC3DataSourceTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
         suite.addTest(Derby3650Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         suite.addTest(Derby2017LayerBTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         suite.addTest(AbortTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         suite.addTest(Driver40Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         suite.addTest(Driver40UnbootedTest.suite());
         suite.addTest(LoginTimeoutTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6614
         if (JDBC.vmSupportsJDBC42())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             suite.addTest( getSuite( "org.apache.derbyTesting.functionTests.tests.jdbc4.PreparedStatementTest42" ) );
         }
 		
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java
index 570b4d459d..f91c42928c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java
@@ -53,6 +53,7 @@ public class AuthenticationTest extends BaseJDBCTestCase {
     private static final String USERS[] = 
         {"APP","dan","kreg","jeff","ames","jerry","francois","jamie","howardR",
         "\"eVe\"","\"fred@derby.com\"", "\"123\"" };
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
 
     private static final String zeus = "\u0396\u0395\u03A5\u03A3";
     private static final String apollo = "\u0391\u09A0\u039F\u039B\u039B\u039A\u0390";
@@ -83,14 +84,17 @@ protected void initializeConnection(Connection conn) throws SQLException {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("AuthenticationTest");
         suite.addTest(baseSuite("AuthenticationTest:embedded"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         suite.addTest(TestConfiguration.clientServerDecorator(
                 baseSuite("AuthenticationTest:client")));
         return suite;
     }
     
     public static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("AuthenticationTest");
         
         Test test = new AuthenticationTest(
@@ -106,6 +110,7 @@ public static Test baseSuite(String name) {
         test = new AuthenticationTest("testNotFullAccessUsers");
         setBaseProps(suite, test);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         test = new AuthenticationTest("testUserAccessRoutines");
         setBaseProps(suite, test);
         
@@ -156,6 +161,7 @@ protected static void setBaseProps(BaseTestSuite suite, Test test)
     }
 
     private static void setBaseProps(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite, Test test, Properties extraDbProps)
     {
         // Use DatabasePropertyTestSetup.builtinAuthentication decorator
@@ -185,6 +191,7 @@ private static void setBaseProps(
     
     protected void setUp() throws Exception {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
         setDatabaseProperty("derby.database.defaultConnectionMode",
                 null, getConnection());
         setDatabaseProperty("derby.database.readOnlyAccessUsers",
@@ -256,6 +263,7 @@ public void testUserCasing() throws SQLException
         // to set the access on others to avoid setting a user to read-only
         // and then not being able to reset it.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
         PreparedStatement psGetAccess = prepareStatement(
             "VALUES SYSCS_UTIL.SYSCS_GET_USER_ACCESS(?)");
         CallableStatement csSetAccess = prepareCall(
@@ -303,6 +311,7 @@ public void testUserCasing() throws SQLException
             connUser.close();
             
             psGetAccess.setString(1, normalUserName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3160
             JDBC.assertSingleValueResultSet(psGetAccess.executeQuery(),
                     "READONLYACCESS");
             commit();
@@ -318,6 +327,7 @@ public void testUserCasing() throws SQLException
             connUser.close(); 
             
             psGetAccess.setString(1, normalUserName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3160
             JDBC.assertSingleValueResultSet(psGetAccess.executeQuery(),
                     "FULLACCESS");
             commit();
@@ -339,6 +349,7 @@ public void testUserCasing() throws SQLException
             connUser.close();
             
             psGetAccess.setString(1, normalUserName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3160
             JDBC.assertSingleValueResultSet(psGetAccess.executeQuery(),
                     "READONLYACCESS");
             commit();           
@@ -388,6 +399,9 @@ private void userCasingTest(String jdbcUserName, String normalUserName,
         // DatabaseMetaData.getUserName() returns the user name used
         // to make the request via JDBC.
         assertEquals("DatabaseMetaData.getUserName()",
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
+//IC see: https://issues.apache.org/jira/browse/DERBY-3158
+//IC see: https://issues.apache.org/jira/browse/DERBY-3159
                 jdbcUserName, connUser.getMetaData().getUserName());
         
         
@@ -452,6 +466,7 @@ public void testConnectShutdownAuthentication() throws SQLException {
         assertShutdownWOUPOK(dbName, "system", "admin");
         assertConnectionOK(dbName, "system", ("admin"));
         // try shutdown as owner
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         assertShutdownUsingConnAttrsOK(dbName, "APP", ("APP" + PASSWORD_SUFFIX));
         
         // ensure that a password is encrypted
@@ -519,6 +534,8 @@ public void testConnectShutdownAuthentication() throws SQLException {
         // just checking that it's still not working if we try again
         assertConnectionFail("08004", dbName, "badUser", "badPwd");
         // system is not on the list...
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertConnectionFail("08004", dbName, "system", "admin");
         // dan's on the list, but this isn't the pwd
         assertConnectionFail("08004", dbName, "dan", "badPwd");
@@ -707,6 +724,7 @@ public void testNotFullAccessUsers() throws SQLException
             "dan", ("dan" + PASSWORD_SUFFIX));
         
         // Test duplicates on the list of users
+//IC see: https://issues.apache.org/jira/browse/DERBY-3147
         try {
             setDatabaseProperty("derby.database.fullAccessUsers", 
                     "dan,jamie,dan", conn1);
@@ -779,8 +797,10 @@ public void testNotFullAccessUsers() throws SQLException
         conn1.commit();
         
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         PreparedStatement psGetAccess = conn1.prepareStatement(
                 "VALUES SYSCS_UTIL.SYSCS_GET_USER_ACCESS(?)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3160
         psGetAccess.setString(1, "JAMIE");
         JDBC.assertSingleValueResultSet(psGetAccess.executeQuery(), "FULLACCESS");
         
@@ -800,6 +820,7 @@ public void testNotFullAccessUsers() throws SQLException
         psGetAccess.setString(1, "hagrid");
         JDBC.assertSingleValueResultSet(psGetAccess.executeQuery(), "NOACCESS");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         conn1.commit();
         
         // now add/switch some names using the utility method
@@ -814,6 +835,7 @@ public void testNotFullAccessUsers() throws SQLException
         psGetAccess.setString(1, "AMES");
         JDBC.assertSingleValueResultSet(psGetAccess.executeQuery(), "FULLACCESS");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3160
         psGetAccess.setString(1, "MICKEY");
         JDBC.assertSingleValueResultSet(psGetAccess.executeQuery(), "READONLYACCESS");
         psGetAccess.setString(1, "JAMIE");
@@ -831,6 +853,7 @@ public void testNotFullAccessUsers() throws SQLException
         psGetAccess.setString(1, "AMES");
         JDBC.assertSingleValueResultSet(psGetAccess.executeQuery(), "READONLYACCESS");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3160
         psGetAccess.setString(1, "MICKEY");
         JDBC.assertSingleValueResultSet(psGetAccess.executeQuery(), "READONLYACCESS");
         psGetAccess.setString(1, "JAMIE");
@@ -944,6 +967,7 @@ public void testNotFullAccessUsers() throws SQLException
     public void testUserAccessRoutines() throws SQLException
     {
         // use valid user/pwd to set the full accessusers.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         Connection conn1 = openDefaultConnection(
             "dan", ("dan" + PASSWORD_SUFFIX));
         
@@ -952,6 +976,7 @@ public void testUserAccessRoutines() throws SQLException
         CallableStatement csSetAccess = conn1.prepareCall(
             "CALL SYSCS_UTIL.SYSCS_SET_USER_ACCESS(?, ?)"); 
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3160
         csSetAccess.setString(1, "DAN");
         csSetAccess.setString(2, "FULLACCESS");
         csSetAccess.execute();
@@ -1006,6 +1031,7 @@ public void testGreekCharacters() throws SQLException {
         conn1.close();
         
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         assertConnectionOK(dbName, zeus, apollo);
         assertConnectionFail("08004", dbName, apollo, apollo);
         // shutdown as non-dbo
@@ -1017,6 +1043,7 @@ public void testGreekCharacters() throws SQLException {
         assertShutdownOK(dbName, apollo, zeus);
         assertConnectionOK(dbName, apollo, zeus);
         // shutdown as dbo
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         assertShutdownUsingSetShutdownOK(
             dbName, "APP", ("APP" + PASSWORD_SUFFIX));
 
@@ -1037,6 +1064,7 @@ public void testGreekCharacters() throws SQLException {
             "derby.database.defaultConnectionMode","fullAccess", conn1);
         setDatabaseProperty(
             "derby.connection.requireAuthentication","false", conn1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         stmt = conn1.createStatement();
         if (usingEmbedded())
             assertUpdateCount(stmt, 0, "drop table APP.t1");
@@ -1062,6 +1090,7 @@ public void testSystemShutdown() throws SQLException
         setSystemProperty("derby.connection.requireAuthentication", "true");
 
         // bring down the database
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         assertShutdownUsingSetShutdownOK(
             dbName, "APP", "APP" + PASSWORD_SUFFIX);
         // recheck
@@ -1093,6 +1122,7 @@ public void testSystemShutdown() throws SQLException
         conn1.commit();
         conn1.close();
         openDefaultConnection("system", "admin").close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         assertShutdownUsingSetShutdownOK(
             dbName, "APP", "APP" + PASSWORD_SUFFIX);
         assertSystemShutdownOK("", "system", "admin");
@@ -1214,6 +1244,7 @@ public void testNoCollisionsWithConfigurableHash() throws SQLException {
 
         // Store a set of generated password tokens to detect collisions
         HashSet<String> tokens = new HashSet<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         for (int i = 0; i < USERS.length; i++) {
             String user = USERS[i];
@@ -1279,6 +1310,8 @@ protected void assertFailSetDatabaseProperty(
         setDBP.setString(1, propertyName);
         setDBP.setString(2, value);
         // user jamie cannot be both readOnly and fullAccess
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("4250C", setDBP);
         setDBP.close();
     }
@@ -1334,6 +1367,7 @@ protected void assertUserValue(
         assertEquals(expected.length, i);
         conn1.commit();
         stmt.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         conn1.close();
     }
     
@@ -1401,6 +1435,7 @@ protected void assertConnectionWOUPFail(
     }
 
     protected void assertShutdownUsingSetShutdownOK(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
             String dbName, String user, String password) throws SQLException {
         DataSource ds = JDBCDataSource.getDataSource(dbName);
         JDBCDataSource.setBeanProperty(ds, "shutdownDatabase", "shutdown");
@@ -1435,6 +1470,7 @@ protected void assertShutdownWOUPOK(
         String dbName, String user, String password)
     throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         DataSource ds = JDBCDataSource.getDataSource(dbName);
         JDBCDataSource.setBeanProperty(ds, "shutdownDatabase", "shutdown");
         JDBCDataSource.setBeanProperty(ds, "user", user);
@@ -1466,6 +1502,7 @@ protected void assertShutdownOK(
         String dbName, String user, String password)
     throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         DataSource ds = JDBCDataSource.getDataSource(dbName);
         JDBCDataSource.setBeanProperty(ds, "shutdownDatabase", "shutdown");
         try {
@@ -1480,6 +1517,7 @@ protected void assertShutdownWOUPFail(
         String expectedSqlState, String dbName, String user, String password) 
     throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         DataSource ds = JDBCDataSource.getDataSource(dbName);
         JDBCDataSource.setBeanProperty(ds, "shutdownDatabase", "shutdown");
         JDBCDataSource.setBeanProperty(ds, "user", user);
@@ -1505,7 +1543,9 @@ protected void assertSystemShutdownOK(
             // where dbName is an empty string - this will in the current code
             // be interpreted as a system shutdown.
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
             ds = JDBCDataSource.getDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
             JDBCDataSource.clearStringBeanProperty(ds, "databaseName");
         }
         else 
@@ -1535,6 +1575,10 @@ protected void assertSystemShutdownFail(
         if (usingEmbedded())
         {
             ds = JDBCDataSource.getDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1982
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
+//IC see: https://issues.apache.org/jira/browse/DERBY-1982
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
             JDBCDataSource.clearStringBeanProperty(ds, "databaseName");
         }
         else
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoGenJDBC30Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoGenJDBC30Test.java
index 2384c7a25d..56d7131d31 100755
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoGenJDBC30Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoGenJDBC30Test.java
@@ -95,6 +95,7 @@ public AutoGenJDBC30Test(String name) {
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("AutoGenJDBC30Test");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(baseSuite("AutoGenJDBC30Test:embedded"));
 
@@ -112,6 +113,7 @@ public static Test suite() {
     private static Test baseSuite(String name) {
 
         BaseTestSuite suite = new BaseTestSuite(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         if (!JDBC.vmSupportsJDBC3()) {
             // empty suite
@@ -224,6 +226,8 @@ public void testInsertManyRowsNoPriorKey() throws SQLException
     public void testUpdateManyRowsAfterOneRowKey() throws SQLException
     {
         // Do a one-row insert into a table with an auto-generated key.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
         Statement s = createStatement();
         s.execute("insert into t11_AutoGen(c11) values (99)", Statement.RETURN_GENERATED_KEYS);
         int expected=1;
@@ -555,6 +559,8 @@ public void testUpdateOneRowKey() throws SQLException
         Statement s = createStatement();
         s.execute("insert into t11_AutoGen(c11) values(999)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
         String sqlStmt="update t11_AutoGen set c12=default where c11=999";
         s.execute(sqlStmt, Statement.RETURN_GENERATED_KEYS);
         int keyval = getKeyValue (s.getGeneratedKeys());
@@ -1054,10 +1060,12 @@ public void testColumnIndexes() throws SQLException
         // Valid (typical) usage.
 
         int [] colIndexes = new int [] { 2 };
+//IC see: https://issues.apache.org/jira/browse/DERBY-2631
         testUserGivenColumns(colIndexes, null, 1);
         
 
         // Mulitple columns. one not an identity column.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
         colIndexes = new int[] {1,2};
         testUserGivenColumnsError(colIndexes, null);
         
@@ -1120,6 +1128,7 @@ public void testColumnNames() throws SQLException
         testUserGivenColumns(null, colNames, 1);
 
         // column name array is of length > 1
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
         colNames = new String[] {"C12","C13"};
         testUserGivenColumnsError(null, colNames);
              
@@ -1187,6 +1196,7 @@ public void testColumnNames() throws SQLException
     public void testUserGivenColumnsEmpty() throws SQLException
     {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
 
         String sql="insert into t11_AutoGen(c11) values (99)";
 
@@ -1267,6 +1277,7 @@ public void testUserGivenColumnsNull() throws SQLException
             s.getGeneratedKeys());
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
         PreparedStatement ps;
         ps = prepareStatement(sql, (String[]) null);
         ps.execute();
@@ -1399,6 +1410,7 @@ private void testUserGivenColumnsError(int [] colIndexes,
         boolean useIndexes = (colIndexes != null);
         String expectedSQLState = (useIndexes ? "X0X0E" : "X0X0F");
         // Derby client will only give an error if colNames array is not of length 1.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
         if (usingDerbyNetClient() && colNames != null && 
                 colNames.length != 1)
             expectedSQLState = "X0X0D";
@@ -1520,6 +1532,8 @@ public void verifyNullKey (String description, ResultSet r)
      * @exception SQLException if a database error occurs
      */
     public int getKeyValue (ResultSet r) throws SQLException
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6753
     {if(r==null) System.out.println("it is null");
         JDBC.assertGeneratedKeyResultSet("AutoGenJDBC30Test.getKeyValue", r);
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
index ce24aa6c99..d98fbeb056 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
@@ -66,6 +66,7 @@ public class AutoloadTest extends BaseJDBCTestCase
      * desired configuration
      */
     private AutoloadTest(Class<?> wrapper) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5664
         this("spawnProcess");
         spawnedTestClass = wrapper;
     }
@@ -91,9 +92,11 @@ public String getName() {
      * @return the test
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
         if (!JDBC.vmSupportsJDBC3())
             return new BaseTestSuite("empty: no java.sql.DriverManager");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         boolean embeddedAutoLoad = false;
         boolean clientAutoLoad = false;
@@ -107,6 +110,7 @@ public static Test suite() {
             // does not start up. Unlike when the embedded driver is
             // put in jdbc.drivers.
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
             jdbc4Autoload = true;
         }
 
@@ -122,6 +126,7 @@ public static Test suite() {
 
             embeddedAutoLoad = jdbcDrivers
                     .contains("org.apache.derby.jdbc.EmbeddedDriver");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6704
 
             clientAutoLoad = jdbcDrivers
                     .contains("org.apache.derby.jdbc.ClientDriver");
@@ -134,6 +139,7 @@ public static Test suite() {
         
         if (jdbc4Autoload || embeddedAutoLoad || clientAutoLoad)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite = new BaseTestSuite("AutoloadTest");
             
             if (jdbc4Autoload && !embeddedAutoLoad)
@@ -166,6 +172,7 @@ public static Test suite() {
 
         // Run a single test that ensures that the driver is
         // not loaded implicitly by some other means.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("AutoloadTest: no autoloading expected");
         
@@ -185,9 +192,12 @@ public static Test suite() {
      */
     private static Test baseAutoLoadSuite(String which)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("AutoloadTest: " + which);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         suite.addTest(new AutoloadTest("testRegisteredDriver"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         if ("embedded".equals(which))
         {
             // Tests to see if the full engine is booted correctly
@@ -199,6 +209,7 @@ private static Test baseAutoLoadSuite(String which)
         
         suite.addTest(new AutoloadTest("testSuccessfulConnect"));
       	
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         if ("embedded".equals(which)) {
             suite.addTest(SecurityManagerSetup.noSecurityManager(
                 new AutoloadTest("testEmbeddedStarted")));
@@ -234,7 +245,9 @@ private static Test baseAutoLoadSuite(String which)
      * @return the test constructed
      */
     static Test fullAutoloadSuite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("AutoloadTest:All");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5664
         suite.addTest(new AutoloadTest(AutoloadTest.class));
         suite.addTest(new AutoloadTest(JDBCDriversEmbeddedTest.class));
         suite.addTest(new AutoloadTest(JDBCDriversClientTest.class));
@@ -258,6 +271,7 @@ protected void setUp() {
      * @throws java.lang.Exception something went wrong
      */
     public void spawnProcess() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6704
         final List<String> args = new ArrayList<String>();
         args.add("-Dderby.system.durability=" +
                 getSystemProperty("derby.system.durability"));
@@ -347,6 +361,7 @@ public void spawnProcess() throws Exception {
      */
     public void testAutoloadDriverUnregister() throws Exception {
         if (usingEmbedded()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
             String AutoloadedDriver = getAutoloadedDriverName();
             String Driver40 = "org.apache.derby.jdbc.Driver40";
             String Driver30 = "org.apache.derby.jdbc.Driver30";
@@ -374,6 +389,7 @@ public void testAutoloadDriverUnregister() throws Exception {
 
             //Derby should be able to get a connection if AutoloaderDriver is
             //not in DriverManager. Make a connection to test it. Derby-2905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(driverClass);
             clazz.getConstructor().newInstance();
             url = getTestConfiguration().getJDBCUrl();
@@ -393,10 +409,12 @@ public void testAutoloadDriverUnregister() throws Exception {
     }
     private String  getAutoloadedDriverName()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return "org.apache.derby.iapi.jdbc.AutoloadedDriver";
     }
     private String  getClientDriverName()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return "org.apache.derby.client.ClientAutoloadedDriver";
     }
     
@@ -409,6 +427,7 @@ public void testRegisteredDriver() throws SQLException
         String protocol =
             getTestConfiguration().getJDBCClient().getUrlBase();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         println("Test case '" + getName() + "'. Looking up driver for protocol " + protocol);
         Driver driver = DriverManager.getDriver(protocol);
         assertNotNull("Expected registered driver", driver);
@@ -435,8 +454,10 @@ public void testShutdownDeRegister() throws SQLException
      */
     private boolean isEmbeddedDriverRegistered()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         String  clientDriverName = getClientDriverName();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6704
         for (Enumeration<Driver> e = DriverManager.getDrivers();
                 e.hasMoreElements(); )
         {
@@ -444,6 +465,7 @@ private boolean isEmbeddedDriverRegistered()
             String driverClass = d.getClass().getName();
             if (!driverClass.startsWith("org.apache.derby."))
                 continue;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
             if (driverClass.equals( clientDriverName ))
                 continue;
 
@@ -518,6 +540,7 @@ public void testExplicitReload() throws Exception
     
     private void explicitLoad(boolean instanceOnly) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         String driverClass =
             getTestConfiguration().getJDBCClient().getJDBCDriverName();
         
@@ -529,6 +552,7 @@ private void explicitLoad(boolean instanceOnly) throws Exception
             testUnsuccessfulConnect();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(driverClass);
         clazz.getConstructor().newInstance();
         testSuccessfulConnect();
@@ -580,9 +604,11 @@ public void testAutoNetworkServerBoot() throws Exception
         String user = getTestConfiguration().getUserName();
         String pw = getTestConfiguration().getUserPassword();
         int port = TestConfiguration.getBasePort();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6181
         final InetAddress host = InetAddress.getByName(TestConfiguration.getCurrent().getHostName());
         NetworkServerControl control = new NetworkServerControl(host, port, user, pw);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5643
         if (!serverShouldBeUp) {
             // If we expect the server not to come up, wait a little before
             // checking if the server is up. If the server is (unexpectedly)
@@ -608,6 +634,7 @@ public void testAutoNetworkServerBoot() throws Exception
     private boolean fullEngineAutoBoot()
     {
         String jdbcDrivers = getSystemProperty("jdbc.drivers");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6704
         return jdbcDrivers.contains("org.apache.derby.jdbc.EmbeddedDriver");
     }
     
@@ -618,6 +645,7 @@ private boolean fullEngineAutoBoot()
     
     public void testEmbeddedNotStarted()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         assertFalse(hasDerbyThreadGroup());
     }
     
@@ -635,6 +663,7 @@ public void testEmbeddedStarted()
     private boolean getRegisteredDrivers(String driver) {
 
     Enumeration<Driver> e = DriverManager.getDrivers();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6704
 
         while(e.hasMoreElements())
         {
@@ -676,6 +705,8 @@ public void testAssertShutdownOK() throws SQLException {
             //Case 2: Test with deregister=false, AutoloadedDriver should
             //still be in DriverManager
             JDBCDataSource.setBeanProperty(ds, "connectionAttributes",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5029
+//IC see: https://issues.apache.org/jira/browse/DERBY-2095
                     "shutdown=true;deregister=false");
             try {
                 ds.getConnection();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBDataModelSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBDataModelSetup.java
index 9da89b3c11..4dd4c4ef6d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBDataModelSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBDataModelSetup.java
@@ -38,6 +38,8 @@
  *  3. the data field (data), which is the actual BLOB data.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
 final public class BLOBDataModelSetup extends BaseJDBCTestSetup
 {
     
@@ -58,6 +60,8 @@ public BLOBDataModelSetup(Test test)
     protected final void setUp() 
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Connection con = getConnection();
         con.setAutoCommit(false);
         
@@ -74,6 +78,7 @@ protected final void setUp()
             ("INSERT INTO " + tableName + "(val, length, data) VALUES (?,?, ?)");
         
         // Insert 10 records with size of 1MB
+//IC see: https://issues.apache.org/jira/browse/DERBY-1477
         for (int i = 0; i < regularBlobs; i++) {
             final int val = i;
             final InputStream stream = new TestInputStream(size, val);
@@ -84,6 +89,7 @@ protected final void setUp()
         }
         
         // Insert 1 record with size of 64 MB
+//IC see: https://issues.apache.org/jira/browse/DERBY-1477
         BaseJDBCTestCase.println("Insert BLOB with size = " + bigSize);
         preparedStatement.setInt(1, bigVal);
         preparedStatement.setInt(2, bigSize);
@@ -107,6 +113,8 @@ protected final void tearDown()
         throws Exception
     {
         try { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
             Connection con = getConnection();
             Statement statement = con.createStatement();
             statement.execute("DROP TABLE " + tableName);
@@ -129,6 +137,7 @@ public static final String getBlobTableName()
     }
     
     /** Size of regular Blobs (currently 1MB) */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1477
     final static int size = 1024 * 1024;
     
     /** Number of regular Blobs */
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java
index 968ac23add..43067d4f21 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BLOBTest.java
@@ -162,6 +162,8 @@ public void testUpdateBlobFromForwardOnlyResultSetUsingPositionedUpdates()
                               BLOBDataModelSetup.getBlobTableName());
         while (rs.next()) {
             println("Next");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1477
+//IC see: https://issues.apache.org/jira/browse/DERBY-1477
             final int val = rs.getInt(1);
             if (val == BLOBDataModelSetup.bigVal) break;
         }
@@ -312,6 +314,7 @@ private void testUpdateBlobWithResultSetMethods(final ResultSet rs,
         int val = rs.getInt("VAL");
         int size = rs.getInt("LENGTH");
         println("VerifyBlob");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1477
         verifyBlob(val, size, rs.getBlob("DATA"));
         
         println("UpdateBlob");
@@ -366,6 +369,7 @@ private void testUpdateBlobWithPositionedUpdate(final ResultSet rs,
      * @throws SQLException if something goes wrong
      */
     public void testBlobCastInValuesClause()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4102
             throws IOException, SQLException {
         // The length must be at least 32 KB.
         final int length = 38*1024;
@@ -396,6 +400,10 @@ public void testBlobCastInValuesClause()
      * @see org.apache.derbyTesting.functionTests.tests.memory.ClobMemTest#testDerby4477_3645_3646_Repro_lowmem_clob
      */
     public void testDerby4477_3645_3646_Repro() throws SQLException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
         setAutoCommit(false);
         Statement s = createStatement();
 
@@ -557,6 +565,7 @@ public void testDerby4477_2349_Repro() throws SQLException, IOException {
      * See DERBY-2992.
      */
     public void testDerby2992_Repro()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2992
             throws IOException, SQLException {
         // Autocommit doesn't seem to be enabled here in all cases.
         setAutoCommit(true);
@@ -734,6 +743,10 @@ private void verifyNewValueInTable(final int newVal,
     {
         println("Verify new value in table: " + newVal);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
         final Statement stmt = createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                                    ResultSet.CONCUR_READ_ONLY);
 
@@ -757,7 +770,16 @@ private void verifyNewValueInTable(final int newVal,
         }
         assertTrue("No column with value= " + newVal + " found ", foundVal);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         stmt.close();
     }
 
@@ -772,6 +794,10 @@ private void verifyNewValueInTable(final int newVal,
      * @exception IOException causes test to fail with error
      */
     private void verifyBlob(final int expectedVal,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3645
+//IC see: https://issues.apache.org/jira/browse/DERBY-3646
+//IC see: https://issues.apache.org/jira/browse/DERBY-2349
                             final int expectedSize,
                             final Blob blob)
         throws IOException, SQLException
@@ -798,6 +824,7 @@ private void verifyBlob(final int expectedVal,
      */
     public static Test suite() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite mainSuite =
             new BaseTestSuite(BLOBTest.class, "BLOBTest");
         return new BLOBDataModelSetup(mainSuite);
@@ -810,6 +837,7 @@ public static Test suite()
     public final void setUp() 
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         getConnection().setAutoCommit(false);
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java
index 9ee1a96467..0283b065a6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BatchUpdateTest.java
@@ -148,6 +148,7 @@ public BatchUpdateTest(String name) {
      *  This is itself a test of statements creating tables in batch. 
      */
     public void setUp() throws  Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         getConnection().setAutoCommit(false);
         Statement s = createStatement();
         s.execute("delete from t1");
@@ -156,6 +157,7 @@ public void setUp() throws  Exception {
     }
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("BatchUpdateTest");
         suite.addTest(baseSuite("BatchUpdateTest:embedded"));
         suite.addTest(TestConfiguration.clientServerDecorator(
@@ -171,7 +173,9 @@ public static Test suite() {
      */
     public static Test embeddedSuite() {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("BatchUpdateTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2656
         suite.addTest(baseSuite("BatchUpdateTest:embedded"));
         return suite;
     }
@@ -206,10 +210,12 @@ protected void decorateSQL(Statement stmt) throws SQLException
      * helper method to check each count in the return array of a BatchUpdateException
      */
     public  static   void assertBatchUpdateCounts
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         ( long[] expectedBatchResult, BatchUpdateException bue )
     {
         assertBatchUpdateCounts( squashLongs( expectedBatchResult ), bue.getUpdateCounts() );
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6614
         if (JDBC.vmSupportsJDBC42())
         {
             BatchUpdateExceptionWrapper wrapper = new BatchUpdateExceptionWrapper( bue );
@@ -262,6 +268,7 @@ private static void assertBatchUpdateCounts(
     public static void assertBatchExecuteError( 
         String expectedError,
         Statement stmt,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         long[] expectedUpdateCount) 
     throws SQLException 
     { 
@@ -285,6 +292,7 @@ public void testMinimalDDLInBatch() throws SQLException {
         int expectedCount[] = {0,0,0};
         assertBatchUpdateCounts(expectedCount, stmt.executeBatch());
         ResultSet rs = stmt.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
             "select count(*) from SYS.SYSTABLES where CAST(tablename AS VARCHAR(128)) like 'DDL%'");
         JDBC.assertSingleValueResultSet(rs, "2");
         rs = stmt.executeQuery(
@@ -308,6 +316,7 @@ public void testEmptyStatementBatch() throws SQLException {
         assertBatchUpdateCounts(new int[0], stmt.executeBatch());
 
         stmt.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
 
@@ -355,6 +364,8 @@ public void testMultipleStatementsBatch() throws SQLException {
         
         stmt.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
 
@@ -410,6 +421,7 @@ public void test1000StatementsBatch() throws SQLException {
 
         stmt.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
 
@@ -460,6 +472,7 @@ public void testCombinationsOfClearBatch() throws SQLException {
         assertTableRowCount("T1", 3);
 
         stmt.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
 
@@ -474,6 +487,7 @@ public void testCombinationsOfClearBatch() throws SQLException {
     public void testAssociatedParams() throws SQLException 
     {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         Statement stmt = createStatement();
         int i;
         println("Positive Statement: testing associated parameters");
@@ -483,11 +497,13 @@ public void testAssociatedParams() throws SQLException
             "insert into assoc values (?, 'hello')");
         for ( i = 10; i < 60; i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             ps.setString(1, Integer.toString(i));
             ps.executeUpdate();     
         }
         ps.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         ps = prepareStatement(
             "insert into assocout select x from assoc where x like ?");
         ps.setString(1, "33%");
@@ -506,6 +522,7 @@ public void testAssociatedParams() throws SQLException
                 
         stmt.executeUpdate("delete from assocout");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         ps = prepareStatement(
                 "insert into assocout select x from assoc where x like ?");
         ps.setString(1, "3%");
@@ -529,6 +546,7 @@ public void testAssociatedParams() throws SQLException
         JDBC.assertFullResultSet(rs, expectedStrArray, true);
                 
         stmt.executeUpdate("delete from assocout");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         ps = prepareStatement(
             "insert into assocout select x from assoc where x like ?");
         ps.setString(1, "%");// values 10-59
@@ -576,6 +594,7 @@ public void testStatementWithResultSetBatch() throws SQLException {
         stmt.addBatch("insert into t1 values(1)");
         if (usingEmbedded())
             /* Ensure the exception is the ResultSetReturnNotAllowed */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("X0Y79", stmt, new long[] {});
         else if (usingDerbyNetClient())
             assertBatchExecuteError("XJ208", stmt, new long[] {-3, 1});
@@ -591,6 +610,7 @@ else if (usingDerbyNetClient())
         stmt.addBatch("insert into t1 values(1)");
         if (usingEmbedded())
             /* Ensure the exception is the ResultSetReturnNotAllowed */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("X0Y79", stmt, new long[] {1});
         else if (usingDerbyNetClient())
             assertBatchExecuteError("XJ208", stmt, new long[] {1,-3,1});
@@ -606,6 +626,7 @@ else if (usingDerbyNetClient())
         stmt.addBatch("SELECT * FROM SYS.SYSCOLUMNS");
         if (usingEmbedded())
             /* Ensure the exception is the ResultSetReturnNotAllowed */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("X0Y79", stmt, new long[] {1,1});
         else if (usingDerbyNetClient())
             assertBatchExecuteError("XJ208", stmt, new long[] {1,1,-3});
@@ -619,6 +640,7 @@ else if (usingDerbyNetClient())
 
         stmt.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
     
@@ -639,8 +661,10 @@ public void testStatementNonBatchStuffInBatch() throws SQLException {
         else if (usingDerbyNetClient())
         {
             stmt.addBatch("insert into t1 values(1)"); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("XJ208",stmt, new long[] {-3,1});           
             // pull level with embedded situation
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
             rollback();
         }
         // do clearBatch so we can proceed
@@ -649,6 +673,7 @@ else if (usingDerbyNetClient())
         assertTableRowCount("T1", 0);
 
         // trying executeQuery after addBatch
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         println("Negative Statement: " +
             "statement testing executeQuery in the middle of batch");
         stmt.addBatch("insert into t1 values(1)");
@@ -679,6 +704,7 @@ else if (usingDerbyNetClient())
         println("Negative Statement: " +
             "statement testing executeUpdate in the middle of batch");
         // trying executeUpdate after addBatch
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         println("Negative Statement: " +
         "statement testing executeUpdate in the middle of batch");
         stmt.addBatch("insert into t1 values(1)");
@@ -689,6 +715,7 @@ else if (usingDerbyNetClient())
             stmt.addBatch("SELECT * FROM SYS.SYSCOLUMNS");
             if (usingDerbyNetClient())
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 assertBatchExecuteError("XJ208", stmt, new long[] {1,1,-3});
             }
             else if (usingEmbedded())
@@ -733,6 +760,7 @@ public void testStatementWithErrorsBatch() throws SQLException {
         /* Check to be sure the exception is the one we expect */
         /* Overflow is first stmt in the batch, so expect no update count */
         if (usingEmbedded())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("22003", stmt, new long[] {});
         else if (usingDerbyNetClient())
             assertBatchExecuteError("XJ208", stmt, new long[] {-3,1});
@@ -749,6 +777,7 @@ else if (usingDerbyNetClient())
         /* Check to be sure the exception is the one we expect */
         /* Update is second statement in the batch, expect 1 update count */
         if (usingEmbedded())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("22003", stmt, new long[] {1});
         else if (usingDerbyNetClient())
             assertBatchExecuteError("XJ208", stmt, new long[] {1,-3,1});
@@ -765,6 +794,7 @@ else if (usingDerbyNetClient())
         /* Check to be sure the exception is the one we expect */
         /* Update is last statement in the batch, expect 2 update counts */
         if (usingEmbedded())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("22003", stmt, new long[] {1,1});
         else if (usingDerbyNetClient())
             assertBatchExecuteError("XJ208", stmt, new long[] {1,1,-3});
@@ -773,6 +803,7 @@ else if (usingDerbyNetClient())
                 usingEmbedded() ? 4 : 6);
         stmt.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
     
@@ -848,6 +879,7 @@ public void testCallableStatementBatch() throws SQLException {
         executeBatchCallableStatement(cs);
 
         cleanUpCallableStatement(cs, "t1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
 
         /* For 'beetle' bug 2813 - setDate/setTime/setTimestamp
          * calls on callableStatement throws ClassNotFoundException 
@@ -864,6 +896,7 @@ public void testCallableStatementBatch() throws SQLException {
         executeBatchCallableStatement(cs);
 
         cleanUpCallableStatement(cs, "datetab");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
 
         cs = prepareCall("insert into timetab values(?)");
 
@@ -874,6 +907,7 @@ public void testCallableStatementBatch() throws SQLException {
         executeBatchCallableStatement(cs);
 
         cleanUpCallableStatement(cs, "timestamptab");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
 
         cs = prepareCall("insert into timestamptab values(?)");
 
@@ -884,6 +918,7 @@ public void testCallableStatementBatch() throws SQLException {
         executeBatchCallableStatement(cs);
 
         cleanUpCallableStatement(cs, "timestamptab");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
 
         // Try with a user type
         cs = prepareCall("insert into usertypetab values(?)");
@@ -894,6 +929,7 @@ public void testCallableStatementBatch() throws SQLException {
         cs.addBatch();
         executeBatchCallableStatement(cs);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         cleanUpCallableStatement(cs, "usertypetab");
     }
     
@@ -906,6 +942,7 @@ private static void executeBatchCallableStatement(CallableStatement cs)
 
         updateCount = cs.executeBatch();
         assertEquals("there were 2 statements in the batch", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
             2, updateCount.length);
         for (int i=0; i<updateCount.length; i++) 
         {
@@ -1017,6 +1054,7 @@ public void testNoParametersPreparedBatch() throws SQLException {
         assertTableRowCount("T1", 3);
         stmt.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
     
@@ -1047,6 +1085,7 @@ public void testSingleValueSetPreparedBatch() throws SQLException {
 
         stmt.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
     
@@ -1071,6 +1110,7 @@ public void testMultipleValueSetPreparedBatch() throws SQLException {
         
         assertTableRowCount("T1", 3);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
     
@@ -1080,6 +1120,7 @@ public void testMultipleValueSetPreparedBatch() throws SQLException {
     // preparedStatement gives nullPointerException
     public void testMultipleValueSetNullPreparedBatch() throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         Statement stmt = createStatement();
         ResultSet rs;
 
@@ -1298,6 +1339,7 @@ public void testCombinationsOfClearPreparedStatBatch()
 
         pStmt.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
     
@@ -1317,6 +1359,7 @@ public void testPreparedStmtWithResultSetBatch() throws SQLException {
             /* Ensure the exception is the ResultSetReturnNotAllowed */
             /* "Select is first statement in the batch, 
              * so there should not be any update counts */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("X0Y79", pStmt, new long[] {});
         else if (usingDerbyNetClient())
             assertBatchExecuteError("XJ117", pStmt, new long[] {-3});
@@ -1359,6 +1402,7 @@ else if (usingDerbyNetClient())
         assertTableRowCount("T1", 0);
 
         // trying executeQuery in the middle of batch
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         println("Negative Prepared Statement: " +
             "testing executeQuery in the middle of batch");
         pStmt = 
@@ -1384,6 +1428,7 @@ else if (usingDerbyNetClient())
         assertTableRowCount("T1", 0);
 
         //  trying executeUpdate in the middle of batch
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         println("Negative Prepared Stat: " +
             "testing executeUpdate in the middle of batch");
         pStmt = 
@@ -1408,6 +1453,7 @@ else if (usingDerbyNetClient())
 
         assertTableRowCount("T1", 0);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
     
@@ -1429,6 +1475,7 @@ public void testPreparedStmtWithErrorsBatch() throws SQLException {
             /* Check to be sure the exception is the one we expect */
             /* Overflow is first statement in the batch, 
              * so there should not be any update count */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("22003", pStmt, new long[] {});
         else if (usingDerbyNetClient())
             assertBatchExecuteError("XJ208", pStmt, new long[] {-3});
@@ -1449,6 +1496,7 @@ else if (usingDerbyNetClient())
             /* Check to be sure the exception is the one we expect */
             /* Overflow is second statement in the batch, 
              * so there should be only 1 update count */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("22003", pStmt, new long[] {1});
         else if (usingDerbyNetClient())
             assertBatchExecuteError("XJ208", pStmt, new long[] {1,-3,1});
@@ -1459,6 +1507,9 @@ else if (usingDerbyNetClient())
         // trying select as the last statement
         println("Negative Prepared Stat: " +
             "testing overflow as last set of values");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         pStmt = prepareStatement("update t1 set c1=(? + 1)");
         pStmt.setInt(1, 1);
         pStmt.addBatch();
@@ -1470,6 +1521,7 @@ else if (usingDerbyNetClient())
             /* Check to be sure the exception is the one we expect */
             /* Overflow is last statement in the batch, 
              * so there should be 2 update counts */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             assertBatchExecuteError("22003", pStmt, new long[] {1,1});
         else if (usingDerbyNetClient())
             assertBatchExecuteError("XJ208", pStmt, new long[] {1,1,-3});
@@ -1479,6 +1531,10 @@ else if (usingDerbyNetClient())
         pStmt.close();
         stmt.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         commit();
     }
     
@@ -1542,6 +1598,8 @@ else if (usingDerbyNetClient())
         stmt.close();
         stmt2.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
         rollback();
         conn2.rollback();
         conn2.close();
@@ -1603,6 +1661,7 @@ public void testContinueAfterError() throws SQLException {
         // Embedded stops processing the batch on the first failure, and only
         // the update count from the successful statement is returned. The
         // client driver continues after the failure, so it'll also drop C.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         long[] expectedCounts = usingEmbedded() ?
             new long[]{0} : new long[]{0, Statement.EXECUTE_FAILED, 0};
 
@@ -1640,6 +1699,7 @@ public  static  class   BatchUpdateExceptionWrapper
 
         public BatchUpdateExceptionWrapper( BatchUpdateException wrappedException )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
             _wrappedException = wrappedException;
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
index e91dfebe83..1af0414961 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobClob4BlobTest.java
@@ -87,6 +87,7 @@ public void setUp() throws  Exception {
         checkSmallPageSize(stmt, "TESTBLOB");
 
         stmt.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2519
         commit();
     }
 
@@ -125,6 +126,8 @@ public void testUnconsumedParameter() throws SQLException
         PreparedStatement ps = prepareStatement( sql);
         ps.setBinaryStream( 1, is,data.length);
         //DERBY-4312 Make sure commit() doesn't interfere here
+//IC see: https://issues.apache.org/jira/browse/DERBY-4312
+//IC see: https://issues.apache.org/jira/browse/DERBY-4224
         commit();
         ps.executeUpdate();          
         // Make sure things still work ok when we have a parameter that does get consumed.
@@ -224,6 +227,8 @@ public void testSetCharacterStream() throws Exception {
                 clobLength, CharAlphabet.tamil());
         ps.setCharacterStream(1, streamReader, clobLength);
         //DERBY-4312 make sure commit() doesn't interfere
+//IC see: https://issues.apache.org/jira/browse/DERBY-4312
+//IC see: https://issues.apache.org/jira/browse/DERBY-4224
         commit();
         ps.executeUpdate();
         streamReader.close();
@@ -402,6 +407,7 @@ public void baseTestTriggersWithClobColumn(boolean useOrderBy)
         stmt.executeUpdate(
                 "create trigger T13A after update on testClob " +
                 "referencing new as n old as o " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3220
                 "for each row "+
                 "insert into testClobTriggerA(a, b) values (n.a, n.b)");
         stmt.executeUpdate(
@@ -421,6 +427,8 @@ public void baseTestTriggersWithClobColumn(boolean useOrderBy)
         Statement trigASt = createStatement();
         Statement trigBSt = createStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
         ResultSet origRS  = null;
         ResultSet trigARS = null;
         ResultSet trigBRS = null;
@@ -435,6 +443,8 @@ public void baseTestTriggersWithClobColumn(boolean useOrderBy)
             trigBRS = 
                 trigBSt.executeQuery(
                     "select a, length(a), b from testClobTriggerB order by b");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4122
+//IC see: https://issues.apache.org/jira/browse/DERBY-1895
 
         } else {
             origRS = 
@@ -456,6 +466,7 @@ public void baseTestTriggersWithClobColumn(boolean useOrderBy)
             assertTrue("statement trigger produced less rows " +
                     count, trigBRS.next());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
             Clob origClob = origRS.getClob(1);
             if (origClob != null) {
                 assertEquals("FAIL - Invalid checksum for row trigger",
@@ -501,6 +512,10 @@ public void baseTestTriggersWithClobColumn(boolean useOrderBy)
      **/
     public void testTriggersWithClobColumnOrderBy() 
         throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
 
         baseTestTriggersWithClobColumn(true);
     }
@@ -715,6 +730,7 @@ private void runPositionClobTest() throws Exception {
                 for (int i=0; i<10; i++) {
                     // find a random string to search for
                     start = Math.max(random.nextInt(clobLength - 1), 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1917
                     length = random.nextInt(clobLength - start) + 1;
                     println("start:" + start + " length:" + length);
                     searchString = clob.getSubString(start, length);
@@ -818,6 +834,7 @@ public void testGetClobFromIntColumn() throws Exception{
             try {
                 Clob clob = rs.getClob(1);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2768
                 rs.close(); // Cleanup on fail
                 stmt.close();
 
@@ -853,6 +870,7 @@ public void testSetClobToIntColumn() throws Exception {
                     ps.setInt(2, clobLength);
                     ps.executeUpdate();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2768
                     rs.close(); // Cleanup on fail
                     stmt.close();
 
@@ -999,6 +1017,8 @@ public void testSetClob() throws Exception {
      * Test Clob.position()
      */
     public void testPositionAgressiveUseOrderBy() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
         throws Exception {
             baseTestPositionAgressive(true);
     }
@@ -1008,6 +1028,10 @@ public void testPositionAgressiveDoNotUseOrderBy()
     }
 
     public void baseTestPositionAgressive(boolean useOrderBy) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
         throws Exception {
         Statement s = createStatement();
 
@@ -1069,6 +1093,8 @@ public void baseTestPositionAgressive(boolean useOrderBy)
         psp.setString(1, pstr);
         psp.executeUpdate();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
         checkClob8(s, pstr, useOrderBy);
         commit();
 
@@ -1129,6 +1155,10 @@ public void baseTestPositionAgressive(boolean useOrderBy)
         commit();
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
         checkClob8(s, pstr, useOrderBy);
         commit();
 
@@ -1216,6 +1246,8 @@ private static int addPatternPrefix(
     }
 
     private static void checkClob8(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
     Statement   s, 
     String      pstr,
     boolean     useOrderBy) 
@@ -1251,6 +1283,8 @@ private static void checkClob8(
     }
 
     private static void checkClob8(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6154
+//IC see: https://issues.apache.org/jira/browse/DERBY-6092
     Statement   s, 
     Clob        pstr,
     boolean     useOrderBy) 
@@ -1362,6 +1396,7 @@ public void testLockingClob() throws Exception {
         try {
             stmt2.executeUpdate(
                     "update testClob set b = b + 1 where b = 10000");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2768
             stmt2.close(); // Cleanup on fail
             conn2.rollback();
             conn2.close();
@@ -1377,6 +1412,7 @@ public void testLockingClob() throws Exception {
         assertEquals("FAIL: clob length changed", 10000, clob.length());
         
         // Test that update goes through after the transaction is committed
+//IC see: https://issues.apache.org/jira/browse/DERBY-3098
         commit();
         stmt2.executeUpdate("update testClob set b = b + 1 where b = 10000");
         
@@ -1433,7 +1469,9 @@ public void testLockingWithLongRowClob() throws Exception
         try {
             stmt2.executeUpdate(
                     "update testClob set el = 'smurfball' where b = 1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2768
             stmt2.close(); // Cleanup on fail
+//IC see: https://issues.apache.org/jira/browse/DERBY-3098
             conn2.rollback();
             conn2.close();
             fail("FAIL - statement should timeout");
@@ -1485,6 +1523,7 @@ public void testClobAfterCommit() throws Exception {
         try {
             shortClob.length();
             //Should have thrown an SQLException in the
+//IC see: https://issues.apache.org/jira/browse/DERBY-2787
             fail("FAIL - should not be able to access Clob after commit");
         } catch (SQLException e) {
             //The same SQLState String INVALID_LOB
@@ -1587,6 +1626,7 @@ public void testClobAfterClosingConnection() throws Exception {
             //Clobs on the Embedded side and the NetworkClient
             //side are not accessible after closing the
             //connection. Should have thrown an SQLException here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
             fail("FAIL - should not be able to access Clob after " +
                     "Connection Close");
         }
@@ -1665,6 +1705,7 @@ public void testClobAfterClosingConnection() throws Exception {
      */
     public void testClobAfterCommitWithSecondClob() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3365
         getConnection().setAutoCommit(false);
         Statement s1 = createStatement();
         ResultSet rs1 = s1.executeQuery("values cast('first' as clob)");
@@ -1745,6 +1786,7 @@ private void checkContentsBeforeAndAfterUpdatingClob(ResultSet rs)
         assertEquals("FAIL - wrong clob value", expectedValue, value);
         // update contents
         value = updatedClobData + rs.getInt(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2519
         c.setString(1, value);
         rs.updateClob(2, c);
         rs.updateRow();
@@ -1949,6 +1991,7 @@ public void testPositionBytes() throws Exception {
                     length = random.nextInt(blobLength - start) + 1;
                     println("start:" + start + " length:" + length);
                     searchBytes = blob.getBytes(start, length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
                     String searchString = new String(searchBytes, "US-ASCII");
                     // get random position to start the search from
                     distance = random.nextInt(maxStartPointDistance);
@@ -1980,6 +2023,7 @@ public void testPositionBytes() throws Exception {
      * actions and arguments.
      */
     public void testPositionBlobDeterministic()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3766
             throws IOException, SQLException {
         getConnection().setAutoCommit(false);
         final int size = 100000;
@@ -2078,6 +2122,7 @@ public void testPositionBlob() throws Exception {
                     start = Math.max(random.nextInt(blobLength - 1), 1);
                     length = random.nextInt(blobLength - start) + 1;
                     println("start:" + start + " length:" + length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
                     searchString = new String(blob.getBytes(start, length),"US-ASCII");
                     // get random position to start the search from
                     distance = random.nextInt(maxStartPointDistance);
@@ -2106,6 +2151,7 @@ public void testPositionBlob() throws Exception {
                     start = rs2.getInt(3);
 
                     searchString = new String(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
                             searchBlob.getBytes(1L, (int)searchBlob.length()),"US-ASCII");
                     println("startSearchPos: " + startSearchPos +
                             "searchString: " + searchString);
@@ -2138,6 +2184,7 @@ public void testTriggerWithBlobColumn() throws Exception {
         stmt.executeUpdate(
                 "create trigger T8A after update on testBlob " +
                 "referencing new as n old as o " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3220
                 "for each row "+
                 "insert into blobTest8TriggerA(a, b, crc32) " +
                 "values (n.a, n.b, n.crc32)");
@@ -2235,6 +2282,7 @@ public void testGetBlobFromIntColumn() throws Exception {
             // get the first column as a clob
             try {
                 Blob blob = rs.getBlob(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2768
                 rs.close();
                 stmt.close();
                 fail("FAIL - getBlob on int column should throw an " +
@@ -2268,6 +2316,7 @@ public void testSetBlobOnIntColumn() throws Exception {
                 try {
                     ps.setBlob(1,blob);
                     ps.executeUpdate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2768
                     rs.close();
                     stmt.close();
                     ps.close();
@@ -2359,6 +2408,8 @@ public void testRaisingOfExceptionsBlob() throws Exception {
                 // 0 or negative position value
                 try {
                     blob.position(blob, -42);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4785
+//IC see: https://issues.apache.org/jira/browse/DERBY-4785
                     fail("FAIL - position with negative start " +
                             "position should have caused an exception");
                 } catch (SQLException e) {
@@ -2505,8 +2556,10 @@ public void testLockingBlob() throws Exception {
             
             stmt2.executeUpdate(
                     "update testBlob set b = b + 1 where b = 10000");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2768
             stmt.close();
             stmt2.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3098
             conn2.rollback();
             conn2.close();
             fail("FAIL - should have gotten lock timeout");
@@ -2530,6 +2583,8 @@ public void testLockingBlob() throws Exception {
         assertTrue(shortBlob != null);
         
         // Test that update goes through after the transaction is committed
+//IC see: https://issues.apache.org/jira/browse/DERBY-4312
+//IC see: https://issues.apache.org/jira/browse/DERBY-4224
         commit();
         stmt2.executeUpdate("update testBlob set b = b + 1 where b = 10000");
         
@@ -2592,8 +2647,10 @@ public void testLockingWithLongRowBlob() throws Exception
         stmt2 = conn2.createStatement();
         try {
             stmt2.executeUpdate("update testBlob set el = null where b = 1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2768
             stmt2.close();
             stmt.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3098
             conn2.rollback();
             conn2.close();
             fail("FAIL - statement should timeout");
@@ -2660,6 +2717,7 @@ public void testBlobAfterCommit() throws Exception {
             shortBlob.length();
             fail("FAIL - should not be able to access Blob after commit");
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2770
             checkException(INVALID_LOB, e);
         }
 
@@ -2669,6 +2727,7 @@ public void testBlobAfterCommit() throws Exception {
             blob.length();
             fail("FAIL - should not be able to access large Blob after commit");
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2770
             checkException(INVALID_LOB, e);
         }
         try {
@@ -2693,6 +2752,7 @@ public void testBlobAfterCommit() throws Exception {
             blob.position(blob,2);
             fail("FAIL - should not be able to access large Blob after commit");
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2770
             checkException(INVALID_LOB, e);
         }
     }
@@ -2728,6 +2788,7 @@ public void testBlobAfterClosingConnection() throws Exception {
         getConnection().close();
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2729
             long length = shortBlob.length();                        
             fail("FAIL - should get an exception, connection is closed");
         } catch (SQLException e) {
@@ -2740,6 +2801,7 @@ public void testBlobAfterClosingConnection() throws Exception {
             fail("FAIL - should not be able to access large lob " +
                     "after the connection is closed");
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2729
             checkException(NO_CURRENT_CONNECTION, e);
         }
         try {
@@ -2768,6 +2830,7 @@ public void testBlobAfterClosingConnection() throws Exception {
             fail("FAIL - should not be able to access large lob " +
                     "after the connection is closed");
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
             checkException(NO_CURRENT_CONNECTION, e);
         }
 
@@ -2861,12 +2924,14 @@ private void checkContentsBeforeAndAfterUpdatingBlob(ResultSet rs)
         b = rs.getBlob(2);
         // check contents
         value = b.getBytes(1, blobData.length() + 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
         expectedValue = (blobData + rs.getInt(1)).getBytes("US-ASCII");
         assertTrue("FAIL - wrong blob value",
                 Arrays.equals(value, expectedValue));
 
         // update contents
         value = (updatedBlobData + rs.getInt(1)).getBytes("US-ASCII");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2519
         b.setBytes(1, value);
         rs.updateBlob(2, b);
         rs.updateRow();
@@ -2897,6 +2962,8 @@ public void testGetBlobBeforeAndAfterUpdateStream() throws Exception {
                 "insert into testBlob (b, a) values (?, ?)");
         for (int i=0; i<10; i++) {
             ps.setInt(1, i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
             ps.setBytes(2, (blobData + i).getBytes("US-ASCII"));
             ps.execute();
         }
@@ -2926,6 +2993,8 @@ public void testGetBlobBeforeAndAfterUpdateStream() throws Exception {
     }
 
     private void updateBlobWithUpdateBinaryStream(ResultSet rs)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
     throws SQLException, UnsupportedEncodingException {
         Blob b;
         byte[] value, expectedValue;
@@ -2935,6 +3004,7 @@ private void updateBlobWithUpdateBinaryStream(ResultSet rs)
         b = rs.getBlob(2);
         // check contents
         value = b.getBytes(1, blobData.length() + 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
         expectedValue = (blobData + rs.getInt(1)).getBytes("US-ASCII");
         
         assertTrue("FAIL - wrong blob value",
@@ -2951,6 +3021,8 @@ private void updateBlobWithUpdateBinaryStream(ResultSet rs)
         b = rs.getBlob(2);
         // check contents
         value = b.getBytes(1, updatedBlobData.length() + 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
         expectedValue = (updatedBlobData + rs.getInt(1)).getBytes("US-ASCII");
         assertTrue("FAIL - wrong blob value",
                 Arrays.equals(value, expectedValue));
@@ -3008,6 +3080,7 @@ public void testSelfDestructiveClob() throws Exception {
         assertEquals("FAIL - invalid column size", clobLength, columnSize);
         assertEquals("FAIL - invalid column size", columnSize, clob.length());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2140
         rs.close();
         stmt.close();
     }
@@ -3046,6 +3119,7 @@ public void testSelfDestructiveClob2() throws Exception {
                     break;
                 columnSize += size;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2702
             fail("FAIL - should have got an IOException");
         } catch (java.io.IOException ioe) {
             if(usingEmbedded()) {
@@ -3168,7 +3242,9 @@ public void testNegativeTestDerby265Clob() throws Exception {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("BlobClob4BlobTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
         suite.addTest(baseSuite("embedded"));
         suite.addTest(
                 TestConfiguration.clientServerDecorator(baseSuite("client")));
@@ -3184,8 +3260,10 @@ public static Test suite() {
     }
 
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(
                 BlobClob4BlobTest.class, "BlobClob4BlobTest:" + name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2003
         return new CleanDatabaseTestSetup(
                 DatabasePropertyTestSetup.setLockTimeouts(suite, 2, 4));
     }
@@ -3463,6 +3541,7 @@ private void verifyInterval(Blob blob, long pos, int length,
             if (numBytes >= 0) {
                 byte[] readBytes = new byte[numBytes];
                 System.arraycopy(value, 0, readBytes, 0, numBytes);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3776
                 valueString = new String(readBytes, "US-ASCII");
                 assertEquals("FAIL - wrong substring value",
                         valueString, subStr);
@@ -3538,6 +3617,7 @@ public void testBlobContents(ResultSet rs) throws Exception {
      * @throws SQLException
      */
     public void testBlobInsert() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2523
         String[] typeNames = { "int", "char(10)", "varchar(80)", "long varchar",
                 "char(10) for bit data", "long varchar for bit data", "blob(80)" };
 
@@ -3589,6 +3669,7 @@ public void testBlobInsert() throws SQLException {
     private void checkException(String SQLState, SQLException se)
             throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4785
          assertSQLState(SQLState, se);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java
index e3559ca1e1..1c5d89cc37 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobStoredProcedureTest.java
@@ -55,7 +55,9 @@ public BlobStoredProcedureTest(String name) {
      * @return the test suite created.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2427
         if (JDBC.vmSupportsJSR169()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(
                 "empty: client not supported on JSR169; procs use DriverMgr");
         }
@@ -73,6 +75,7 @@ public static Test suite() {
     protected void setUp() throws SQLException, UnsupportedEncodingException {
     	 //Byte array obatined from the string
     	byte [] strBytes = testStr.getBytes("US-ASCII");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3775
 
         //initialize the locator to a default value.
         int locator = -1;
@@ -120,6 +123,7 @@ public void testBlobGetBytesSP() throws SQLException, UnsupportedEncodingExcepti
         // stored procedure
         String testSubStr = testStr.substring(0, 10);
         byte [] testSubBytes = testSubStr.getBytes("US-ASCII");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3775
 
         //create a callable statement and execute it to call the stored
         //procedure BLOBGETBYTES that will get the bytes
@@ -163,6 +167,7 @@ public void testBlobCreateLocatorSP() throws SQLException {
         //remember in setup a locator is already created
         //hence expected value is 2
         assertEquals("The locator values returned by " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3365
             "SYSIBM.BLOBCREATELOCATOR() are incorrect", 2, locator);
         cs.close();
     }
@@ -226,6 +231,7 @@ public void testBlobGetPositionFromBytesSP() throws Exception {
         cs.setInt(2, 1);
         //find the position of the bytes corresponding to
         //the String simple in the test string.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3775
         cs.setBytes(3, (new String("simple")).getBytes("US-ASCII"));
         cs.setLong(4, 1L);
         cs.executeUpdate();
@@ -321,6 +327,8 @@ public void testBlobTruncateSP() throws SQLException {
      */
     public void testBlobGetPositionFromLocatorSP() throws SQLException, UnsupportedEncodingException {
         String newString = "simple";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3775
+//IC see: https://issues.apache.org/jira/browse/DERBY-3775
         byte [] newBytes = newString.getBytes("US-ASCII");
         //initialize the locator to a default value.
         int locator = -1;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobUpdatableStreamTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobUpdatableStreamTest.java
index eff4c1e022..2c7378680b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobUpdatableStreamTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/BlobUpdatableStreamTest.java
@@ -58,6 +58,7 @@ public void testUpdatableBlob () throws Exception {
         blob.truncate (l);
         int ret = is.read();
         //should not be able to read after truncated value
+//IC see: https://issues.apache.org/jira/browse/DERBY-2830
         assertEquals ("stream update failed", -1, ret);
         byte [] buffer = new byte [1024];
         for (int i = 0; i < buffer.length; i++)
@@ -82,7 +83,9 @@ public void testUpdatableBlob () throws Exception {
     }
 
     public static Test suite () {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
         return TestConfiguration.defaultSuite (
+//IC see: https://issues.apache.org/jira/browse/DERBY-2830
                 BlobUpdatableStreamTest.class);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java
index cab36fe48f..c81a1021f9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java
@@ -108,6 +108,7 @@ public CacheSessionDataTest(String name) {
     /**
      * Adds both the embedded and client-server versions of the baseSuite to
      * the Test. An empty BaseTestSuite is returned unless we have JDBC3
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
  support, because all test cases call verifyCachedIsolation() which in
  turn makes use of getTransactionIsolationJDBC()
  (GET_TRANSACTION_ISOLATION_JDBC) which uses DriverManager to access the
@@ -126,6 +127,7 @@ public static Test suite() {
     
     /**
      * Creates a new BaseTestSuite with all the tests, and wraps it in a
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
  CleanDatabaseSetup with a custom decorator.
      * @param name BaseTestSuite name
      * @return wrapped TestSuite
@@ -214,6 +216,7 @@ protected void decorateSQL(Statement s) throws SQLException {
                         ".getCycleIsolationJDBC'");
  
                 s.execute("CREATE FUNCTION GET_CYCLE_ISOLATION_SQL " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
                         "() RETURNS VARCHAR(2) READS SQL DATA LANGUAGE JAVA " +
                         "PARAMETER STYLE JAVA EXTERNAL NAME '" +
                         CacheSessionDataTest.class.getName() + 
@@ -378,6 +381,7 @@ public static String getCycleIsolationSQL()
      * @throws java.sql.SQLException
      */
     public static void setSchema(String schemaName)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
             throws SQLException {
         Connection c = DriverManager.getConnection("jdbc:default:connection");
         Statement s = c.createStatement();
@@ -450,8 +454,11 @@ private void verifyCachedIsolation(Connection c) throws SQLException {
     }
     
     private void verifyCachedSchema(Connection c) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         if (usingDerbyNetClient()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
             String cached =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
                     ((ClientConnection) c).getCurrentSchemaName();
             Statement s = c.createStatement();
             ResultSet rs = s.executeQuery("VALUES CURRENT SCHEMA");
@@ -808,6 +815,7 @@ public void testLargePreparedScrollSensitiveReadOnly() throws SQLException {
                 ResultSet.CONCUR_READ_ONLY);
     }
     public void testLargePreparedScrollInsensitiveReadOnly()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
             throws SQLException {
         preparedCursorTest("BIG", ResultSet.TYPE_SCROLL_INSENSITIVE,
                 ResultSet.CONCUR_READ_ONLY);
@@ -817,6 +825,7 @@ public void testLargePreparedForwardOnlyUpdatable() throws SQLException {
                 ResultSet.CONCUR_UPDATABLE);
     }
     public void testLargePreparedScrollSensitiveUpdatable()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3192
             throws SQLException {
         preparedCursorTest("BIG", ResultSet.TYPE_SCROLL_SENSITIVE,
                 ResultSet.CONCUR_UPDATABLE);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CallableTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CallableTest.java
index a38fe5ab3f..68e82f4659 100755
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CallableTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CallableTest.java
@@ -130,6 +130,7 @@ public class CallableTest extends BaseJDBCTestCase {
         "OUT P9 DECIMAL(14,4)) EXTERNAL NAME '" + 
         CallableTest.class.getName() + ".bigDecimalInAndOutProc' " +
         "NO SQL LANGUAGE JAVA PARAMETER STYLE JAVA",
+//IC see: https://issues.apache.org/jira/browse/DERBY-2304
 
         "CREATE PROCEDURE BATCH_UPDATE_PROC " +
         "(P1 INT, P2 INT) MODIFIES SQL DATA " +
@@ -154,6 +155,7 @@ public class CallableTest extends BaseJDBCTestCase {
           "(maxcol NUMERIC(31,15), mincol NUMERIC(15,15), nulcol NUMERIC)"},
 
         // BATCH_UPDATE is used by BATCH_UPDATE_PROC
+//IC see: https://issues.apache.org/jira/browse/DERBY-2304
         { "BATCH_TABLE", 
           "CREATE TABLE BATCH_TABLE " +
           "(id int, tag varchar(32), " +
@@ -171,6 +173,7 @@ public CallableTest(String name) {
 
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("CallableTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(baseSuite("CallableTest:embedded"));
 
@@ -194,6 +197,7 @@ public static Test suite() {
     private static Test baseSuite(String name) {
 
         BaseTestSuite suite = new BaseTestSuite(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // Add tests that every JVM should be able to run.
         suite.addTestSuite(CallableTest.class);
@@ -206,6 +210,7 @@ private static Test baseSuite(String name) {
                 (new CallableTest("xtestUpdateLongBinaryProc"));
 
             // Tests that require DriverManager and batch update.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2304
             suite.addTest
                 (new CallableTest("xtestBatchUpdate"));
             suite.addTest
@@ -307,6 +312,7 @@ public void testNoInOneOutFunc() throws SQLException
     }
 
     public void testIsolationLevelChangeAfterFunctionCall()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3496
             throws SQLException {
         CallableStatement cs = prepareCall("? = CALL NO_IN_ONE_OUT_FUNC()");
         cs.registerOutParameter(1, java.sql.Types.INTEGER);
@@ -475,6 +481,7 @@ private void testTimeAndDateWithCalendar(Calendar cal1, Calendar cal2)
 
         assertSameDate(d, cal1, cs.getDate(5, cal2), cal2);
         assertSameTime(t, cal1, cs.getTime(6, cal2), cal2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5172
         vetTimestamp(ts, cal1, cs.getTimestamp(7, cal2), cal2);
     }
 
@@ -543,6 +550,7 @@ private void assertSameTime(java.util.Date expected, Calendar cal1,
      */
     private void vetTimestamp(Timestamp original, Calendar cal1,
                               Timestamp returned, Calendar cal2) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5172
 
         // Initialize cal1 with values from the original timestamp.
         cal1.clear();
@@ -671,6 +679,7 @@ public void xtestUpdateLongBinaryProc() throws SQLException
     public void xtestBatchUpdate() throws SQLException
     {
         // Setup table data
+//IC see: https://issues.apache.org/jira/browse/DERBY-2304
         Statement stmt = createStatement();
         stmt.executeUpdate("INSERT INTO BATCH_TABLE VALUES(1, 'STRING_1',10)");
         stmt.executeUpdate("INSERT INTO BATCH_TABLE VALUES(2, 'STRING_2',0)");
@@ -897,6 +906,7 @@ public void xtestBigDecimalInAndOutProc() throws SQLException
      * xtestNumericBoundariesProc, methods.
      */
     public void assertDecimalSameValue(String message, String expected_s, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2304
         BigDecimal actual)
     {
         BigDecimal expected = (new BigDecimal(expected_s));
@@ -1135,6 +1145,7 @@ public static void manyTypesInoutProc (
      * @exception SQLException if a database error occurs
      */
     public static void batchUpdateProc (int id, int id_newval)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2304
         throws SQLException
     {
         Connection conn = 
@@ -1154,6 +1165,7 @@ public static void batchUpdateProc (int id, int id_newval)
     
     public void testsetURL() throws SQLException, MalformedURLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6291
     	CallableStatement cs = prepareCall("call TWO_IN_ONE_OUT_PROC (?, ?, ?)");
     	try {
     		URL domain = new URL("http://www.apache.org");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CharacterStreamsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CharacterStreamsTest.java
index c83afa7611..d118ae342f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CharacterStreamsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/CharacterStreamsTest.java
@@ -221,6 +221,7 @@ private void runTestSetCharacterStreamLongValues() throws Exception {
                 "insert into charstream(c, vc, lvc, lob) " +
                 "values(?,?,?,?)");
         PreparedStatement psDel = prepareStatement("DELETE FROM charstream");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4040
         PreparedStatement psqSQLLength = prepareStatement(
                 "select length(c), length(vc), length(lvc), length(lob) " +
                 "from charstream");
@@ -567,6 +568,7 @@ private void checkAsciiStreams(
     }
 
     private Reader getSourceStream(int length, int bytesPerChar) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4040
         switch (bytesPerChar) {
             case 0:
                 return new c3Reader(length);
@@ -632,6 +634,7 @@ private void checkCharacterStreams(
 
         Reader r = rs.getCharacterStream(1);
         checkCharStream(r, cl, 25, bytesPerChar);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4040
 
         r = rs.getCharacterStream(2);
         checkCharStream(r, vcl, -1, bytesPerChar);
@@ -651,6 +654,7 @@ private void checkCharacterStreams(
         String suv = rs.getString(1);
         r = new StringReader(suv);
         checkCharStream(r, cl, 25, bytesPerChar);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4040
 
         suv = rs.getString(2);
         r = new StringReader(suv);
@@ -796,6 +800,8 @@ private void checkCharStream(Reader r, int length, int fixedLen,
     {
 
         Reader orig = getSourceStream(length, bytesPerChar);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4040
+//IC see: https://issues.apache.org/jira/browse/DERBY-4040
 
         int count = 0;
         for (;;) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java
index 06f7bc43d2..0020724dbf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java
@@ -53,6 +53,7 @@ public ClientConnectionPoolDataSourceTest(String name) {
     public void testMaxStatementsProperty() throws Exception {
         ClientConnectionPoolDataSourceInterface cDs;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
         if (JDBC.vmSupportsJNDI()) {
             clazz = Class.forName("org.apache.derby.jdbc.ClientConnectionPoolDataSource");
@@ -87,6 +88,7 @@ public void testMaxStatementsProperty() throws Exception {
      */
     public void testGetConnectionNoStatementPooling()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         ClientConnectionPoolDataSourceInterface cDs =
             (ClientConnectionPoolDataSourceInterface)J2EEDataSource.
                 getConnectionPoolDataSource();
@@ -104,6 +106,7 @@ public void testGetConnectionNoStatementPooling()
      */
     public void testGetConnectionWithStatementPooling()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         ClientConnectionPoolDataSourceInterface cDs =
             (ClientConnectionPoolDataSourceInterface)J2EEDataSource.
                 getConnectionPoolDataSource();
@@ -121,7 +124,10 @@ public void testGetConnectionWithStatementPooling()
      */
     private void verifyConnection(ClientConnectionPoolDataSourceInterface cDs)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3325
         J2EEDataSource.setBeanProperty(cDs, "createDatabase", "create");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3325
+//IC see: https://issues.apache.org/jira/browse/DERBY-3306
         PooledConnection pc = cDs.getPooledConnection();
         // Get a connection and make sure we can access the database.
         Connection con = pc.getConnection();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java
index 9ab4302e75..14ed2cf1aa 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobStoredProcedureTest.java
@@ -49,7 +49,9 @@ public ClobStoredProcedureTest(String name) {
      * @return the test suite created.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2427
         if (JDBC.vmSupportsJSR169()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(
                 "empty: client not supported on JSR169; procs use DriverMgr");
         }
@@ -133,6 +135,7 @@ public void testClobCreateLocatorSP() throws SQLException {
         //remember in setup a locator is already created
         //hence expected value is 2
         assertEquals("The locator values returned by " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3365
             "SYSIBM.CLOBCREATELOCATOR() are incorrect", 2, locator);
         cs.close();
     }
@@ -290,6 +293,7 @@ public void testClobTruncateSP() throws SQLException {
         cs.setInt(1, 1);
         cs.setLong(2, 10L);
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2600
             cs.execute();
         }
         catch(SQLException sqle) {
@@ -324,6 +328,7 @@ public void testClobGetPositionFromLocatorSP() throws SQLException {
         cs.setLong(3, newStr.length());
         cs.setString(4, newStr);
         cs.execute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2600
 
         cs.close();
         cs  = prepareCall
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobTest.java
index 203581a2e3..d9e021fa9e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobTest.java
@@ -209,6 +209,7 @@ public void testInsertStringInMiddle_Multibyte()
         assertEquals(1, this.clob.setString(9, "c"));
         assertEquals(1, this.clob.setString(5, "a"));
         assertEquals(1, this.clob.setString(6, "b"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
 	    assertEquals("Clob content is incorrect",
             newContent, this.clob.getSubString(1, newContent.length()));
     }
@@ -217,6 +218,7 @@ public void testInsertStringInMiddle_Multibyte()
      * Tests that the length is updated correctly when inserting data.
      */
     public void testLengthAfterInsertOnEmpty()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
             throws IOException, SQLException {
         insertDataWithToken("", 0, 0, SET_STRING);
         assertEquals(0L, clob.length());
@@ -257,6 +259,7 @@ public void testLengthAfterInsertOnLarge()
     }
 
     public void testReplaceMultibyteWithSingleByteForwards()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
             throws IOException, SQLException {
         // Add some content to work on first.
         this.clob.setString(1, NORWEGIAN_LETTERS);
@@ -307,6 +310,7 @@ public void testReplaceMultibyteWithSingleByteBackwards()
      * ID USAGE: reads id 2, writes id 10002
      */
     public void testInsertCharacter_ReadOnlyToTemporary()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3793
             throws IOException, SQLException {
         setAutoCommit(false);
         // Insert data, a medium sized Clob to store it as a stream.
@@ -386,6 +390,7 @@ public void testPositionWithString_CJK()
         final long prefix = 11L;
         final long postfix = 90L;
         char[] tmpChar = new char[1];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         LoopingAlphabetReader tokenSrc =
             new LoopingAlphabetReader(1L, CharAlphabet.cjkSubset());
         tokenSrc.read(tmpChar);
@@ -399,6 +404,7 @@ public void testPositionWithString_CJK()
      * Test setString() refuses wrong offset. 
      */
     public void testSetStringOnWrongOffset() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2769
         clob.setString(1, "TEST");
         long upperLimit = clob.length() + 1;
         String str = "AGAIN";
@@ -501,6 +507,7 @@ public void testSetStringWithEmptyString() throws SQLException {
      * Truncating a Clob to the empty string.
      */
     public void testTruncateZeroOnDisk()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3991
             throws IOException, SQLException {
         long size = 33*1024+7;
         insertDataWithToken("", size, 0, SET_CHARACTER_STREAM);
@@ -537,6 +544,7 @@ private void truncateToZero(long initSize)
      * Truncating a Clob to the current length should work.
      */
     public void testTruncateExactOnDisk()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3978
             throws IOException, SQLException {
         long size = 33*1024+7;
         insertDataWithToken("", size, 0, SET_CHARACTER_STREAM);
@@ -587,6 +595,8 @@ public void testTruncateTooLongInMemory()
             this.clob.truncate(size * 2);
             fail("Truncate should have failed, position too large");
         } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3977
+//IC see: https://issues.apache.org/jira/browse/DERBY-3977
             assertSQLState("XJ079", sqle);
         }
     }
@@ -622,6 +632,7 @@ public void testGetLengthAfterTruncate()
      * @throws SQLException if something goes wrong
      */
     public void testCloningThroughAddBatchWithStream()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4278
             throws SQLException {
         testCloningThroughAddBatch(true, true);
         testCloningThroughAddBatch(true, false);
@@ -859,6 +870,7 @@ protected void setUp()
         // Obtain a Clob containing the empty string ("").
         Statement stmt = createStatement();
         // Keep reference to the result set to be able to close it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3934
         ResultSet rs = stmt.executeQuery(
                 "select dClob from ClobTestData where id = 1");
         assertTrue(rs.next());
@@ -1025,6 +1037,7 @@ protected void setUp() throws SQLException {
             Connection con = getConnection();
             Statement stmt = con.createStatement();
             stmt.execute("create table ClobTestData (" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3793
                     "id int unique, dClob CLOB)");
             stmt.executeUpdate("insert into ClobTestData values (1, '')");
             stmt.close();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java
index 7728f4b9df..3f620c5cda 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClobUpdatableReaderTest.java
@@ -53,8 +53,10 @@ public ClobUpdatableReaderTest (String name) {
      * Test updating a large clob
      */
     public void testUpdateableStoreReader () throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2806
         getConnection().setAutoCommit (false);
         PreparedStatement ps = prepareStatement ("insert into updateClob " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2712
                 "(id , data) values (? ,?)");
         ps.setInt (1, 2);
         StringBuffer sb = new StringBuffer ();
@@ -179,6 +181,7 @@ public void testUpdateableReader () throws Exception {
      */
     public void testMultiplexedOperationProblem()
             throws IOException, SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2806
         getConnection().setAutoCommit(false);
         int length = 266000;
         PreparedStatement ps = prepareStatement(
@@ -221,6 +224,7 @@ public void testMultiplexedOperationProblem()
         lastReadAscii = assertCorrectChar(lastReadAscii, ra.read());
         lastReadChar = assertCorrectChar(lastReadChar, r.read());
         // Close resources.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2806
         r.close();
         ra.close();
         rs.close();
@@ -268,6 +272,7 @@ private String getUnicodeString () {
         for (int i = 0; i < 4; i++) {
             sb.append (fill);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2806
         return sb.toString();
     }
 
@@ -285,7 +290,9 @@ public void setUp() throws Exception {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite ts = new BaseTestSuite("ClobUpdatableReaderTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2763
         ts.addTest(TestConfiguration.defaultSuite(
                     ClobUpdatableReaderTest.class));
         BaseTestSuite encSuite =
@@ -299,6 +306,7 @@ public static Test suite() {
      * Cleans up the database.
      */
     protected void tearDown() throws java.lang.Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2806
         rollback();
         Statement stmt = createStatement ();
         stmt.execute ("drop table updateClob");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java
index b7fceebafb..d9e00e975e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java
@@ -140,6 +140,7 @@ public void testClosedObjects() throws Throwable {
     private boolean isImplemented() throws NoSuchMethodException {
         // Check if the method is implemented in one of the Derby classes
         // that the JDBC object belongs to.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Class<?> c = decorator_.getClosedObject().getClass();
                 c != null; c = c.getSuperclass()) {
             if (c.getName().startsWith("org.apache.derby.")) {
@@ -163,7 +164,9 @@ private boolean isImplemented() throws NoSuchMethodException {
 
     /** Creates a suite with all tests in the class. */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ClosedObjectTest suite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5872
         suite.addTest(baseSuite(false));
         suite.addTest(baseSuite(true));
         return suite;
@@ -179,6 +182,7 @@ public static Test suite() {
      * @exception Exception if an error occurs while building the test suite
      */
     private static Test baseSuite(boolean network) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite topSuite = new BaseTestSuite(
             "ClosedObjectTest:" + (network ? "client" : "embedded"));
 
@@ -194,6 +198,7 @@ private static Test baseSuite(boolean network) {
 
             // Plain connection pool test.
             topSuite.addTest(poolSuite(Collections.emptyMap()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5872
 
             // The client driver has a variant of connection pool that caches
             // and reuses JDBC statements. Test it here by setting the
@@ -203,6 +208,7 @@ private static Test baseSuite(boolean network) {
                         "maxStatements", Integer.valueOf(5))));
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite xaSuite = new BaseTestSuite("ClosedObjectTest XA");
             XADataSourceDecorator xaDecorator = new XADataSourceDecorator(xaSuite);
             topSuite.addTest(xaDecorator);
@@ -222,6 +228,7 @@ private static Test baseSuite(boolean network) {
      * @return a suite
      */
     private static Test poolSuite(Map dsProps) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite poolSuite = new BaseTestSuite(
                 "ClosedObjectTest ConnectionPoolDataSource");
         PoolDataSourceDecorator poolDecorator =
@@ -243,6 +250,7 @@ private static Test poolSuite(Map dsProps) {
     private static void fillDataSourceSuite(BaseTestSuite suite,
                                             DataSourceDecorator dsDecorator)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite rsSuite = new BaseTestSuite("Closed ResultSet");
         ResultSetObjectDecorator rsDecorator =
             new ResultSetObjectDecorator(rsSuite, dsDecorator);
@@ -286,6 +294,7 @@ private static void fillObjectSuite(BaseTestSuite suite,
                                         ObjectDecorator decorator,
                                         Class iface)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2324
         Method[] methods = iface.getMethods();
         for (int i = 0; i < methods.length; i++) {
             ClosedObjectTest cot = new ClosedObjectTest(methods[i], decorator);
@@ -326,6 +335,7 @@ private static Object getNullValueForType(Class type) {
             return Boolean.FALSE;
         }
         if (type == Character.TYPE) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             return (char) 0;
         }
         if (type == Byte.TYPE) {
@@ -373,6 +383,8 @@ public ObjectDecorator(Test test, DataSourceDecorator decorator) {
 
         /** Tears down the test environment. */
         protected void tearDown() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             object_ = null;
         }
 
@@ -415,6 +427,7 @@ public final void checkException(Method method, SQLException sqle)
                 throw sqle;
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2324
             if (sqle.getSQLState().startsWith("0A")) {
                 // method is not supported, so we don't expect closed object
                 // exception
@@ -519,6 +532,8 @@ public void setUp() throws SQLException {
          */
         public void tearDown() throws Exception {
             stmt_.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             stmt_ = null;
             super.tearDown();
         }
@@ -539,6 +554,7 @@ protected void checkSQLState(Method method, SQLException sqle)
                 String methodString=method.getName();
                 if (methodString.indexOf("(") > 1 )
                     methodString=methodString.substring(0, (methodString.length() -2));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
                 assertTrue("method = " + method.toString() + ", but message: " + sqle.getMessage(),
                            sqle.getMessage().indexOf(methodString) > 0); 
                 // everything is OK, do nothing
@@ -588,6 +604,7 @@ protected void checkSQLState(Method method, SQLException sqle)
             throws SQLException
         {
             String sqlState = sqle.getSQLState();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1395
             if (sqlState.equals("XJ012")) {
                 // expected, do nothing
             } else {
@@ -723,6 +740,7 @@ public void setUp() throws SQLException {
         protected void checkSQLState(Method method, SQLException sqle)
             throws SQLException
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2324
             if (method.getName().equals("setClientInfo") &&
                     method.getParameterTypes().length == 1 &&
                     method.getParameterTypes()[0] == Properties.class) {
@@ -763,6 +781,7 @@ public DataSourceDecorator(Test test) {
          * @exception SQLException if an error occurs
          */
         public final void setUp() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2324
              connection_ = newConnection();
         }
 
@@ -795,6 +814,8 @@ public final Connection newConnection() throws SQLException {
         public final void tearDown() throws SQLException {
             connection_.rollback();
             connection_.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             connection_ = null;
         }
 
@@ -805,9 +826,12 @@ public final void tearDown() throws SQLException {
          * @exception SQLException if an error occurs
          */
         protected Connection newConnection_() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             DataSource ds = JDBCDataSource.getDataSource();
             // make sure the database is created when running the test
             // standalone
+//IC see: https://issues.apache.org/jira/browse/DERBY-2324
             JDBCDataSource.setBeanProperty(ds, "connectionAttributes",
                                            "create=true");
             return ds.getConnection();
@@ -829,6 +853,7 @@ private static class PoolDataSourceDecorator extends DataSourceDecorator {
          */
         public PoolDataSourceDecorator(Test test, Map dsProps) {
             super(test);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5872
             this.dsProps = dsProps;
         }
 
@@ -840,7 +865,10 @@ public PoolDataSourceDecorator(Test test, Map dsProps) {
          * @exception SQLException if an error occurs
          */
         protected Connection newConnection_() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             ConnectionPoolDataSource ds = J2EEDataSource.getConnectionPoolDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5872
             for (Iterator it = dsProps.entrySet().iterator(); it.hasNext(); ) {
                 Map.Entry e = (Map.Entry) it.next();
                 J2EEDataSource.setBeanProperty(
@@ -873,6 +901,8 @@ public XADataSourceDecorator(Test test) {
          * @exception SQLException if an error occurs
          */
         protected Connection newConnection_() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             XADataSource ds = J2EEDataSource.getXADataSource();
             XAConnection xac = ds.getXAConnection();
             return xac.getConnection();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Compat_BlobClob4BlobTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Compat_BlobClob4BlobTest.java
index cc16e102c4..e098ffef7f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Compat_BlobClob4BlobTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Compat_BlobClob4BlobTest.java
@@ -56,6 +56,7 @@ protected void tearDown() throws Exception {
      *
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Compat_BlobClob4BlobTest");
         /* Embedded is not relevant for a running server....
          suite.addTest(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java
index fc7bfda9cc..3b446e61b3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java
@@ -49,6 +49,7 @@ public void setUp()
         // For the concurrency tests, we recreate the model
         // for each testcase (since we do commits)
         SURDataModelSetup.createDataModel
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
             (SURDataModelSetup.SURDataModel.MODEL_WITH_PK, getConnection());
         commit();
     }
@@ -108,6 +109,8 @@ public void testUpdateLockDownGrade1()
     public void testAquireUpdateLock1()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement();
         ResultSet rs = s.executeQuery("select * from t1");
         
@@ -127,6 +130,10 @@ public void testAquireUpdateLock1()
             con2.rollback();
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s2.close();
         con2.close();
         s.close();
@@ -139,6 +146,8 @@ public void testAquireUpdateLock1()
     public void testSharedLocks1()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                           ResultSet.CONCUR_READ_ONLY);
         final ResultSet rs = s.executeQuery("select * from t1");
@@ -165,9 +174,12 @@ public void testSharedLocks1()
     public void testSharedLocks2()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement();
         ResultSet rs = s.executeQuery("select * from t1");
         scrollForward(rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection con2 = openDefaultConnection();
         Statement s2 = con2.createStatement();
         try {
@@ -203,6 +215,12 @@ public void testSharedAndUpdateLocks1()
             con2.rollback();
             con2.close();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s.close();
     }
     
@@ -214,10 +232,19 @@ public void testSharedAndUpdateLocks1()
     public void testSharedAndUpdateLocks2()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                           ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = s.executeQuery("select * from t1 for update");
         scrollForward(rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection con2 = openDefaultConnection();
         Statement s2 = con2.createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                             ResultSet.CONCUR_READ_ONLY);
@@ -303,6 +330,8 @@ public void testUpdatePurgedTuple1()
         println("T1: updateInt(2, 3);");
         rs.updateRow();
         println("T1: updateRow()");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit();
         println("T1: commit");
         rs = s.executeQuery("select * from t1");
@@ -358,6 +387,8 @@ public void testUpdatePurgedTuple2()
                 rs.getInt(2) + "," +
                 rs.getInt(3) + ")");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         PreparedStatement ps = prepareStatement
             ("update T1 set a=? where current of " + rs.getCursorName());
         ps.setInt(1, 3);
@@ -418,6 +449,7 @@ public void testUpdatePurgedTuple3()
             ps2.executeUpdate();
             con2.commit();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
             ps2 = con2.prepareStatement("insert into t1 values(?,?,?,?,?)");
             ps2.setInt(1, firstKey);
             ps2.setInt(2, -1);
@@ -441,6 +473,8 @@ public void testUpdatePurgedTuple3()
         rs.updateRow();
         println("T1: updated column 2, to value=3");
         println("T1: commit");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit();
         rs = s.executeQuery("select * from t1");
         while (rs.next()) {
@@ -503,6 +537,7 @@ public void testUpdatePurgedTuple4()
             con2.commit();
             println("T3: commit");
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
             ps2 = con2.prepareStatement("insert into t1 values(?,?,?,?,?)");
             ps2.setInt(1, firstKey);
             ps2.setInt(2, valA);
@@ -602,6 +637,11 @@ public void testUpdateModifiedTuple1()
     public void testUpdateModifiedTuple2()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         getConnection().setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_UPDATABLE);
@@ -658,6 +698,7 @@ public void testUpdateModifiedTuple2()
     public void testTableIntentLock1()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         getConnection().setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_UPDATABLE);
@@ -670,6 +711,14 @@ public void testTableIntentLock1()
         } // Now the cursor does not point to any tuples
         
         // Compressing the table in another transaction:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection con2 = openDefaultConnection();
         
         con2.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
@@ -702,7 +751,10 @@ public void testTableIntentLock1()
     public void testUpdateLockInReadUncommitted()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         getConnection().setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                           ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = s.executeQuery("select * from t1");
@@ -758,6 +810,8 @@ private void testCompressDuringScan(boolean testDefragment,
                                         boolean testTruncate)
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         getConnection().setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
         Statement delStatement = createStatement();
         // First delete all records except the last and first
@@ -768,6 +822,8 @@ private void testCompressDuringScan(boolean testDefragment,
         assertEquals("Invalid number of records deleted", expectedDeleted, 
                      deleted);
         delStatement.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit();
         println("T1: commit");
         
@@ -787,6 +843,7 @@ private void testCompressDuringScan(boolean testDefragment,
                     rs.getInt(3) + ")");
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         final Connection con2 = openDefaultConnection();
         con2.setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
         final PreparedStatement ps2 = con2.prepareStatement
@@ -827,6 +884,14 @@ private void testCompressDuringScan(boolean testDefragment,
         println("T1: updateInt(2, 3);");
         rs.updateRow();
         println("T1: updateRow()");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit();
         println("T1: commit");
         rs = s.executeQuery("select * from t1");
@@ -836,7 +901,17 @@ private void testCompressDuringScan(boolean testDefragment,
                     rs.getInt(2) + "," +
                     rs.getInt(3) + ")");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         con2.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s.close();
     }
     
@@ -848,7 +923,9 @@ private void testCompressDuringScan(boolean testDefragment,
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         final BaseTestSuite suite = new BaseTestSuite("ConcurrencyTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2021
         suite.addTest(baseSuite("ConcurrencyTest:embedded", true));
         
         suite.addTest(
@@ -861,6 +938,7 @@ public static Test suite()
     }
     
     private static Test baseSuite(String name, boolean embedded) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         final BaseTestSuite suite = new BaseTestSuite(name);
         
         // This testcase does not require JDBC3/JSR169, since it does not
@@ -876,6 +954,7 @@ private static Test baseSuite(String name, boolean embedded) {
             suite.addTest(new ConcurrencyTest("testSharedLocks1"));
             suite.addTest(new ConcurrencyTest("testSharedAndUpdateLocks1"));
             suite.addTest(new ConcurrencyTest("testSharedAndUpdateLocks2"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4785
             suite.addTest(new ConcurrencyTest ("testUpdatePurgedTuple2"));
             suite.addTest(new ConcurrencyTest("testUpdatePurgedTuple3"));
             suite.addTest(new ConcurrencyTest("testUpdatePurgedTuple4"));
@@ -889,12 +968,14 @@ private static Test baseSuite(String name, boolean embedded) {
             
             // This testcase fails in DerbyNetClient framework due to 
             // DERBY-1696
+//IC see: https://issues.apache.org/jira/browse/DERBY-2021
             if (embedded) {
                 suite.addTest
                     (new ConcurrencyTest("testUpdatePurgedTuple1"));
             }        
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2021
         return suite;
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java
index 25f6a29904..4c7426465d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java
@@ -59,6 +59,7 @@ public void testConcurrentAutoloading() throws Exception {
         final String user = tc.getUserName();
         final String pw = tc.getUserPassword();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         final List<Throwable> errors =
                 Collections.synchronizedList(new ArrayList<Throwable>());
 
@@ -66,6 +67,7 @@ public void testConcurrentAutoloading() throws Exception {
             public void run() {
                 try {
                     DriverManager.getConnection(url, user, pw);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                     println("Successfully connected!");
                 } catch (Throwable t) {
                     println("Failed to connect!");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java
index 6a900b22fa..21ceb074bd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DMDBugsTest.java
@@ -86,6 +86,7 @@ public void testDerby3000() throws SQLException, IOException {
 	/* Default suite for running this test.
 	 */
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DMDBugsTest");
 		suite.addTest(
 				TestConfiguration.defaultSuite(DMDBugsTest.class));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java
index 7d00974ea5..2d2cb1158c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java
@@ -33,6 +33,7 @@
 public class DSCreateShutdownDBTest extends BaseJDBCTestCase {
 
     static final String[] ADDITIONAL_DBS = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         "dscreateconatdb1",
         "dscreateshutdowndb1", 
         "dscreateshutdowndb2",
@@ -53,6 +54,7 @@ public DSCreateShutdownDBTest(String name) {
 
     public static Test suite() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DSCreateShutdownDBTest");
         Test test = TestConfiguration.defaultSuite(DSCreateShutdownDBTest.class);        
         //Test test = TestConfiguration.clientServerSuite(DSCreateShutdownDBTest.class);
@@ -75,6 +77,7 @@ public void tearDown() throws Exception {
         // attempt to get rid of any databases. 
         // only 5 dbs (in addition to defaultdb) should actually get
         // created, but just in case, try all...
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         TestConfiguration conf = TestConfiguration.getCurrent();
         for (int i = 0; i < ADDITIONAL_DBS.length; i++) {
             removeDirectory(conf.getDatabasePath("emb" + ADDITIONAL_DBS[i]));
@@ -108,9 +111,11 @@ public void testCreateAndShutdown() throws SQLException {
         assertNotSetAndGet(dbName, "shutdownDatabase", "false");
         assertNotSetAndGet(dbName, "createDatabase", "false");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         assertReset(dbName);
         
         // check that create using ConnAttributes works
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         assertCreateUsingConnAttrsOK(composeDatabaseName(ADDITIONAL_DBS[0]));
         
         // check that shutting down using ConnAttributes works
@@ -137,6 +142,7 @@ public void testCreateAndShutdown() throws SQLException {
         // what happens when you combine create and shutdown connattr?
         // database does not get created.
         assertShutdownAndCreateConnAttr(DBNotFoundState, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
             composeDatabaseName(ADDITIONAL_DBS[3]), 
             "shutdown=true;create=true");
         assertShutdownAndCreateConnAttr(DBNotFoundState, 
@@ -182,6 +188,7 @@ protected void assertNotSetAndGet(
     }
     
     protected void assertReset(String dbName) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
     throws SQLException {
         DataSource ds = JDBCDataSource.getDataSourceLogical(dbName);
 
@@ -259,6 +266,7 @@ protected void assertShutdownUsingSetOK(String dbName, boolean connAttr)
     
     // for completeness' sake, test create=true conn attr.
     protected void assertCreateUsingConnAttrsOK(String dbName)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
     throws SQLException {
         DataSource ds = JDBCDataSource.getDataSource(dbName);
         JDBCDataSource.setBeanProperty(
@@ -337,6 +345,7 @@ protected void assertConflictedSettersOK(String dbName) throws SQLException {
 
     protected void assertConflictedSetterConnAttrOK() 
     throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         assertConSetOK(DBNotFoundState, composeDatabaseName(ADDITIONAL_DBS[6]), 
             "shutdown=true", "CreateDatabase", "create");
         // with the new networkserver methods, this actually works...
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest.java
index 709d1330ec..381d1271a5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest.java
@@ -56,6 +56,7 @@ public DataSourcePropertiesTest(String name) {
     public static Test suite() {
         
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DataSourcePropertiesTest");
         
         // TODO: Run fixtures in J2ME and JDBC2 (with extensions)
@@ -67,6 +68,7 @@ public static Test suite() {
             // Add all methods starting with 'test'.
             //suite.addTestSuite(DataSourcePropertiesTest.class);
  
+//IC see: https://issues.apache.org/jira/browse/DERBY-2021
             Method[] methods = DataSourcePropertiesTest.class.getMethods();
             for (int i = 0; i < methods.length; i++) {
                 Method m = methods[i];
@@ -80,6 +82,7 @@ public static Test suite() {
                 }
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         return new CleanDatabaseTestSetup(suite);
     }
 
@@ -94,6 +97,7 @@ public void embeddedTestAttributesAsPasswordWithoutPassword_ds()
         throws Exception
     {
         DataSource ds = JDBCDataSource.getDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         JDBCDataSource.setBeanProperty(ds, "password",  "mypassword");
         JDBCDataSource.setBeanProperty(ds, "attributesAsPassword", Boolean.TRUE);
         Connection c = ds.getConnection();
@@ -110,6 +114,7 @@ public void embeddedTestAttributesAsPasswordWithoutPassword_pooled()
     {
         ConnectionPoolDataSource ds =
             J2EEDataSource.getConnectionPoolDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         JDBCDataSource.setBeanProperty(ds, "password",  "mypassword");
         JDBCDataSource.setBeanProperty(ds, "attributesAsPassword", Boolean.TRUE);
        // DERBY-1586 caused a malformed url error here
@@ -127,6 +132,7 @@ public void embeddedTestAttributesAsPasswordWithoutPassword_xa()
         throws Exception
     {
         XADataSource ds = J2EEDataSource.getXADataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         JDBCDataSource.setBeanProperty(ds, "password",  "mypassword");
         JDBCDataSource.setBeanProperty(ds, "attributesAsPassword", Boolean.TRUE);
         XAConnection xa = ds.getXAConnection();
@@ -142,7 +148,12 @@ public void embeddedTestAttributesAsPasswordWithoutPassword_xa()
     public void embeddedTestAttributesAsPasswordWithPassword_ds()
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         DataSource ds = JDBCDataSource.getDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         JDBCDataSource.setBeanProperty(ds, "attributesAsPassword", Boolean.TRUE);
         try {
             Connection c = ds.getConnection("username", "mypassword");
@@ -162,7 +173,12 @@ public void embeddedTestAttributesAsPasswordWithPassword_pooled()
         throws Exception
     {
         ConnectionPoolDataSource ds =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             J2EEDataSource.getConnectionPoolDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         JDBCDataSource.setBeanProperty(ds, "attributesAsPassword", Boolean.TRUE);
         try {
             PooledConnection pc =
@@ -182,7 +198,12 @@ public void embeddedTestAttributesAsPasswordWithPassword_pooled()
     public void embeddedTestAttributesAsPasswordWithPassword_xa()
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
+//IC see: https://issues.apache.org/jira/browse/DERBY-2023
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         XADataSource ds = J2EEDataSource.getXADataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         JDBCDataSource.setBeanProperty(ds, "attributesAsPassword", Boolean.TRUE);
         try {
             XAConnection xa = ds.getXAConnection("username", "mypassword");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java
index 2da4995ddb..34b5d44d32 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java
@@ -60,6 +60,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class DataSourceReferenceTest
         extends BaseJDBCTestCase {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3369
 
     /** Lookup constant for the descriptor array. */
     private static final int BASE_DS = 0;
@@ -117,6 +118,8 @@ public class DataSourceReferenceTest
 
     /** Descriptor for the client connection pool data source. */
     private static final DataSourceDescriptor POOL_CLIENT_DS =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3325
+//IC see: https://issues.apache.org/jira/browse/DERBY-3329
             new DataSourceDescriptor("Connection pool client data source",
                                      BASE_CLIENT_DS);
 
@@ -142,6 +145,7 @@ public static Test suite() {
        Test suite;
        if (JDBC.vmSupportsJSR169() || !JDBC.vmSupportsJNDI()) {
             // Referenceable is not supported with JSR169 or without JNDI
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             suite = new BaseTestSuite(
                     "DatasourceReferenceTest cannot run with JSR169");
         } else {
@@ -177,6 +181,8 @@ public void testDataSourceReference()
             // Specify client data source descriptors.
             descriptors = new DataSourceDescriptor[] {
                 BASE_CLIENT_DS, // Base
+//IC see: https://issues.apache.org/jira/browse/DERBY-3325
+//IC see: https://issues.apache.org/jira/browse/DERBY-3329
                 POOL_CLIENT_DS, // Pool
                 BASE_CLIENT_DS  // XA
             };
@@ -220,6 +226,7 @@ private void assertDataSourceReference(
                                         String className)
         throws Exception {
         // Instantiate a new data source object and get all its properties.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(className);
         Object dsObj = clazz.getConstructor().newInstance();
         String[] properties = getPropertyBeanList(dsObj);
@@ -291,6 +298,7 @@ private void assertDataSourceReferenceEmpty(DataSourceDescriptor dsDesc,
             throws Exception {
         println("Testing recreated empty data source.");
         // Create an empty data source.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(className);
         Object ds = clazz.getConstructor().newInstance();
         Referenceable refDs = (Referenceable)ds;
@@ -336,6 +344,7 @@ private void assertDataSourceReferencePopulated(
                                                 String className)
             throws Exception {
         println("Testing recreated populated data source.");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(className);
         Object ds = clazz.getConstructor().newInstance();
         // Populate the data source.
@@ -365,6 +374,7 @@ private void assertDataSourceReferencePopulated(
         Referenceable refDs = (Referenceable)ds;
         Reference dsAsReference = refDs.getReference();
         String factoryClassName = dsAsReference.getFactoryClassName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         clazz = Class.forName(factoryClassName);
         ObjectFactory factory =
             (ObjectFactory) clazz.getConstructor().newInstance();
@@ -450,6 +460,7 @@ private void compareDataSources(DataSourceDescriptor dsDesc,
     private static String[] getPropertyBeanList(Object ds) {
         Method[] allMethods = ds.getClass().getMethods();
         ArrayList<String> properties = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         for (int i = 0; i < allMethods.length; i++) {
             Method method = allMethods[i];
@@ -479,6 +490,7 @@ private static String[] getPropertyBeanList(Object ds) {
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return properties.toArray(new String[properties.size()]);
     }
 
@@ -509,6 +521,7 @@ private static Method getGet(String property, Object ds)
      *
      * @throws NoSuchMethodException if the method does not exist
      */private static Method getSet(Method getMethod, Object ds)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3369
             throws NoSuchMethodException {
         String methodName = "s" + getMethod.getName().substring(1);
         Method m = ds.getClass().getMethod(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
index 92f74c3e9c..8f136e3992 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
@@ -83,6 +83,7 @@ public DataSourceSerializationTest(String name) {
      */
     public void serTestEmbeddedDataSource()
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         if (JDBC.vmSupportsJNDI()) {
             final String EMBEDDED_CLASS = "EmbeddedDataSource";
             deSerializeDs(EMBEDDED_CLASS, VERSION_10_0_2_1, true);
@@ -93,6 +94,7 @@ public void serTestEmbeddedDataSource()
             deSerializeDs(EMBEDDED_CLASS + _40Suffix, VERSION_10_10_1_0, true);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         final String EMBEDDED_CLASS = "BasicEmbeddedDataSource40";
         deSerializeDs(EMBEDDED_CLASS, VERSION_10_10_1_0, false);
         
@@ -105,6 +107,7 @@ public void serTestEmbeddedDataSource()
      */
     public void serTestEmbeddedConnectionPoolDataSource()
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         if (JDBC.vmSupportsJNDI()) {
             final String EMBEDDED_CLASS = "EmbeddedConnectionPoolDataSource";
             deSerializeDs(EMBEDDED_CLASS, VERSION_10_0_2_1, true);
@@ -116,6 +119,7 @@ public void serTestEmbeddedConnectionPoolDataSource()
         }
 
         final String EMBEDDED_CLASS =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
                 "BasicEmbeddedConnectionPoolDataSource40";
         deSerializeDs(EMBEDDED_CLASS, VERSION_10_10_1_0, false);
     }
@@ -127,6 +131,7 @@ public void serTestEmbeddedConnectionPoolDataSource()
      */
     public void serTestEmbeddedXADataSource()
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         if (JDBC.vmSupportsJNDI()) {
             final String EMBEDDED_CLASS = "EmbeddedXADataSource";
             deSerializeDs(EMBEDDED_CLASS, VERSION_10_0_2_1, true);
@@ -137,6 +142,7 @@ public void serTestEmbeddedXADataSource()
             deSerializeDs(EMBEDDED_CLASS + _40Suffix, VERSION_10_10_1_0, true);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         final String EMBEDDED_CLASS = "BasicEmbeddedXADataSource40";
         deSerializeDs(EMBEDDED_CLASS, VERSION_10_10_1_0, false);
     }
@@ -148,6 +154,7 @@ public void serTestEmbeddedXADataSource()
      */
     public void serTestClientDataSource()
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         if (JDBC.vmSupportsJNDI()) {
             final String CLIENT_CLASS = "ClientDataSource";
             // No client driver for Derby 10.0
@@ -158,6 +165,7 @@ public void serTestClientDataSource()
             deSerializeDs(CLIENT_CLASS + _40Suffix, VERSION_10_10_1_0, true);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         final String CLIENT_CLASS = "BasicClientDataSource40";
         deSerializeDs(CLIENT_CLASS, VERSION_10_10_1_0, false);
     }
@@ -169,6 +177,7 @@ public void serTestClientDataSource()
      */
     public void serTestClientConnectionPoolDataSource()
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         if (JDBC.vmSupportsJNDI()) {
             final String CLIENT_CLASS = "ClientConnectionPoolDataSource";
             // No client driver for Derby 10.0
@@ -179,6 +188,7 @@ public void serTestClientConnectionPoolDataSource()
             deSerializeDs(CLIENT_CLASS + _40Suffix, VERSION_10_10_1_0, true);
         }
          
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         final String CLIENT_CLASS = "BasicClientConnectionPoolDataSource40";
         deSerializeDs(CLIENT_CLASS, VERSION_10_10_1_0, false);
     }
@@ -190,6 +200,7 @@ public void serTestClientConnectionPoolDataSource()
      */
     public void serTestClientXADataSource()
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         if (JDBC.vmSupportsJNDI()) {
             final String CLIENT_CLASS = "ClientXADataSource";
             // No client driver for Derby 10.0
@@ -200,6 +211,7 @@ public void serTestClientXADataSource()
             deSerializeDs(CLIENT_CLASS + _40Suffix, VERSION_10_10_1_0, true);
         }
          
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         final String CLIENT_CLASS = "BasicClientXADataSource40";
         deSerializeDs(CLIENT_CLASS, VERSION_10_10_1_0, false);
     }
@@ -222,6 +234,7 @@ public void serTestClientXADataSource()
      * @throws Exception on a number of error conditions
      */
     private void deSerializeDs(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             String className, String version, boolean dsHasJNDI)
             throws Exception {
 
@@ -236,10 +249,12 @@ private void deSerializeDs(
         fname.append(version);
         fname.append(".ser");
         println( "Deserializing " + fname.toString() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         // De-serialize the data source.
         InputStream is;
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             is = AccessController.doPrivileged(
                   new PrivilegedExceptionAction<InputStream>() {
                 public InputStream run() throws FileNotFoundException {
@@ -252,9 +267,11 @@ public InputStream run() throws FileNotFoundException {
                 throw (FileNotFoundException)e.getException();
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3415
         assertNotNull("FileInputStream is null", is);
         Object dsObj = null;
         DataSource ds = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         Object dsRef = null;
         // Used to preserve original error information in case of exception when 
         // closing the input stream.
@@ -277,6 +294,7 @@ public InputStream run() throws FileNotFoundException {
             ds.setLoginTimeout(newTimeout);
             assertEquals(newTimeout, ds.getLoginTimeout());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             if (dsHasJNDI) {
                 // Recreate the data source using reference.
                 dsRef = ois.readObject();
@@ -295,6 +313,7 @@ public InputStream run() throws FileNotFoundException {
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         if (dsHasJNDI) {
             // Recreate ds via the Reference's factory class.  We use
             // reflection here to make the test runnable for non JNDI
@@ -306,6 +325,7 @@ public InputStream run() throws FileNotFoundException {
                     "getFactoryClassName", null);
             String factoryClassName =
                     (String)getFactoryClassName.invoke(dsRef, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(factoryClassName);
             Object factory = clazz.getConstructor().newInstance();
             Method getObjectInstance =
@@ -331,6 +351,7 @@ public InputStream run() throws FileNotFoundException {
      * @return A test suite.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("DataSourceSerializationTest");
 
@@ -398,6 +419,7 @@ public static Test suite() {
                 filePrefix + "ClientConnectionPoolDataSource40-10_10_1_0.ser",
                 filePrefix + "ClientXADataSource-10_10_1_0.ser",
                 filePrefix + "ClientXADataSource40-10_10_1_0.ser",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
                 filePrefix + "BasicEmbeddedDataSource40-10_10_1_0.ser",
                 filePrefix +
                     "BasicEmbeddedConnectionPoolDataSource40-10_10_1_0.ser",
@@ -408,6 +430,7 @@ public static Test suite() {
                 filePrefix + "BasicClientXADataSource40-10_10_1_0.ser",
 
                 // 10.11 resources
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
                 filePrefix + "EmbeddedDataSource-10_11_1_0.ser",
                 filePrefix + "EmbeddedDataSource40-10_11_1_0.ser",
                 filePrefix + "EmbeddedConnectionPoolDataSource-10_11_1_0.ser",
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
index c42b5f8cae..1f41296436 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
@@ -66,6 +66,7 @@ public class DataSourceTest extends BaseJDBCTestCase {
      * in this hashtable
      */
     protected static Hashtable<String, Connection> conns =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             new Hashtable<String, Connection>();
     
     /** The expected format of a connection string. In English:
@@ -73,6 +74,7 @@ public class DataSourceTest extends BaseJDBCTestCase {
      *  (DATABASE=<dbname>), (DRDAID = <drdaid>)"
      */
     private static final String CONNSTRING_FORMAT = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3082
         "\\S+@\\-?[0-9]+.* \\(XID = .*\\), \\(SESSIONID = [0-9]+\\), " +
         "\\(DATABASE = [A-Za-z]+\\), \\(DRDAID = .*\\) "; 
     
@@ -96,12 +98,14 @@ public DataSourceTest(String name) {
      * @return A suite of tests to be run with client and/or embedded
      */
     private static Test baseSuite(String postfix) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite
             suite = new BaseTestSuite("ClientAndEmbedded" + postfix);
 
         suite.addTest(new DataSourceTest("testBadConnectionAttributeSyntax"));
         suite.addTest(new DataSourceTest("testDescriptionProperty"));
         suite.addTest(new DataSourceTest("testAllDataSources"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2498
         suite.addTest(new DataSourceTest("testJira95ds"));
         return suite;
     }
@@ -112,6 +116,7 @@ private static Test baseSuite(String postfix) {
      * @return A suite of tests being run with client only
      */
     private static Test getClientSuite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Client/Server");
         suite.addTest(new DataSourceTest("testClientDSConnectionAttributes"));
         suite.addTest(new DataSourceTest(
@@ -128,6 +133,7 @@ private static Test getClientSuite() {
      * @return A suite of tests being run with embedded only
      */
     private static Test getEmbeddedSuite(String postfix) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Embedded" + postfix);
         suite.addTest(new DataSourceTest("testDSRequestAuthentication"));
         return suite;
@@ -136,6 +142,7 @@ private static Test getEmbeddedSuite(String postfix) {
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("DataSourceTest suite");
         // Add the tests that only run with embedded
+//IC see: https://issues.apache.org/jira/browse/DERBY-3410
         suite.addTest(getEmbeddedSuite("embedded"));
         // Add tests that will run with embedded
         suite.addTest(baseSuite(":embedded"));
@@ -164,6 +171,7 @@ protected void decorateSQL(Statement s) throws SQLException {
     
     public void tearDown() throws Exception {
         // attempt to get rid of any left-over trace files
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (int i = 0; i < 6; i++) {
             String traceFileName = "trace" + (i + 1) + ".out";
             File traceFile = new File(traceFileName);
@@ -172,6 +180,7 @@ public void tearDown() throws Exception {
                 PrivilegedFileOpsForTests.delete(traceFile);
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
         super.tearDown();
     }
 
@@ -183,6 +192,7 @@ public void testAllDataSources() throws SQLException, Exception
         //Connection dmc = getConnection();
         
         Object[] expectedValues = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             ResultSet.HOLD_CURSORS_OVER_COMMIT, "XJ010",
             2, true, false};
 
@@ -197,6 +207,7 @@ public void testAllDataSources() throws SQLException, Exception
         assertConnectionOK(expectedValues, "DataSource", ds.getConnection());
         
         if (JDBC.vmSupportsJDBC4()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             BasicEmbeddedDataSource40 nds = new BasicEmbeddedDataSource40();
             nds.setDatabaseName(dbName);
             assertConnectionOK(
@@ -216,6 +227,7 @@ public void testJira95ds() throws SQLException {
             ds.getConnection();
             fail ("expected an SQLException!");
         } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2498
             assertSQLState("XCY00", sqle);
         } catch (Exception e) {
             fail ("unexpected exception: " + e.toString());
@@ -233,6 +245,7 @@ public void testBadConnectionAttributeSyntax() throws SQLException {
             ds.getConnection();
             fail ("should have seen an error");
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4070
             assertSQLState("XJ028", e);
         } 
     } // End testBadConnectionAttributeSyntax
@@ -252,6 +265,7 @@ public void testClientDSConnectionAttributes() throws Exception {
         ClientDataSourceInterface ds = null;
 
         Class<?> clazz;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         if (JDBC.vmSupportsJNDI()) {
             // Use reflection to avoid class not found in non-JNDI context
@@ -301,9 +315,11 @@ public void testClientDSConnectionAttributes() throws Exception {
     public void testDSRequestAuthentication() throws SQLException {
 
         // Create an empty datasource of the type befitting the jvm/client/server
+//IC see: https://issues.apache.org/jira/browse/DERBY-3410
         JDBCClient dsclient = getTestConfiguration().getJDBCClient();
         String dsName = dsclient.getDataSourceClassName();
         DataSource ds = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
         try {
             clazz = Class.forName(dsName);
@@ -318,6 +334,7 @@ public void testDSRequestAuthentication() throws SQLException {
              "XJ004","XJ004","XJ004","XJ004","XJ004"}, ds);
  
         // DataSource - connectionAttributes=databaseName=wombat");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3410
         JDBCDataSource.setBeanProperty(ds, "connectionAttributes", "databaseName=" + dbName);
         dsConnectionRequests(new String[] {  
             "XJ004","XJ004","XJ004","XJ004",
@@ -395,6 +412,7 @@ private static void dsGetBadConnection(DataSource ds) {
      */
     private static void assertTraceFilesExist() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (int i = 0; i < 2; i++) {
             String traceFileName = "trace" + (i + 1) + ".out";
             File traceFile = new File(traceFileName);
@@ -426,6 +444,7 @@ public void testClientMessageTextConnectionAttribute() throws Exception
         // DataSource - retrieveMessageTextProperty
         ClientDataSourceInterface ds = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
         if (JDBC.vmSupportsJNDI()) {
             // Use reflection to avoid class not found in non-JNDI context
@@ -611,6 +630,7 @@ else if (((String)expectedValues[1]).equals("OK"))
         // if this fixture runs without the default db being created,
         // there will not be a warning. Otherwise,  the warning will be,
         // cannot create db, connecting to existing db
+//IC see: https://issues.apache.org/jira/browse/DERBY-3410
         if (conn.getWarnings() != null)
             assertSQLState("01J01", conn.getWarnings());
 
@@ -725,7 +745,9 @@ private static void assertStringFormat(Connection conn) //throws Exception
         assertStringPrefix(conn);
         String str = conn.toString(); 
         // matches is not a supported method with JSR169
+//IC see: https://issues.apache.org/jira/browse/DERBY-3410
         if (!JDBC.vmSupportsJSR169())
+//IC see: https://issues.apache.org/jira/browse/DERBY-3082
             assertTrue("\nexpected format:\n " + CONNSTRING_FORMAT + "\nactual value:\n " + str,
                     str.matches(CONNSTRING_FORMAT));
     }
@@ -772,6 +794,7 @@ private static void assertToString(DataSource ds) throws Exception
      */
     private static void clearConnections() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Connection conn : conns.values()) {
             conn.close();
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
index 6fe6a15b46..cb88604880 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
@@ -81,6 +81,7 @@ public class DatabaseMetaDataTest extends BaseJDBCTestCase {
     private static final String[][] NUMERIC_FUNCTIONS =
     {
         // Section C.1 JDBC 3.0 spec.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         { "ABS", "-25.67" },
         { "ACOS", "0.0707" },
         { "ASIN", "0.997" },
@@ -183,6 +184,7 @@ public DatabaseMetaDataTest(String name) {
      */
     @Override
     protected void setUp()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
             throws Exception {
         // Currently there are no tests that depend on data created outside
         // of the test ficture itself. This means we can relax the retrictions 
@@ -197,12 +199,16 @@ protected void setUp()
     @Override
     protected void tearDown() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         if (modifiedDatabase)
         {
             Connection conn = getConnection();
             conn.setAutoCommit(false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
             DatabaseMetaData dmd = getDMD();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
             for (String IDS1 : IDS) {
                 JDBC.dropSchema(dmd, getStoredIdentifier(IDS1));
             }
@@ -217,9 +223,12 @@ protected void tearDown() throws Exception
      * @return the suite
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DatabaseMetaDataTest");
         suite.addTest(
             TestConfiguration.defaultSuite(DatabaseMetaDataTest.class));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3350
+//IC see: https://issues.apache.org/jira/browse/DERBY-3171
 
         // Add some tests to be run with connection pooling enabled.
         suite.addTest(connectionPoolingSuite("embedded"));
@@ -233,6 +242,9 @@ public static Test suite() {
         suite.addTest(
             TestConfiguration.singleUseDatabaseDecorator(
                 new DatabaseMetaDataTest("initialCompilationTest")));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
 
         // The test for DERBY-4160 needs a fresh database to ensure that the
         // meta-data queries haven't already been compiled.
@@ -266,7 +278,9 @@ public static Test suite() {
      */
     private static Test connectionPoolingSuite(String jdbcClient) {
         // Return an empty suite if running in JavaME environment.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3685
         if (JDBC.vmSupportsJSR169()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("Base connection pooling suite:DISABLED");
         }
 
@@ -274,6 +288,7 @@ private static Test connectionPoolingSuite(String jdbcClient) {
             new BaseTestSuite("Base connection pooling suite");
         // Add the tests here.
         baseCpSuite.addTest(new DatabaseMetaDataTest("testConnectionSpecific"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3431
 
         // Setup the two configurations; CPDS and XADS.
         BaseTestSuite fullCpSuite = new BaseTestSuite(
@@ -295,6 +310,7 @@ private static Test connectionPoolingSuite(String jdbcClient) {
      */
     private String[] getSortedIdentifiers()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         String[] dbIDS = new String[IDS.length];
         // Remove any quotes from user schemas and upper case
         // those without quotes.
@@ -472,6 +488,7 @@ public void testDetermineFeatureSupport() throws SQLException
         
         assertTrue(dmd.supportsColumnAliasing());
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-462
         assertFalse(dmd.supportsConvert());
         // Simple check since convert is not supported.
         // A comprehensive test should be added when convert
@@ -479,6 +496,7 @@ public void testDetermineFeatureSupport() throws SQLException
         // specific to convert.
         assertFalse(dmd.supportsConvert(Types.INTEGER, Types.SMALLINT));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         assertFalse(dmd.supportsCoreSQLGrammar());
         assertTrue(dmd.supportsCorrelatedSubqueries());
         
@@ -530,6 +548,7 @@ public void testDetermineFeatureSupport() throws SQLException
         assertTrue(dmd.supportsPositionedDelete());
         assertTrue(dmd.supportsPositionedUpdate());
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         assertTrue(dmd.supportsResultSetConcurrency(
             ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY));
         assertTrue(dmd.supportsResultSetConcurrency(
@@ -565,6 +584,7 @@ public void testDetermineFeatureSupport() throws SQLException
         assertTrue(dmd.supportsSchemasInTableDefinitions());
         assertTrue(dmd.supportsSelectForUpdate());
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         assertFalse(dmd.supportsStatementPooling());
         assertTrue(dmd.supportsStoredProcedures());
         assertTrue(dmd.supportsSubqueriesInComparisons());
@@ -600,6 +620,7 @@ public void testDetermineFeatureSupport() throws SQLException
      */
     public void testDataSourceLimits() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         DatabaseMetaData dmd = getDMD();
         
         assertEquals(0, dmd.getMaxBinaryLiteralLength());
@@ -625,11 +646,13 @@ public void testDataSourceLimits() throws SQLException
         assertEquals(0, dmd.getMaxStatements());
         assertEquals(128, dmd.getMaxTableNameLength());
         assertEquals(0, dmd.getMaxTablesInSelect());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3146
         assertEquals(128, dmd.getMaxUserNameLength());
     }
     
     public void testMiscellaneous() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         DatabaseMetaData dmd = getDMD();
         
         assertTrue(dmd.allProceduresAreCallable());
@@ -647,6 +670,7 @@ public void testMiscellaneous() throws SQLException
         assertFalse(dmd.deletesAreDetected(ResultSet.TYPE_FORWARD_ONLY));
         assertTrue(dmd.deletesAreDetected(ResultSet.TYPE_SCROLL_INSENSITIVE));
         assertFalse(dmd.deletesAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         assertFalse(dmd.insertsAreDetected(ResultSet.TYPE_FORWARD_ONLY));
         assertFalse(dmd.insertsAreDetected(ResultSet.TYPE_SCROLL_INSENSITIVE));
         assertFalse(dmd.insertsAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE));
@@ -706,6 +730,7 @@ public void testMiscellaneous() throws SQLException
         
         assertFalse(dmd.isCatalogAtStart()); 
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2789
         assertTrue(dmd.locatorsUpdateCopy());
         
         assertTrue(dmd.usesLocalFilePerTable());
@@ -763,6 +788,7 @@ else if (usingDerbyNetClient())
         int expectedJDBCMajor = -1;
         int expectedJDBCMinor = -1;
         // java 8 - jdbc 4.2
+//IC see: https://issues.apache.org/jira/browse/DERBY-6324
         if (JDBC.vmSupportsJDBC42())
         {
             expectedJDBCMajor = 4;
@@ -798,6 +824,7 @@ else if (JDBC.vmSupportsJDBC4())
      */
     public void testGetURL() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         DatabaseMetaData dmd = getDMD();
         
         String url;
@@ -806,6 +833,7 @@ public void testGetURL() throws SQLException
         } catch (NoSuchMethodError e) {
             // JSR 169 - method must not be there!
             assertTrue("getURL not supported", JDBC.vmSupportsJSR169());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
             assertFalse("getURL not supported", JDBC.vmSupportsJDBC3());
             return;
         }
@@ -820,6 +848,7 @@ public void testGetURL() throws SQLException
         // client returns the URL with connection attributes.
         if (usingDerbyNetClient()) {
             List<String> urlComponents = Arrays.asList(url.split(";"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
             // Only compare whatever comes before the first semi-colon with
             // the expected URL. Check connection attributes separately.
@@ -921,6 +950,7 @@ public void testConnectionSpecific() throws SQLException
      */
     public void testConstants()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
       assertEquals(DatabaseMetaData.columnNoNulls, ResultSetMetaData.columnNoNulls);
       assertEquals(DatabaseMetaData.columnNullable, ResultSetMetaData.columnNullable);
       assertEquals(DatabaseMetaData.columnNullableUnknown, ResultSetMetaData.columnNullableUnknown);
@@ -964,6 +994,7 @@ public void testUDTs() throws Exception
 
         String[][] expectedRows = new String[][]
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
             {  null, schema, "PRICE", "org.apache.derbyTesting.functionTests.tests.lang.Price", "2000", null, null },
         };
         JDBC.assertFullResultSet( rs, expectedRows );
@@ -980,6 +1011,7 @@ public void testUDTs() throws Exception
         JDBC.assertEmpty(rs);
 
         // try explicit schema and type name
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         rs = dmd.getUDTs( null, schema, "PRICE",
                 new int[] { Types.DISTINCT, Types.JAVA_OBJECT } );
         JDBC.assertFullResultSet( rs, expectedRows );
@@ -1005,6 +1037,7 @@ public void testUDTs() throws Exception
             },
         };
         JDBC.assertFullResultSet( rs, expectedRows );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         rs = dmd.getColumns( null, schema, "ORDERS", null );
         crossCheckGetColumnsAndResultSetMetaData( rs, false, 0 );
 
@@ -1062,6 +1095,7 @@ public void testUnimplementedSQLObjectAttributes() throws SQLException
         
         rs = dmd.getAttributes(null,null,null,null);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         String [] columnNames = {
                 "TYPE_CAT", "TYPE_SCHEM", "TYPE_NAME", "ATTR_NAME", "DATA_TYPE",
                 "ATTR_TYPE_NAME", "ATTR_SIZE", "DECIMAL_DIGITS", "NUM_PREC_RADIX",
@@ -1083,6 +1117,8 @@ public void testUnimplementedSQLObjectAttributes() throws SQLException
         if (usingDerbyNetClient())
             nullval = false;
         boolean [] nullability = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3350
+//IC see: https://issues.apache.org/jira/browse/DERBY-3171
                 true, true, false, nullval, nullval, nullval, nullval,
                 nullval, nullval, nullval, true, true, nullval, nullval,
                 nullval, nullval, nullval, true, true, true, true
@@ -1101,6 +1137,7 @@ public void testUnimplementedSQLObjectAttributes() throws SQLException
         columnTypes = new int[] {
                 Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR};
         nullability = new boolean[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3350
                 true, true, false, false};
         assertMetaDataResultSet(rs, columnNames, columnTypes, nullability);
         JDBC.assertEmpty(rs);
@@ -1113,10 +1150,12 @@ public void testUnimplementedSQLObjectAttributes() throws SQLException
                 Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR,
                 Types.VARCHAR, Types.VARCHAR};
         nullability = new boolean[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3350
                 true, true, false, true, true, false};
         assertMetaDataResultSet(rs, columnNames, columnTypes, nullability);
         JDBC.assertEmpty(rs);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         ResultSet rss[] = getVersionColumns(null,null, "No_such_table");
         checkVersionColumnsShape(rss);
         JDBC.assertEmpty(rss[0]);
@@ -1180,6 +1219,8 @@ private ResultSet[] getVersionColumns(
      */
     private static final String[] IDS =
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
             "one_dmd_test",
             "TWO_dmd_test",
             "ThReE_dmd_test",
@@ -1213,6 +1254,8 @@ public void testGetSchemasReadOnly() throws SQLException {
         DatabaseMetaData dmd = getDMD();
          
         ResultSet rs = dmd.getSchemas();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         checkSchemas(rs, new String[0]);
     }
     
@@ -1222,9 +1265,12 @@ public void testGetSchemasReadOnly() throws SQLException {
      * @throws SQLException
      */
     public void testGetSchemasModify() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         createSchemasForTests();
         DatabaseMetaData dmd = getDMD();
         ResultSet rs = dmd.getSchemas();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         checkSchemas(rs, IDS);
     }
     
@@ -1234,6 +1280,7 @@ private void createSchemasForTests() throws SQLException
         modifiedDatabase = true;
 
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         for (String IDS1 : IDS) {
             s.executeUpdate("CREATE SCHEMA " + IDS1);
         }
@@ -1316,6 +1363,7 @@ private static void checkSchemasShape(ResultSet rs) throws SQLException
          new int[] {
           Types.VARCHAR, Types.VARCHAR
          }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         , new boolean[] {false, true}
         );        
     }
@@ -1352,6 +1400,7 @@ public void testGetTablesReadOnly() throws SQLException, IOException {
         
         ResultSet rs;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         rs = getDMDTables(dmd, null, null, null, null);
         checkTablesShape(rs);
         int allTableCount = JDBC.assertDrainResults(rs);
@@ -1435,9 +1484,11 @@ public void testGetTablesModify() throws Exception {
         
         // Get the list of idenifiers from IDS as the database
         // would store them in the order required.      
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         String[] dbIDS = getSortedIdentifiers();    
                
         // Check the contents, ordered by TABLE_CAT, TABLE_SCHEMA, TABLE_NAME
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         rs = getDMDTables(dmd, null, null, null, userTableOnly);
         checkTablesShape(rs);
         int rowPosition = 0;
@@ -1446,6 +1497,7 @@ public void testGetTablesModify() throws Exception {
             //boolean ourTable;
             assertEquals("TABLE_CAT", "", rs.getString("TABLE_CAT"));
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
             String schema_ = rs.getString("TABLE_SCHEM");
             
             // See if the table is in one of the schemas we created.
@@ -1469,6 +1521,7 @@ public void testGetTablesModify() throws Exception {
             assertNull("SELF_REFERENCING_COL_NAME", rs.getString("SELF_REFERENCING_COL_NAME"));
             assertNull("REF_GENERATION", rs.getString("REF_GENERATION"));
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             if (ourSchema)
                 rowPosition++;
          }
@@ -1478,16 +1531,19 @@ public void testGetTablesModify() throws Exception {
        
          Random rand = new Random();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         for (String schema_ : dbIDS) {
             int pc = rand.nextInt(6);
             String schemaPattern = schema_.substring(0, pc + 2) + "%";
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             rs = getDMDTables(dmd, null, schemaPattern, null, userTableOnly);
             checkTablesShape(rs);
             rowPosition = 0;
             while (rs.next())
             {
                 assertEquals("TABLE_SCHEM",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
                         schema_, rs.getString("TABLE_SCHEM"));
                 assertEquals("TABLE_NAME",
                         dbIDS[rowPosition%dbIDS.length], rs.getString("TABLE_NAME"));
@@ -1499,10 +1555,12 @@ public void testGetTablesModify() throws Exception {
                     dbIDS.length, rowPosition);
         }
          
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         for (String table : dbIDS) {
             int pc = rand.nextInt(6);
             String tablePattern = table.substring(0, pc + 2) + "%";
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             rs = getDMDTables(dmd, null, null, tablePattern, userTableOnly);
             checkTablesShape(rs);
             rowPosition = 0;
@@ -1535,10 +1593,12 @@ public void testGetTablesModify() throws Exception {
     private void checkGetTablesODBC(String catalog, String schema,
             String table, String[] tableTypes) throws SQLException, IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         String tableTypesAsString = null;
         if (tableTypes != null) {
             int count = tableTypes.length;
             StringBuilder sb = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
 
             for (int i = 0; i < count; i++) {
                 if (i > 0)
@@ -1595,7 +1655,9 @@ private void checkGetTablesODBC(String catalog, String schema,
      */
     private int createTablesForTest(boolean skipXML) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         getConnection().setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<String> types = getSQLTypes(getConnection());
         if (skipXML)
             types.remove("XML");
@@ -1604,6 +1666,7 @@ private int createTablesForTest(boolean skipXML) throws Exception
         // The BOOLEAN datatype is only allowed in databases
         // at level 10.7 or higher.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
         Version dataVersion = getDataVersion( getConnection() );
         if ( dataVersion.compareTo( new Version( 10, 7, 0, 0 ) ) < 0 )
         {
@@ -1618,6 +1681,7 @@ private int createTablesForTest(boolean skipXML) throws Exception
         
         int columnCounter = 0;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         for (String IDS1 : IDS) {
             for (String IDS2 : IDS) {
                 StringBuilder sb = new StringBuilder();
@@ -1651,6 +1715,7 @@ private int createTablesForTest(boolean skipXML) throws Exception
         s.close();
         
         commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
 
         return IDS.length * IDS.length;
     }
@@ -1665,6 +1730,7 @@ private int createTablesForTest(boolean skipXML) throws Exception
      */
     public void testGetColumnsReadOnly() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         ResultSet[] rs = getColumns(null, null, null, null);
         for ( int j =0 ; j<2 ; j++) {
             checkColumnsShape(rs[j], j);
@@ -1685,8 +1751,10 @@ public void testGetColumnsModify() throws Exception {
         
         // First cross check all the columns in the database
         // with the ResultSetMetaData.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         testGetColumnsReadOnly();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         Random rand = new Random();
         String[] dbIDS = getSortedIdentifiers();
             
@@ -1697,6 +1765,7 @@ public void testGetColumnsModify() throws Exception {
             String tableNamePattern = getPattern(rand, dbIDS);
             String columnNamePattern = getPattern(rand, dbIDS);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             ResultSet[] rs = getColumns(null,
                 schemaPattern, tableNamePattern, columnNamePattern);
             
@@ -1705,6 +1774,7 @@ public void testGetColumnsModify() throws Exception {
 
                 while (rs[j].next())
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
                     String schema_ = rs[j].getString("TABLE_SCHEM");
                     String table = rs[j].getString("TABLE_NAME");
                     String column = rs[j].getString("COLUMN_NAME");
@@ -1735,6 +1805,7 @@ public void testGetColumnsModify() throws Exception {
             for (int j=0  ; j<2 ; j++) {
                 while (rs[j].next())
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
                     String schema_ = rs[j].getString("TABLE_SCHEM");
                     String table = rs[j].getString("TABLE_NAME");
                     String column = rs[j].getString("COLUMN_NAME");
@@ -1877,6 +1948,7 @@ private String getPattern(Random rand, String[] dbIDS)
             base = dbIDS[rand.nextInt(dbIDS.length)];
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < base.length();)
         {
@@ -1941,6 +2013,7 @@ private void crossCheckGetColumnsAndResultSetMetaData(ResultSet rs,
         Statement s = createStatement();
         while (rs.next())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
             String schema_ = rs.getString("TABLE_SCHEM");
             String table = rs.getString("TABLE_NAME");
             
@@ -1951,6 +2024,7 @@ private void crossCheckGetColumnsAndResultSetMetaData(ResultSet rs,
                      
             for (int col = 1; col <= rsmdt.getColumnCount() ; col++)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
                 if (!partial) {
                     if (col != 1)
                         assertTrue(rs.next());
@@ -1962,11 +2036,14 @@ private void crossCheckGetColumnsAndResultSetMetaData(ResultSet rs,
                 assertEquals("TABLE_CAT",
                         "", rs.getString("TABLE_CAT"));
                 assertEquals("TABLE_SCHEM",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
                         schema_, rs.getString("TABLE_SCHEM"));
                 assertEquals("TABLE_NAME",
                         table, rs.getString("TABLE_NAME"));
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
                 crossCheckGetColumnRowAndResultSetMetaData(rs, rsmdt, odbc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
                 if (partial)
                     break;
                 
@@ -1989,6 +2066,7 @@ private void crossCheckGetColumnsAndResultSetMetaData(ResultSet rs,
      * @throws SQLException
      */
     public void crossCheckGetColumnRowAndResultSetMetaData(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             ResultSet rs, ResultSetMetaData rsmdt, int odbc)
         throws Exception
     {
@@ -2075,6 +2153,7 @@ else if (dmdColumnType == Types.NUMERIC && usingDerbyNetClient())
         */
         
         // not used by JDBC spec, but by ODBC
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         if (odbc == 0)
         {
             assertEquals("BUFFER_LENGTH", 0, rs.getInt("BUFFER_LENGTH"));
@@ -2106,6 +2185,7 @@ else if (dmdColumnType == Types.NUMERIC && usingDerbyNetClient())
         
         // COLUMN_DEF ??
        
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         if (odbc == 0)
         {
             // both unused by JDBC spec
@@ -2183,6 +2263,7 @@ else if (dmdColumnType == 93)
      * @throws java.sql.SQLException
      */
     private ResultSet getColumnsODBC(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             String catalog, String schemaPattern, String tableNamePattern,
             String columnNamePattern)
         throws SQLException 
@@ -2239,6 +2320,8 @@ public void testTableTypes() throws SQLException
                new int[] {
                 Types.VARCHAR
                }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         , null
               );
         
@@ -2260,6 +2343,7 @@ public void testGetTypeInfo() throws Exception
         int BOOLEAN = Types.BOOLEAN;      
         
         String[] JDBC_COLUMN_NAMES = new String[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
                 "TYPE_NAME", "DATA_TYPE", "PRECISION", "LITERAL_PREFIX",
                 "LITERAL_SUFFIX", "CREATE_PARAMS", "NULLABLE", "CASE_SENSITIVE",
                 
@@ -2305,10 +2389,16 @@ public void testGetTypeInfo() throws Exception
         );
 
 	/*
+//IC see: https://issues.apache.org/jira/browse/DERBY-2258
+//IC see: https://issues.apache.org/jira/browse/DERBY-2259
+//IC see: https://issues.apache.org/jira/browse/DERBY-2260
+//IC see: https://issues.apache.org/jira/browse/DERBY-2245
 	 Derby-2258 Removed 3 data types which are not supported by Derby
 	 and added XML data type which is supported by Derby
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<Integer> supportedTypes = new ArrayList<Integer>(Arrays.asList(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
           Types.BIGINT, Types.BINARY, Types.BLOB, Types.BOOLEAN,
           Types.CHAR, Types.CLOB, Types.DATE,
           Types.DECIMAL, Types.DOUBLE, Types.FLOAT,
@@ -2317,6 +2407,7 @@ public void testGetTypeInfo() throws Exception
           Types.TIME, Types.TIMESTAMP,  Types.VARBINARY,
           Types.VARCHAR, JDBC.SQLXML, Types.JAVA_OBJECT
         ));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         Version dataVersion = getDataVersion(getConnection());
         boolean booleanSupported =
@@ -2325,6 +2416,7 @@ public void testGetTypeInfo() throws Exception
         // DERBY-4946: Boolean isn't supported if DB is soft-upgraded from
         // pre-10.7 version
         if (!booleanSupported) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             supportedTypes.remove(Integer.valueOf(Types.BOOLEAN));
         }
 
@@ -2341,6 +2433,7 @@ public void testGetTypeInfo() throws Exception
             // DATA_TYPE (column 2)
             int type = rs.getInt("DATA_TYPE");
             assertFalse(rs.wasNull());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             if (!supportedTypes.get(offset).equals(type))
             {
                 fail("Unexpected type " + typeName);
@@ -2354,6 +2447,7 @@ public void testGetTypeInfo() throws Exception
             int precision = -1;
             switch (type)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
             case Types.BOOLEAN:
                 precision = 1;
                 break;
@@ -2373,6 +2467,7 @@ public void testGetTypeInfo() throws Exception
                 precision = 8;
                 break;
             case Types.TIMESTAMP:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
                 precision = 29;
                 break;
                                 
@@ -2436,6 +2531,7 @@ public void testGetTypeInfo() throws Exception
             // LITERAL_SUFFIX (column 5)
             
             // CREATE_PARAMS (column 6)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             String createParams;
             switch (type)
             {
@@ -2478,6 +2574,10 @@ public void testGetTypeInfo() throws Exception
             switch (type)
             {
 	    /*
+//IC see: https://issues.apache.org/jira/browse/DERBY-2258
+//IC see: https://issues.apache.org/jira/browse/DERBY-2259
+//IC see: https://issues.apache.org/jira/browse/DERBY-2260
+//IC see: https://issues.apache.org/jira/browse/DERBY-2245
 	     Derby-2259 Correcting the searchable value for 
 	     LONGVARBINARY, LONGVARCHAR & BLOB data type
 	     also adding SQLXML data type in the test.
@@ -2517,6 +2617,7 @@ public void testGetTypeInfo() throws Exception
             
             // FIXED_PREC_SCALE (column 11)
             boolean fixedScale = type == Types.DECIMAL || type == Types.NUMERIC;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             assertEquals("FIXED_PREC_SCALE " + typeName,
                     fixedScale, rs.getBoolean("FIXED_PREC_SCALE"));
             assertFalse(rs.wasNull());
@@ -2546,11 +2647,13 @@ public void testGetTypeInfo() throws Exception
             boolean hasScale = true;
             switch (type)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2262
         case Types.DECIMAL:
         case Types.NUMERIC:
             maxScale = 31; // Max Scale for Decimal & Numeric is 31: Derby-2262
             break;
             case Types.TIMESTAMP:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
                 maxScale = 9;
                 break;
             case Types.SMALLINT:
@@ -2599,6 +2702,7 @@ public void testGetTypeInfo() throws Exception
         
         // ODBC column names & types differ from JDBC slightly.
         // ODBC has one more column.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         String[] ODBC_COLUMN_NAMES = new String[19];
         System.arraycopy(JDBC_COLUMN_NAMES, 0, ODBC_COLUMN_NAMES, 0,
                 JDBC_COLUMN_NAMES.length);
@@ -2623,7 +2727,9 @@ public void testGetTypeInfo() throws Exception
         // column 16 - SQL_DATA_TYPE is NULL in JDBC but a valid non-null value in ODBC
         // column 19 -  INTERVAL_PRECISION (extra column comapred to JDBC)
         boolean[] ODBC_COLUMN_NULLABILITY = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3400
                 true, false, true, true,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3350
                 true, true, false, false,
                 false, true, false,
                 true, true,
@@ -2654,6 +2760,7 @@ public void testGetTypeInfo() throws Exception
     private void checkColumnsShape(ResultSet rs, int odbc) throws SQLException
     {
         int[] columnTypes = new int[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
                 Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR,
                 Types.INTEGER, Types.VARCHAR, Types.INTEGER, Types.INTEGER,
                 Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.VARCHAR,
@@ -2665,6 +2772,7 @@ private void checkColumnsShape(ResultSet rs, int odbc) throws SQLException
         boolean[]   nullability =
         {
             false,   false,  false,  false,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
             true,  true,   true,  true,
             true,   true,   true,  false,
             true,   true,   true,   true,
@@ -2681,6 +2789,7 @@ private void checkColumnsShape(ResultSet rs, int odbc) throws SQLException
             columnTypes[13] = Types.SMALLINT;
             columnTypes[14] = Types.SMALLINT;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         assertMetaDataResultSet
             (
              rs,
@@ -2743,6 +2852,7 @@ private void checkCatalogsShape(ResultSet rs) throws SQLException
          new int[] {
           Types.CHAR
          }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         , new boolean[] {false}
         );        
     }
@@ -2755,6 +2865,7 @@ private void checkCatalogsShape(ResultSet rs) throws SQLException
      */
     private static void checkVersionColumnsShape(ResultSet[] rs) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         String [] columnNames = new String[] {
                 "SCOPE", "COLUMN_NAME", "DATA_TYPE", "TYPE_NAME",
                 "COLUMN_SIZE", "BUFFER_LENGTH", "DECIMAL_DIGITS", "PSEUDO_COLUMN"
@@ -2929,6 +3040,7 @@ private void executeEscaped(String[] specDetails)
      */
     public static List<String> getSQLTypes(Connection conn) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<String> list = new ArrayList<String>();
         
         Random rand = new Random();
@@ -2951,6 +3063,7 @@ public static List<String> getSQLTypes(Connection conn) throws SQLException
                 continue;
             }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
             if (createParams.contains("length"))
             {
                 int maxLength = rs.getInt("PRECISION");
@@ -2963,6 +3076,7 @@ public static List<String> getSQLTypes(Connection conn) throws SQLException
                     list.add(typeName + "(" + length + ")");
                     
                 } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
                     StringBuilder sb = new StringBuilder();
                     sb.append(typeName.substring(0, paren+1));
                     sb.append(length);
@@ -2973,6 +3087,7 @@ public static List<String> getSQLTypes(Connection conn) throws SQLException
                 continue;
             }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
             if (createParams.contains("scale"))
             {
                 int maxPrecision = rs.getInt("PRECISION");
@@ -2992,6 +3107,7 @@ public static List<String> getSQLTypes(Connection conn) throws SQLException
                 continue;
             }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
             if (createParams.contains("precision"))
             {
                 list.add(typeName);
@@ -3092,6 +3208,7 @@ public static int getJDBCType(String type)
         if ("XML".equals(type))
             return JDBC.SQLXML;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
         if (type.equals("BOOLEAN"))
             return Types.BOOLEAN;
         
@@ -3123,6 +3240,7 @@ public static int getPrecision(int jdbcType, String type)
             int lp = type.indexOf('(');
             int rp = type.indexOf(')');
             int precision =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
                 Integer.parseInt(type.substring(lp+1, rp));
             return precision;
 
@@ -3172,6 +3290,7 @@ public void testGetXXportedKeysODBC() throws SQLException, IOException
          * there is no equivalent in JDBC.
          */
         checkODBCKeys(null, schema, null, null, null, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
 
         /* Run equivalent of getImportedKeys(), getExportedKeys(),
          * and getCrossReference for each of the primary/foreign
@@ -3293,6 +3412,7 @@ else if (pTable != null)
 
             JDBC.assertFullResultSet(odbcrs,
                 new String [][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                     {"",schema,"PKT1","I","",schema,"FKT1","FI",
                         "1","3","3","FK1","PK1","7"},
                     {"",schema,"PKT2","C","",schema,"FKT1","FC",
@@ -3443,6 +3563,7 @@ public void testGetBestRowIdentifier() throws SQLException
         // DERBY-3180; if this table gets created here, running the entire test
         // twice with defaultSuite runs into into trouble.
         // Moving into separate fixture does not have this problem.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         st.execute("create table brit17 (i int not null default 10, " +
                 "s smallint not null, c30 char(30) not null, " +
                 "vc10 varchar(10) not null default 'asdf', " +
@@ -3468,6 +3589,7 @@ public void testGetBestRowIdentifier() throws SQLException
                 {"2", "J", "4", "INTEGER", "4", null, "10", "1"}};
         
         // result: column i
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         ResultSet[] rs = getBestRowIdentifier(null,schema,"BRIT1",
         		DatabaseMetaData.bestRowTemporary, true);
         verifyBRIResults(rs, expRSI);
@@ -3481,6 +3603,7 @@ public void testGetBestRowIdentifier() throws SQLException
         // sorts after i: DERBY-6623)
         rs = getBestRowIdentifier(null,schema,"BRIT3",
         		DatabaseMetaData.bestRowTemporary,true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         verifyBRIResults(rs, expRSI);
         // result: column i
         rs = getBestRowIdentifier(null,schema,"BRIT4",
@@ -3576,6 +3699,7 @@ public void testGetBestRowIdentifier() throws SQLException
                 {"2", "I", "4", "INTEGER", "4", null, "10", "1"},
                 {"2", "VC10", "12", "VARCHAR", "10", null, null, "1"}
         };
+//IC see: https://issues.apache.org/jira/browse/DERBY-6968
         JDBC.assertUnorderedResultSet(rs[0], expRS, true);
         // set buffer_length expected for ODBC; for most of the simple 
         // tables/rows in our test it's "4" so set in verifyBRIResults
@@ -3585,6 +3709,7 @@ public void testGetBestRowIdentifier() throws SQLException
         
         // test DERBY-2610 for fun; can't pass in null table name      
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
             getBestRowIdentifier(null,schema,null,
             		DatabaseMetaData.bestRowTemporary,true);
         } catch (SQLException sqle) {
@@ -3597,6 +3722,7 @@ public void testGetBestRowIdentifier() throws SQLException
         expRS = new String [][] {
                 {"2", "TABLEID", "1", "CHAR", "36", null, null, "1"}
         };
+//IC see: https://issues.apache.org/jira/browse/DERBY-6968
         JDBC.assertUnorderedResultSet(rs[0], expRS, true);
         // set buffer_length expected for ODBC
         expRS[0][5] = "72";
@@ -3693,6 +3819,7 @@ private ResultSet[] getBestRowIdentifier(String catalog, String schema, String t
                 Types.SMALLINT, Types.VARCHAR, Types.INTEGER, Types.VARCHAR,
                 Types.INTEGER, Types.INTEGER, Types.SMALLINT, Types.SMALLINT};
         int[] odbcColumnTypes = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
                 Types.SMALLINT, Types.VARCHAR, Types.SMALLINT, Types.VARCHAR,
                 Types.INTEGER, Types.INTEGER, Types.SMALLINT, Types.SMALLINT};
         boolean [] nullability = {
@@ -3729,6 +3856,7 @@ private ResultSet[] getBestRowIdentifier(String catalog, String schema, String t
      */
     public void verifyBRIResults(ResultSet[] rss, String[][] expRS) throws SQLException {      
         JDBC.assertFullResultSet(rss[0], expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         for (String[] expRS1 : expRS) {
             expRS1[5] = "4";
         }
@@ -3749,6 +3877,7 @@ public void testGetColumnPrivileges() throws SQLException
         // getColumnPrivileges with all nulls gets stopped because 
         // the spec indicates it takes a table name, not just a pattern
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             getColumnPrivileges(null,null,null,null);
             fail ("expected error XJ103");
         } catch (SQLException sqle) {
@@ -3838,6 +3967,7 @@ private ResultSet[] getColumnPrivileges(String catalog, String schema, String ta
      */
     public void testGetTablePrivileges() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         ResultSet rs[] = getTablePrivileges(null,null,null);
         JDBC.assertEmpty(rs[0]);
         JDBC.assertEmpty(rs[1]);
@@ -3986,9 +4116,11 @@ public void testMoreGetIndexInfo() throws SQLException
         st.execute("create table iit (i int not null, j int)");
         st.execute("create unique index iii on iit(i asc, j desc)");
         DatabaseMetaData dmd = getDMD();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         ResultSet rs = dmd.getIndexInfo("",schema,"IIT",false,false);
         boolean more = rs.next();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         if (more) {
             assertEquals("A",rs.getString(10));
         }
@@ -3999,10 +4131,13 @@ public void testMoreGetIndexInfo() throws SQLException
             assertEquals("D",rs.getString(10));
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         rs = getIndexInfoODBC("",schema,"IIT",false,false);
         more = rs.next();
 
         if (more) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             assertEquals("A",rs.getString(10));
         }
 
@@ -4077,6 +4212,7 @@ private ResultSet[] getIndexInfo(String catalog, String schema, String table,
                 Types.VARCHAR,Types.VARCHAR,Types.VARCHAR,
                 Types.BOOLEAN,Types.VARCHAR,Types.VARCHAR,Types.SMALLINT,
                 // ASC_OR_DESC is Types.CHAR rather than VARCHAR...
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
                 Types.SMALLINT,Types.VARCHAR,Types.CHAR,Types.BIGINT,
                 Types.BIGINT,Types.VARCHAR};
         
@@ -4125,6 +4261,7 @@ private void assertFullResultSet(
      * @throws SQLException
      */
     private void assertFullUnorderedResultSet(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         ResultSet rs[], String[][] expRS, boolean trim) throws SQLException
     {
         JDBC.assertUnorderedResultSet(rs[0], expRS, trim);
@@ -4204,6 +4341,7 @@ private void dropObjectsForKeysTests() throws SQLException
     public void testGetPrimaryKeys() throws SQLException
     {
         String[][] expRS = new String[][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                 {"",schema,"KT1","I","2","PRIMKEY"},
                 {"",schema,"KT1","VC10","1","PRIMKEY"}};
                        
@@ -4211,9 +4349,11 @@ public void testGetPrimaryKeys() throws SQLException
         
         // try with valid search criteria
         // although, % may not actually be appropriate?
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         ResultSet rs[] = getPrimaryKeys("", "%", "KT1");
         assertFullResultSet(rs, expRS, true);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         rs = getPrimaryKeys(null, schema, "KT1");
         assertFullResultSet(rs, expRS, true);
 
@@ -4308,6 +4448,7 @@ public void testGetXXportedKeys() throws SQLException
 
 
         String[][] expRS1 = new String[][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
             {"",schema,"KT1","VC10","",schema,"REFTAB","VC10","1","3","3","FKEY1","PRIMKEY","7"},
             {"",schema,"KT1","I","",schema,"REFTAB","I","2","3","3","FKEY1","PRIMKEY","7"},
             {"",schema,"KT1","C30","",schema,"REFTAB","C30","1","3","3","FKEY3","UNIQUEKEY","7"},
@@ -4324,10 +4465,12 @@ public void testGetXXportedKeys() throws SQLException
         // try with valid search criteria
         // although, % may not actually be appropriate?
         ResultSet rs[] = getImportedKeys("", "%", "REFTAB");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         assertFullUnorderedResultSet(rs, expRS1, true);
         rs = getImportedKeys("", "%", "REFTAB2");
         assertFullResultSet(rs, expRS2, true);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         rs = getImportedKeys(null, schema, "REFTAB");
         assertFullUnorderedResultSet(rs, expRS1, true);
         rs = getImportedKeys(null, schema, "REFTAB2");
@@ -4362,6 +4505,7 @@ public void testGetXXportedKeys() throws SQLException
 
         // getExportedKeys
         expRS1 = new String[][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                 {"",schema,"KT1","VC10","",schema,"REFTAB","VC10","1","3","3","FKEY1","PRIMKEY","7"},
                 {"",schema,"KT1","I","",schema,"REFTAB","I","2","3","3","FKEY1","PRIMKEY","7"},
                 {"",schema,"KT1","C30","",schema,"REFTAB","C30","1","3","3","FKEY2","UNIQUEKEY","7"},
@@ -4383,6 +4527,7 @@ public void testGetXXportedKeys() throws SQLException
         rs = getExportedKeys(null, schema, "REFTAB");
        assertFullResultSet(rs, expRS2, true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         rs = getExportedKeys(null, null, "KT1");
         assertFullResultSet(rs, expRS1, true);
 
@@ -4392,6 +4537,7 @@ public void testGetXXportedKeys() throws SQLException
 
         // tablename may not be null
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
             rs[0] = dmd.getExportedKeys(null, schema, null);
             fail ("table name may not be null, should've given error");
         } catch (SQLException sqle) {
@@ -4411,6 +4557,7 @@ public void testGetXXportedKeys() throws SQLException
         
         // getCrossReference
         expRS1 = new String[][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                 {"",schema,"KT1","VC10","",schema,"REFTAB","VC10","1","3","3","FKEY1","PRIMKEY","7"},
                 {"",schema,"KT1","I","",schema,"REFTAB","I","2","3","3","FKEY1","PRIMKEY","7"},
                 {"",schema,"KT1","C30","",schema,"REFTAB","C30","1","3","3","FKEY2","UNIQUEKEY","7"},
@@ -4455,6 +4602,7 @@ public void testGetXXportedKeys() throws SQLException
                 {"",schema,"KT1","I","",schema,"REFTAB2","T2_I","2","3","3","T2_FKEY1","PRIMKEY","7"}};
         JDBC.assertFullResultSet(rs[1], expRS, true);
         // Test also with null for schema.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         rs = getCrossReference(null, null, "%", null, null, "%");
         JDBC.assertEmpty(rs[0]);
         JDBC.assertResultSetContains(rs[1], expRS);
@@ -4471,7 +4619,9 @@ public void testGetXXportedKeys() throws SQLException
         }
         // Note: With ODBC, this does *not* give an error. 
         // If that changes, uncomment the fail.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
             rs[1] = getCrossReferenceODBC(null, schema, null, null, schema, null);
         //    fail ("table name may not be null, should've given error");
         } catch (SQLException sqle) {
@@ -4482,6 +4632,7 @@ public void testGetXXportedKeys() throws SQLException
         }
         // tablename may not be null
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
             rs[0] = dmd.getCrossReference(null, null, "", null, null, null);
             fail ("table name may not be null, should've given error");
         } catch (SQLException sqle) {
@@ -4490,7 +4641,9 @@ public void testGetXXportedKeys() throws SQLException
             else
                 assertSQLState("XJ103", sqle);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
             rs[1] = getCrossReferenceODBC(null, schema, "", null, schema, null);
             //fail ("table name may not be null, should've given error");
         } catch (SQLException sqle) {
@@ -4501,6 +4654,7 @@ public void testGetXXportedKeys() throws SQLException
         }        
         
         // DERBY-2610, tablename must be given as stored - % means no rows
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         rs = getCrossReference(null, schema, "%", null, schema, "%");
         JDBC.assertEmpty(rs[0]);
         // But it *is* allowed with ODBC, see DERBY-2758
@@ -4713,6 +4867,7 @@ public void testReferentialAction() throws SQLException
         short setnull = DatabaseMetaData.importedKeySetNull;
         short setdefault = DatabaseMetaData.importedKeySetDefault;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         ResultSet rs[] = getCrossReference("",schema,"REFACTION1","",schema,"REFACTNONE");
         verifyReferentialAction(rs, new short[] {no_action, no_action});
         rs = getCrossReference("",schema,"REFACTION1","",schema,"REFACTRESTRICT");
@@ -4754,6 +4909,7 @@ public void testReferentialAction() throws SQLException
                 {restrict, no_action}};
         for (int i = 0 ; i < 6 ; i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
             rs[0].next();
             assertEquals(expkeyresults[i][0], rs[0].getShort(10));
             assertEquals(expkeyresults[i][1], rs[0].getShort(11));
@@ -4822,6 +4978,8 @@ public void testGetProceduresGetProcColumns() throws Exception {
                 "e SMALLINT, f INTEGER, g BIGINT, h FLOAT, i DOUBLE PRECISION, " +
                 "k DATE, l TIME, T TIMESTAMP )"+
                 "language java external name " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
+//IC see: https://issues.apache.org/jira/browse/DERBY-514
                 "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.getpc'" +
         " parameter style java"); 
         s.execute("create procedure GETPCTEST2 (pa INTEGER, pb BIGINT)"+
@@ -4848,6 +5006,7 @@ public void testGetProceduresGetProcColumns() throws Exception {
                 "language java external name " +
                 "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.getpc4b'" +
         " parameter style java");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
 
         if ( supportsBoolean )
         {
@@ -4867,6 +5026,7 @@ public void testGetProceduresGetProcColumns() throws Exception {
 
         ResultSet rs[] = getProcedures(null, "%", "GETPCTEST%");
         Object[][] expRS = new Object[][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                 {"",schema,"GETPCTEST1",null,null,null,getpc,i(1),genid},
                 {"",schema,"GETPCTEST2",null,null,null,getpc,i(1),genid},
                 {"",schema,"GETPCTEST3A",null,null,null,getpc,i(1),genid},
@@ -4883,6 +5043,7 @@ public void testGetProceduresGetProcColumns() throws Exception {
                  expRS,
                  new Object[][]
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                      {"",schema,"GETPCTEST5",null,null,null,foo,i(1),genid},
                  }
                  );
@@ -4904,6 +5065,7 @@ public void testGetProceduresGetProcColumns() throws Exception {
         rs = getProcedureColumns(null, "%", "GETPCTEST%", "%");
 
         expRS = new Object[][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                 {null,schema,"GETPCTEST1","OUTB",i(4),i(12),"VARCHAR",i(3),i(6),null,null,i(1),null,null,i(12),null,i(6),i(1),"YES",genid,i(12),i(0)},
                 {null,schema,"GETPCTEST1","A",i(1),i(12),"VARCHAR",i(3),i(6),null,null,i(1),null,null,i(12),null,i(6),i(2),"YES",genid,i(12),i(1)},
                 {null,schema,"GETPCTEST1","B",i(1),i(2),"NUMERIC",i(5),i(14),i(0),i(10),i(1),null,null,i(2),null,null,i(3),"YES",genid,i(12),i(2)},
@@ -4931,6 +5093,7 @@ public void testGetProceduresGetProcColumns() throws Exception {
                  expRS,
                  new Object[][]
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                      {null,schema,"GETPCTEST5","INARG",i(1),i(16),"BOOLEAN",i(1),i(1),null,null,i(1),null,null,i(16),null,null,i(1),"YES",genid,i(3),i(0)},
                      {null,schema,"GETPCTEST5","OUTARG",i(4),i(16),"BOOLEAN",i(1),i(1),null,null,i(1),null,null,i(16),null,null,i(2),"YES",genid,i(3),i(1)},
                      {null,schema,"GETPCTEST5","INOUTARG",i(2),i(16),"BOOLEAN",i(1),i(1),null,null,i(1),null,null,i(16),null,null,i(3),"YES",genid,i(3),i(2)},
@@ -4945,10 +5108,12 @@ public void testGetProceduresGetProcColumns() throws Exception {
 
             // JDBC variant has always null in column #15 (SQL_DATA_TYPE) and
             // column #16 (SQL_DATETIME_SUB)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
             Object[] jdbcRow = row.clone();
             jdbcRow[14] = jdbcRow[15] = null;
 
             // ODBC variant lacks column #20 (SPECIFIC_NAME)...
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             ArrayList<Object> odbcRow =
                     new ArrayList<Object>(Arrays.asList(row));
             odbcRow.remove(19);
@@ -4967,6 +5132,7 @@ public void testGetProceduresGetProcColumns() throws Exception {
         JDBC.assertFullResultSet(rs[0], jdbcExpRS, false);
         JDBC.assertFullResultSet(rs[1], odbcExpRS, false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
         if ( supportsBoolean ) { s.execute("drop procedure GETPCTEST5"); }
         s.execute("drop procedure GETPCTEST4Bx");
         s.execute("drop procedure GETPCTEST4B");
@@ -4990,6 +5156,7 @@ private Object[][] appendArray(Object[][] target, Object[][] suffix)
         int suffixLength = suffix.length;
         int resultLength = targetLength + suffixLength;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4933
         Object[][] result = new Object[resultLength][];
         System.arraycopy(target, 0, result, 0, targetLength);
         System.arraycopy(suffix, 0, result, targetLength, suffixLength);
@@ -5144,6 +5311,9 @@ private ResultSet[] getProcedureColumns(String catalog,
                 , Types.SMALLINT, Types.SMALLINT};
 
         boolean[] nullability = new boolean[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2775
+//IC see: https://issues.apache.org/jira/browse/DERBY-3346
+//IC see: https://issues.apache.org/jira/browse/DERBY-3342
                 true, false, false, false, false, false, false, false, false, true,
                 true, false, true, true, true, true, true, false, false, false//};
                 , false, false};
@@ -5167,6 +5337,7 @@ private ResultSet[] getProcedureColumns(String catalog,
         //      SQL_DATA_TYPE NULL in JDBC, valid type in ODBC.
         // otherwise the same as JDBC
         boolean[] odbcNullability = new boolean[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3400
                 true, false, false, false, false, false, false, false, false, true,
                 true, false, true, true, false, true, true, false, false, false
                 , false};
@@ -5200,6 +5371,7 @@ public void testGetFunctionColumns() throws Exception
         // this method is supported in database meta data only from 10.2 onward
 
         boolean supportsBoolean = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
         Version dataVersion = getDataVersion( getConnection() );
         if ( dataVersion.compareTo( new Version( 10, 7, 0, 0 ) ) < 0 ) { supportsBoolean = false; }
         
@@ -5230,6 +5402,7 @@ public void testGetFunctionColumns() throws Exception
         // vm whose DatabaseMetaData doesn't include this method, even though
         // our actual drivers do.
         Method gfcMethod = dmd.getClass().getMethod
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
             ( "getFunctionColumns", new Class<?>[] {
                 String.class, String.class, String.class, String.class, } );
         
@@ -5239,6 +5412,7 @@ public void testGetFunctionColumns() throws Exception
         JDBC.GeneratedId genid = new JDBC.GeneratedId();
 
         Object[][] expRS = new Object[][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
             {null,schema,"F_GFC_1","",i(4),i(4),"INTEGER",i(10),i(4),i(0),i(10),i(1),null,null,i(0),"YES",genid,i(11),i(-1)},
             {null,schema,"F_GFC_1","A",i(1),i(12),"VARCHAR",i(3),i(6),null,null,i(1),null,i(6),i(1),"YES",genid,i(11),i(0)},
             {null,schema,"F_GFC_1","B",i(1),i(2),"NUMERIC",i(5),i(14),i(0),i(10),i(1),null,null,i(2),"YES",genid,i(11),i(1)},
@@ -5260,6 +5434,7 @@ public void testGetFunctionColumns() throws Exception
                  expRS,
                  new Object[][]
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                      {null,schema,"F_GFC_2","",i(4),i(16),"BOOLEAN",i(1),i(1),null,null,i(1),null,null,i(0),"YES",genid,i(1),i(-1)},
                      {null,schema,"F_GFC_2","A",i(1),i(16),"BOOLEAN",i(1),i(1),null,null,i(1),null,null,i(1),"YES",genid,i(1),i(0)},
                  }
@@ -5279,6 +5454,7 @@ public void testGetFunctionColumns() throws Exception
      * @return an Integer
      */
     private static Integer i(int i) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return i;
     }
 
@@ -5289,6 +5465,7 @@ private static Integer i(int i) {
      */
     public void test_jdbc4_1() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         Version dataVersion = getDataVersion( getConnection() );
         if ( dataVersion.compareTo( new Version( 10, 8, 0, 0 ) ) < 0 ) { return; }
 
@@ -5334,6 +5511,7 @@ public void test_jdbc4_1() throws Exception
         // IS_GENERATEDCOLUMN added to ResultSet returned by getColumns()
         //
         s.execute( "create table t_jdbc41( a int, b int, c generated always as ( -a ) )" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         ResultSet   rs2 = dmd.getColumns( null, schema, "T_JDBC41", null );
         String[][] expectedRows = new String[][]
         {
@@ -5347,6 +5525,7 @@ public void test_jdbc4_1() throws Exception
                 null
             },
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                 "", schema, "T_JDBC41", "B",
                 "4", "INTEGER", "10", null,
                 "0", "10", "1", "",
@@ -5356,6 +5535,7 @@ public void test_jdbc4_1() throws Exception
                 null
             },
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                 "", schema, "T_JDBC41", "C",
                 "4", "INTEGER", "10", null,
                 "0", "10", "1", "",
@@ -5378,6 +5558,7 @@ public void test_jdbc4_1() throws Exception
      */
     public void test_jdbc4_2() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         Version dataVersion = getDataVersion( getConnection() );
         if ( dataVersion.compareTo( new Version( 10, 10, 0, 0 ) ) < 0 ) { return; }
 
@@ -5390,6 +5571,7 @@ public void test_jdbc4_2() throws Exception
         // getMaxLogicalLobSize()
         //
         assertEquals( 0L, wrapper.getMaxLogicalLobSize() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
 
         //
         // supportsRefCursors()
@@ -5415,6 +5597,7 @@ public void testBugFixes() throws SQLException {
         s.execute("CREATE TABLE Derby655t3(c31_ID BIGINT NOT NULL primary key)");
         s.execute("ALTER TABLE Derby655t2 ADD CONSTRAINT F_443 Foreign Key (c21_ID) REFERENCES Derby655t3(c31_ID) ON DELETE CASCADE ON UPDATE NO ACTION");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         ResultSet rs = dmd.getImportedKeys("", schema, "DERBY655T1");
         JDBC.assertDrainResults(rs, 1);
         
@@ -5426,6 +5609,8 @@ public void testBugFixes() throws SQLException {
         // if you do not get an error, the bug does not occur.          
         if(JDBC.vmSupportsJDBC3()){
             s.execute("create procedure isReadO() language java external name " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
+//IC see: https://issues.apache.org/jira/browse/DERBY-514
                     "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.isro'" +
             " parameter style java"); 
             s.execute("call isReadO()");
@@ -5462,6 +5647,7 @@ public void testGetColumns_DERBY5274() throws SQLException {
 
         // Expected values for various columns in the meta-data.
         String[][] expected = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
             {"TABLE_SCHEM", schema},
             {"TABLE_NAME", "DERBY5274"},
             {"COLUMN_NAME", "X"},
@@ -5476,6 +5662,7 @@ public void testGetColumns_DERBY5274() throws SQLException {
 
         // Verify that the returned meta-data looks right.
         assertTrue("No columns found", rs.next());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         for (String[] expected1 : expected) {
             String label = expected1[0];
             String expectedVal = expected1[1];
@@ -5509,6 +5696,7 @@ public void testGetColumns_DERBY5274() throws SQLException {
      * @return the {@code j} byte array
      */
     public static byte[] getpc(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6623
         String a, BigDecimal b, short c, byte d, short e,
         int f, long g, float h, double i, byte[] j, Date k, Time l, Timestamp T)
     {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java
index 9833f83073..abd402d8ec 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DboPowersTest.java
@@ -63,6 +63,7 @@ public class DboPowersTest extends BaseJDBCTestCase
         "authentication",
         "authentication + sqlAuthorization"};
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
     final private static boolean ENCRYPT = true;
     final private static boolean DECRYPT = false;
 
@@ -112,6 +113,7 @@ public DboPowersTest(String name, int authLevel,
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("DboPowersTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         /* Database shutdown powers */
 
@@ -126,6 +128,7 @@ public static Test suite()
         // the specification for JSR169 support in DERBY-97.
         if (!JDBC.vmSupportsJSR169()) {
             suite.addTest(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 dboCryptoSuite("suite: cryptographic powers, embedded"));
             suite.addTest(
                 TestConfiguration.clientServerDecorator(
@@ -178,6 +181,7 @@ private static Test dboShutdownSuite(String framework)
         /* Tests without any authorization active (level ==
          * NOAUTHENTICATION).
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite noauthSuite =
             new BaseTestSuite("suite: security level=" +
                           secLevelNames[NOAUTHENTICATION]);
@@ -306,6 +310,10 @@ private void vetShutdownException (String user, SQLException e)
             } else {
                 assertSQLState("database shutdown restriction, " +
                                "SQL authorization, not db owner",
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
                                "08004", e);
             }
             break;
@@ -336,10 +344,12 @@ private static Test dboCryptoSuite(String framework)
          * variants: Necessary since framework doesn't know
          * bootPassword.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite noauthSuite =
             new BaseTestSuite("suite: security level=" +
                           secLevelNames[NOAUTHENTICATION]);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         for (int tNo = 0; tNo < cryptoTests.length; tNo++) {
             noauthSuite.addTest(
                 TestConfiguration.singleUseDatabaseDecoratorNoShutdown(
@@ -354,10 +364,13 @@ private static Test dboCryptoSuite(String framework)
         for (int autLev = AUTHENTICATION;
              autLev <= SQLAUTHORIZATION ; autLev++) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             tests[autLev] = wrapCryptoUserTests(autLev);
         }
 
         BaseTestSuite suite = new BaseTestSuite("dboPowers:"+framework);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         /* run tests with no authentication enabled */
         suite.addTest(tests[NOAUTHENTICATION]);
@@ -383,6 +396,7 @@ private static Test dboCryptoSuite(String framework)
     private static Test wrapCryptoUserTests(int autLev)
     {
         // add decorator for different users authenticated
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite usersSuite =
             new BaseTestSuite("usersSuite: security level=" +
                           secLevelNames[autLev]);
@@ -391,6 +405,7 @@ private static Test wrapCryptoUserTests(int autLev)
         // use of no teardown / no shutdown decorator variants:
         // Necessary since framework doesnt know bootPassword
         for (int userNo = 0; userNo < users.length; userNo++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             for (int tNo = 0; tNo < cryptoTests.length; tNo++) {
                 Test test = TestConfiguration.changeUserDecorator
                     (new DboPowersTest(cryptoTests[tNo],
@@ -417,6 +432,7 @@ private static Test wrapCryptoUserTests(int autLev)
     /**
      * Enumerates the cryptographic tests.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
     final static String[] cryptoTests = {
         "testEncrypt", "testReEncrypt", "testDecrypt"};
 
@@ -450,6 +466,7 @@ public void testEncrypt() throws SQLException
         JDBCDataSource.setBeanProperty(ds, "user", user);
         JDBCDataSource.setBeanProperty(ds, "password", password);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         Connection con;
         try {
             con = ds.getConnection();
@@ -509,6 +526,7 @@ public void testReEncrypt() throws SQLException
 
         try {
             ds.getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             vetCryptoAttempt(ENCRYPT, user, null);
         } catch (SQLException e) {
             vetCryptoAttempt(ENCRYPT, user, e);
@@ -526,6 +544,7 @@ public void testReEncrypt() throws SQLException
      * Tests that only the DBO can decrypt a database.
      */
     public void testDecrypt()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             throws SQLException {
         println("testDecrypt: auth=" + this._authLevel +
                 " user=" + getTestConfiguration().getUserName());
@@ -612,6 +631,7 @@ private void bringDbUp(String bootPassword) throws SQLException
         String user = getTestConfiguration().getUserName();
         String password = getTestConfiguration().getUserPassword();
         DataSource ds = JDBCDataSource.getDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         if (bootPassword != null) {
             JDBCDataSource.setBeanProperty(
                 ds, "connectionAttributes", "bootPassword=" + bootPassword);
@@ -658,6 +678,7 @@ private static Test dboHardUpgradeSuite(String framework)
         /* Tests without any authorization active (level ==
          * NOAUTHENTICATION).
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite noauthSuite =
             new BaseTestSuite("suite: security level=" +
                           secLevelNames[NOAUTHENTICATION]);
@@ -678,6 +699,7 @@ private static Test dboHardUpgradeSuite(String framework)
         }
 
         BaseTestSuite suite = new BaseTestSuite("dboPowers:"+framework);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // A priori, doing a hard upgrade is a no-op here; we are only
         // interested in checking if we have the powers to do it. However,
@@ -689,6 +711,7 @@ private static Test dboHardUpgradeSuite(String framework)
         // care of itself since it uses another database anyway.
 
         /* run tests with no authentication enabled */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4154
         suite.addTest(TestConfiguration.singleUseDatabaseDecorator(
                           tests[NOAUTHENTICATION]));
 
@@ -716,6 +739,8 @@ private static Test dboHardUpgradeSuite(String framework)
     private static Test wrapHardUpgradeUserTests(int autLev)
     {
         // add decorator for different users authenticated
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite usersSuite =
             new BaseTestSuite("usersSuite: security level=" +
                           secLevelNames[autLev]);
@@ -779,6 +804,8 @@ public void testHardUpgrade() throws SQLException
      */
     private void vetHardUpgradeAttempt (String user, SQLException e)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         vetAttempt(user, e, "08004", "hard upgrade");
     }
 
@@ -811,6 +838,7 @@ private void vetAttempt (String user, SQLException e,
                 assertEquals(operation + ", SQL authorization, db owner",
                              null, e);
             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 String msg = operation + ", SQL authorization, not db owner";
                 assertNotNull(
                         msg + ": succeeded unexpectedly without exeption", e);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby2017LayerATest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby2017LayerATest.java
index 77c7c525df..b31c3a1cbd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby2017LayerATest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby2017LayerATest.java
@@ -64,12 +64,14 @@ public Derby2017LayerATest(String name) {
      * @return A suite of tests.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite ts = new BaseTestSuite();
         ts.addTest(
                 TestConfiguration.defaultSuite(Derby2017LayerATest.class));
         // Run the tests below with the client driver only.
         BaseTestSuite clientSuite = new BaseTestSuite("Client only tests");
         clientSuite.addTest(new Derby2017LayerATest(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
                 "cs_FailedStreamInsertCharBufferBoundaries"));
         clientSuite.addTest(new Derby2017LayerATest(
                 "cs_StreamInsertCharBufferBoundary"));
@@ -157,6 +159,7 @@ public void cs_FailedStreamInsertCharBufferBoundaries()
                 0+i,
             };
             // We test only one combination of auto-commit and rollback here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             doInsertTest(INSERT, false, false);
         }
     }
@@ -343,6 +346,7 @@ public void testFailedStreamInsertCharAutoCommitRollbackOnError()
     }
 
     public void testFailedStreamInsertBinary()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             throws IOException, SQLException {
         byte[][] INSERT = generateDefaultInsert();
         String[][] MASTER = generateMaster(INSERT, new int[] {3, 4});
@@ -591,6 +595,7 @@ private void doInsertTest(int[] INSERT,
      */
     private void doInsertTest(byte[][] INSERT, String[][] MASTER,
                               boolean autoCommit, boolean rollbackOnError)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
             throws IOException, SQLException {
         // A few sanity checks.
         assertEquals("Expects 7 rows", 7, INSERT.length);
@@ -725,6 +730,7 @@ public void close() {
      * @return A byte array with byte arrays ("rows").
      */
     public static byte[][] generateDefaultInsert() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         try {
             byte[][] INSERT = new byte[][] {
                 "This is row 1".getBytes(UTF8),
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5158Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5158Test.java
index b9229ab3b6..2c1ea67afe 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5158Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5158Test.java
@@ -39,6 +39,7 @@ public Derby5158Test(String name)
     protected static Test makeSuite(String name)
     {
         BaseTestSuite suite = new BaseTestSuite(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         Test cst = TestConfiguration.defaultSuite(Derby5158Test.class);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5165Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5165Test.java
index db459c04b1..d83f1fcc67 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5165Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Derby5165Test.java
@@ -62,6 +62,7 @@ public static Test suite() {
             
             test = TestConfiguration.singleUseDatabaseDecorator( test, "d5165db" );
             test = TestConfiguration.singleUseDatabaseDecorator( test, "d5165db2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6727
             test = TestConfiguration.singleUseDatabaseDecorator( test, "d5165db3" );
             test = TestConfiguration.singleUseDatabaseDecorator( test, "d5165db4");
             
@@ -121,6 +122,7 @@ public void testXAUpdateLockKeptPastDBRestart()
         // time out.
         Statement s2 = c2.createStatement();
         try { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6727
             ResultSet rs = s2.executeQuery("select * from " + tableName);
             //System.out.println("Contents of T:");
             while (rs.next()) {
@@ -159,6 +161,8 @@ public void testXAInsertLockKeptPastDBRestart()
         Connection conn = xac.getConnection();
         // step 1 - perform insert with XA, using Xid xid1 
         Statement s = conn.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6727
+//IC see: https://issues.apache.org/jira/browse/DERBY-6727
         String tableName = "d5165t";
         createAndLoadTable(conn, tableName, true);
         conn.commit();
@@ -196,6 +200,7 @@ public void testXAInsertLockKeptPastDBRestart()
         // timed out.
         Statement s2 = c2.createStatement();
         try { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6727
             ResultSet rs = s2.executeQuery("select * from " + tableName);
             while (rs.next()) {
                 //    System.out.println(rs.getInt(1));
@@ -221,6 +226,7 @@ public void testXAUpdateLockKeptPastCrashedDBRestart() throws Exception
         // implying a crash when the jvm is done
         // This will force the connect to recover the database.
         // Pass in the name of the database to be used.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6727
         assertLaunchedJUnitTestMethod("org.apache.derbyTesting." +
                 "functionTests.tests.jdbcapi.Derby5165Test.launchUpdate",
                 "d5165db3");
@@ -276,6 +282,7 @@ public void launchUpdate() throws Exception
         xar.start(xid1, XAResource.TMNOFLAGS);
         Connection c1 = xac.getConnection();
         Statement s1 = c1.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6727
         s1.execute("update " + tableName + " set x = 2 where x = 1");
         xar.end(xid1, XAResource.TMSUCCESS);
 
@@ -338,6 +345,7 @@ public void launchInsert() throws Exception
         Connection c1 = xac.getConnection();
         Statement s1 = c1.createStatement();
         // insert
+//IC see: https://issues.apache.org/jira/browse/DERBY-6727
         s1.execute("insert into " + tableName + " values 2");
         xar.end(xid1, XAResource.TMSUCCESS);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverMgrAuthenticationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverMgrAuthenticationTest.java
index 41e34d9a0e..758146e5c3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverMgrAuthenticationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverMgrAuthenticationTest.java
@@ -43,6 +43,7 @@ public DriverMgrAuthenticationTest(String name) {
     public static Test suite() {
         // This test uses driverManager and so is not suitable for JSR169
         if (JDBC.vmSupportsJSR169())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(
                 "DriverManager not available with JSR169;" +
                 "empty DriverMgrAuthenticationTest");
@@ -60,11 +61,13 @@ public static Test suite() {
     // baseSuite takes advantage of setting system properties as defined
     // in AuthenticationTest
     public static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("DriverMgrAuthenticationTest");
         
         Test test = new DriverMgrAuthenticationTest(
             "testConnectShutdownAuthentication");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         setBaseProps(suite, test);
         
         test = new DriverMgrAuthenticationTest("testUserFunctions");
@@ -223,6 +226,7 @@ protected void assertSystemShutdownFail(
         String expectedSqlState, String dbName, String user, String password) 
     throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         String url = TestConfiguration.getCurrent().getJDBCUrl(dbName);
         if (usingDerbyNetClient() && dbName=="")
             // The junit test harness that kicked off the test will hang when 
@@ -234,6 +238,7 @@ protected void assertSystemShutdownFail(
             url + ";user=" + user + ";password=" + password + ";shutdown=true";
         try {
             //DriverManager.getConnection(url2, user, password);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
             DriverManager.getConnection(url2);
             fail("expected failed shutdown");
         } catch (SQLException e) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java
index fb7c8e0916..e4e5ca5ee2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java
@@ -65,8 +65,11 @@ public class DriverTest extends BaseJDBCTestCase {
     static final String[] ADDITIONAL_DBS = {
         DB_NAME_WITH_SPACES,
         "testcreatedb1", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
         "testcreatedb2",
+//IC see: https://issues.apache.org/jira/browse/DERBY-974
         "testcreatedb3",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6246
         "trailblank",
         "'wombat'"
     };
@@ -79,6 +82,7 @@ public static Test suite() {
         // java.sql.Driver is not supported with JSR169, so return empty suite
         if (JDBC.vmSupportsJSR169())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(
                 "DriverTest tests java.sql.Driver, not supported with JSR169");
         }
@@ -91,6 +95,7 @@ public static Test suite() {
     
     private static Test baseSuite(String name) {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DriverTest");
         setBaseProps(suite, new DriverTest("testDriverCompliantVersion"));
         setBaseProps(suite, new DriverTest("testAcceptsURL"));
@@ -99,6 +104,7 @@ private static Test baseSuite(String name) {
         setBaseProps(suite, new DriverTest("testClientURL"));
         setBaseProps(suite, new DriverTest("testDbNameWithSpaces"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
         return suite;
     }
     
@@ -120,6 +126,7 @@ private static void setBaseProps(BaseTestSuite suite, Test test)
 
     public void tearDown() throws Exception {
         // attempt to get rid of any left-over trace files
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (int i = 0; i < 2; i++) {
             String traceFileName = "trace" + (i + 1) + ".out";
             File traceFile = new File(traceFileName);
@@ -130,6 +137,7 @@ public void tearDown() throws Exception {
         }
 
         TestConfiguration config = TestConfiguration.getCurrent();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6246
                 for (String dbName : ADDITIONAL_DBS) {
             removeDirectory(config.getDatabasePath(dbName));
         }
@@ -168,10 +176,12 @@ public void testDriverCompliantVersion() throws Exception
         // Test that the driver class is the expected one. Currently, the same
         // driver class is used regardless of JDBC version.
         println( "Driver is a " + driver.getClass().getName() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         assertEquals(usingEmbedded() ? "AutoloadedDriver" : "ClientAutoloadedDriver",
                      driver.getClass().getSimpleName());
 
         // test that null connection URLs raise a SQLException per JDBC 4.2 spec clarification
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         try {
             driver.acceptsURL( null );
             fail( "Should not have accepted a null connection url" );
@@ -311,6 +321,7 @@ public void testEmbeddedAttributes() throws SQLException
         }
         
         // shutdown using url
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
         try {
             assertConnect(
                 false, protocol + "testcreatedb2;shutdown=true", null);
@@ -345,8 +356,10 @@ public void testClientAttributes() throws SQLException
         assertConnect(false, url, info);
         assertTraceFilesExist();
         shutdownDB(url + ";shutdown=true", null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
 
         // Derby-974: test that connection sees default properties as well
+//IC see: https://issues.apache.org/jira/browse/DERBY-974
         info.setProperty("create","true");
         Properties infoWithDefaults = new Properties(info);
 
@@ -362,6 +375,7 @@ public void testClientAttributes() throws SQLException
      */
     private static void assertTraceFilesExist() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (int i = 0; i < 2; i++) {
             String traceFileName = "trace" + (i + 1) + ".out";
             File traceFile = new File(traceFileName);
@@ -385,6 +399,7 @@ public void testClientURL() throws SQLException {
         
         Properties info = null;     //test with null Properties object
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
         String CLIENT_CREATE_URL_WITH_COLON1 = 
             protocol + dbName + ":create=true";
         //String CLIENT_CREATE_URL_WITH_COLON2 = protocol + DERBY_SYSTEM_HOME + 
@@ -431,6 +446,7 @@ public void testClientURL() throws SQLException {
         // shutdown the databases, which should get rid of all open connections
         // currently, there's only the one; otherwise, this could be done in
         // a loop.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
         shutdownDB(
             CLIENT_SHUT_URL_WITH_SINGLE_QUOTES2 + ";shutdown=true", null);
     }   
@@ -462,6 +478,7 @@ public void testDbNameWithSpaces() throws SQLException {
         if (usingDerbyNetClient())
             protocol = protocol + TestConfiguration.getCurrent().getHostName()
             + ":" + TestConfiguration.getCurrent().getPort() + "/";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
         url = protocol + DB_NAME_WITH_SPACES + ";create=true";
         String shuturl = protocol + DB_NAME_WITH_SPACES + ";shutdown=true";
         
@@ -469,6 +486,7 @@ public void testDbNameWithSpaces() throws SQLException {
         shutdownDB(shuturl, null);
         
         // Test trailing spaces - Beetle 4653. Moved from urlLocale.sql
+//IC see: https://issues.apache.org/jira/browse/DERBY-6246
         url = TestConfiguration.getCurrent().getJDBCUrl("trailblank");
         url += ";create=true";
         assertConnect(false,url,null);
@@ -501,6 +519,7 @@ private static void assertConnect(
     {
         Driver driver = DriverManager.getDriver(url);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
         Connection conn = driver.connect(url, info);
         assertNotNull(conn);
    
@@ -513,6 +532,7 @@ private static void assertConnect(
         rs.next();
         assertEquals(
             rs.getString(1), conn.getMetaData().getUserName().toUpperCase());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
         rs.close();
         conn.close();
         return;
@@ -540,6 +560,7 @@ private static void loadDriver()
         String driverClass =
             TestConfiguration.getCurrent().getJDBCClient().getJDBCDriverName();
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(driverClass);
             clazz.getConstructor().newInstance();
         } catch (Exception e) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/HoldabilityTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/HoldabilityTest.java
index 86f40af1ab..066902c6f4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/HoldabilityTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/HoldabilityTest.java
@@ -51,6 +51,7 @@ protected void setUp()
         // We also use more records to ensure that the disk
         // is being used.
         SURDataModelSetup.createDataModel
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
             (SURDataModelSetup.SURDataModel.MODEL_WITH_PK, getConnection(),
              recordCount);
         commit();
@@ -89,6 +90,10 @@ public void testHeldForwardOnlyResultSetScanInit()
     public void testHeldForwardOnlyResultSetScanInProgress() 
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement();
         ResultSet rs = s.executeQuery(selectStatement);
 
@@ -111,6 +116,8 @@ public void testHeldForwardOnlyResultSetScanInProgress()
     public void testHeldForwardOnlyUpdatableResultSetScanInit() 
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                           ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = s.executeQuery(selectStatement);
@@ -172,6 +179,8 @@ public void testCompressOnHeldForwardOnlyUpdatableResultSetScanInit()
     public void testHeldForwardOnlyUpdatableResultSetScanInProgress() 
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                           ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = s.executeQuery(selectStatement);
@@ -181,6 +190,8 @@ public void testHeldForwardOnlyUpdatableResultSetScanInProgress()
             verifyTuple(rs);
         }
         updateTuple(rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit(); // Scan is in progress
         rs.next();
         updateTuple(rs); // Still updatable
@@ -197,6 +208,8 @@ public void testHeldForwardOnlyUpdatableResultSetScanInProgress()
     public void testHeldScrollableResultSetScanInit() 
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_READ_ONLY);
         ResultSet rs = s.executeQuery(selectStatement);
@@ -224,6 +237,8 @@ public void testHeldScrollableResultSetScanInProgress()
             rs.next();
             verifyTuple(rs);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit(); // Scan is in progress
         
         while (rs.next()) {
@@ -240,6 +255,10 @@ public void testHeldScrollableResultSetScanInProgress()
     public void testHeldScrollableResultSetScanDone() 
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_READ_ONLY);
         ResultSet rs = s.executeQuery(selectStatement);
@@ -266,6 +285,8 @@ public void testHeldScrollableUpdatableResultSetScanInit()
         if (rs.getConcurrency()==ResultSet.CONCUR_READ_ONLY) {
             fail("ResultSet concurrency downgraded to CONCUR_READ_ONLY");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit(); // scan initialized
         
         scrollForward(rs);
@@ -291,6 +312,10 @@ public void testHeldScrollableUpdatableResultSetScanInProgress()
             rs.next();
             verifyTuple(rs);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit(); // Scan is in progress
         
         while (rs.next()) {
@@ -318,6 +343,8 @@ public void testHeldScrollableUpdatableResultSetScanDone()
       
         scrollForward(rs); // Scan is done
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit();
         
         scrollBackwardAndUpdate(rs);
@@ -330,8 +357,15 @@ public void testHeldScrollableUpdatableResultSetScanDone()
      * on a held forward only ResulTset.
      */
     public void testUpdateRowAfterCommitOnHeldForwardOnlyResultSet() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1172
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                           ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = s.executeQuery(selectStatement);
@@ -367,6 +401,10 @@ public void testUpdateRowAfterCommitOnHeldScrollInsensitiveResultSet()
             fail("ResultSet concurrency downgraded to CONCUR_READ_ONLY");
         }
         rs.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit();
         try {
             rs.updateInt(2, -100);
@@ -395,6 +433,8 @@ public void testCompressOnHeldScrollableUpdatableResultSetScanInit()
         if (rs.getConcurrency()==ResultSet.CONCUR_READ_ONLY) {
             fail("ResultSet concurrency downgraded to CONCUR_READ_ONLY");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit(); // commit
         
         // Verifies resultset can do updates after compress
@@ -412,6 +452,8 @@ public void testCompressOnHeldScrollableUpdatableResultSetScanInProgress()
         throws SQLException
     {
         // First: Read all records in the table into the ResultSet:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = s.executeQuery(selectStatement);
@@ -420,6 +462,8 @@ public void testCompressOnHeldScrollableUpdatableResultSetScanInProgress()
         }
         rs.next(); // Scan is in progress.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit(); // commit, releases the lock on the records
         
         verifyCompressInvalidation(rs);
@@ -436,6 +480,18 @@ public void testCompressOnHeldScrollableUpdatableResultSetScanDone()
         throws SQLException
     {
         // First: Read all records in the table into the ResultSet:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = s.executeQuery(selectStatement);
@@ -445,9 +501,15 @@ public void testCompressOnHeldScrollableUpdatableResultSetScanDone()
         
         scrollForward(rs); // scan is done
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit(); // commit, releases the lock on the records
         
         verifyCompressInvalidation(rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s.close();
     }
 
@@ -481,12 +543,15 @@ private void verifyResultSetUpdatableAfterCompress(ResultSet rs)
             ps.setInt(2, recordId);
             ps.setInt(3, recordId *2 + 17);
             ps.setString(4, "m" + recordId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
             ps.setString(5, "c"+recordId);
             ps.addBatch();
         }
         ps.executeBatch();
         ps.close();
         commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
 
         rs.next();
         updateTuple(rs);
@@ -531,6 +596,10 @@ private void verifyCompressInvalidation(ResultSet rs)
     {
         
         // Delete all records except the first:
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement delStatement = createStatement();
         int deleted = delStatement.executeUpdate("delete from T1 where id>0");
         int expectedDeleted = recordCount-1;    
@@ -545,6 +614,8 @@ private void verifyCompressInvalidation(ResultSet rs)
         
         // Now reinsert the tuples:
         PreparedStatement ps = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
             prepareStatement("insert into t1 values (?,?,?,?,?)");
         
         for (int i=0; i<recordCount*2; i++) {
@@ -553,10 +624,13 @@ private void verifyCompressInvalidation(ResultSet rs)
             ps.setInt(2, recordId);
             ps.setInt(3, recordId *2 + 17);
             ps.setString(4, "m" + recordId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
             ps.setString(5, "c" + recordId);
             ps.addBatch();
         }
         ps.executeBatch();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         ps.close();
         commit();
         
@@ -574,6 +648,10 @@ private void verifyCompressInvalidation(ResultSet rs)
         updateTuple(rs); 
         warn = rs.getWarnings();
         assertWarning(warn, CURSOR_OPERATION_CONFLICT);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit();
         
         // Verify data
@@ -597,6 +675,7 @@ private void onlineCompress(boolean purge,
         throws SQLException
     {
                // Use a new connection to compress the table        
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         final Connection con2 = openDefaultConnection();
         con2.setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
         
@@ -609,6 +688,8 @@ private void onlineCompress(boolean purge,
         ps2.setBoolean(5, truncate);
         
         ps2.executeUpdate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         ps2.close();
         con2.commit();
         con2.close();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java
index 755cbcee58..8f62be9f32 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java
@@ -63,6 +63,7 @@ public class InternationalConnectTest extends BaseJDBCTestCase {
     public InternationalConnectTest(String name) {
         super(name);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         databasesForCleanup = new ArrayList<String>();
     }
 
@@ -144,6 +145,7 @@ private void loadDriver(String url) throws SQLException {
             println("Loading JDBC driver " + driverClass);
             // load the driver
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Class<?> clazz = Class.forName(driverClass);
                 clazz.getConstructor().newInstance();
             } catch (ClassNotFoundException cnfe) {
@@ -158,6 +160,7 @@ private void loadDriver(String url) throws SQLException {
                 throw new SQLException("Failed to load JDBC driver '" 
                         + driverClass + "', InstantiationException: " 
                         + ie.getMessage());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             } catch (NoSuchMethodException ie) {
                 throw new SQLException("Failed to load JDBC driver '" 
                         + driverClass + "', InstantiationException: " 
@@ -183,6 +186,7 @@ public void testDriverManagerConnect() throws SQLException {
         String url = null;
 
         //Test Chinese database name
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         url = TestConfiguration.getCurrent().getJDBCUrl("\u4e10;create=true");
         
         conn = DriverManager.getConnection(url);
@@ -223,9 +227,11 @@ public void testXADSConnect() throws SQLException {
         J2EEDataSource.setBeanProperty(ds, "databaseName", "\u4e10");
         J2EEDataSource.setBeanProperty(ds, "createDatabase", "create");        
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         XAConnection xaconn = ds.getXAConnection();
         Connection conn = xaconn.getConnection();
         conn.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5722
         xaconn.close();
   
         // Chinese user
@@ -257,9 +263,11 @@ public void testCPDSConnect() throws SQLException {
         J2EEDataSource.setBeanProperty(ds, "databaseName", "\u4e10");
         J2EEDataSource.setBeanProperty(ds, "createDatabase", "create");        
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4757
         PooledConnection poolConn = ds.getPooledConnection();
         Connection conn = poolConn.getConnection();
         conn.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5722
         poolConn.close();
  
         // Chinese user
@@ -277,6 +285,10 @@ public void testCPDSConnect() throws SQLException {
         poolConn.close();
         
         /* Add the created database for cleanup by tearDown() */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4836
+//IC see: https://issues.apache.org/jira/browse/DERBY-4836
+//IC see: https://issues.apache.org/jira/browse/DERBY-4836
+//IC see: https://issues.apache.org/jira/browse/DERBY-4836
         databasesForCleanup.add("\u4e10");
     }
 
@@ -289,6 +301,7 @@ public void testCPDSConnect() throws SQLException {
      */
     public void testFailureOnNonExistentDatabase() throws SQLException {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4746
         String url = TestConfiguration.getCurrent().getJDBCUrl(
                 "abcdefghijklmnopq\u00E5");
         try {
@@ -312,6 +325,7 @@ public void tearDown() throws Exception {
                                 .getJDBCUrl(databasesForCleanup.get(i) + ";shutdown=true");
             try {
                 DriverManager.getConnection(shutdownUrl);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4836
                 fail("Database didn't shut down");
             } catch (SQLException se) {
                 // ignore shutdown exception
@@ -323,6 +337,7 @@ public void tearDown() throws Exception {
         
         /* Clear the array list as new fixtures will add other databases */
         databasesForCleanup = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5722
 
         super.tearDown();
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/InvalidLDAPServerAuthenticationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/InvalidLDAPServerAuthenticationTest.java
index 18635bfeb8..0e12cb7aca 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/InvalidLDAPServerAuthenticationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/InvalidLDAPServerAuthenticationTest.java
@@ -52,6 +52,7 @@ protected void initializeConnection(Connection conn) throws SQLException {
 
     public static Test suite() {
         if (JDBC.vmSupportsJSR169())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(
                 "InvalidLDAPServerAuthenticationTest - cannot" +
                 " run with JSR169 - missing functionality for " +
@@ -71,6 +72,7 @@ public static Test suite() {
     }
 
     public static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         Test test = new InvalidLDAPServerAuthenticationTest("testInvalidLDAPServerConnectionError");
         suite.addTest(test);
@@ -97,6 +99,7 @@ public void testInvalidLDAPServerConnectionError() throws SQLException {
         // set the ldap properties
         setDatabaseProperty("derby.connection.requireAuthentication", "true", conn);
         setDatabaseProperty("derby.authentication.provider", "LDAP", conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5941
         setDatabaseProperty("derby.authentication.server", "noSuchServer.invalid", conn);
         setDatabaseProperty("derby.authentication.ldap.searchBase", "o=dnString", conn);
         setDatabaseProperty("derby.authentication.ldap.searchFilter","(&(objectClass=inetOrgPerson)(uid=%USERNAME%))", conn);
@@ -115,6 +118,7 @@ public void testInvalidLDAPServerConnectionError() throws SQLException {
             ds.getConnection();
             fail("expected java.net.UnknownHostException for datasource");
         } catch (SQLException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             if (JDBC.vmSupportsJNDI()) {
                 assertSQLState("08004", se);
                 // with network server, the java.net.UnknownHostException will
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
index c760aa92e5..b503edb7c5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
@@ -93,6 +93,7 @@ public class J2EEDataSourceTest extends BaseJDBCTestCase {
      * in this hashtable
      */
     protected static Hashtable<String, Connection> conns =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             new Hashtable<String, Connection>();
     
     /** The expected format of a connection string. In English:
@@ -123,6 +124,7 @@ public J2EEDataSourceTest(String name) {
      * @return A suite of tests being run with a lower lock timeout.
      */
     private static Test getTimeoutSuite(String postfix) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("Lower lock timeout" + postfix);
 
@@ -139,11 +141,13 @@ private static Test getTimeoutSuite(String postfix) {
      * @return A suite of tests to be run with client and/or embedded
      */
     private static Test baseSuite(String postfix) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ClientAndEmbedded" + postfix);
 
         suite.addTest(new J2EEDataSourceTest("testGlobalLocalInterleaf"));
         suite.addTest(new J2EEDataSourceTest("testSetIsolationWithStatement"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2498
         suite.addTest(new J2EEDataSourceTest("testJira95pds"));
         suite.addTest(new J2EEDataSourceTest("testJira95xads"));
         suite.addTest(new J2EEDataSourceTest("testBadConnectionAttributeSyntax"));
@@ -164,9 +168,12 @@ private static Test baseSuite(String postfix) {
         suite.addTest(new J2EEDataSourceTest("testClosedCPDSConnection"));
         suite.addTest(new J2EEDataSourceTest("testClosedXADSConnection"));
         suite.addTest(new J2EEDataSourceTest("testSetSchemaInXAConnection"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3379
         suite.addTest(new J2EEDataSourceTest("testPooledReuseOnClose"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3690
         suite.addTest(new J2EEDataSourceTest("testSchemaIsReset"));
         suite.addTest(new J2EEDataSourceTest("testSchemaIsResetWhenDeleted"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         suite.addTest(new J2EEDataSourceTest("testDerby3799"));
         return suite;
     }
@@ -177,13 +184,18 @@ private static Test baseSuite(String postfix) {
      * @return A suite of tests being run with client only
      */
     private static Test getClientSuite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Client/Server");
         suite.addTest(new J2EEDataSourceTest("testClientDSConnectionAttributes"));
         suite.addTest(new J2EEDataSourceTest(
                 "testClientTraceFileDSConnectionAttribute"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4067
+//IC see: https://issues.apache.org/jira/browse/DERBY-2468
         suite.addTest(new J2EEDataSourceTest(
                 "testClientMessageTextConnectionAttribute"));
         suite.addTest(new J2EEDataSourceTest("testConnectionFlowCommit"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4709
+//IC see: https://issues.apache.org/jira/browse/DERBY-4653
         suite.addTest(new J2EEDataSourceTest("testConnectionFlowCommitAlt"));
         suite.addTest(new J2EEDataSourceTest("testDerby2026LoginTimeout"));
         // Disabled because rollback flow optimization hasn't been implemented.
@@ -199,6 +211,7 @@ private static Test getClientSuite() {
      * @return A suite of tests being run with embedded only
      */
     private static Test getEmbeddedSuite(String postfix) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Embedded" + postfix);
         suite.addTest(new J2EEDataSourceTest("testDSRequestAuthentication"));
         // Following cannot run with client because of DERBY-2533; it hangs
@@ -214,6 +227,7 @@ public static Test suite() {
             // test uses unsupported classes like DriverManager, XADataSource,
             // ConnectionPoolDataSource, ConnectionEvenListenere, as well as
             // unsupported methods, like Connection.setTypeMap()...
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite =
                 new BaseTestSuite("J2EEDatasourceTest cannot run with JSR169");
             return suite;
@@ -229,6 +243,8 @@ public static Test suite() {
             suite.addTest(TestConfiguration.clientServerDecorator(
                     baseSuite(":client")));
             // Add the tests that only run with client
+//IC see: https://issues.apache.org/jira/browse/DERBY-4709
+//IC see: https://issues.apache.org/jira/browse/DERBY-4653
             suite.addTest(new SupportFilesSetup(
                     TestConfiguration.clientServerDecorator(getClientSuite())));
             // Add the tests that only run with embedded
@@ -263,6 +279,7 @@ protected void decorateSQL(Statement s) throws SQLException {
                             "'org.apache.derbyTesting.functionTests.tests.jdbcapi.J2EEDataSourceTest." +
                             getNestedMethodName() +
                     "'");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
                     s.execute("create table derby3799 (dClob clob)");
                     s.executeUpdate("insert into derby3799 values (" +
                             "'myLittleTestClob')");
@@ -273,6 +290,7 @@ protected void decorateSQL(Statement s) throws SQLException {
     
     public void tearDown() throws Exception {
         // attempt to get rid of any left-over trace files
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (int i = 0; i < 6; i++) {
             String traceFileName = "trace" + (i + 1) + ".out";
             File traceFile = new File(traceFileName);
@@ -329,6 +347,7 @@ public void testConnectionErrorEvent() throws SQLException, Exception
         //before shutdown and they all should generate connection error event.
         try {
             conn.prepareStatement("CREATE TABLE TAB1(COL1 INT NOT NULL)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
             fail("SQLException should be thrown!");
         } catch (SQLException e) {
             //The first call on JDBC Connection object after Network Server
@@ -418,6 +437,7 @@ public void testConnectionErrorEvent() throws SQLException, Exception
         aes12.resetState();
         try {
             conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
                     ResultSet.CONCUR_READ_ONLY);
             fail("SQLException of 08003 should be thrown!");
         } catch (SQLException e) {
@@ -428,6 +448,7 @@ public void testConnectionErrorEvent() throws SQLException, Exception
         aes12.resetState();
         try {
             conn.prepareCall("CREATE TABLE TAB1(COL1 INT NOT NULL)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
                     ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
             fail("SQLException of 08003 should be thrown!");
         } catch (SQLException e) {
@@ -447,6 +468,7 @@ public void testConnectionErrorEvent() throws SQLException, Exception
         aes12.resetState();
         try {
             conn.prepareCall("CREATE TABLE TAB1(COL1 INT NOT NULL)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
                     ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
                     ResultSet.CLOSE_CURSORS_AT_COMMIT);
             fail("SQLException of 08003 should be thrown!");
@@ -476,6 +498,7 @@ public void testConnectionErrorEvent() throws SQLException, Exception
         aes12.resetState();
         try {
             conn.setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
             fail("SQLException of 08003 should be thrown!");
         } catch (SQLException e) {
             assertSQLState("08003", e);
@@ -521,6 +544,7 @@ public void testConnectionErrorEvent() throws SQLException, Exception
         aes12.resetState();
         try {
             conn.setSavepoint();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
             fail("SQLException of 08003 should be thrown!");
         } catch (SQLException e) {
             assertSQLState("08003", e);
@@ -647,6 +671,16 @@ public void testConnectionErrorEvent() throws SQLException, Exception
         aes12.resetState();
         try {
             conn.setTypeMap(null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
             fail("SQLException of 08003 should be thrown!");
         } catch (SQLException e) {
             assertSQLState("08003", e);
@@ -656,6 +690,7 @@ public void testConnectionErrorEvent() throws SQLException, Exception
         aes12.resetState();
         if (usingEmbedded())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
             clazz.getConstructor().newInstance();
         }else
@@ -828,6 +863,8 @@ public void testCloseActiveConnection_XA_global()
         c.setAutoCommit(false);
         testCloseActiveConnection(c, false, true);
         xar.end(xid, XAResource.TMSUCCESS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4151
+//IC see: https://issues.apache.org/jira/browse/DERBY-4151
         xa.close();
     }
 
@@ -994,6 +1031,8 @@ public void connectionClosed(ConnectionEvent event) {
                     // Need to catch the exception here because
                     // we cannot throw a checked exception through
                     // the api method. Wrap it in a RuntimeException.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3425
+//IC see: https://issues.apache.org/jira/browse/DERBY-3425
                     throw new RuntimeException(e);
                 }
             }
@@ -1147,6 +1186,7 @@ public void testAllDataSources() throws SQLException, Exception
         cs.setString(1,"Nested");
         try {
             cs.execute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
             fail("SQLException of 40XC0 should be thrown!");
         } catch (SQLException sqle) {
             assertSQLState("40XC0", sqle);
@@ -1158,6 +1198,7 @@ public void testAllDataSources() throws SQLException, Exception
         String NullMapValue = "XJ081";
         String MapMapValue = "0A000";
         Object[] expectedValues = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             ResultSet.HOLD_CURSORS_OVER_COMMIT, "XJ010",
             2, true, false, 
             EmptyMapValue, NullMapValue, MapMapValue};
@@ -1225,6 +1266,7 @@ public void testAllDataSources() throws SQLException, Exception
         cs.setString(1,"Nested");
         try {
             cs.execute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
             fail("SQLException of 40XC0 should be thrown!");
         } catch (SQLException sqle) {
             assertSQLState("40XC0", sqle);
@@ -1290,6 +1332,7 @@ public void testAllDataSources() throws SQLException, Exception
         xar.start(xid, XAResource.TMNOFLAGS);
         Connection xacc = xac.getConnection();
         xacc.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         expectedValues[0] = ResultSet.CLOSE_CURSORS_AT_COMMIT;
         if (usingEmbedded())
             expectedValues[1] = "XJ058";
@@ -1309,6 +1352,7 @@ public void testAllDataSources() throws SQLException, Exception
 
         xar.end(xid, XAResource.TMSUCCESS);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         expectedValues[0] = ResultSet.HOLD_CURSORS_OVER_COMMIT;
         expectedValues[3] = true;
         assertConnectionOK(expectedValues, 
@@ -1327,6 +1371,7 @@ public void testAllDataSources() throws SQLException, Exception
         Connection backtoGlobal = xac.getConnection();
 
         xar.start(xid, XAResource.TMJOIN);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         expectedValues[0] = ResultSet.CLOSE_CURSORS_AT_COMMIT;
         expectedValues[3] = false;
         assertConnectionOK(expectedValues, 
@@ -1923,6 +1968,7 @@ public void testReuseAcrossGlobalLocal() throws SQLException, XAException {
         try {
             // (DERBY-2532)
             xac2.getXAResource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2532
             fail("expected SQLException on closed XAConnection.getXAResource");
         } catch (SQLException sqle) {
             assertSQLState("08003", sqle);
@@ -2037,6 +2083,7 @@ public void testSetSchemaInXAConnection() throws SQLException {
      * @throws SQLException if something goes wrong
      */
     public void testSchemaIsReset()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3690
             throws SQLException {
         final String userSchema = "USERSCHEMA";
         ConnectionPoolDataSource cpDs =
@@ -2052,6 +2099,7 @@ public void testSchemaIsReset()
         // This is currently only implemented in the client driver.
         if (usingDerbyNetClient()) {
             J2EEDataSource.setBeanProperty(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     cpDs, "maxStatements",7);
             doTestSchemaIsReset(cpDs.getPooledConnection(userSchema, "secret"),
                     userSchema);
@@ -2070,6 +2118,7 @@ private void doTestSchemaIsReset(PooledConnection pc, String userSchema)
             throws SQLException {
         Connection con1 = pc.getConnection();
         JDBC.assertCurrentSchema(con1, userSchema);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         JDBC.assertCurrentUser(con1, userSchema);
         Statement stmt1 = con1.createStatement();
         // Change the schema.
@@ -2263,6 +2312,8 @@ private void testConnectionFlowCommitWork(Connection conn) throws SQLException {
      * @throws SQLException if something goes wrong
      */
     public void testConnectionFlowRollbackAlt()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4709
+//IC see: https://issues.apache.org/jira/browse/DERBY-4653
             throws IOException, SQLException {
         Object[] dataSources = new Object[] {
             JDBCDataSource.getDataSource(),
@@ -2331,6 +2382,7 @@ private int testConnectionFlowCommitRollback(
             throws IOException, SQLException {
         final int extraInvokations = invokeExtra ? 25 : 0;
         final int rowCount = 10;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         final boolean isXA = ds instanceof XADataSource;
         final boolean isCP = ds instanceof ConnectionPoolDataSource;
         // Generate trace file name and define trace behavior.
@@ -2344,6 +2396,7 @@ private int testConnectionFlowCommitRollback(
         J2EEDataSource.setBeanProperty(ds, "traceFileAppend", Boolean.FALSE);
         J2EEDataSource.setBeanProperty( ds, "traceLevel",
                 BasicClientDataSource40.TRACE_ALL);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         // Obtain connection.
         PooledConnection physicalCon = null;
@@ -2352,6 +2405,7 @@ private int testConnectionFlowCommitRollback(
             physicalCon = ((XADataSource)ds).getXAConnection();
             con = physicalCon.getConnection();
         } else if (isCP) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             physicalCon = ((ClientConnectionPoolDataSourceInterface)ds).
                     getPooledConnection();
             con = physicalCon.getConnection();
@@ -2660,6 +2714,7 @@ public void testJira95pds() throws Exception {
             pds.getPooledConnection();
             fail ("expected an SQLException!");
         } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2498
             assertSQLState("XCY00", sqle);
         } catch (Exception e) {
             throw e;
@@ -2712,6 +2767,7 @@ public void testBadConnectionAttributeSyntax() throws SQLException {
      */
     public void testClientDSConnectionAttributes()
             throws SQLException, ClassNotFoundException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                    IllegalAccessException, InstantiationException,
                    NoSuchMethodException, InvocationTargetException
     {
@@ -2763,6 +2819,7 @@ public void testClientDSConnectionAttributes()
         ClientXADataSourceInterface xads;
         
         if (JDBC.vmSupportsJNDI()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             clazz = Class.forName("org.apache.derby.jdbc.ClientXADataSource");
             xads = (ClientXADataSourceInterface) clazz.getConstructor().newInstance();
         } else {
@@ -2791,6 +2848,7 @@ public void testClientDSConnectionAttributes()
         // connectionAttributes=databaseName=kangaroo
         xads.setConnectionAttributes("databaseName=kangaroo");
         xads.setDatabaseName("wombat");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         dsXAConnectionRequests(new String[]
             {"OK","08001","OK","OK","08001","08001","OK","OK","OK"},
             xads);
@@ -2813,6 +2871,7 @@ public void testDSRequestAuthentication() throws Exception {
         
         JDBCClient dsclient = getTestConfiguration().getJDBCClient();
         String dsName = dsclient.getDataSourceClassName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(dsName);
         DataSource ds = (DataSource) clazz.getConstructor().newInstance();
 
@@ -2843,6 +2902,8 @@ public void testDSRequestAuthentication() throws Exception {
         JDBCDataSource.setBeanProperty(ds, "shutdownDatabase", "shutdown");
         try {
             ds.getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3852
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
             fail("shutdown should raise exception");
         } catch (SQLException sqle) {
             assertSQLState("XJ015", sqle);
@@ -2877,10 +2938,12 @@ public void testDSRequestAuthentication() throws Exception {
 
         // now with ConnectionPoolDataSource
         String cpdsName = dsclient.getConnectionPoolDataSourceClassName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         clazz = Class.forName(cpdsName);
         ConnectionPoolDataSource cpds =(ConnectionPoolDataSource) clazz.getConstructor().newInstance();
 
         // ConnectionPoolDataSource - EMPTY
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         dsCPConnectionRequests(new String[] {
             "XJ004","XJ004","XJ004","XJ004",
             "XJ004","XJ004","XJ004","XJ004","XJ004"},
@@ -2910,6 +2973,7 @@ public void testDSRequestAuthentication() throws Exception {
         JDBCDataSource.setBeanProperty(cpds, "attributesAsPassword", Boolean.TRUE);
         JDBCDataSource.setBeanProperty(cpds, "user", "fred");
         JDBCDataSource.setBeanProperty(cpds, "password", "databaseName=" + dbName + ";password=wilma");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         dsCPConnectionRequests(new String[] {
             "XJ004","XJ004","XJ004","XJ028",
             "XJ028","XJ004","XJ004","XJ004","XJ004"},
@@ -2922,11 +2986,13 @@ public void testDSRequestAuthentication() throws Exception {
         // now with XADataSource
 //        EmbeddedXADataSource xads = new EmbeddedXADataSource();
         String xadsName = dsclient.getXADataSourceClassName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         clazz = Class.forName(xadsName);
         XADataSource xads =
             (XADataSource) clazz.getConstructor().newInstance();
 
         // XADataSource - EMPTY
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         dsXAConnectionRequests(new String[] {
             "08006","08006","08006","08006",
             "08006","08006","08006","08006","08006"},
@@ -2994,6 +3060,7 @@ public void testClientTraceFileDSConnectionAttribute() throws SQLException
         JDBCDataSource.setBeanProperty(cpds, "connectionAttributes",
         		"traceFile="+traceFile);
         // DERBY-2468 - trace3.out does not get created
+//IC see: https://issues.apache.org/jira/browse/DERBY-4717
         ((PooledConnection)getPhysicalConnection(cpds)).close();
         JDBCDataSource.clearStringBeanProperty(cpds, "connectionAttributes");
 
@@ -3008,6 +3075,7 @@ public void testClientTraceFileDSConnectionAttribute() throws SQLException
         traceFile = "trace5.out";
         JDBCDataSource.setBeanProperty(xads, "connectionAttributes",
         		"traceFile="+traceFile);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4717
         ((XAConnection)getPhysicalConnection(xads)).close();
         // DERBY-2468 - trace5.out does not get created
         JDBCDataSource.clearStringBeanProperty(xads, "connectionAttributes");
@@ -3026,6 +3094,7 @@ public void testClientTraceFileDSConnectionAttribute() throws SQLException
      */
     private static void assertTraceFilesExistAndCanBeDeleted()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (int i = 3; i <= 6; i++) {
             File traceFile = new File("trace" + i + ".out");
             assertTrue("Doesn't exist",
@@ -3048,6 +3117,7 @@ private static void assertTraceFilesExistAndCanBeDeleted()
      */
     public void testClientMessageTextConnectionAttribute()
             throws SQLException, ClassNotFoundException, IllegalAccessException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                    InstantiationException, NoSuchMethodException, InvocationTargetException
     {
         String retrieveMessageTextProperty = "retrieveMessageText";
@@ -3069,6 +3139,7 @@ public void testClientMessageTextConnectionAttribute()
         cpds.setDatabaseName(dbName);
         cpds.setConnectionAttributes(
                 retrieveMessageTextProperty + "=false");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4717
         PooledConnection cpConn = cpds.getPooledConnection();
         assertMessageText(cpConn.getConnection(), "false");
         cpConn.close();
@@ -3082,6 +3153,7 @@ public void testClientMessageTextConnectionAttribute()
         // now with XADataSource
         ClientXADataSourceInterface xads;
         if (JDBC.vmSupportsJNDI()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             clazz = Class.forName("org.apache.derby.jdbc.ClientXADataSource");
             xads = (ClientXADataSourceInterface) clazz.getConstructor().newInstance();
         } else {
@@ -3093,6 +3165,7 @@ public void testClientMessageTextConnectionAttribute()
         xads.setDatabaseName(dbName);
         xads.setConnectionAttributes(
                 retrieveMessageTextProperty + "=false");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4717
         XAConnection xaConn = xads.getXAConnection();
         assertMessageText(xaConn.getConnection(), "false");
         xaConn.close();
@@ -3119,6 +3192,7 @@ private static void assertMessageText(
     {
         try {
             conn.createStatement().executeQuery("SELECT * FROM APP.NOTTHERE");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3853
             fail("SQLException of 42X05 should be thrown!");
         }
         catch (SQLException e)
@@ -3133,6 +3207,7 @@ private static void assertMessageText(
                 // retrieveMessageTextValue is false
                 assertTrue(e.getMessage().indexOf("does not exist") == -1);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4717
         } finally {
             try {
                 conn.close();
@@ -3177,6 +3252,7 @@ private void subTestDataSourceDescription(DataSource ds) throws Exception
             "Everything you ever wanted to know about this datasource";
         
         JDBCDataSource.setBeanProperty(ds, "description", setDescription);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4717
         getPhysicalConnection(ds);
         assertEquals(setDescription, JDBCDataSource.getBeanProperty(ds, "description"));
         JDBCDataSource.clearStringBeanProperty(ds, "description");
@@ -3451,6 +3527,7 @@ else if (usingDerbyNetClient())
         // HOLDABLE Statement in global xact " 
         assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, 
             s.getResultSetHoldability());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
         assertErrorCode(10000, conn.getWarnings());
         shxa.close();
 
@@ -3460,6 +3537,7 @@ else if (usingDerbyNetClient())
         // HOLDABLE PreparedStatement in global xact 
         assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT,
             s.getResultSetHoldability());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
         assertErrorCode(10000, conn.getWarnings());
         shxa.close();
 
@@ -3469,6 +3547,7 @@ else if (usingDerbyNetClient())
         // HOLDABLE CallableStatement in global xact:
         assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT,
             s.getResultSetHoldability());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
         assertErrorCode(10000, conn.getWarnings());
         shxa.close();
 
@@ -3546,6 +3625,7 @@ public void testConnectionLeakInDatabaseMetaData()
         // The first meta data object should not return a reference to the
         // second logical connection.
         assertSame(con2, dmd2.getConnection());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3431
         try {
             dmd1.getConnection();
             fail("Should have thrown no current connection exception");
@@ -3570,6 +3650,7 @@ public void testConnectionLeakInDatabaseMetaData()
      * See Jira issue DERBY-3799.
      */
     public void testDerby3799() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3799
         ConnectionPoolDataSource cpDs =
                 J2EEDataSource.getConnectionPoolDataSource();
         PooledConnection pc = cpDs.getPooledConnection();
@@ -3968,6 +4049,7 @@ private static void queryOnStatement(String expectedCursorName,
         // DERBY-2531
         // network server gives mismatched connections. See also
         // comment in testAllDataSources()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3425
         if (usingEmbedded()) {
             assertEquals(conn, s.getConnection());
         }
@@ -4141,6 +4223,7 @@ private void assertConnectionOK(
             if (conn.getAutoCommit())
                 assertSQLState("XJ010", sqle);
             else if (((String)expectedValues[1]).equals("OK"))
+//IC see: https://issues.apache.org/jira/browse/DERBY-3425
                 throw sqle;
             else 
                 assertSQLState((String)expectedValues[1], sqle);
@@ -4177,12 +4260,14 @@ else if (((String)expectedValues[1]).equals("OK"))
 
         // Derby-33 - setTypeMap on connection
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Map<String, Class<?>> empty = Collections.emptyMap();
             conn.setTypeMap(empty);
             if (!((String)expectedValues[5]).equals("OK"))
                 fail (" expected an sqlexception on setTypeMap(EMPTY_MAP)");
         } catch (SQLException sqle) {
             if (((String)expectedValues[5]).equals("OK"))
+//IC see: https://issues.apache.org/jira/browse/DERBY-3425
                 throw sqle;
             else
                 assertSQLState((String)expectedValues[5], sqle);
@@ -4197,6 +4282,7 @@ else if (((String)expectedValues[1]).equals("OK"))
         }
         try {
             // a populated map, not implemented
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Map<String, Class<?>> map = new HashMap<String, Class<?>>();
             map.put("name", Class.class);
             conn.setTypeMap(map);
@@ -4204,6 +4290,7 @@ else if (((String)expectedValues[1]).equals("OK"))
                 fail (" expected an sqlexception on setTypeMap(map)");
         } catch (SQLException sqle) {
             if (((String)expectedValues[7]).equals("OK"))
+//IC see: https://issues.apache.org/jira/browse/DERBY-3425
                 throw sqle;
             else
                 assertSQLState((String)expectedValues[7], sqle);
@@ -4214,6 +4301,7 @@ else if (((String)expectedValues[1]).equals("OK"))
 
         // method calls on a closed connection
         conn.close(); // expect no error
+//IC see: https://issues.apache.org/jira/browse/DERBY-3425
 
         try {
             conn.createStatement();
@@ -4414,6 +4502,7 @@ private static void assertToString(DataSource ds) throws Exception
      */
     private static void clearConnections() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Connection conn : conns.values()) {
             conn.close();
         }
@@ -4450,6 +4539,7 @@ private static void assertToString(XADataSource xds) throws Exception
 
         //  First get a bunch of pooled connections
         //  and make sure they're all unique
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<String, XAConnection> xaConns =
                 new HashMap<String, XAConnection>();
         for ( int i = 0 ; i < numConnections ; i++ )
@@ -4496,6 +4586,7 @@ private static void assertToString(ConnectionPoolDataSource pds)
 
         //  First get a bunch of pooled connections
         //  and make sure they're all unique
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<String, PooledConnection> pooledConns =
                 new HashMap<String, PooledConnection>();
         for ( int i = 0 ; i < numConnections ; i++ )
@@ -4525,6 +4616,7 @@ private static void assertToString(ConnectionPoolDataSource pds)
         while ( it.hasNext() )
         {
             PooledConnection pc = (PooledConnection)it.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4151
             pc.close();
         }
         pooledConns.clear();
@@ -4556,6 +4648,7 @@ else if (usingDerbyNetClient())
             EmptyMapValue="0A000"; NullMapValue="0A000"; MapMapValue="0A000";
         }
         Object[] expectedValues = { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             ResultSet.HOLD_CURSORS_OVER_COMMIT, "OK",
             2, false, false, 
             EmptyMapValue, NullMapValue, MapMapValue};
@@ -4579,6 +4672,7 @@ else if (usingDerbyNetClient())
      * @throws IllegalArgumentException if the object isn't a data source
      */
     public static Object getPhysicalConnection(Object ds)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4717
             throws SQLException {
         if (ds instanceof XADataSource) {
             return ((XADataSource)ds).getXAConnection();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversEmbeddedTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversEmbeddedTest.java
index f7b2d78497..50197c2386 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversEmbeddedTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversEmbeddedTest.java
@@ -35,10 +35,12 @@ public static Test suite() throws Exception
         // Also test that the network server comes up automatically
         // when this property is set and the embedded driver
         // is autoloaded by jdbc.drivers
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         System.setProperty("derby.drda.startNetworkServer", "true");
         // if the property derby.tests.basePort has been set, we need to
         // ensure we specify the portNumber as well, because we're then
         // not using 1527 for checks and shutting down.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6181
         String portNumberString = System.getProperty("derby.tests.basePort");
         if (portNumberString != null )
         {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversPropertyTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversPropertyTest.java
index 39625b683a..5d46c7e975 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversPropertyTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversPropertyTest.java
@@ -36,6 +36,7 @@ abstract class JDBCDriversPropertyTest extends TestCase {
     
     final static Test getSuite(String jdbcDrivers) throws Exception {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("jdbc.drivers="+jdbcDrivers);
         
         System.setProperty("jdbc.drivers", jdbcDrivers);
@@ -53,6 +54,7 @@ final static Test getSuite(String jdbcDrivers) throws Exception {
     private static Test getAutoLoadSuite()
        throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Class<?> alt = Class.forName(
            "org.apache.derbyTesting.functionTests.tests.jdbcapi.AutoloadTest");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java
index 700a0ea207..39570030b2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java
@@ -66,6 +66,7 @@ protected String getArea() {
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("jdbcapi: old harness java tests");
 
@@ -76,6 +77,7 @@ public static Test suite()
     }
    
     private static Test baseSuite(String which, String[] set) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("jdbcapi: " + which);
         for (int i = 0; i < set.length; i++)
         {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPAuthenticationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPAuthenticationTest.java
index 9f9f2aa8c9..fbcf3ac722 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPAuthenticationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPAuthenticationTest.java
@@ -55,6 +55,7 @@ public class LDAPAuthenticationTest extends BaseJDBCTestCase {
 
     // create own policy file, so we can connect to the ldap server
     private static final String POLICY_FILE_NAME =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         "org/apache/derbyTesting/functionTests/tests/jdbcapi/LDAPTests.policy";
     
     /** Creates a new instance of the Test */
@@ -71,6 +72,7 @@ protected void initializeConnection(Connection conn) throws SQLException {
 
     public static Test suite() {
         if (JDBC.vmSupportsJSR169())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(
                 "cannot run with JSR169 - missing functionality" +
                 " for org.apache.derby.iapi.jdbc.AuthenticationService");
@@ -116,8 +118,10 @@ public static Test suite() {
                 "-DderbyTesting.dnString=myJNDIstring");
 
         ldapContextFactory=getSystemProperty("derbyTesting.ldapContextFactory");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
 
         BaseTestSuite suite = new BaseTestSuite("LDAPAuthenticationTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3659
         suite.addTest(baseSuite("LDAPAuthenticationTest:embedded",
             "testLDAPConnection"));
         suite.addTest(TestConfiguration.clientServerDecorator(
@@ -125,10 +129,12 @@ public static Test suite() {
 
         // Grant ALL FILES execute, and getPolicy permissions, as well as
         // resolve/connect for the LDAP server identified with the property.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         return new SecurityManagerSetup(suite, POLICY_FILE_NAME);
     }
 
     public static Test baseSuite(String name, String fixture) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         Test test = new LDAPAuthenticationTest(fixture);
         setBaseProps(suite, test);
@@ -194,6 +200,7 @@ public void testLDAPConnection() throws SQLException {
         // but using literal string here to avoid unnecessary import.
         // If the initial context factory is not provided it'll default to 
         // com.sun.jndi.ldap.LdapCtxFactory in LDAPAuthenticationSchemeImpl.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
         if ((ldapContextFactory != null) && (ldapContextFactory.length() > 0))
             setDatabaseProperty("java.naming.factory.initial", ldapContextFactory, conn);
         commit();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LargeDataLocksTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LargeDataLocksTest.java
index 3e0b9bbdaf..75fc637c56 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LargeDataLocksTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LargeDataLocksTest.java
@@ -132,6 +132,10 @@ public void testGetString() throws SQLException, IOException {
         String value = rs.getString(1);
         assertEquals(38000, value.length());
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4825
+//IC see: https://issues.apache.org/jira/browse/DERBY-4825
+//IC see: https://issues.apache.org/jira/browse/DERBY-4825
+//IC see: https://issues.apache.org/jira/browse/DERBY-4825
         assertLockCount(0);
         commit();
     }
@@ -152,6 +156,7 @@ private void assertLockCount(int expected) throws SQLException {
         // First wait for post-commit work to complete so that we don't count
         // locks held by the background worker thread.
         stmt.execute("call wait_for_post_commit()");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4825
 
         ResultSet rs = stmt.executeQuery("select * from syscs_diag.lock_table");
         ResultSetMetaData meta = rs.getMetaData();
@@ -180,6 +185,7 @@ private void assertLockCount(int expected) throws SQLException {
 
     public static Test baseSuite(String name) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(LargeDataLocksTest.class);
 
@@ -204,6 +210,7 @@ protected void decorateSQL(Statement s) throws SQLException {
 
                 ps.setCharacterStream(1, new java.io.StringReader(Utilities
                         .repeatChar("a", 38000)), 38000);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3780
                 try {
                     ps.setBytes(2, Utilities.repeatChar("a", 38000).getBytes("US-ASCII"));
                 } catch (UnsupportedEncodingException ue) {
@@ -217,6 +224,7 @@ protected void decorateSQL(Statement s) throws SQLException {
                 // Create a procedure for use by assertLockCount() to ensure
                 // that the background worker thread has completed all the
                 // post-commit work.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4825
                 s.execute("CREATE PROCEDURE WAIT_FOR_POST_COMMIT() "
                         + "LANGUAGE JAVA EXTERNAL NAME "
                         + "'org.apache.derbyTesting.functionTests.util."
@@ -229,6 +237,7 @@ protected void decorateSQL(Statement s) throws SQLException {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("LargeDataLocksTest");
         suite.addTest(baseSuite("LargeDataLocksTest:embedded"));
         // Disable for client until DERBY-2892 is fixed
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobLengthTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobLengthTest.java
index 34c38e7b3c..46aa278301 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobLengthTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobLengthTest.java
@@ -51,6 +51,7 @@ public LobLengthTest(String name)
     
     public static Test suite() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         return TestConfiguration.defaultSuite(LobLengthTest.class);
     }
 
@@ -62,6 +63,7 @@ public static Test suite()
     public void setUp() throws Exception
     {
         getConnection().setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
 
         // Create a test table.
         Statement st = createStatement();
@@ -75,6 +77,7 @@ public void setUp() throws Exception
      */
     public void tearDown() throws Exception 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         Statement st = createStatement();
         st.execute("drop table lobTable100M");
         st.close();
@@ -93,6 +96,7 @@ public void tearDown() throws Exception
      */
     public void testLongLobLengths() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         PreparedStatement pSt = prepareStatement(
             "insert into lobTable100M(bl) values (?)");
 
@@ -108,6 +112,7 @@ public void testLongLobLengths() throws Exception
         int lobSize = 16800000;
         pSt.setBinaryStream(1,
             new LoopingAlphabetStream(lobSize), lobSize);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2027
 
         // Now try the insert; this is where the server processes
         // the lob length.
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobRsGetterTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobRsGetterTest.java
index eab51f1f5f..ea99831401 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobRsGetterTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobRsGetterTest.java
@@ -167,6 +167,7 @@ protected void decorateSQL(Statement s)
      */
     public void testBlobGettersSimple()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
         _testGettersSimple("dBlob", BLOB);
     }
 
@@ -175,6 +176,7 @@ public void testBlobGettersSimple()
      */
     public void testClobGettersSimple()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
         _testGettersSimple("dClob", CLOB);
     }
 
@@ -183,6 +185,7 @@ public void testClobGettersSimple()
      */
     public void testBlobGettersSimpleNegative()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
         _testGettersSimpleNegative("dBlob", BLOB);
     }
 
@@ -191,6 +194,7 @@ public void testBlobGettersSimpleNegative()
      */
     public void testClobGettersSimpleNegative()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
         _testGettersSimpleNegative("dClob", CLOB);
     }
 
@@ -203,6 +207,7 @@ public void testClobGettersSimpleNegative()
      */
     public void testBlobGettersMultiInvocation()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
         _testGettersMultiInvocation("dBlob", BLOB);
     }
 
@@ -214,6 +219,7 @@ public void testBlobGettersMultiInvocation()
      */
     public void testClobGettersMultiInvocation()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
         _testGettersMultiInvocation("dClob", CLOB);
     }
 
@@ -283,6 +289,7 @@ public void testClobGetXFollowedByGetString()
      * Tests that data returned by the last BLOB getter invokation is correct.
      */
     public void testCorrectBlobDataWithMultiCall()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
             throws IOException, SQLException {
         setAutoCommit(false);
         PreparedStatement psId = prepareStatement("select id from " + TABLE);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobStreamsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobStreamsTest.java
index 8005ddf20c..a35122849f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobStreamsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/LobStreamsTest.java
@@ -63,6 +63,7 @@ public LobStreamsTest(String name) {
      */
     public void setUp() throws Exception {
         getConnection().setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
 
         Statement stmt1 = createStatement();
         stmt1.execute("create table testBlobX1 (" +
@@ -74,6 +75,7 @@ public void setUp() throws Exception {
         byte[] b2 = new byte[1];
         b2[0] = (byte)64;
         String c2 = "c";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         PreparedStatement stmt2 = prepareStatement(
                 "INSERT INTO testBlobX1(a, b, c) " +
                 "VALUES (?, ?, ?)");
@@ -103,6 +105,7 @@ public void setUp() throws Exception {
      * @throws Exception if something goes wrong
      */
     public void testGettingBlobTwice()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
             throws Exception {
         setAutoCommit(false);
         // We need a Blob represented as a stream in store.
@@ -239,6 +242,7 @@ public void testBlobWrite3Param() throws Exception {
         rs3 = stmt3.executeQuery();
         assertTrue("FAIL -- blob not found", rs3.next());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
         blob = rs3.getBlob(1);
         long new_length = blob.length();
         assertEquals("FAIL -- wrong blob length;",
@@ -262,6 +266,8 @@ public void testBlobWrite3Param() throws Exception {
     public void testBlobWrite1Param() throws Exception {
         InputStream streamIn = new LoopingAlphabetStream(streamSize[1]);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         PreparedStatement stmt3 = prepareStatement(
             "SELECT b FROM testBlobX1 WHERE a = 1");
         ResultSet rs3 = stmt3.executeQuery();
@@ -278,6 +284,8 @@ public void testBlobWrite1Param() throws Exception {
         outstream.close();
         streamIn.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         PreparedStatement stmt4 = prepareStatement(
             "UPDATE testBlobX1 SET b = ? WHERE a = 1");
         stmt4.setBlob(1,  blob);
@@ -289,6 +297,7 @@ public void testBlobWrite1Param() throws Exception {
 
         assertTrue("FAIL -- blob not found", rs3.next());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
         blob = rs3.getBlob(1);
         long new_length = blob.length();
         assertEquals("FAIL -- wrong blob length", streamSize[1], new_length);
@@ -337,6 +346,7 @@ public void testClobAsciiWrite1Param() throws Exception
         rs3 = stmt3.executeQuery();
         assertTrue("FAIL -- clob not found", rs3.next());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
         clob = rs3.getClob(1);
         long new_length = clob.length();
         assertEquals("FAIL -- wrong clob length", streamSize[1], new_length);
@@ -386,6 +396,7 @@ public void testClobAsciiWrite3Param() throws Exception {
 
         assertTrue("FAIL -- clob not found", rs3.next());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
         clob = rs3.getClob(1);
         long new_length = clob.length();
         assertEquals("FAIL -- wrong clob length",
@@ -429,6 +440,7 @@ public void testClobCharacterWrite3ParamChar() throws Exception
         rs3 = stmt3.executeQuery();
 
         assertTrue("FAIL -- clob not found", rs3.next());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
         clob = rs3.getClob(1);
         long new_length = clob.length();
         assertEquals("FAIL -- wrong clob length",
@@ -510,6 +522,8 @@ public void testClobCharacterWrite1ParamString() throws Exception
         rs3 = stmt3.executeQuery();
         assertTrue("FAIL -- clob not found", rs3.next());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
         clob = rs3.getClob(1);
         long new_length = clob.length();
         assertEquals("FAIL -- wrong clob length", unicodeTestString.length(), new_length);
@@ -533,6 +547,12 @@ public void testClobCharacterWrite1Char() throws Exception
     {
         char testchar = 'a';
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         PreparedStatement stmt3 = prepareStatement(
             "SELECT c FROM testBlobX1 WHERE a = 1");
         ResultSet rs3 = stmt3.executeQuery();
@@ -544,6 +564,12 @@ public void testClobCharacterWrite1Char() throws Exception
         clobWriter.write(testchar);
         clobWriter.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         PreparedStatement stmt4 = prepareStatement(
             "UPDATE testBlobX1 SET c = ? WHERE a = 1");
         stmt4.setClob(1,  clob);
@@ -554,6 +580,7 @@ public void testClobCharacterWrite1Char() throws Exception
         rs3 = stmt3.executeQuery();
         assertTrue("FAIL -- clob not found", rs3.next());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
         clob = rs3.getClob(1);
         long new_length = clob.length();
         assertEquals("FAIL -- wrong clob length", 1, new_length);
@@ -574,9 +601,11 @@ public void testClobCharacterWrite1Char() throws Exception
      */
     public static Test suite() {
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite ts  = new BaseTestSuite ("LobStreamsTest");
         ts.addTest(TestConfiguration.defaultSuite (LobStreamsTest.class));
         // JSR169 does not have support for encryption
+//IC see: https://issues.apache.org/jira/browse/DERBY-2718
         if (JDBC.vmSupportsJDBC3()) {
             BaseTestSuite encSuite =
                 new BaseTestSuite ("LobStreamsTest:encrypted");
@@ -587,6 +616,7 @@ public static Test suite() {
     }
     //method to ensure that buffer is filled if there is any data in stream
     private int readBytesFromStream (byte [] b, InputStream is) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
                                                           throws IOException {
         int read = 0;
         while (read < b.length) {
@@ -614,6 +644,7 @@ private boolean compareLob2File(
         String fString, lString;
 
         do {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2346
             fLength = readBytesFromStream (fByte, fStream);
             lLength = readBytesFromStream (lByte, lStream);
             if (!java.util.Arrays.equals(fByte, lByte))
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/NullSQLTextTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/NullSQLTextTest.java
index 62c312cc40..17c0249f5b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/NullSQLTextTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/NullSQLTextTest.java
@@ -56,6 +56,7 @@ public NullSQLTextTest(String name) {
      * all tests in this class
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("NullSQLTextTest");
         
         suite.addTest(baseSuite("NullSQLTextTest:embedded"));
@@ -68,6 +69,7 @@ public static Test suite() {
     }
     
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         
         suite.addTestSuite(NullSQLTextTest.class);
@@ -320,6 +322,7 @@ public static void zeroArg () {
     
     private static String SQLSTATE_SYNTAX_ERROR = "42X01";
     public void testExecuteEmptyString() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5806
         try {
             createStatement().execute("");
             fail("Statement expected to fail");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java
index c5856af4e5..c68435f136 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java
@@ -80,6 +80,7 @@ public class ParameterMappingTest extends BaseJDBCTestCase {
         
     private static int[] jdbcTypes = { Types.TINYINT, Types.SMALLINT,
             Types.INTEGER, Types.BIGINT, Types.REAL, Types.FLOAT, Types.DOUBLE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
             Types.DECIMAL, Types.NUMERIC, Types.BIT, Types.BOOLEAN,
             Types.CHAR, Types.VARCHAR, Types.LONGVARCHAR, Types.NULL, // Types.BINARY,
             Types.VARBINARY, Types.NULL, // Types.LONGVARBINARY,
@@ -94,7 +95,9 @@ public class ParameterMappingTest extends BaseJDBCTestCase {
     };
 
     private static String[] validString = {null,"98","98","98",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
            "98","98", "98","98",null,null,"TRUE",
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
            "98","98","98","0x4",
            "0x4","0x4", "2004-02-14",
            "00:00:00","2004-02-14 00:00:00","98","0x4"};
@@ -367,6 +370,7 @@ protected void setUp() throws Exception {
         pscb.setInt(1, 1);
         {
             byte[] data = new byte[6];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
             data[0] = (byte) 0x4;
             data[1] = (byte) 0x3;
             data[2] = (byte) 0x72;
@@ -476,7 +480,9 @@ public void testDerby6214() throws Exception
     public void testDerby2073() throws Exception
     {
         // Cannot use setBigDecimal with J2ME
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
         if (!JDBC.vmSupportsJDBC3())
+//IC see: https://issues.apache.org/jira/browse/DERBY-3126
             return;
         
         
@@ -497,6 +503,7 @@ public void testDerby2073() throws Exception
         ps.executeUpdate();
 
         // Can't use negative scale on jdk1.4.2
+//IC see: https://issues.apache.org/jira/browse/DERBY-3126
         if (JDBC.vmSupportsJDBC4())
         {
             // Test with negative scale.
@@ -545,6 +552,7 @@ public void testDerby2073() throws Exception
         ps.executeUpdate();
         
         // Can't use negative scale on jdk1.4.2
+//IC see: https://issues.apache.org/jira/browse/DERBY-3126
         if (JDBC.vmSupportsJDBC4())
         {
             // Test with setObject and negative scale.
@@ -589,6 +597,7 @@ public void testParameterMapping() throws Exception {
             String sqlType = SQLTypes[type];
 
             if (sqlType == null || jdbcTypes[type] == Types.NULL) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 continue;
             }
 
@@ -608,6 +617,7 @@ public void testParameterMapping() throws Exception {
                     .prepareStatement("SELECT VAL FROM PM.TYPE_AS");
             ResultSet rs = psq.executeQuery();
             ResultSetMetaData rsmd = rs.getMetaData();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
             assertEquivalentDataType(jdbcTypes[type], rsmd.getColumnType(1));
             rs.close();
             // For this data type
@@ -618,6 +628,7 @@ public void testParameterMapping() throws Exception {
             getXXX(psq, type, true);
 
             s.execute("DELETE FROM PM.TYPE_AS");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
             // For this data type
             // Test inserting a valid value and then performing all the getXXX()
@@ -652,7 +663,9 @@ public void testParameterMapping() throws Exception {
                 s.execute(procSQL);
             } catch (SQLException sqle) {
                 // may get error that column is not allowed
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
                 if (BAD_TYPE.equals(sqle.getSQLState()))
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                     continue;
                 else
                     fail(sqle.getSQLState() + ":" + sqle.getMessage());
@@ -707,8 +720,10 @@ public void testParameterMapping() throws Exception {
 
                         } catch (SQLException sqle) {
                             boolean expectedConversionError = ("22018".equals(sqle.getSQLState())|| 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2381
                                                                "22007".equals(sqle.getSQLState()) ||
                                                                "22005".equals(sqle.getSQLState()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
                             if ( !expectedConversionError)
                             {
                                 printStackTrace( sqle );
@@ -734,10 +749,12 @@ public void testParameterMapping() throws Exception {
      */
     public void testClobMapping() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         Connection conn = getConnection();
         PreparedStatement ps;
         CallableStatement cs;
         Clob outVal;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
 
         //
         // Clob input parameter
@@ -771,6 +788,7 @@ public void testClobMapping() throws Exception
         //
         // Clob output parameter
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         ps = chattyPrepare
             (
              conn,
@@ -781,6 +799,7 @@ public void testClobMapping() throws Exception
              "no sql\n" +
              "external name '" + getClass().getName() + ".clobOut'\n"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         ps.execute();
         ps.close();
         
@@ -804,16 +823,20 @@ public void testClobMapping() throws Exception
              "no sql\n" +
              "external name '" + getClass().getName() + ".clobInOut'\n"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         ps.execute();
         ps.close();
         
         cs = chattyPrepareCall( conn, "call clobInOut( ? )" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         cs.setClob( 1, new HarmonySerialClob( "ghi" ) );
         cs.registerOutParameter( 1, Types.CLOB );
         cs.execute();
         outVal = cs.getClob( 1 );
         assertEquals( "ihg", outVal.getSubString( 1L, (int) outVal.length() ) );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         Clob inValue = makeBigClob();
         cs.setClob( 1, inValue );
         cs.execute();
@@ -838,6 +861,7 @@ private Clob makeBigClob() throws Exception
                           
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         return new HarmonySerialClob( new String( value ) );
     }
     private void compareClobs( Clob left, Clob right ) throws Exception
@@ -848,6 +872,7 @@ private void compareClobs( Clob left, Clob right ) throws Exception
         println( "Left clob has " + leftLength + " characters and right clob has " + rightLength + " characters." );
 
         assertEquals( leftLength, rightLength );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
 
         if ( leftLength == rightLength );
         {
@@ -882,6 +907,7 @@ public void testBlobMapping() throws Exception
         PreparedStatement ps;
         CallableStatement cs;
         Blob outVal;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
 
         //
         // Blob input parameter
@@ -900,6 +926,7 @@ public void testBlobMapping() throws Exception
         ps.close();
 
         cs = chattyPrepareCall( conn, "call blobIn( ?, ? )" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         cs.setBlob( 1, new HarmonySerialBlob( "ghi".getBytes( UTF8 ) ) );
         cs.registerOutParameter( 2, Types.VARCHAR );
         cs.execute();
@@ -909,6 +936,7 @@ public void testBlobMapping() throws Exception
         //
         // Blob output parameter
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         ps = chattyPrepare
             (
              conn,
@@ -919,6 +947,7 @@ public void testBlobMapping() throws Exception
              "no sql\n" +
              "external name '" + getClass().getName() + ".blobOut'\n"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         ps.execute();
         ps.close();
 
@@ -942,16 +971,19 @@ public void testBlobMapping() throws Exception
              "no sql\n" +
              "external name '" + getClass().getName() + ".blobInOut'\n"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         ps.execute();
         ps.close();
 
         cs = chattyPrepareCall( conn, "call blobInOut( ? )" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         cs.setBlob( 1, new HarmonySerialBlob( "ghi".getBytes( UTF8 ) ) );
         cs.registerOutParameter( 1, Types.BLOB );
         cs.execute();
         outVal = cs.getBlob( 1 );
         assertEquals( "ihg", getBlobValue( outVal ) );
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         Blob inValue = makeBigBlob();
         cs.setBlob( 1, inValue );
         cs.execute();
@@ -976,6 +1008,7 @@ private Blob makeBigBlob() throws Exception
                           
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         return new HarmonySerialBlob( value );
     }
     private void compareBlobs( Blob left, Blob right ) throws Exception
@@ -986,6 +1019,7 @@ private void compareBlobs( Blob left, Blob right ) throws Exception
         println( "Left blob has " + leftLength + " bytes and right blob has " + rightLength + " bytes." );
 
         assertEquals( leftLength, rightLength );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
 
         if ( leftLength == rightLength );
         {
@@ -1005,6 +1039,8 @@ private void compareBlobs( Blob left, Blob right ) throws Exception
                     return;
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
                 assertEquals( leftC, rightC );
             }
         }
@@ -1092,6 +1128,7 @@ public  void    testBigInteger() throws  Exception
                 "char_col", "varchar_col"
             };
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashSet<String> smallIntColumns = new HashSet<String>();
         for ( int i = 0; i < allColumns.length; i++ )
         {
@@ -1187,7 +1224,9 @@ public  void    testBigInteger() throws  Exception
      */
     protected void tearDown() throws Exception {
         rollback();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5721
         dropTable("PM.LOB_GET");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
         commit();
         super.tearDown();
     }
@@ -1198,6 +1237,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
         // Expect the different getters to return some variant of the integer
         // 32. The exception is BOOLEAN columns, which don't have high enough
         // precision to do that. So expect 1 for BOOLEAN columns.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
         final int expectedInt =
                 (ps.getMetaData().getColumnType(1) == Types.BOOLEAN) ?
                     1 : 32;
@@ -1216,6 +1256,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                     assertTrue(wn);
                 } else {
                     assertFalse(wn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
                     assertEquals(expectedInt, b);
                 }
                 worked = true;
@@ -1241,6 +1282,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                     assertTrue(wn);
                 } else {
                     assertFalse(wn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
                     assertEquals(expectedInt, s);
                 }
                 worked = true;
@@ -1263,9 +1305,11 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                 int i = rs.getInt(1);
                 boolean wn = rs.wasNull();
                 if (isNull) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                     assertTrue(wn);
                 } else {
                     assertFalse(isNull);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
                     assertEquals(expectedInt, i);
                 }
                 worked = true;
@@ -1289,6 +1333,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                 if (isNull) {
                     assertTrue(wn);
                 } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
                     assertEquals(expectedInt, l);
                     assertFalse(wn);
                 }
@@ -1316,6 +1361,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                     assertTrue(wn);
                 } else {
                     assertFalse(wn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
                     assertEquals((float) expectedInt, f, .000001);
                 }
                 worked = true;
@@ -1341,6 +1387,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                     assertTrue(wn);
                 } else {
                     assertFalse(wn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
                     assertEquals((double) expectedInt, d, .00001);
                 }
                 worked = true;
@@ -1368,6 +1415,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                 } else {
                     assertFalse(wn);
                     assertEquals("BigDecimal comparison failed", 0,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
                             BigDecimal.valueOf(
                                     (long)expectedInt).compareTo(bd));
                 }
@@ -1418,6 +1466,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                 if (isNull) {
                     assertNull(s);
                     assertTrue(wn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 } else {                    
                     s = s.trim();
                     int jdbcType = jdbcTypes[type];
@@ -1428,6 +1477,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                     case java.sql.Types.CHAR:
                     case java.sql.Types.VARCHAR:
                     case java.sql.Types.LONGVARCHAR:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
                         assertEquals(Integer.toString(expectedInt),s);
                         break;
                     case java.sql.Types.REAL:
@@ -1484,6 +1534,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                 if (isNull) {
                     assertNull(data);
                     assertTrue(wn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 } else {
                     int jdbcType = jdbcTypes[type];
                     switch (jdbcType) {
@@ -1517,6 +1568,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
             try {
                 rs = ps.executeQuery();
                 rs.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 Date d = rs.getDate(1);
                 boolean wn = rs.wasNull();
                 if (isNull) {
@@ -1557,6 +1609,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                     assertTrue(wn);
                 } else {
                     assertFalse(wn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                     assertEquals("17:14:24", t.toString());
                 }
                 worked = true;
@@ -1588,6 +1641,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                     assertNull(ts);
                     assertTrue(wn);
                 } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                     if (type == java.sql.Types.DATE
                             || type == java.sql.Types.TIMESTAMP)
                         assertEquals("2004-02-14 00:00:00.0", ts.toString());
@@ -1599,6 +1653,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                 sqleResult = sqle;
                 // 22007 invalid date time conversion
                 worked = "22007".equals(sqle.getSQLState());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
             } catch (Throwable t) {
                 // System.out.println(t);
                 worked = false;
@@ -1618,6 +1673,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
             try {
                 InputStream is = rs.getAsciiStream(1);
                 boolean wn = rs.wasNull();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 if (isNull) {
                     assertTrue(wn);
                     assertNull(is);
@@ -1655,10 +1711,12 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
             SQLException sqleResult = null;
             try {
                 InputStream is = rs.getBinaryStream(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 if (isNull) {
                     assertTrue(rs.wasNull());
                     assertNull(is);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 } else if (B6[14][type]) {
                     assertNotNull(showFirstTwo(is));
                 }
@@ -1685,6 +1743,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
 
                 Reader r = rs.getCharacterStream(1);
                 boolean wn = rs.wasNull();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 if (isNull) {
                     assertNull(r);
                     assertTrue(wn);
@@ -1714,6 +1773,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
             try {
                 Clob clob = rs.getClob(1);
                 boolean wn = rs.wasNull();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 if (isNull) {
                     assertNull(clob);
                     assertTrue(wn);
@@ -1744,10 +1804,12 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
             try {
                 Blob blob = rs.getBlob(1);
                 boolean wn = rs.wasNull();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 if (isNull) {
                     assertTrue(wn);
                     assertNull(blob);
                 } else if (B6[17][type]) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                     assertNotNull(showFirstTwo(blob.getBinaryStream()));
                 }
                 worked = true;
@@ -1775,7 +1837,9 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                 @SuppressWarnings("deprecation")
                 InputStream is = rs.getUnicodeStream(1);
                 boolean wn = rs.wasNull();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 if (isNull) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                     assertTrue(wn);
                     assertNull(is);
 
@@ -1792,6 +1856,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                 worked = false;
             }
             rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
             if (JDBC.vmSupportsJDBC3())
                 judge_getXXX(worked, sqleResult, 18, type);
         }
@@ -1814,6 +1879,7 @@ private static void getXXX(PreparedStatement ps, int type, boolean isNull)
                         cname = "byte[]";
                     else
                         cname = cgo.getName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                     if (isNull) {
                         assertTrue(wn);
                         assertNull(o);
@@ -1879,6 +1945,7 @@ else if (sqlState == null) {
                         "Wrong result column type for requested conversion") != -1)
                     validSQLState = true;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
             assertTrue("FAIL: Expected conversion error but got " + sqleResult,
                     validSQLState);
 
@@ -1895,6 +1962,7 @@ private static void judge_setXXX(boolean worked, SQLException sqleResult,
             msg = " JDBC MATCH(OK)";
         else if (worked)
             msg = " CLOUD EXT (OK)";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
         else if (sqleResult != null && "0A000".equals(sqleResult.getSQLState()))
             msg = " Not Implemented (OK)";
         else if (shouldWork) {
@@ -1906,6 +1974,7 @@ else if (shouldWork) {
             if (msg == null)
                 return;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
         if (msg.startsWith("JDBC FAIL"))
             fail(" JDBC FAIL " + SQLTypes[type]);
     }
@@ -1919,6 +1988,7 @@ private static void judge_setObject(boolean worked,
             msg = " JDBC MATCH(OK)";
         else if (worked)
             msg = " CLOUD EXT (OK)";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
         else if ("0A000".equals(sqleResult.getSQLState()))
             msg = " Not Implemented (OK)";
         else if (shouldWork) {
@@ -1930,6 +2000,7 @@ else if (shouldWork) {
             if (msg == null)
                 return;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
         if (msg.startsWith("JDBC FAIL"))
             fail(" JDBC FAIL " + SQLTypes[type]);
     }
@@ -1956,6 +2027,7 @@ private static String checkForInvalidConversion(SQLException sqle) {
                     || "XCL12".equals(e.getSQLState())
                     || e.getMessage().indexOf("Illegal Conv") != -1) {
                 unknownException = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 if ("0A000".equals(e.getSQLState())
                         && e.getMessage().indexOf("setUnicodeStream") != -1)
                     unknownException = false;
@@ -2007,6 +2079,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setByte");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2049,6 +2123,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setShort");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2091,6 +2167,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setInt");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2133,6 +2211,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setLong");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2177,6 +2257,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setFloat");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2221,6 +2303,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setDouble");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2309,6 +2393,10 @@ private static void setXXX(Statement s, PreparedStatement psi,
                     psi.executeBatch();
 
                     getValidValue(psq, jdbcTypes[type], "setBigDecimal");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                     worked = true;
 
@@ -2352,6 +2440,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setBoolean");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2396,6 +2486,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
             try {
                 // setString() as batch
                
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 psi.setString(1,validString[type]);
                 psi.addBatch();
                 psi.executeBatch();
@@ -2457,6 +2549,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setString");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2557,6 +2651,10 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setBytes");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2642,6 +2740,9 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setDate");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2679,6 +2780,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
             boolean worked;
             try {
                 // setTime() as batch
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 psi.setTime(1, java.sql.Time.valueOf("00:00:00"));
                 psi.addBatch();
                 psi.executeBatch();
@@ -2726,6 +2829,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setTime");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2765,6 +2870,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
             try {
                 // setTimestamp() as batch
                 psi.setTimestamp(1, java.sql.Timestamp
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                         .valueOf("2004-02-14 00:00:00.0"));
                 psi.addBatch();
                 psi.executeBatch();
@@ -2813,6 +2920,8 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.executeBatch();
 
                 getValidValue(psq, jdbcTypes[type], "setTimestamp");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2913,6 +3022,10 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.addBatch();
                 psi.executeBatch();
                 getValidValue(psq, jdbcTypes[type], "setAsciiStream");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -2970,6 +3083,7 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.addBatch();
                 psi.executeBatch();
                 getValidValue(psq, jdbcTypes[type], "getBinaryStream");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -3010,6 +3124,9 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.addBatch();
                 psi.executeBatch();
                 getValidValue(psq, jdbcTypes[type], "setBinaryStream");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -3090,6 +3207,10 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.addBatch();
                 psi.executeBatch();
                 getValidValue(psq, jdbcTypes[type], "setCharacterStream");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -3186,6 +3307,10 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.addBatch();
                 psi.executeBatch();
                 getValidValue(psq, jdbcTypes[type], "setClob");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -3276,6 +3401,10 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 psi.addBatch();
                 psi.executeBatch();
                 getValidValue(psq, jdbcTypes[type], "setBlob");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
                 worked = true;
 
@@ -3293,6 +3422,9 @@ private static void setXXX(Statement s, PreparedStatement psi,
             try {
                 // setUnicodeStream()
                 byte[] data = new byte[6];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 data[0] = (byte) 0x4;
                 data[1] = (byte) 0x3;
                 data[2] = (byte) 0xca;
@@ -3300,9 +3432,11 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 data[4] = (byte) 0x00;
                 data[5] = (byte) 0x32;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 setUnicodeStream(psi, 1, new java.io.ByteArrayInputStream(
                             data), 6);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
                 if (JDBC.vmSupportsJDBC3()) {
                     psi.executeUpdate();
                     getValidValue(psq, jdbcTypes[type], "setUnicodeStream");
@@ -3313,12 +3447,14 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 sqleResult = sqle;
                 worked = false;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
             if (JDBC.vmSupportsJDBC3())
                 judge_setXXX(worked, sqleResult, 14, type);
         }
 
         // DERBY-1938: Test setObject with null and no type specification.
         setXXX_setObjectNullNoTypeSpec(s, psi, psq, type);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1938
 
         setXXX_setObject(s, psi, psq, type, validString[type], "java.lang.String", 0);
         
@@ -3329,6 +3465,7 @@ private static void setXXX(Statement s, PreparedStatement psi,
                 2);
 
         // DERBY-1500: setObject() should work for Byte and Short too.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         setXXX_setObject(s, psi, psq, type, (byte) 98,
                 "java.lang.Byte", 1);
         setXXX_setObject(s, psi, psq, type, (short) 98,
@@ -3357,6 +3494,7 @@ private static void setXXX(Statement s, PreparedStatement psi,
 
         // Test setObject with Blob
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1944
             ResultSet rsc = s
                     .executeQuery("SELECT B FROM PM.LOB_GET WHERE ID = 1");
             rsc.next();
@@ -3388,6 +3526,7 @@ private static void setXXX(Statement s, PreparedStatement psi,
     @SuppressWarnings("deprecation")
     private static void setUnicodeStream(PreparedStatement ps,
                   int parameterIndex, InputStream stream, int length)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             throws SQLException {
         ps.setUnicodeStream(parameterIndex, stream, length);
     }
@@ -3481,6 +3620,7 @@ private static void setXXX_setObject_doWork(
      * @param type the type of the column
      */
     private static void setXXX_setObjectNullNoTypeSpec(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1938
             Statement s, PreparedStatement psi, PreparedStatement psq,
             int type) throws SQLException, IOException {
         // setObject(null) - see DERBY-1938
@@ -3497,6 +3637,8 @@ private static void setXXX_setObjectNullNoTypeSpec(
         psi.setObject(1, null);
         psi.addBatch();
         psi.executeBatch();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
         getValidValue(psq, jdbcTypes[type], "setObject");
     }
 
@@ -3525,6 +3667,7 @@ private static boolean setValidValue(PreparedStatement ps, int param,
 
         switch (jdbcType) {
         case Types.BIT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
         case Types.BOOLEAN:
             ps.setBoolean(param, true);
             return true;
@@ -3602,6 +3745,7 @@ private static boolean setValidValue(PreparedStatement ps, int param,
 
     private static boolean getValidValue(PreparedStatement ps, int jdbcType,
             String method) throws SQLException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
 
         ResultSet rs = ps.executeQuery();
         rs.next();
@@ -3725,6 +3869,7 @@ else if (method.equals("setDouble"))
                     s = sb.toString();
 
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 checkValidStringValue(method, s);
             }
             return true;
@@ -3861,6 +4006,8 @@ else if ("setObject(java.lang.Clob)".equals(method))
         }
         default:
             fail("FAIL JDBC TYPE IN getValidValue "
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                     + JDBC.sqlNameFromJdbc(jdbcType));
             return false;
         }
@@ -3911,6 +4058,7 @@ private static boolean getOutValue(CallableStatement cs, int param,
         
         int paramJdbcType= jdbcTypes[paramType];
         switch (regJdbcType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
         case Types.BIT:
         case Types.BOOLEAN:
         {
@@ -4200,6 +4348,7 @@ private static void checkProcedureOutput(int param, int paramType, byte[] val) {
         boolean isBlob =  ( jdbcTypes[ paramType ] == Types.BLOB );
         if (param == 2)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
             if ( isBlob )
             {
                 assertEquals("0x82,0x43",showFirstTwo(val));
@@ -4326,6 +4475,7 @@ private static void testSetStringInvalidValue(int type,
                 ;
             // System.out.println(" IC (Expected)");
             else
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
                 fail("FAIL:" + sqle.getMessage());
         } catch (Exception e) {
             fail("FAIL: Unexpected Exception " + e.getMessage());
@@ -4365,6 +4515,7 @@ private static String showFirstTwo(byte[] data) {
     
     public static Test suite() {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2381
         return TestConfiguration.defaultSuite(ParameterMappingTest.class);
     }
         /*
@@ -4382,6 +4533,7 @@ public static void pmap(int in, int[] inout, int[] out) {
 
         }
         public static void pmap(boolean in, boolean[] inout, boolean[] out) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4891
             inout[0] = true;
             out[0] = true;
         }
@@ -4443,11 +4595,13 @@ public static void pmap(BigDecimal in, BigDecimal[] inout, BigDecimal[] out) {
     public static void pmap(Blob in, Blob[] inout, Blob[] out) throws SQLException {
         int    leftLength = (int) in.length();
         int    rightLength = (int) inout[0].length();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         byte[] left = in.getBytes( 1L, leftLength );
         byte[] right = inout[0].getBytes( 1L, rightLength );
         byte[] retval = new byte[ leftLength + rightLength ];
         System.arraycopy( left, 0, retval, 0, leftLength );
         System.arraycopy( right, 0, retval, leftLength, rightLength );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         inout[0] = new HarmonySerialBlob( retval );
         
         out[0] = new HarmonySerialBlob( new byte[] { (byte) 1, (byte) 2, (byte) 3 } );
@@ -4468,6 +4622,7 @@ public static void clobIn( Clob c, String[] result ) throws SQLException
     }
     public static void clobOut( Clob[] c ) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         c[ 0 ] = new HarmonySerialClob( "abc" );
     }
     public static void clobInOut( Clob[] c ) throws SQLException
@@ -4477,6 +4632,7 @@ public static void clobInOut( Clob[] c ) throws SQLException
         char[] inValue = value.toCharArray();
         char[] outValue = reverse( inValue );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         c[ 0 ] = new HarmonySerialClob( new String( outValue ) );
     }
 
@@ -4504,6 +4660,7 @@ public static void blobIn( Blob c, String[] result ) throws Exception
     }
     public static void blobOut( Blob[] c ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         c[ 0 ] = new HarmonySerialBlob( "abc".getBytes( UTF8 ) );
     }
     public static void blobInOut( Blob[] c ) throws Exception
@@ -4513,6 +4670,7 @@ public static void blobInOut( Blob[] c ) throws Exception
         char[] inValue = value.toCharArray();
         char[] outValue = reverse( inValue );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         c[ 0 ] = new HarmonySerialBlob( (new String( outValue )).getBytes( UTF8 ) );
     }
 
@@ -4566,6 +4724,7 @@ protected void    expectCompilationError( String sqlState, String query )
      */
     public void testDerby5533GetXXX() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5533
         String createTableString = "CREATE TABLE MultiTypeTable (" +
             "F01 SMALLINT," +
             "F02 INTEGER," +
@@ -4600,6 +4759,7 @@ public void testDerby5533GetXXX() throws SQLException
         ps.setBoolean(11, true);
         ps.executeUpdate();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5536
         PreparedStatement plainSelect = 
                 prepareStatement("select * from MultiTypeTable");
         ResultSet rs = plainSelect.executeQuery();
@@ -4673,6 +4833,7 @@ public void testDerby5533GetXXX() throws SQLException
         ps.executeUpdate();
 
         rs = plainSelect.executeQuery();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5536
 
         rs.next();
         // JDBC type -> byte
@@ -4707,6 +4868,7 @@ public void testDerby5533GetXXX() throws SQLException
         // JDBC type -> float
         rs.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5536
         rs = uSelect.executeQuery();
         rs.next();
         rs.updateDouble("F06", -Float.MAX_VALUE * 10.0);
@@ -4827,6 +4989,7 @@ public void testDerby5533UpdateXXX() throws SQLException
                           bdMinLongValue.subtract(BigDecimal.ONE), "22003");
 
         // REAL overflow checking
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Float maxF = Float.MAX_VALUE;
         assertUpdateState(rs, "F04",
                           _X, maxF.doubleValue() * 10,
@@ -4837,9 +5000,11 @@ public void testDerby5533UpdateXXX() throws SQLException
                           bdMaxFloatValue.multiply(BigDecimal.TEN), "22003");
 
         assertUpdateState(rs, "F04",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                           _X, -(maxF).doubleValue() * 10,
                           XXX_DOUBLE, "22003");
         assertUpdateState(rs, "F04",
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
                           _X, Float.POSITIVE_INFINITY, XXX_FLOAT, "22003");
         assertUpdateState(rs, "F04",
                           _X, Float.NEGATIVE_INFINITY, XXX_FLOAT, "22003");
@@ -4862,6 +5027,9 @@ public void testDerby5533UpdateXXX() throws SQLException
 
         // REAL Underflow checking
         // Make unconditional DERBY-5534 is fixed
+//IC see: https://issues.apache.org/jira/browse/DERBY-5546
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
+//IC see: https://issues.apache.org/jira/browse/DERBY-5534
         if (usingEmbedded()) {
             assertUpdateState(rs, "F04", bdSmallestPosDoubleValue, "22003");
             assertUpdateState(rs, "F04", bdSmallestNegDoubleValue, "22003");
@@ -4895,6 +5063,9 @@ public void testDerby5533UpdateXXX() throws SQLException
 
             // DOUBLE, FLOAT underflow checking
             // Make unconditional when DERBY-5534 is fixed
+//IC see: https://issues.apache.org/jira/browse/DERBY-5546
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
+//IC see: https://issues.apache.org/jira/browse/DERBY-5534
             if (usingEmbedded()) {
                 assertUpdateState(rs, dfCols[i],
                     bdSmallestPosDoubleValue.divide(BigDecimal.TEN), "22003");
@@ -4903,6 +5074,7 @@ public void testDerby5533UpdateXXX() throws SQLException
             }
 
             // These two would fail prior to DERBY-3398
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
             assertUpdateOK(rs, dfCols[i], _X, Double.MIN_VALUE, XXX_DOUBLE);
             assertUpdateOK(rs, dfCols[i], _X, -Double.MIN_VALUE, XXX_DOUBLE);
         }
@@ -4931,6 +5103,7 @@ public void testDerby5533UpdateXXX() throws SQLException
      */
     public void testDerby5536() throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5536
         BigDecimal vBelow[] =
             new BigDecimal[]{new BigDecimal(123456789012345678L),  // 18 digits
                              new BigDecimal(-12345678901234567L)};
@@ -4988,6 +5161,7 @@ public void testDerby5536() throws SQLException {
     }
 
     public void testDerby6902()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6902
         throws SQLException
     {
         createStatement().executeUpdate(
@@ -5032,6 +5206,7 @@ public void testDerby6902()
         ps6902.setLong(1, 1470362049757L);
         ps6902.executeUpdate();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6902
         try {
             ps6902.setString( 1,  "abcde" );
             ps6902.executeUpdate();
@@ -5185,6 +5360,7 @@ private void assertUpdateState(
      * updateType.
      */
     private void assertUpdateOK(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
             ResultSet rs,
             String colName,
             long value,
@@ -5228,6 +5404,7 @@ private void assertUpdateState(
                 fail("wrong argument");
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
             if (expected != null) {
                 fail("exception expected");
             }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java
index fc02a2343a..cd5668f264 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java
@@ -53,6 +53,7 @@ public class ParameterMetaDataJdbc30Test extends BaseJDBCTestCase {
          */
 
         public ParameterMetaDataJdbc30Test(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2658
                 super(name);
         }
         
@@ -61,6 +62,7 @@ public ParameterMetaDataJdbc30Test(String name) {
 	 * all tests in this class
          */
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ParameterMetaDataJdbc30Test");
 
@@ -80,6 +82,7 @@ public static Test suite() {
 	private static Test baseSuite(String name)
     	{
             BaseTestSuite suite = new BaseTestSuite(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         	suite.addTestSuite(ParameterMetaDataJdbc30Test.class);
 
@@ -97,6 +100,7 @@ protected void decorateSQL(Statement stmt) throws SQLException {
                 // Create procedure used by
                 // testParameterMetadataWithDECIMALParameters() and
                 // testParameterMetadataWithLITERALParameters().
+//IC see: https://issues.apache.org/jira/browse/DERBY-5159
                 stmt.execute(
                     "CREATE PROCEDURE PMDD(IN pmdI_1 DECIMAL(5,3), " +
                     "IN pmdI_2 DECIMAL(4,2), INOUT pmdI_3 DECIMAL(9,0), " +
@@ -149,6 +153,7 @@ public void testCallableStatement () throws SQLException {
       		//parameter 3 is output only
       		cs.registerOutParameter(3,Types.INTEGER);
       		// parameter 4 is input and output
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
       		Object x = 1;
       		cs.setObject(4,x, Types.INTEGER);
       		cs.registerOutParameter(4,Types.INTEGER);
@@ -239,6 +244,7 @@ public void testPreparedStatement () throws SQLException {
       		 * getParameterMetaData().
 		 */
       		ps = prepareStatement("select * from sys.systables where " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
              			      " CAST(tablename AS VARCHAR(128)) like ? and CAST(tableID AS CHAR(36)) like ?");
       		ps.setString (1, "SYS%");
       		ps.setString (2, "8000001%");
@@ -265,6 +271,7 @@ public void testPreparedStatement () throws SQLException {
          */
 	public void testBooleanParameters() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
         Statement stmt = createStatement();
         stmt.executeUpdate
             (
@@ -272,6 +279,7 @@ public void testBooleanParameters() throws SQLException
              "returns varchar( 100 ) language java parameter style java no sql\n" +
              "external name 'org.apache.derbyTesting.functionTests.tests.lang.BooleanValuesTest.booleanValue'\n"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4716
         stmt.executeUpdate
             (
              "create table t_boolean( b boolean )"
@@ -300,6 +308,7 @@ public void testBooleanParameters() throws SQLException
         //
         // Test metadata for boolean-valued columns.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4716
         ps = prepareStatement("insert into t_boolean values(?)");
         ps.setBoolean(1, true);
 
@@ -322,6 +331,7 @@ public void testBooleanParameters() throws SQLException
 	public void testBooleanProcedureArgs() throws Exception
     {
         Statement stmt = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
 
         stmt.executeUpdate("create procedure booleanProc" + 
                            "( in inarg boolean, out outarg boolean, inout inoutarg boolean )" + 
@@ -379,6 +389,7 @@ public void testLikeEscaleStatement () throws SQLException {
 
       		//variation 1, testing DERBY-44 
       		PreparedStatement ps = prepareStatement("select * from sys.systables " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
 							"where CAST(tablename AS VARCHAR(128)) like ? escape CAST(? AS VARCHAR(128))");
       		ps.setString (1, "SYS%");
       		ps.setString (2, "");
@@ -399,6 +410,7 @@ public void testLikeEscaleStatement () throws SQLException {
 			fail("DERBY-44 failed (didn't get SQLSTATE 22019)");
           		rs.close();
       		} catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2658
 			assertSQLState("22019", e);
       		}
 		ps.close();
@@ -420,6 +432,7 @@ public void testExecuteStatementUsing () throws SQLException {
                  * orig: ps = con.prepareStatement("execute statement systab using values('SYS%','8000001%')");
 		 */
       		PreparedStatement ps = prepareStatement("select * from sys.systables " + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
 							"where CAST(tablename AS VARCHAR(128)) like 'SYS%' and " + 
 							"CAST(tableID AS VARCHAR(128)) like '8000001%'");
 
@@ -530,6 +543,7 @@ public void testMetatdataAfterProcRecompile () throws SQLException {
 
 		Statement stmt = createStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5117
         stmt.executeUpdate("create procedure dummyint( "
                 + "in a integer, in b integer, "
                 + "out c integer, inout d integer) "
@@ -587,6 +601,8 @@ public void testMetatdataAfterProcRecompile () throws SQLException {
 		}
       		cs.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5117
+//IC see: https://issues.apache.org/jira/browse/DERBY-5117
         stmt.execute("drop procedure dummyint");
 	}
 	/**
@@ -604,6 +620,7 @@ public void testParameterMetadataWithINTParameters () throws SQLException {
                	cs.setInt(1,1);
         	cs.setInt(2,1);
 		// parameter 3 is input and output
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Object x = 1;
                 cs.setObject(3,x, Types.INTEGER);
                 cs.registerOutParameter(3,Types.INTEGER);
@@ -673,6 +690,7 @@ public void testParameterMetadataWithCHARParameters () throws SQLException {
          */
     public void testParameterMetadataWithTimestampParameters () throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
         Statement stmt = createStatement();
         stmt.execute("CREATE PROCEDURE PMDT(IN pmdI_1 TIMESTAMP, INOUT pmdI_2 TIMESTAMP, OUT pmdI_3 TIMESTAMP) language java parameter style java external name 'org.apache.derbyTesting.functionTests.tests.jdbcapi.ParameterMetaDataJdbc30Test.dummyString'");
         CallableStatement cs = prepareCall("CALL PMDT(?, ?, ?)");
@@ -887,6 +905,7 @@ static void dumpParameterMetaDataNegative(ParameterMetaData paramMetaData) throw
                 *  DERBY-3039 - ParameterMetaData.isNullable() returns differenet SQLState in Embedded  
                 *  and Network Client 
                 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2658
 		String expectedSQLState = (usingEmbedded())?"XCL13":"XCL14";
 	
 		try {
@@ -988,6 +1007,7 @@ public static void dummyDecimal(BigDecimal in_param, BigDecimal in_param2, BigDe
     /** Java method for testing procedures with boolean args */
     public static void booleanProc( boolean inarg, boolean[] outarg, boolean[] inoutarg )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
         outarg[ 0 ] = inarg;
         inoutarg[ 0 ] = !inoutarg[ 0 ];
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolDSAuthenticationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolDSAuthenticationTest.java
index 4a5d3ebe03..de32737643 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolDSAuthenticationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolDSAuthenticationTest.java
@@ -44,6 +44,7 @@ public static Test suite() {
         // This test uses ConnectionPoolDataSource and so is not suitable for 
         // JSR169
         if (JDBC.vmSupportsJSR169())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("ConnectionPoolDataSource not available" +
                 " with JSR169; empty test");
         else {
@@ -61,9 +62,11 @@ public static Test suite() {
     // in AuthenticationTest
     public static Test baseSuite(String name) {
         BaseTestSuite suite = new BaseTestSuite("PoolDSAuthenticationTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         Test test = new PoolDSAuthenticationTest(
             "testConnectShutdownAuthentication");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         setBaseProps(suite, test);
         
         test = new PoolDSAuthenticationTest("testUserFunctions");
@@ -144,6 +147,7 @@ protected void assertShutdownUsingSetShutdownOK(
         String dbName, String user, String password)
     throws SQLException {
         ConnectionPoolDataSource pds = J2EEDataSource.getConnectionPoolDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         JDBCDataSource.setBeanProperty(pds, "databaseName", dbName);
         JDBCDataSource.setBeanProperty(pds, "shutdownDatabase", "shutdown");
         try {
@@ -191,6 +195,7 @@ protected void assertShutdownFail(
     throws SQLException
     {
         ConnectionPoolDataSource pds = J2EEDataSource.getConnectionPoolDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         JDBCDataSource.setBeanProperty(pds, "shutdownDatabase", "shutdown");
         JDBCDataSource.setBeanProperty(pds, "databaseName", dbName);
         try {
@@ -206,6 +211,7 @@ protected void assertShutdownWOUPFail(
     throws SQLException
     {
         ConnectionPoolDataSource pds = J2EEDataSource.getConnectionPoolDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         JDBCDataSource.setBeanProperty(pds, "shutdownDatabase", "shutdown");
         JDBCDataSource.setBeanProperty(pds, "user", user);
         JDBCDataSource.setBeanProperty(pds, "password", password);
@@ -223,6 +229,7 @@ protected void assertSystemShutdownOK(
         String dbName, String user, String password)
     throws SQLException {
         ConnectionPoolDataSource pds = J2EEDataSource.getConnectionPoolDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         JDBCDataSource.clearStringBeanProperty(pds, "databaseName");
         JDBCDataSource.setBeanProperty(pds, "shutdownDatabase", "shutdown");
         JDBCDataSource.setBeanProperty(pds, "databaseName", dbName);
@@ -241,6 +248,7 @@ protected void assertSystemShutdownFail(
             String expectedError, String dbName, String user, String password)
     throws SQLException {
         ConnectionPoolDataSource pds = J2EEDataSource.getConnectionPoolDataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         JDBCDataSource.clearStringBeanProperty(pds, "databaseName");
         JDBCDataSource.setBeanProperty(pds, "databaseName", dbName);
         JDBCDataSource.setBeanProperty(pds, "shutdownDatabase", "shutdown");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolXADSCreateShutdownDBTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolXADSCreateShutdownDBTest.java
index 4f9d7c04a9..d208386e27 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolXADSCreateShutdownDBTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolXADSCreateShutdownDBTest.java
@@ -57,6 +57,7 @@ public PoolXADSCreateShutdownDBTest(String name) {
 
     public static Test suite() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("PoolXADSCreateShutdownTest");
         Test test = TestConfiguration.defaultSuite(PoolXADSCreateShutdownDBTest.class);        
         //Test test = TestConfiguration.clientServerSuite(DSCreateShutdownDBTest.class);
@@ -79,6 +80,7 @@ public void tearDown() throws Exception {
         // attempt to get rid of any databases. 
         // only 5 dbs (in addition to the defaultdb) should actually get
         // created, but just in case...
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         TestConfiguration conf = TestConfiguration.getCurrent();
         for (int i = 0; i < ADDITIONAL_DBS.length; i++) {
             removeDirectory(conf.getDatabasePath("emb" + ADDITIONAL_DBS[i]));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtMetaDataTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtMetaDataTest.java
index 110172240d..324aec31f9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtMetaDataTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtMetaDataTest.java
@@ -117,6 +117,8 @@ public void testAlterTableMeta() throws SQLException {
 
         s.executeUpdate("alter table bug4579 add column c12 int");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5459
+//IC see: https://issues.apache.org/jira/browse/DERBY-2402
         if (usingDerbyNetClient()) {
             // DERBY-2402 Client does not report added columns.
             // Take out check when DERBY-2402 is fixed
@@ -144,6 +146,8 @@ public void testAlterTableMeta() throws SQLException {
         assertEquals("C13", rsmd.getColumnName(3));
 
         // Check ps metadata again
+//IC see: https://issues.apache.org/jira/browse/DERBY-5459
+//IC see: https://issues.apache.org/jira/browse/DERBY-2402
         rsmd = ps.getMetaData();
         assertEquals(3, rsmd.getColumnCount());
         assertEquals(java.sql.Types.INTEGER, rsmd.getColumnType(1));
@@ -184,9 +188,11 @@ private void checkEmptyMetaData(String sql, boolean execute)
     public void testAllDataTypesMetaData()  throws SQLException
     {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2463
         SQLUtilities.createAndPopulateAllDataTypesTable(s);
         s.close();
         PreparedStatement ps = prepareStatement("SELECT * from AllDataTypesTable");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2452
         ResultSetMetaData rsmd = ps.getMetaData();
         int colCount = rsmd.getColumnCount();
         assertEquals(17, colCount);
@@ -237,6 +243,7 @@ public void testAllDataTypesMetaData()  throws SQLException
         assertEquals(5, rsmd.getScale(4));
         // COLUMN 5 REAL
         assertEquals("java.lang.Float", rsmd.getColumnClassName(5));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
         assertEquals(15, rsmd.getColumnDisplaySize(5));
         assertEquals("REALCOL", rsmd.getColumnLabel(5));
         assertEquals(java.sql.Types.REAL,rsmd.getColumnType(5));
@@ -246,6 +253,7 @@ public void testAllDataTypesMetaData()  throws SQLException
         
         // COLUMN 6 DOUBLE
         assertEquals("java.lang.Double", rsmd.getColumnClassName(6));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
         assertEquals(24, rsmd.getColumnDisplaySize(6));
         assertEquals("DOUBLECOL", rsmd.getColumnLabel(6));
         assertEquals(java.sql.Types.DOUBLE,rsmd.getColumnType(6));
@@ -342,6 +350,7 @@ public void testAllDataTypesMetaData()  throws SQLException
         
         // COLUMN 16 TIMESTAMP
         assertEquals("java.sql.Timestamp", rsmd.getColumnClassName(16));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
         assertEquals(29, rsmd.getColumnDisplaySize(16));
         assertEquals("TIMESTAMPCOL", rsmd.getColumnLabel(16));
         assertEquals(java.sql.Types.TIMESTAMP,rsmd.getColumnType(16));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtNullTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtNullTest.java
index 9051bf5430..cf175499f6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtNullTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtNullTest.java
@@ -57,6 +57,7 @@ public PrepStmtNullTest(String name) {
      * all tests in this class
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("PrepStmtNullTest");
         suite.addTest(baseSuite("PrepStmtNullTest:embedded"));
         suite.addTest(
@@ -66,6 +67,7 @@ public static Test suite() {
     }
     
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         
         suite.addTestSuite(PrepStmtNullTest.class);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ProcedureTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ProcedureTest.java
index 40abdb4b18..2dabbfce10 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ProcedureTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ProcedureTest.java
@@ -86,6 +86,7 @@ public void testExecuteQueryWithOneDynamicResultSet() throws SQLException {
         Statement stmt = createStatement();
         ResultSet rs = stmt.executeQuery("CALL RETRIEVE_DYNAMIC_RESULTS(1)");
         assertNotNull("executeQuery() returned null.", rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
         assertSame(stmt, rs.getStatement());
         JDBC.assertDrainResultsHasData(rs);
     }
@@ -169,6 +170,7 @@ public void testExecuteQueryWithOneDynamicResultSet_prepared()
         ps.setInt(1, 1);
         ResultSet rs = ps.executeQuery();
         assertNotNull("executeQuery() returned null.", rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
         assertSame(ps, rs.getStatement());
         JDBC.assertDrainResultsHasData(rs);
 
@@ -262,6 +264,7 @@ public void testExecuteQueryWithOneDynamicResultSet_callable()
         cs.setInt(1, 1);
         ResultSet rs = cs.executeQuery();
         assertNotNull("executeQuery() returned null.", rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
         assertSame(cs, rs.getStatement());
         JDBC.assertDrainResultsHasData(rs);
     }
@@ -492,6 +495,12 @@ public void testRollbackStoredProcWhenExecuteQueryReturnsTooMuch_prepared()
         testRollbackStoredProcWhenExecuteUpdateReturnsResults_prepared()
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection conn = getConnection();
         conn.setAutoCommit(true);
         PreparedStatement ps =
@@ -572,6 +581,8 @@ public void testDynamicResultSetsFromOtherConnectionWithExecuteUpdate()
         PreparedStatement ps =
             prepareStatement("CALL RETRIEVE_EXTERNAL_RESULT(?,?,?)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         ps.setString(1, getTestConfiguration().getDefaultDatabaseName());
         ps.setString(2, getTestConfiguration().getUserName());
         ps.setString(3, getTestConfiguration().getUserPassword());
@@ -621,6 +632,9 @@ public void testGetClobFromIntParameter() throws SQLException {
      * test case for DERBY-5280.
      */
     public void testStatementSeverityErrorInProcedure() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5280
+//IC see: https://issues.apache.org/jira/browse/DERBY-5161
+//IC see: https://issues.apache.org/jira/browse/DERBY-5157
         Statement s = createStatement();
         s.execute("create procedure proc_5280() language java " +
                   "parameter style java external name '" +
@@ -855,6 +869,7 @@ public void testInOutParamNotSet() throws SQLException {
      * @param i INOUT parameter that gets set to 10 by the procedure
      */
     public static void proc_2516(Integer[] i) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         i[0] = 10;
     }
 
@@ -1009,6 +1024,8 @@ private void assertNoResultSetFromExecuteQuery(SQLException sqle) {
      */
     private void assertMultipleResultsFromExecuteQuery(SQLException sqle)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4785
+//IC see: https://issues.apache.org/jira/browse/DERBY-4785
         assertSQLState("Unexpected SQL state.", "X0Y78", sqle);        
     }
 
@@ -1019,6 +1036,7 @@ private void assertMultipleResultsFromExecuteQuery(SQLException sqle)
      * @param sqle a <code>SQLException</code> value
      */
     private void assertResultsFromExecuteUpdate(SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4785
         assertSQLState("Unexpected SQL state.", "X0Y79", sqle);
     }
 
@@ -1030,8 +1048,10 @@ private void assertResultsFromExecuteUpdate(SQLException sqle) {
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("ProcedureTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(baseSuite("ProcedureTest:embedded"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2021
 
         suite.addTest(
                 TestConfiguration.clientServerDecorator(
@@ -1046,6 +1066,7 @@ public static Test suite() {
      */
     private static Test baseSuite(String name)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         
         // Need JDBC DriverManager to run these tests
@@ -1054,6 +1075,7 @@ private static Test baseSuite(String name)
         
         suite.addTestSuite(ProcedureTest.class);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2021
         return new CleanDatabaseTestSetup(suite) {
             /**
              * Creates the tables and the stored procedures used in the test
@@ -1078,6 +1100,7 @@ protected void decorateSQL(Statement s) throws SQLException
      * @exception SQLException if a database error occurs
      */
     public void setUp() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection conn = getConnection();
         conn.setAutoCommit(false);
         Statement s = createStatement();
@@ -1100,12 +1123,15 @@ public void setUp() throws SQLException {
           ProcedureTest.class.getName() + ".retrieveDynamicResults' " +
           "DYNAMIC RESULT SETS 4",
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2021
 
           "CREATE PROCEDURE RETRIEVE_CLOSED_RESULT() LANGUAGE JAVA " +
           "PARAMETER STYLE JAVA EXTERNAL NAME '" +
           ProcedureTest.class.getName() + ".retrieveClosedResult' " +
           "DYNAMIC RESULT SETS 1",
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
           "CREATE PROCEDURE RETRIEVE_EXTERNAL_RESULT(" +
           "DBNAME VARCHAR(128), DBUSER VARCHAR(128), DBPWD VARCHAR(128)) LANGUAGE JAVA " +
           "PARAMETER STYLE JAVA EXTERNAL NAME '" +
@@ -1197,6 +1223,8 @@ public static void retrieveClosedResult(ResultSet[] closed)
      * @exception SQLException if a database error occurs
      */
     public static void retrieveExternalResult(String dbName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
             String user, String password, ResultSet[] external)
         throws SQLException
     {
@@ -1292,6 +1320,7 @@ public static  AllTypesTuple   makeFirstAllTypesTuple() throws Exception
     {
         return new AllTypesTuple
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              1L,
              new HarmonySerialBlob( new byte[] { (byte) 1, (byte) 1, (byte) 1 } ),
              Boolean.TRUE,
@@ -1299,7 +1328,9 @@ public static  AllTypesTuple   makeFirstAllTypesTuple() throws Exception
              new byte[] { (byte) 1, (byte) 1, (byte) 1 },
              new HarmonySerialClob( "firstt" ),
              new Date( 1L ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5485
              new BigDecimal( "1" ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              1.0,
              1 ,
              new String( "firstt" ),
@@ -1308,6 +1339,7 @@ public static  AllTypesTuple   makeFirstAllTypesTuple() throws Exception
              1,
              new Time( 1L ),
              new Timestamp( 1L ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5485
              new Price( "USD", new BigDecimal( "1" ), new Timestamp( 1 ) ),
              "firstt",
              new byte[] { (byte) 1, (byte) 1, (byte) 1 }
@@ -1317,6 +1349,7 @@ public static  AllTypesTuple   makeSecondAllTypesTuple() throws Exception
     {
         return new AllTypesTuple
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              2L,
              new HarmonySerialBlob( new byte[] { (byte) 2, (byte) 2, (byte) 2 } ),
              Boolean.FALSE,
@@ -1324,7 +1357,9 @@ public static  AllTypesTuple   makeSecondAllTypesTuple() throws Exception
              new byte[] { (byte) 2, (byte) 2, (byte) 2 },
              new HarmonySerialClob( "second" ),
              new Date( 2L ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5485
              new BigDecimal( "2" ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              2.0,
              2,
              new String( "second" ),
@@ -1333,6 +1368,7 @@ public static  AllTypesTuple   makeSecondAllTypesTuple() throws Exception
              2,
              new Time( 2L ),
              new Timestamp( 2L ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5485
              new Price( "USD", new BigDecimal( "2" ), new Timestamp( 2 ) ),
              "second",
              new byte[] { (byte) 2, (byte) 2, (byte) 2 }
@@ -1546,6 +1582,8 @@ private void checkCSCloseClosesResults(CallableStatement cs, ResultSet[] allRS)
             int pass = 0;
             do {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
                     allRS[pass++] = cs.getResultSet();         
                     assertSame(cs, allRS[pass-1].getStatement());
                     // expect everything to stay open.                        
@@ -1568,6 +1606,7 @@ private void mixedGetMoreResults(CallableStatement cs, ResultSet[] allRS) throws
 
             //first two with KEEP_CURRENT_RESULT"
             allRS[0] = cs.getResultSet();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
             assertSame(cs, allRS[0].getStatement());
             boolean moreRS = cs.getMoreResults(Statement.KEEP_CURRENT_RESULT);
             if (!moreRS)
@@ -1586,6 +1625,7 @@ private void mixedGetMoreResults(CallableStatement cs, ResultSet[] allRS) throws
                     fail("FAIL - no third result set");
             // first and third open
             allRS[2] = cs.getResultSet();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
             assertSame(cs, allRS[2].getStatement());
             assertEquals(2,allRS[0].getInt(1));
             JDBC.assertClosed(allRS[1]);
@@ -1598,6 +1638,7 @@ private void mixedGetMoreResults(CallableStatement cs, ResultSet[] allRS) throws
             if (!moreRS)
                     fail("FAIL - no fourth result set");
             allRS[3] = cs.getResultSet();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
             assertSame(cs, allRS[3].getStatement());
             allRS[3].next();
             // first, third and fourth open, second closed
@@ -1611,6 +1652,7 @@ private void mixedGetMoreResults(CallableStatement cs, ResultSet[] allRS) throws
             if (!moreRS)
                    fail("FAIL - no fifth result set");
             allRS[4] = cs.getResultSet();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
             assertSame(cs, allRS[4].getStatement());
             allRS[4].next();
             // only fifth open
@@ -1698,6 +1740,9 @@ private void defaultGetMoreResults(CallableStatement cs, ResultSet[] allRS) thro
             for (int i = 0; i < 5; i++)
             {
                 allRS[i] = cs.getResultSet();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
+//IC see: https://issues.apache.org/jira/browse/DERBY-3305
                 assertSame(cs, allRS[i].getStatement());
                 allRS[i].next();
                 assertEquals(2+i, allRS[i].getInt(1));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/RelativeTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/RelativeTest.java
index 036dabefbd..0fccab65db 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/RelativeTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/RelativeTest.java
@@ -116,6 +116,8 @@ public void testScrolling_CONCUR_UPDATABLE() throws SQLException {
 			 * Therefore, attempting to get value now will throw an exception.
 			 */
 			rs.getString("name");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3587
+//IC see: https://issues.apache.org/jira/browse/DERBY-3587
 			fail("FAIL - Attempting to read from an invalid row should have " +
 				"thrown an exception");
 		} catch (SQLException sqle) {
@@ -139,6 +141,7 @@ public void testScrolling_CONCUR_UPDATABLE() throws SQLException {
 	 * @return test suite
 	 */
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("RelativeTest");
 		suite.addTest(baseSuite("RelativeTest:embedded"));
 		suite.addTest(TestConfiguration
@@ -153,6 +156,7 @@ public static Test suite() {
 	 *            Name for the suite.
 	 */
 	private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
 		suite.addTestSuite(RelativeTest.class);
 		return new CleanDatabaseTestSetup(DatabasePropertyTestSetup
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetCloseTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetCloseTest.java
index de192c9297..2f39748aae 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetCloseTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetCloseTest.java
@@ -52,6 +52,7 @@ public class ResultSetCloseTest extends BaseJDBCTestCase {
      */
     public void setUp()
     throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection con = getConnection();
         con.setAutoCommit(false);
         
@@ -64,6 +65,8 @@ public void setUp()
         s.execute("insert into t1 values(2)");
         s.execute("insert into t1 values(3)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s.close();
         
         con.commit();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetJDBC30Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetJDBC30Test.java
index 7cc93a2341..8ff5adee0d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetJDBC30Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetJDBC30Test.java
@@ -108,6 +108,7 @@ public void testNotImplementedMethods() throws Exception {
                     " JSR169", JDBC.vmSupportsJSR169());
         }
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             rs.updateBlob(8, (Blob) null);
             if (usingEmbedded()) {
                 fail("FAIL - Shouldn't reach here. Method is being invoked" +
@@ -120,6 +121,7 @@ public void testNotImplementedMethods() throws Exception {
             assertSQLState(UPDATABLE_RESULTSET_API_DISALLOWED, se);
         }
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             rs.updateBlob("c", (Blob) null);
             if (usingEmbedded()) {
                 fail("FAIL - Shouldn't reach here. Method is being invoked" +
@@ -132,6 +134,7 @@ public void testNotImplementedMethods() throws Exception {
             assertSQLState(UPDATABLE_RESULTSET_API_DISALLOWED, se);
         }
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             rs.updateClob(8, (Clob) null);
             if (usingEmbedded()) {
                 fail("FAIL - Shouldn't reach here. Method is being invoked" +
@@ -144,6 +147,7 @@ public void testNotImplementedMethods() throws Exception {
             assertSQLState(UPDATABLE_RESULTSET_API_DISALLOWED, se);
         }
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             rs.updateClob("c", (Clob) null);
             if (usingEmbedded()) {
                 fail("FAIL - Shouldn't reach here. Method is being invoked" +
@@ -153,6 +157,10 @@ public void testNotImplementedMethods() throws Exception {
                         " yet.");
             }
         } catch (SQLException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
             assertSQLState(UPDATABLE_RESULTSET_API_DISALLOWED, se);
         }
         try {
@@ -222,6 +230,7 @@ private void checkForCloseOnException(ResultSet rs, boolean holdable)
             throws Exception
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             rs.updateBlob("c", (Blob) null);
             fail("FAIL - rs.updateBlob() on a read-only result set" +
                 "should not have succeeded");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java
index 428be26524..96047a10a0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java
@@ -123,6 +123,7 @@ public void testResultSetMetaData() throws SQLException {
         assertFalse(met.isCurrency(3));
         assertEquals(ResultSetMetaData.columnNullable, met.isNullable(3));
         assertTrue(met.isSigned(3));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
         assertEquals(15, met.getColumnDisplaySize(3));
         assertEquals("R", met.getColumnLabel(3));
         assertEquals("R", met.getColumnName(3));
@@ -148,6 +149,7 @@ public void testResultSetMetaData() throws SQLException {
         assertFalse(met.isCurrency(4));
         assertEquals(ResultSetMetaData.columnNullable, met.isNullable(4));
         assertTrue(met.isSigned(4));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
         assertEquals(24, met.getColumnDisplaySize(4));
         assertEquals("D", met.getColumnLabel(4));
         assertEquals("D", met.getColumnName(4));
@@ -198,6 +200,7 @@ public void testResultSetMetaData() throws SQLException {
         assertFalse(met.isCurrency(7));
         assertEquals(ResultSetMetaData.columnNullable, met.isNullable(7));
         assertFalse(met.isSigned(7));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
         assertEquals(29, met.getColumnDisplaySize(7));
         assertEquals("TS", met.getColumnLabel(7));
         assertEquals("TS", met.getColumnName(7));
@@ -206,6 +209,7 @@ public void testResultSetMetaData() throws SQLException {
         assertEquals("APP", met.getSchemaName(7));
         assertEquals("", met.getCatalogName(7));
         assertEquals(java.sql.Types.TIMESTAMP, met.getColumnType(7));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
         assertEquals(29, met.getPrecision(7));
         assertEquals(9, met.getScale(7));
         assertEquals("TIMESTAMP", met.getColumnTypeName(7));
@@ -270,6 +274,7 @@ public void testResultSetMetaData() throws SQLException {
         assertFalse(met.isAutoIncrement(10));
         assertFalse(met.isCaseSensitive(10));
         assertTrue(met.isSearchable(10));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2423
         assertFalse(met.isCurrency(10));
         assertEquals(ResultSetMetaData.columnNullable, met.isNullable(10));
         assertTrue(met.isSigned(10));
@@ -430,6 +435,7 @@ public void testResultSetMetaData() throws SQLException {
         assertTrue(met.isSearchable(16));
         assertFalse(met.isCurrency(16));
         assertEquals(ResultSetMetaData.columnNullable, met.isNullable(16));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2425
         assertFalse(met.isSigned(16));       
         assertEquals(2147483647, met.getColumnDisplaySize(16));
         assertEquals("BL", met.getColumnLabel(16));
@@ -764,6 +770,7 @@ private boolean locksHeld() throws SQLException {
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("ResultSetTest2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(baseSuite("ResultSetTest2:embedded"));
 
@@ -773,6 +780,7 @@ public static Test suite() {
     }
 
     public static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(ResultSetMiscTest.class);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetStreamTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetStreamTest.java
index 1ee29f8e2b..f5df299723 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetStreamTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetStreamTest.java
@@ -60,6 +60,7 @@ public ResultSetStreamTest(String name) {
     public void testInsertData() throws SQLException, Exception {
         try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             AccessController.doPrivileged(
                     new PrivilegedExceptionAction<Void>() {
                 public Void run() throws SQLException, FileNotFoundException,
@@ -165,6 +166,7 @@ private void assertMisMatchStreamLength(SQLException sqle) {
     public void testBinaryStreamProcessing() throws SQLException, Exception {
         try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             AccessController.doPrivileged(
                     new PrivilegedExceptionAction<Void>() {
                 public Void run() throws SQLException, FileNotFoundException,
@@ -415,6 +417,7 @@ public void testGetCharacterStream() throws SQLException, IOException {
      * @throws SQLException if something goes wrong
      */
     public void testSetMaxFieldSizeLarge()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
             throws IOException, SQLException {
         // Insert test data.
         int id = 1;
@@ -476,6 +479,7 @@ private static String drainStringFromSource(Reader src)
     }
 
     public static Test basesuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite(ResultSetStreamTest.class, name);
 
@@ -483,12 +487,14 @@ public static Test basesuite(String name) {
                 "functionTests/testData/ResultSetStream/littleclob.utf",
                 "functionTests/testData/ResultSetStream/short.utf",
                 "functionTests/testData/ResultSetStream/resultsetStream.gif" });
+//IC see: https://issues.apache.org/jira/browse/DERBY-3990
 
         return new CleanDatabaseTestSetup(test) {
             protected void decorateSQL(Statement s) throws SQLException {
 
                 s.execute("create table t2 (len int, data LONG VARCHAR FOR BIT DATA)");
                 s.execute("create table t3(text_data clob)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 s.execute("create table setMaxFieldSize(id int unique, " +
                         "dVarchar VARCHAR(32672), dClob clob)");
 
@@ -497,6 +503,7 @@ protected void decorateSQL(Statement s) throws SQLException {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ResultSetStreamTest");
         suite.addTest(basesuite("ResultSetStreamTest:embedded"));
         suite.addTest(TestConfiguration.clientServerDecorator(basesuite("ResultSetStreamTest:client")));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURBaseTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURBaseTest.java
index 3b1068b7f4..c97b0917dd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURBaseTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURBaseTest.java
@@ -32,11 +32,13 @@
  * and SURDataModelSetup.
  * 
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-993
 abstract public class SURBaseTest extends BaseJDBCTestCase {
     
     /** Creates a new instance of SURBaseTest */
     public SURBaseTest(String name) {
         super(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1070
         recordCount = SURDataModelSetup.recordCount;  
     }
 
@@ -52,6 +54,8 @@ public SURBaseTest(String name, int records) {
      * read as a starting point.
      */
     protected void initializeConnection(Connection conn) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         conn.setAutoCommit(false);
         conn.setTransactionIsolation(Connection.TRANSACTION_REPEATABLE_READ);   
     }
@@ -66,6 +70,7 @@ protected void verifyTuple(ResultSet rs) throws SQLException {
         int b = rs.getInt(3);
         int sum = a + id + 17;
         println("Reading tuple:(" + id + "," + a  + "," + b + ",'" + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
                 rs.getString(4) + "', '"+rs.getString(5)+"'");
         assertEquals("Expecting b==id+a+17", sum, b);
     }
@@ -95,6 +100,8 @@ protected void updateTuplePositioned(ResultSet rs) throws SQLException {
         int b = rs.getInt(3);        
         int newA = a*2 +id + 37;
         int newB = newA + id + 17;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         PreparedStatement ps = 
             prepareStatement("update T1 set a=?,b=? where current of " +
                              rs.getCursorName());
@@ -257,6 +264,7 @@ protected void assertWarning(SQLWarning warn, String sqlState)
         }
     }
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-1070
     final int recordCount;
     
        
@@ -268,6 +276,7 @@ protected void assertWarning(SQLWarning warn, String sqlState)
     final static String RESULTSET_NOT_UPDATABLE_SQL_STATE = "XJ083";
     final static String LOCK_TIMEOUT_SQL_STATE = "40XL1";
     final static String LOCK_TIMEOUT_EXPRESSION_SQL_STATE = "38000";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1172
     final static String INVALID_CURSOR_STATE_NO_CURRENT_ROW = "24000";
     final static String CURSOR_OPERATION_CONFLICT = "01001";
     final static String QUERY_NOT_QUALIFIED_FOR_UPDATABLE_RESULTSET = "01J06";
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java
index deff07af8f..d8e95449db 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java
@@ -69,6 +69,7 @@ public static void createDataModel(SURDataModel model, Connection con,
         
         /** Create the table */
         statement.execute(model.getCreateTableStatement());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         BaseTestCase.println(model.getCreateTableStatement());
         
         /** Create secondary index */
@@ -79,8 +80,10 @@ public static void createDataModel(SURDataModel model, Connection con,
         
         /** Populate with data */
         PreparedStatement ps = con.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
             prepareStatement("insert into t1 values (?,?,?,?,?)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1070
         for (int i=0; i<records; i++) {
             ps.setInt(1, i);
             ps.setInt(2, i);
@@ -90,6 +93,7 @@ public static void createDataModel(SURDataModel model, Connection con,
             ps.addBatch();
         }
         ps.executeBatch();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         ps.close();
         statement.close();
         con.commit();
@@ -104,6 +108,7 @@ public static void createDataModel(SURDataModel model, Connection con,
      * @param con connection to database
      */
     public static void createDataModel(SURDataModel model, Connection con) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1070
         throws SQLException
     {
         createDataModel(model, con, recordCount);
@@ -117,6 +122,7 @@ protected void setUp() throws  Exception {
         println("Setting up datamodel: " + model);
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
             Connection con = getConnection();
             con.setAutoCommit(false);
             createDataModel(model, con);
@@ -133,6 +139,7 @@ protected void tearDown()
         throws Exception
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
             Connection con = getConnection();
             con.rollback();
             con.createStatement().execute("drop table t1");
@@ -173,6 +180,7 @@ public final static class SURDataModel {
 
         /** Array with all values */
         private final static Set values = Collections.unmodifiableSet
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             (new HashSet<SURDataModel>(Arrays.asList(
                 MODEL_WITH_NO_KEYS, 
                 MODEL_WITH_PK, 
@@ -205,6 +213,7 @@ public boolean hasSecondaryKey() {
          */
         public String getCreateTableStatement() {
             return hasPrimaryKey() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6228
                 ? "create table t1 (id int primary key, a int, b int, c varchar(5000), d clob)"
                 : "create table t1 (id int, a int, b int, c varchar(5000), d clob)";
         }
@@ -235,6 +244,7 @@ private SURDataModel(String name) {
      * has been called.
      */
     static void printStackTrace(Throwable t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-993
         BaseJDBCTestCase.printStackTrace(t);
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java
index 952a505e36..8e74f783cb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java
@@ -73,6 +73,7 @@ public void runTest()
         throws SQLException
     {
         println(query);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         DatabaseMetaData dbMeta = getConnection().getMetaData();
                 
         if (dbMeta.ownDeletesAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)) {
@@ -89,6 +90,7 @@ public void runTest()
         checkRowDeleted = dbMeta.ownDeletesAreVisible(rs.getType());
         
         // Create map with rows
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Map<Integer, String> rows = createRowMap(rs);
         
         // Set of rows which are updated (contains Integer with position in RS)
@@ -138,6 +140,8 @@ public void runTest()
         }
         
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s.close();
     }
     
@@ -150,6 +154,7 @@ public void runTest()
     private Map<Integer, String> createRowMap(final ResultSet rs)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         final Map<Integer, String> rows = new HashMap<Integer, String>();
         rs.beforeFirst();
         assertTrue("Unexpected return from isBeforeFirst()",
@@ -164,6 +169,7 @@ private Map<Integer, String> createRowMap(final ResultSet rs)
             i++;
             String row = getRowString(rs);
             println(row);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             rows.put(i, row);
             sum += rs.getInt(1);
             if (rs.getInt(1) < 0) {
@@ -191,6 +197,7 @@ private Map<Integer, String> createRowMap(final ResultSet rs)
      **/
     private List createRandomSample(final Map<Integer, String> rows, int k) {
         Random r = new Random();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<Integer> sampledKeys = new ArrayList<Integer>();
         int n = 0;        
         for (Integer key : rows.keySet()) {
@@ -220,6 +227,7 @@ private List createRandomSample(final Map<Integer, String> rows, int k) {
      * @param k number of records to be deleted
      */
     private void deleteRandomSampleOfNRecords(final ResultSet rs, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                                               final Map<Integer, String> rows,
                                               final Set<Integer> deletedRows,
                                               final int k) 
@@ -233,12 +241,15 @@ private void deleteRandomSampleOfNRecords(final ResultSet rs,
             rs.absolute(key.intValue());            
             if (rs.rowDeleted()) continue; // skip deleting row if already deleted
             if (positioned) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
                 createStatement().executeUpdate
                         ("DELETE FROM T1 WHERE CURRENT OF \"" + cursorName + 
                          "\"");
             } else {
                 rs.deleteRow();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-690
             rs.relative(0);
             println("Deleted row " + key);
             // Update the rows table
@@ -257,6 +268,7 @@ private void deleteRandomSampleOfNRecords(final ResultSet rs,
      * @param k number of records to be updated
      */
     private void updateRandomSampleOfNRecords(final ResultSet rs, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                                               final Map<Integer, String> rows,
                                               final Set<Integer> updatedRows,
                                               final int k) 
@@ -325,6 +337,8 @@ private void updatePositioned(final ResultSet rs,
         sb.append(cursorName);
         sb.append("\"");
         println(sb.toString());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         PreparedStatement ps = prepareStatement(sb.toString());
         
         for (int column = 1; column<=meta.getColumnCount(); column++) {
@@ -361,6 +375,7 @@ private void testNavigation(final ResultSet rs, final Map rows,
                 String rowString = getRowString(rs);
                 assertEquals("Navigating with rs.previous(). The row is " +
                              "different compared to the value when navigating " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                              "forward.", rows.get(i), rowString);
                 
                 
@@ -382,6 +397,7 @@ private void testNavigation(final ResultSet rs, final Map rows,
             assertEquals("Navigating with rs.absolute(). The row is " +
                          "different compared to the value" +
                          " when navigating forward.", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                          rows.get(i),
                          rowString);
             if (checkRowUpdated && updatedRows.contains(i)) {
@@ -419,6 +435,7 @@ private void testNavigation(final ResultSet rs, final Map rows,
             assertEquals("Navigating with rs.relative(+). " +
                          "A tuple was different compared to the value" +
                          " when navigating forward.", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                          rows.get(relativePos),
                          getRowString(rs));
             
@@ -431,6 +448,7 @@ private void testNavigation(final ResultSet rs, final Map rows,
             assertEquals("Navigating with rs.relative(-). " + 
                          "A tuple was different compared to the value" +
                          " when navigating forward.", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                          rows.get(1),
                          getRowString(rs));
             
@@ -514,6 +532,7 @@ private String getRowString(final ResultSet rs)
     };
     
     private static BaseTestSuite createTestCases(final String modelName) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite();
         for (int doPos = 0; doPos<2; doPos++) {
             boolean positioned = doPos>0; // true if to use positioned updates
@@ -537,8 +556,10 @@ private static BaseTestSuite createTestCases(final String modelName) {
      */
     public static Test suite() 
     {   
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite mainSuite = new BaseTestSuite("SURQueryMixTest suite");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2021
         mainSuite.addTest(baseSuite("SURQueryMixTest:embedded"));
         mainSuite.addTest(
                 TestConfiguration.clientServerDecorator(
@@ -552,6 +573,7 @@ public static Test suite()
      * The suite contains all testcases in this class running on different data models
      */
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite mainSuite = new BaseTestSuite(name);
       
         // Iterate over all data models and decorate the tests:
@@ -561,6 +583,7 @@ private static Test baseSuite(String name) {
             SURDataModelSetup.SURDataModel model =
                 (SURDataModelSetup.SURDataModel) i.next();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite = createTestCases(model.toString());
             TestSetup decorator = new SURDataModelSetup(suite, model);
             mainSuite.addTest(decorator);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
index a8c6280a09..83efb140f8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
@@ -50,6 +50,8 @@ public SURTest(String name) {
     public void testConcurrencyModeWarning1()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                           ResultSet.CONCUR_UPDATABLE);
         s.setCursorName(getNextCursorName());
@@ -126,6 +128,10 @@ public void testForUpdateException1()
     public void testForUpdateException2()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                           ResultSet.CONCUR_UPDATABLE);
         try {
@@ -142,6 +148,10 @@ public void testForUpdateException2()
                          FOR_UPDATE_NOT_PERMITTED_SQL_STATE,
                          e.getSQLState());
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         rollback();
         s.close();
     }
@@ -171,6 +181,8 @@ public void testForwardOnlyReadOnly1()
     public void testFailOnUpdateOfReadOnlyResultSet1()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                           ResultSet.CONCUR_READ_ONLY);
         s.setCursorName(getNextCursorName());
@@ -188,6 +200,8 @@ public void testFailOnUpdateOfReadOnlyResultSet1()
     public void testFailOnUpdateOfReadOnlyResultSet2()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                           ResultSet.CONCUR_UPDATABLE);
         s.setCursorName(getNextCursorName());
@@ -243,6 +257,8 @@ public void testFailOnUpdateOfReadOnlyResultSet4()
     public void testFailOnUpdateOfReadOnlyResultSet5()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.
                                           TYPE_SCROLL_INSENSITIVE,
                                           ResultSet.CONCUR_READ_ONLY);
@@ -264,6 +280,7 @@ public void testFailOnUpdateOfReadOnlyResultSet5()
      * when doing the update.
      */
     public void testCursorStateAfterCommit1() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1361
         throws SQLException
     {
         testCursorStateAfterCommit(false, ResultSet.TYPE_FORWARD_ONLY);
@@ -319,6 +336,8 @@ private void testCursorStateAfterCommit(final boolean positioned,
                                             final int resultSetType) 
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         final Statement s = createStatement(resultSetType, 
                                                 ResultSet.CONCUR_UPDATABLE);
         final String cursorName = getNextCursorName();
@@ -335,6 +354,8 @@ private void testCursorStateAfterCommit(final boolean positioned,
             rs.absolute(recordToUpdate);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         commit();
         
         PreparedStatement ps = 
@@ -383,6 +404,7 @@ private void testCursorStateAfterCommit(final boolean positioned,
      * combined with cancelRowUpdates().
      */
     public void testMultiUpdateRow1() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1251
         throws SQLException 
     {
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
@@ -516,6 +538,8 @@ public void testMultiUpdateRow2()
     public void testCursorOperationConflictWarning1() 
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                                           ResultSet.CONCUR_UPDATABLE);
         s.setCursorName(getNextCursorName());
@@ -555,6 +579,8 @@ public void testCursorOperationConflictWarning1()
     public void testCursorOperationConflictWarning2() 
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                                           ResultSet.CONCUR_UPDATABLE);
         s.setCursorName(getNextCursorName());
@@ -579,6 +605,8 @@ public void testCursorOperationConflictWarning2()
         assertEquals("Did not expect the resultset to be updated", oldValue, rs.getInt(2));
         assertEquals("Expected update count to be 0", 0, updateCount);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s4 = createStatement();
         updateCount = s4.executeUpdate("delete from t1 where current of " +
                                        rs.getCursorName());
@@ -592,6 +620,8 @@ public void testCursorOperationConflictWarning2()
         assertEquals("Expected update count to be 0", 0, updateCount);
         
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s.close();
         s3.close();
         s4.close();
@@ -604,6 +634,8 @@ public void testCursorOperationConflictWarning2()
     public void testIndexedUpdateCursor1()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                           ResultSet.CONCUR_UPDATABLE);
         s.setCursorName(getNextCursorName());
@@ -623,6 +655,14 @@ public void testIndexedUpdateCursor1()
     public void testIndexedUpdateCursor2()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY,
                                           ResultSet.CONCUR_UPDATABLE);
         s.setCursorName(getNextCursorName());
@@ -644,6 +684,8 @@ public void testIndexedUpdateCursor2()
      * to insert a row without being on insert row.
      */
     public void testInsertRowWithScrollCursor() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                                           ResultSet.CONCUR_UPDATABLE);
         
@@ -858,6 +900,8 @@ public void testPrimaryKeyUpdate1()
                 rs.updateRow();
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         PreparedStatement ps = prepareStatement
             ("select * from t1 where id=?");
         for (int i=0; i<recordCount; i++) {
@@ -903,6 +947,8 @@ public void testOtherPrimaryKeyUpdate1()
         rs.updateInt(3, -777);
         rs.updateRow();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         PreparedStatement ps2 = prepareStatement
             ("select * from t1 where id=?");
         ps2.setInt(1, -primaryKey);
@@ -938,6 +984,10 @@ public void testOtherAndOwnPrimaryKeyUpdate1()
         
         rs.last();
         int primaryKey = rs.getInt(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         PreparedStatement ps = prepareStatement
             ("update t1 set id = ? where id= ?");
         ps.setInt(1, -primaryKey);
@@ -950,6 +1000,8 @@ public void testOtherAndOwnPrimaryKeyUpdate1()
         rs.updateRow();
         
         PreparedStatement ps2 =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
             prepareStatement("select * from t1 where id=?");
         ps2.setInt(1, primaryKey*10);
         ResultSet rs2 = ps2.executeQuery();
@@ -981,6 +1033,8 @@ public void testMultipleKeyUpdates()
         
         rs.last();
         int primaryKey = rs.getInt(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         PreparedStatement ps = s.getConnection().prepareStatement
             ("update t1 set id = ? where id= ?");
         ps.setInt(1, -primaryKey);
@@ -1029,6 +1083,8 @@ public void testSecondaryIndexKeyUpdate1()
             rs.updateInt(2, newKey--);
             rs.updateRow();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         PreparedStatement ps = prepareStatement
             ("select * from t1 where a=?");
         for (int i=0; i<recordCount; i++) {
@@ -1065,6 +1121,8 @@ public void testOtherSecondaryKeyUpdate1()
         rs.last();
         int indexedKey = rs.getInt(2);
         PreparedStatement ps =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
             prepareStatement("update t1 set a = ? where a= ?");
         ps.setInt(1, -indexedKey);
         ps.setInt(2, indexedKey);
@@ -1076,6 +1134,8 @@ public void testOtherSecondaryKeyUpdate1()
         rs.updateRow();
         
         PreparedStatement ps2 =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
             prepareStatement("select * from t1 where a=?");
         ps2.setInt(1, -indexedKey);
         ResultSet rs2 = ps2.executeQuery();
@@ -1088,6 +1148,12 @@ public void testOtherSecondaryKeyUpdate1()
         assertTrue("Did not expect more than 1 row, however " +
                    "rs2.next() returned another row", !rs2.next());
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s.close();
         ps.close();
         ps2.close();
@@ -1150,6 +1216,12 @@ public void testForwardOnlyConcurUpdatableWithoutForUpdate1()
     public void testPositionedUpdateWithoutForUpdate1()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement
             (ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
         s.setCursorName("MYCURSOR");
@@ -1167,6 +1239,8 @@ public void testPositionedUpdateWithoutForUpdate1()
     public void testPositionedUpdateWithForUpdate1()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement();
         s.setCursorName(getNextCursorName());
         ResultSet rs = s.executeQuery("select * from t1 for update");
@@ -1182,6 +1256,26 @@ public void testPositionedUpdateWithForUpdate1()
     public void testScrollablePositionedUpdateWithForUpdate1()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement
             (ResultSet.TYPE_SCROLL_INSENSITIVE,
              ResultSet.CONCUR_READ_ONLY);
@@ -1201,6 +1295,8 @@ public void testScrollablePositionedUpdateWithForUpdate1()
         final int previousA = rs.getInt(2);
         final int previousB = rs.getInt(3);
         println(rs.getCursorName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         PreparedStatement ps = prepareStatement
             ("update T1 set a=?,b=? where current of " + rs.getCursorName());
         ps.setInt(1, 666);
@@ -1231,6 +1327,14 @@ public void testScrollablePositionedUpdateWithForUpdate1()
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s.close();
         ps.close();
     }
@@ -1258,6 +1362,10 @@ public void testScrollInsensitiveConcurUpdatableWithForUpdate1()
     public void testScrollInsensitiveConcurUpdatableWithForUpdate2()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_UPDATABLE);
         assertEquals("Invalid resultset concurrency on statement", 
@@ -1309,6 +1417,10 @@ private void testScrollInsensistiveConurUpdatable3(ResultSet rs)
             assertEquals("Incorrect row updated for row " + count, 1000, a);
         }
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                           ResultSet.CONCUR_READ_ONLY);
         s.setCursorName(getNextCursorName());
@@ -1331,6 +1443,8 @@ private void testScrollInsensistiveConurUpdatable3(ResultSet rs)
     public void testScrollInsensitiveConcurUpdatableWithForUpdate3()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_UPDATABLE);
         s.setCursorName(getNextCursorName());
@@ -1347,6 +1461,8 @@ public void testScrollInsensitiveConcurUpdatableWithForUpdate3()
     public void testScrollInsensitiveConcurUpdatableWithoutForUpdate1()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_UPDATABLE);
         s.setCursorName(getNextCursorName());
@@ -1383,6 +1499,8 @@ public void testScrollInsensitiveConcurUpdatableWithoutForUpdate2()
     public void testScrollInsensitiveConcurUpdatableWithoutForUpdate3()
         throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_UPDATABLE);
         s.setCursorName(getNextCursorName());
@@ -1407,6 +1525,7 @@ public void testScrollInsensitiveConcurUpdatableWithoutForUpdate3()
      *
      */
     public void testForUpdateWithColumnList() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4198
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
                                           ResultSet.CONCUR_UPDATABLE);
 
@@ -1560,6 +1679,7 @@ public void testForUpdateWithColumnList() throws SQLException {
      * @param state A string describing the illegal state.
      */
     private void checkDetectabilityCallsOutsideRow(ResultSet rs, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1323
                                                    String state)
     {
         boolean b;
@@ -1599,7 +1719,16 @@ private void checkDetectabilityCallsOutsideRow(ResultSet rs,
      * and deleteRow() methods.
      */
     public void testRowUpdatedAndRowDeleted() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1313
                                            ResultSet.CONCUR_UPDATABLE);
         s.setCursorName(getNextCursorName());
         ResultSet rs = s.executeQuery("select a,b from t1");
@@ -1630,6 +1759,8 @@ public void testRowUpdatedAndRowDeleted() throws SQLException {
      */
     public void testDetectabilityExceptions() throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
                                           ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = s.executeQuery("select * from t1");
@@ -1663,6 +1794,8 @@ public void testDetectabilityExceptions() throws SQLException
         s.close();
 
         // Not strictly SUR, but fixed in same patch, so we test it here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s = createStatement(ResultSet.TYPE_FORWARD_ONLY, 
                                 ResultSet.CONCUR_UPDATABLE);
         rs = s.executeQuery("select * from t1");
@@ -1702,7 +1835,10 @@ public void testDetectabilityExceptions() throws SQLException
      *
      */
     public void testDowngradeToScrollReadOnly() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         Statement s = createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1481
                                           ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = s.executeQuery("select * from t1 order by b");
 
@@ -1723,7 +1859,39 @@ public void testDowngradeToScrollReadOnly() throws SQLException {
         rs.afterLast();
         
         // close result set and statement
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         s.close();
     }
 
@@ -1732,6 +1900,7 @@ public void testDowngradeToScrollReadOnly() throws SQLException {
      * Get a cursor name. We use the same cursor name for all cursors.
      */
     private final String getNextCursorName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-787
         return "MYCURSOR";
     }
     
@@ -1739,6 +1908,7 @@ private final String getNextCursorName() {
      * Run the base suite in embedded and client mode.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite mainSuite = new BaseTestSuite("SURTest");
         mainSuite.addTest(baseSuite("SURTest:embedded"));
         mainSuite.addTest(
@@ -1752,6 +1922,7 @@ public static Test suite() {
      */
     private static Test baseSuite(String name) { 
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite mainSuite = new BaseTestSuite(name);
         
         // Iterate over all data models and decorate the tests:
@@ -1761,6 +1932,7 @@ private static Test baseSuite(String name) {
             SURDataModelSetup.SURDataModel model = 
                 (SURDataModelSetup.SURDataModel) i.next();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite = new BaseTestSuite(SURTest.class);
             TestSetup decorator = new SURDataModelSetup
                 (suite, model);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURijTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURijTest.java
index 2c554bf5b9..02b5aa9709 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURijTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURijTest.java
@@ -53,6 +53,7 @@ private SURijTest(String script) {
 	 */
 	public static Test suite() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("SURijTest");
 		suite.addTest(TestConfiguration
 				.clientServerDecorator(new CleanDatabaseTestSetup(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SavepointJdbc30Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SavepointJdbc30Test.java
index 6a843fec7b..8b3a4b0b91 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SavepointJdbc30Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SavepointJdbc30Test.java
@@ -58,6 +58,7 @@ public SavepointJdbc30Test(String name) {
      * @return A suite containing embedded, client and embedded with XA suites
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("SavepointJdbc30_JSR169Test suite");
 
@@ -70,6 +71,7 @@ public static Test suite() {
         suite.addTest(embedded);
 
         // Get the tests for client.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite client =
             new BaseTestSuite("SavepointJdbc30_JSR169Test:client");
 
@@ -80,7 +82,9 @@ public static Test suite() {
         // an XA data source if it is supported. This is not supported
         // under JSR169.
         if (JDBC.vmSupportsJDBC3()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             embedded = new BaseTestSuite(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3568
             "SavepointJdbc30_JSR169Test:embedded XADataSource");
             embedded.addTestSuite(SavepointJdbc30Test.class);
             embedded.addTest(getEmbeddedSuite("SavepointJdbc30_JSR169Test:"
@@ -89,6 +93,7 @@ public static Test suite() {
             //        	 Repeat the client tests obtaining a connection from
             // an XA data source if it is supported. This is not supported
             // under JSR169.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             client = new BaseTestSuite(
                 "SavepointJdbc30_JSR169Test:client XADatasource");
 
@@ -96,6 +101,7 @@ public static Test suite() {
             suite.addTest(TestConfiguration.clientServerDecorator(TestConfiguration.connectionXADecorator(client)));        	
         }	
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4885
         return new CleanDatabaseTestSetup(
                 DatabasePropertyTestSetup.setLockTimeouts(suite, 1, 2)) {
             /**
@@ -119,6 +125,7 @@ protected void decorateSQL(Statement s) throws SQLException {
      * mode. These tests have names starting with x and are added automatically.
      */
     private static Test getEmbeddedSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite embedded = new BaseTestSuite(name);
         Method[] methods = SavepointJdbc30Test.class.getMethods();
         for (int i = 0; i < methods.length; i++) {
@@ -143,6 +150,7 @@ protected void setUp() throws Exception {
         // Keep Autocommit off
         getConnection().setAutoCommit(false);
         // Clear the tables created by the decorator
+//IC see: https://issues.apache.org/jira/browse/DERBY-5114
         Statement s = createStatement();
         s.execute("truncate table t1");
         s.execute("truncate table t2");
@@ -959,6 +967,7 @@ public void xtestRollbackWillReleaseLaterSavepoints() throws SQLException {
         Statement s = createStatement();
 
         // Make sure T1 is empty (testcase running order might have left content!):
+//IC see: https://issues.apache.org/jira/browse/DERBY-3824
         s.execute("DELETE FROM T1");
         
         Savepoint savepoint1 = con.setSavepoint();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ScrollResultSetTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ScrollResultSetTest.java
index dbe017345b..f827d59adb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ScrollResultSetTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/ScrollResultSetTest.java
@@ -65,6 +65,7 @@ public static Test suite() {
         }
         
         // empty suite, no holdability supported.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(
                 "Empty ScrollResultSetTest suite, no support for holdability");
     }
@@ -73,6 +74,7 @@ public static Test suite() {
      * Set up the connection to the database.
      */
     public void setUp() throws  Exception {       
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection con = getConnection();
         con.setAutoCommit(true);
 
@@ -85,6 +87,7 @@ public void setUp() throws  Exception {
         stmt.execute(createTableWithPK);
         
         stmt.execute(insertData);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         stmt.close();
     }
     
@@ -93,6 +96,7 @@ public void setUp() throws  Exception {
      */
     public void tearDown() throws Exception {
         println("TearDown");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Statement s = getConnection().createStatement();
         try { 
             
@@ -102,6 +106,8 @@ public void tearDown() throws Exception {
         }    
         s.close();
         super.tearDown();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
 
     }
     
@@ -141,6 +147,8 @@ public void testNextOnLastRowForwardOnly()  throws SQLException{
      */
     public void testNextOnLastRowScrollable()  throws SQLException{
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection con = getConnection();
         con.setAutoCommit(true);
         con.setHoldability(ResultSet.CLOSE_CURSORS_AT_COMMIT);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java
index 94061924ac..c68b7950e9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java
@@ -153,6 +153,7 @@ private static void exec(Connection connection,
         throws
             TestFailedException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-579
         Statement statement = null;
         try {
             statement = connection.createStatement();
@@ -191,9 +192,11 @@ private static void dropTables(Connection conn, String tablePrefix)
         throws
             TestFailedException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashSet<String> ignore = new HashSet<String>();
         ignore.add("42Y55");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-579
         exec(conn, "drop table " + tablePrefix + "_orig", ignore);
         exec(conn, "drop table " + tablePrefix + "_copy", ignore);
     }
@@ -208,6 +211,7 @@ private static void prepareTables(Connection conn, String tablePrefix)
         
         exec(conn,
              "create table " + tablePrefix + "_orig (a int)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-579
 
         exec(conn,
              "create table " + tablePrefix + "_copy (a int)");
@@ -245,6 +249,7 @@ private static void prepareForTimedQueries(Connection conn)
             throw new TestFailedException("Should not happen", e);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-506
         try {
             exec(conn, "DROP FUNCTION DELAY");
         } catch (Exception e) {
@@ -252,6 +257,7 @@ private static void prepareForTimedQueries(Connection conn)
         }
 
         exec(conn, "CREATE FUNCTION DELAY(SECONDS INTEGER, VALUE INTEGER) RETURNS INTEGER PARAMETER STYLE JAVA NO SQL LANGUAGE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.tests.jdbcapi.SetQueryTimeoutTest.delay'");
+//IC see: https://issues.apache.org/jira/browse/DERBY-579
 
         prepareTables(conn, "t");
     }
@@ -296,6 +302,7 @@ public StatementExecutor(PreparedStatement statement,
             this.timeout = timeout;
             highestRunTime = 0;
             sqlException = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-579
             if (timeout > 0) {
                 try {
                     statement.setQueryTimeout(timeout);
@@ -437,6 +444,9 @@ private static void testTimeoutWithFetch(Connection conn1,
         // D - here just to create equal contention on conn1 and conn2
 
         PreparedStatement statementA = prepare(conn1, getFetchQuery("t"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-579
+//IC see: https://issues.apache.org/jira/browse/DERBY-705
+//IC see: https://issues.apache.org/jira/browse/DERBY-506
         PreparedStatement statementB = prepare(conn1, getFetchQuery("t"));
         PreparedStatement statementC = prepare(conn2, getFetchQuery("t"));
         PreparedStatement statementD = prepare(conn2, getFetchQuery("t"));
@@ -512,6 +522,7 @@ private static void testTimeoutWithExec(Connection[] connections)
     {
         System.out.println("Testing timeout with an execute operation");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-579
         for (int i = 0; i < connections.length; ++i) {
             try {
                 connections[i].setAutoCommit(true);
@@ -562,6 +573,7 @@ private static void testTimeoutWithExec(Connection[] connections)
          * in this class (note that the TIMEOUT constant is in seconds,
          * while the execution time is in milliseconds). 
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-579
         for (int i = 0; i < executors.length; ++i) {
             int timeout =
                 (i % 2 == 0)
@@ -645,6 +657,7 @@ private static void testInvalidTimeoutValue(Connection conn)
 
     /** This tests timeout with executeUpdate call. */
     private static void testTimeoutWithExecuteUpdate(Connection conn)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1698
         throws TestFailedException
     {
     	System.out.println("Testing timeout with executeUpdate call.");
@@ -681,10 +694,12 @@ private static void testStatementRemembersTimeout(Statement stmt)
     {
         System.out.println("Testing that Statement remembers timeout.");
         stmt.setQueryTimeout(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6280
         long runTime=0;
         for (int i = 0; i < 3; i++) {
             try {
                 long startTime = System.currentTimeMillis();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6280
                 ResultSet rs = stmt.executeQuery(getFetchQuery("t"));
                 while (rs.next());
                 long endTime = System.currentTimeMillis();
@@ -710,9 +725,11 @@ private static void testStatementRemembersTimeout(PreparedStatement ps)
         System.out.println("Testing that " + name + " remembers timeout.");
         ps.setQueryTimeout(1);
         for (int i = 0; i < 3; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6280
             long runTime=0;
             try {
                 long startTime = System.currentTimeMillis();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6280
                 ResultSet rs = ps.executeQuery();
                 while (rs.next()); 
                 long endTime = System.currentTimeMillis();
@@ -747,6 +764,7 @@ public void go(String[] args)
         System.out.println("Test SetQueryTimeoutTest starting");
 
         Connection[] connections = new Connection[CONNECTIONS];
+//IC see: https://issues.apache.org/jira/browse/DERBY-579
 
         try {
             // Load the JDBC Driver class
@@ -768,6 +786,7 @@ public void go(String[] args)
             testTimeoutWithExec(connections);
             testInvalidTimeoutValue(connections[0]);
             testRememberTimeoutValue(connections[0]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1698
             testTimeoutWithExecuteUpdate(connections[0]);
   
             System.out.println("Test SetQueryTimeoutTest PASSED");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetTransactionIsolationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetTransactionIsolationTest.java
index 272efcde34..eb7ae276b7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetTransactionIsolationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetTransactionIsolationTest.java
@@ -194,6 +194,7 @@ public void testSetTransactionIsolationInHoldCursor() throws SQLException
 
     public static Test baseSuite(String name) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(SetTransactionIsolationTest.class);
 
@@ -255,6 +256,7 @@ protected void decorateSQL(Statement s) throws SQLException {
 
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("SetTransactionIsolation");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(baseSuite("SetTransactionIsolation:embedded"));
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementJdbc20Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementJdbc20Test.java
index a3455b5edb..e2cd411c43 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementJdbc20Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementJdbc20Test.java
@@ -60,6 +60,7 @@ public StatementJdbc20Test(String name) {
      * all tests in this class
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("StatementJdbc20Test");
         suite.addTest(baseSuite("StatementJdbc20Test:embedded"));
         suite.addTest(
@@ -70,6 +71,7 @@ public static Test suite() {
     }
     
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         
         suite.addTestSuite(StatementJdbc20Test.class);
@@ -92,6 +94,7 @@ protected void decorateSQL(Statement stmt) throws SQLException {
                 stmt.execute("create table tab1 (i int, s smallint, r real)");
                 stmt.executeUpdate("insert into tab1 values(1, 2, 3.1)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
                 stmt.execute
                     (
                      "create procedure dynamic_results() " +
@@ -100,6 +103,7 @@ protected void decorateSQL(Statement stmt) throws SQLException {
                      "dynamic result sets 2"
                      );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
                 stmt.execute( "create table t_autogen( a int generated always as identity, b int )" );
             }
         };
@@ -196,6 +200,7 @@ public void testLocalValuesOfResultSet() throws SQLException {
         
         // Verify that fetch size can be set larger than maxRows
         stmt.setMaxRows(10);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3573
         rs.setFetchSize(100);
         
         //Error  testing  : set wrong values ..
@@ -275,6 +280,7 @@ public void testCreateTableWithExecuteQuery() throws SQLException {
      */
     public void testAddBatchClarification_jdbc4_1() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         PreparedStatement ps = prepareStatement( "select * from sys.systables" );
         CallableStatement cs = prepareCall( "CALL SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS(1)" );
 
@@ -303,8 +309,10 @@ public void testAddBatchClarification_jdbc4_1() throws SQLException
      */
     public void testCompletionClosure_jdbc4_1() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4983
         if ( JDBC.vmSupportsJSR169() ) { return; }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         vetClosure( false, false );
         vetClosure( false, true );
         vetClosure( true, false );
@@ -315,6 +323,7 @@ private void vetClosure( boolean closeOnCompletion, boolean delayClosureCall ) t
         vetClosedSelect( closeOnCompletion, delayClosureCall );
         vetClosedCall( closeOnCompletion, delayClosureCall );
         vetClosedPS( closeOnCompletion, delayClosureCall );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         vetClosedAutoGen( closeOnCompletion, delayClosureCall );
     }
     private void vetClosedSelect( boolean closeOnCompletion, boolean delayClosureCall ) throws Exception
@@ -400,6 +409,7 @@ private void vetClosedPS( boolean closeOnCompletion, boolean delayClosureCall )
     }
     private void vetClosedAutoGen( boolean closeOnCompletion, boolean delayClosureCall ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         Statement stmt = createStatement();
         ResultSet rs;
 
@@ -468,6 +478,7 @@ private void    setCloseOnCompletion( Wrapper41Statement wrapper, boolean closeO
     public  void    test_clarification_jdbc4_1()    throws Exception
     {
         Connection  conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
 
         PreparedStatement   ps = conn.prepareStatement( "select * from sys.syscolumns" );
         CallableStatement   cs = conn.prepareCall( "call dynamic_results()" );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementJdbc30Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementJdbc30Test.java
index 6fa5ab633a..fcf4f09eee 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementJdbc30Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementJdbc30Test.java
@@ -38,6 +38,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class StatementJdbc30Test extends BaseJDBCTestCase {
     private static final String CLIENT_SUITE_NAME = 
         "StatementJdbc30Test:client";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3198
 
     /**
      * Create a test with the given name.
@@ -56,20 +57,24 @@ public StatementJdbc30Test(String name) {
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("StatementJdbc30Test");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(baseSuite("StatementJdbc30Test:embedded"));
         suite
                 .addTest(TestConfiguration
                         .clientServerDecorator(baseSuite(CLIENT_SUITE_NAME)));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3198
 
         return suite;
     }
 
     private static Test baseSuite(String name) {
         BaseTestSuite suite = new BaseTestSuite(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTestSuite(StatementJdbc30Test.class);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3198
         if  (name.equals(CLIENT_SUITE_NAME)) {
             // These test CAN be run in embedded mode as well, but
             // they're only meaningful in c/s mode and also take quite
@@ -127,6 +132,7 @@ public void testGetMoreResults() throws SQLException {
 
         Statement stmt = createStatement();
         assertFalse(stmt.getMoreResults(Statement.CLOSE_CURRENT_RESULT));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 
     }
 
@@ -140,6 +146,7 @@ public void testInsertNoGenKeys() throws SQLException {
 
         Statement stmt = createStatement();
         stmt.executeUpdate("insert into tab1 values(2, 3, 4.1)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
                 Statement.NO_GENERATED_KEYS);
         assertNull("Expected NULL ResultSet after stmt.execute()", stmt
                 .getGeneratedKeys());
@@ -199,6 +206,7 @@ public void testExecuteUpdateNoAutoGenColumnName() throws SQLException {
     public void testSelectNoGenKeys() throws SQLException {
 
         Statement stmt = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
         stmt.execute("select * from tab1", Statement.NO_GENERATED_KEYS);
         assertNull("Expected NULL ResultSet after stmt.execute()", stmt
                 .getGeneratedKeys());
@@ -222,6 +230,8 @@ public void testExecuteNoAutoGenColumnIndex() throws SQLException {
             stmt.execute("insert into tab1 values(2, 3, 4.1)", columnIndexes);
             fail("FAIL -- executeUpdate should have failed...");
         } catch (SQLException ex) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2942
+//IC see: https://issues.apache.org/jira/browse/DERBY-2942
             assertFailedExecuteUpdateForColumnIndex(ex);
         }
     }
@@ -236,6 +246,7 @@ private void assertFailedExecuteUpdateForColumnIndex(SQLException ex) {
         // In network client we only check columnIndex array length,
         // so throw a different error.
         if (usingDerbyNetClient()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
             assertSQLState("X0X0D", ex);
         } else {
             assertSQLState("X0X0E", ex);
@@ -252,6 +263,7 @@ private void assertFailedExecuteUpdateForColumnName(SQLException ex) {
         // Derby client complains that the array is too long.
         // Embedded is smart enough to know which column caused the problem.
         if (usingDerbyNetClient()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2653
             assertSQLState("X0X0D", ex);
         } else {
             assertSQLState("X0X0F", ex);
@@ -275,6 +287,8 @@ public void testExecuteNoAutoGenColumnName() throws SQLException {
                         columnNames);
                 fail("FAIL -- executeUpdate should have failed...");
             } catch (SQLException ex) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2942
+//IC see: https://issues.apache.org/jira/browse/DERBY-2942
                 assertFailedExecuteUpdateForColumnName(ex);
             }
         
@@ -285,6 +299,7 @@ public void testExecuteNoAutoGenColumnName() throws SQLException {
      * more than 32000 times, even when query timeout is enabled.
      */
     public void xtestMultiExecWithQueryTimeout() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3198
         Statement stmt = createStatement();
         stmt.setQueryTimeout(10);
         for (int i = 0; i < 33000; ++i) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java
index be1bdbe6a2..940288b552 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StatementPoolingTest.java
@@ -183,16 +183,19 @@ private static void assertClassName(Object obj, String expectedName) {
         final String simpleName = names[names.length -1];
         if (JDBC.vmSupportsJDBC4() && !expectedName.endsWith("40")) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6613
             if (JDBC.vmSupportsJDBC42()
                     && expectedName.contains("Statement"))
             {
                 expectedName += "42";
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             else if (usingEmbedded())
             {
                 expectedName += "40";
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3431
         assertEquals(expectedName, simpleName);
     }
 
@@ -286,6 +289,7 @@ private void doTestHoldabilityIsReset(final boolean closeConnection)
         // Keep track of our own connection, the framework currently creates
         // a new pooled connection and then obtains a connection from that.
         // Statement pooling only works within a single pooled connection.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6086
         Connection con = getCachingConnection();
         assertEquals("Unexpected default holdability",
                 ResultSet.HOLD_CURSORS_OVER_COMMIT, con.getHoldability());
@@ -295,6 +299,7 @@ private void doTestHoldabilityIsReset(final boolean closeConnection)
         if (closeConnection) {
             con.close();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6086
         con = getCachingConnection();
         assertEquals("Holdability not reset",
                 ResultSet.HOLD_CURSORS_OVER_COMMIT, con.getHoldability());
@@ -340,6 +345,7 @@ private void doTestIsolationLevelIsReset(final boolean closeConnection,
         // Keep track of our own connection, the framework currently creates
         // a new pooled connection and then obtains a connection from that.
         // Statement pooling only works within a single pooled connection.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6086
         Connection con = getCachingConnection();
         assertEquals("Unexpected default isolation level",
                 Connection.TRANSACTION_READ_COMMITTED,
@@ -356,6 +362,7 @@ private void doTestIsolationLevelIsReset(final boolean closeConnection,
         if (closeConnection) {
             con.close();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6086
         con = getCachingConnection();
         assertEquals("Isolation level not reset",
                 Connection.TRANSACTION_READ_COMMITTED,
@@ -384,14 +391,17 @@ private void doTestIsolationLevelIsReset(final boolean closeConnection,
      */
     public void testCachingLogicalConnectionCloseLeavesPhysicalStatementsOpen()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3596
         final String SELECT_SQL = "select * from clcclso";
         // Keep track of our own connection, the framework currently creates
         // a new pooled connection and then obtains a connection from that.
         // Statement pooling only works within a single pooled connection.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6086
         Connection con = getCachingConnection();
         con.setAutoCommit(false);
         Statement stmt = createStatement();
         stmt.executeUpdate("create table clcclso (id int)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3596
         PreparedStatement ps = con.prepareStatement(SELECT_SQL);
         con.commit();
         con.close();
@@ -408,7 +418,9 @@ public void testCachingLogicalConnectionCloseLeavesPhysicalStatementsOpen()
         commit();
         // If an exception is thrown here, statement pooling is disabled or not
         // working correctly.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6086
         con = getCachingConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3596
         ps = con.prepareStatement(SELECT_SQL); // From cache.
         try {
             // Should fail here because the referenced table has been deleted.
@@ -565,6 +577,7 @@ public void resTestHoldCursorsOverCommit()
     public void testTemporaryTablesAreDeletedInNewLogicalConnection()
             throws SQLException {
         Connection lcOne = getCachingConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6086
 
         // Create the first logical connection and the temporary table.
         Statement stmt = lcOne.createStatement();
@@ -578,6 +591,7 @@ public void testTemporaryTablesAreDeletedInNewLogicalConnection()
         lcOne.close();
 
         // Create the second logical connection and try to query the temp table.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6086
         Connection lcTwo = getCachingConnection();
         stmt = lcTwo.createStatement();
         try {
@@ -630,6 +644,7 @@ private void doTestResultSetCloseForHoldability(int holdability)
      * one that created the result set.
      */
     public void testGetStatementCallable()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3446
             throws SQLException {
         doTestGetStatement(prepareCall("values 7653"));
     }
@@ -838,6 +853,7 @@ private void cleanTableExceptedToBeEmpty()
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("StatementPoolingTest suite");
         BaseTestSuite baseSuite =
             new BaseTestSuite(StatementPoolingTest.class);
@@ -912,12 +928,14 @@ private static class LogicalPooledConnectionFactory {
         private PooledConnection pooledConnection;
         
         public Connection getConnection(int cacheSize) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6086
                 throws SQLException {
             if (pooledConnection == null || curCacheSize != cacheSize) {
                 close();
                 ConnectionPoolDataSource cpDs =
                         J2EEDataSource.getConnectionPoolDataSource();
                 J2EEDataSource.setBeanProperty(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         cpDs, "maxStatements", cacheSize);
                 J2EEDataSource.setBeanProperty(
                         cpDs, "createDatabase", "create");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StreamTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StreamTest.java
index 2d64357d41..0ffb996dcb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StreamTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/StreamTest.java
@@ -139,6 +139,7 @@ private void runGetStreamTwiceTest() throws SQLException, IOException {
         } catch(SQLException se) {
             assertSQLState(LANG_STREAM_RETRIEVED_ALREADY, se);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2005
         rs.close();
         st.close();
     }
@@ -161,6 +162,7 @@ public void runGetReaderTwiceTest() throws SQLException, IOException {
         } catch(SQLException se) {
             assertSQLState(LANG_STREAM_RETRIEVED_ALREADY, se);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2005
         rs.close();
         st.close();
     }
@@ -179,6 +181,7 @@ public void runGetReaderTwiceTest() throws SQLException, IOException {
      */
     public void testDerby4531() throws SQLException {
         setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4531
 
         Statement s = createStatement();
         s.executeUpdate("create table tDerby4531(c clob(200))");
@@ -225,4 +228,4 @@ public void close() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/URCoveringIndexTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/URCoveringIndexTest.java
index 88104a86d3..c32b7dd9bd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/URCoveringIndexTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/URCoveringIndexTest.java
@@ -36,6 +36,8 @@
 public class URCoveringIndexTest extends BaseJDBCTestCase {
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1971
         return TestConfiguration.defaultSuite(URCoveringIndexTest.class);
     }
     
@@ -49,6 +51,7 @@ public URCoveringIndexTest(String name) {
      * Set up the connection to the database.
      */
     public void setUp() throws  Exception {       
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection con = getConnection();
         con.setAutoCommit(false);
 
@@ -61,6 +64,7 @@ public void setUp() throws  Exception {
         
         stmt.execute(insertData);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         stmt.close();
     }
     
@@ -72,6 +76,7 @@ private void testUpdateUpdatedTupleWithCoveringIndex(
         int resultsetType = scroll ? ResultSet.TYPE_SCROLL_INSENSITIVE :
                 ResultSet.TYPE_FORWARD_ONLY;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection con = getConnection();
         
         if (!(con.getMetaData().supportsResultSetConcurrency(resultsetType,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdatableResultSetTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdatableResultSetTest.java
index 3d57560ca5..f5ab23e19c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdatableResultSetTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdatableResultSetTest.java
@@ -42,6 +42,7 @@
 public class UpdatableResultSetTest extends BaseJDBCTestCase {
     
     private static final byte[] BYTES1 = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
             0x65, 0x66, 0x67, 0x68, 0x69,
             0x69, 0x68, 0x67, 0x66, 0x65
         };
@@ -75,6 +76,7 @@ protected void setUp() throws SQLException {
         conn.setAutoCommit(false);
         Statement stmt = conn.createStatement();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
         stmt.execute("create table UpdateTestTableResultSet (" +
                             "sno int not null unique," +
                             "dBlob BLOB," +
@@ -402,6 +404,7 @@ public void testDeleteRowOnQuotedCursor() throws SQLException {
      * @throws Exception
      */
     public void testUpdateBlob()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
     throws Exception {
         //Byte array in which the returned bytes from
         //the Database after the update are stored. This
@@ -721,6 +724,7 @@ private ResultSet fetch(String colName, int key)
     }
 
     public void testDerby6981()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6981
         throws SQLException
     {
         Statement stmt = createStatement();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdateXXXTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdateXXXTest.java
index d7648015ed..93755e8713 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdateXXXTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdateXXXTest.java
@@ -53,8 +53,10 @@ public UpdateXXXTest(final String name) {
      */
     public static Test suite() {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = baseSuite("UpdateXXXTest");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2021
         suite.addTest(
                 TestConfiguration.clientServerDecorator(
                         baseSuite("UpdateXXXTest:client")));
@@ -67,11 +69,13 @@ public static Test suite() {
      * @param name Name for the suite.
      */
     private static BaseTestSuite baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
           
         suite.addTestSuite(UpdateXXXTest.class);
         
         // requires java.math.BigDecimal
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
         if (JDBC.vmSupportsJDBC3())
             suite.addTest(new UpdateXXXTest("jdbc2testUpdateBigDecimal"));
                       
@@ -87,6 +91,7 @@ private static BaseTestSuite baseSuite(String name) {
     public void setUp()
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection con = getConnection();
         try {
             
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper41DBMD.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper41DBMD.java
index 8ba2f1abf8..da9e77d975 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper41DBMD.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper41DBMD.java
@@ -51,6 +51,7 @@ public  class   Wrapper41DBMD
     public Wrapper41DBMD( Object wrapped ) throws Exception
     {
         if ( wrapped instanceof EmbedDatabaseMetaData ) { _embedded = (EmbedDatabaseMetaData) wrapped; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         else if ( wrapped instanceof ClientDatabaseMetaData ) { _netclient = (ClientDatabaseMetaData) wrapped; }
         else { throw nothingWrapped(); }
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper41Statement.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper41Statement.java
index bc776d46f6..724185bd1e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper41Statement.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper41Statement.java
@@ -52,6 +52,7 @@ public  class   Wrapper41Statement
     public Wrapper41Statement( Object wrapped ) throws Exception
     {
         if ( wrapped instanceof EngineStatement ) { _engineStatement = (EngineStatement) wrapped; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         else if ( wrapped instanceof ClientStatement ) { _netStatement = (ClientStatement) wrapped; }
         else if ( wrapped instanceof LogicalPreparedStatement ) { _logicalStatement = (LogicalPreparedStatement) wrapped; }
         else { throw nothingWrapped(); }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper42DBMD.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper42DBMD.java
index cdcbced1ba..ac16d25614 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper42DBMD.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/Wrapper42DBMD.java
@@ -53,6 +53,7 @@ public  class   Wrapper42DBMD   extends Wrapper41DBMD
 
     public  long getMaxLogicalLobSize() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         if ( _embedded != null ) { return _embedded.getMaxLogicalLobSize(); }
         else if ( _netclient != null ) { return _netclient.getMaxLogicalLobSize(); }
         else { throw nothingWrapped(); }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XADSAuthenticationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XADSAuthenticationTest.java
index 5ec90b1014..649e2df0a6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XADSAuthenticationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XADSAuthenticationTest.java
@@ -43,6 +43,7 @@ public XADSAuthenticationTest(String name) {
     public static Test suite() {
         // This test uses XADataSource and so is not suitable for JSR169
         if (JDBC.vmSupportsJSR169())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("");
         else {
             BaseTestSuite suite = new BaseTestSuite("XADSAuthenticationTest");
@@ -57,9 +58,11 @@ public static Test suite() {
     // in AuthenticationTest
     public static Test baseSuite(String name) {
         BaseTestSuite suite = new BaseTestSuite("XADSAuthenticationTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         Test test = new XADSAuthenticationTest(
             "testConnectShutdownAuthentication");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         setBaseProps(suite, test);
         
         test = new XADSAuthenticationTest("testUserFunctions");
@@ -137,6 +140,7 @@ protected void assertConnectionWOUPFail(
     }
     
     protected void assertShutdownUsingSetShutdownOK(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
             String dbName, String user, String password) throws SQLException {
         XADataSource xads = J2EEDataSource.getXADataSource();
         JDBCDataSource.setBeanProperty(xads, "databaseName", dbName);
@@ -188,6 +192,7 @@ protected void assertShutdownFail(
     throws SQLException
     {
         XADataSource xads = J2EEDataSource.getXADataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         JDBCDataSource.setBeanProperty(xads, "shutdownDatabase", "shutdown");
         JDBCDataSource.setBeanProperty(xads, "databaseName", dbName);
         try {
@@ -203,6 +208,7 @@ protected void assertShutdownWOUPFail(
     throws SQLException
     {
         XADataSource xads = J2EEDataSource.getXADataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         JDBCDataSource.setBeanProperty(xads, "shutdownDatabase", "shutdown");
         JDBCDataSource.setBeanProperty(xads, "databaseName", dbName);
         JDBCDataSource.setBeanProperty(xads, "user", user);
@@ -219,6 +225,7 @@ protected void assertSystemShutdownOK(
         String dbName, String user, String password)
     throws SQLException {
         XADataSource xads = J2EEDataSource.getXADataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         JDBCDataSource.setBeanProperty(
                 xads, "shutdownDatabase", "shutdown");
         JDBCDataSource.setBeanProperty(xads, "databaseName", dbName);
@@ -239,6 +246,7 @@ protected void assertSystemShutdownFail(
         XADataSource xads = J2EEDataSource.getXADataSource();
         JDBCDataSource.setBeanProperty(
                 xads, "shutdownDatabase", "shutdown");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
         JDBCDataSource.setBeanProperty(xads, "databaseName", dbName);
         JDBCDataSource.setBeanProperty(xads, "user", user);
         JDBCDataSource.setBeanProperty(xads, "password", password);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XAJNDITest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XAJNDITest.java
index 289396da4a..e4f6749795 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XAJNDITest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XAJNDITest.java
@@ -51,6 +51,7 @@ public static Test suite() {
         if (JDBC.vmSupportsJDBC3()) {
             ldapServer=getSystemProperty("derbyTesting.ldapServer");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             if (ldapServer == null || ldapServer.length() < 1) {
                 return new BaseTestSuite(
                     "XAJNDITest requires property derbyTesting.ldapServer " +
@@ -74,6 +75,7 @@ public static Test suite() {
                     "for setting o=, eg: -DderbyTesting.dnString=myJNDIstring");
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3659
             return TestConfiguration.defaultSuite(XAJNDITest.class);
         }
         return new BaseTestSuite("XAJNDITest cannot run without XA support");
@@ -90,8 +92,10 @@ public void tearDown() throws Exception {
     private InitialDirContext getInitialDirContext()
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Hashtable<String, String> env = new Hashtable<String, String>();
             // using properties - these will have been passed in.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3972
             String ldapContextFactory=getSystemProperty("derbyTesting.ldapContextFactory");
             if (ldapContextFactory == null || ldapContextFactory.length() < 1)
                 env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
@@ -130,6 +134,7 @@ public void testCompareXADataSourcewithJNDIDataSource()
             // property manually. And by the way, we don't trust that equals()
             // in embedded data sources checks all the properties, so do a
             // full check for embedded as well.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3669
             String[] orgprops = getPropertyBeanList(xads);
             String[] bindprops = getPropertyBeanList(ads);
             assertEquals(orgprops.length, bindprops.length);
@@ -159,6 +164,7 @@ public void testCompareXADataSourcewithJNDIDataSource()
     private static String[] getPropertyBeanList(Object ds) {
         Method[] allMethods = ds.getClass().getMethods();
         ArrayList<String> properties = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         for (int i = 0; i < allMethods.length; i++) {
             Method method = allMethods[i];
@@ -188,6 +194,7 @@ private static String[] getPropertyBeanList(Object ds) {
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return properties.toArray(new String[properties.size()]);
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
index e800088a83..38193339d2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
@@ -59,6 +59,7 @@ public class XATest extends BaseJDBCTestCase {
     
     public XATest(String name) {
         super(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2474
 
     }
 
@@ -88,6 +89,7 @@ public XATest(String name) {
      */
     public void testSingleConnectionOnePhaseCommit() throws SQLException,
             XAException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2474
 
         XADataSource xads = J2EEDataSource.getXADataSource();
         J2EEDataSource.setBeanProperty(xads, "databaseName", "wombat");
@@ -177,6 +179,8 @@ public void testSingleConnectionOnePhaseCommit() throws SQLException,
      * transaction xa_commit xa_1Phase 3; disconnect; </code>
      */
     public void testInterleavingTransactions() throws SQLException, XAException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         Statement preStatement = getConnection().createStatement();
         preStatement.execute("create table fooInterleaving (a int)");
         preStatement.execute("insert into fooInterleaving values (0)");
@@ -195,6 +199,8 @@ public void testInterleavingTransactions() throws SQLException, XAException {
         Connection conn = xac.getConnection();
 
         Statement s = conn.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         s.executeUpdate("insert into APP.fooInterleaving values (1)");
         xar.end(xid1, XAResource.TMSUSPEND);
 
@@ -270,6 +276,8 @@ public void testInterleavingTransactions() throws SQLException, XAException {
         expectedRows = new String[][] { { "(3", "IDLE", "NULL", "SKU",
                 "UserTransaction" } };
         XATestUtil.checkXATransactionView(conn, expectedRows);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         ResultSet rs = s.executeQuery("select * from APP.fooInterleaving");
         expectedRows = new String[][] { { "0" }, { "1" }, { "3" } };
         JDBC.assertFullResultSet(rs, expectedRows);
@@ -321,6 +329,7 @@ public void testInterleavingTransactions() throws SQLException, XAException {
      </code>
      */
     public void testNoTransaction() throws SQLException, XAException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2474
         XADataSource xads = J2EEDataSource.getXADataSource();
         XAConnection xac = xads.getXAConnection();
         XAResource xar = xac.getXAResource();
@@ -397,6 +406,8 @@ public void testNoTransaction() throws SQLException, XAException {
      * Morph a connection between local anf global transactions.
      */
     public void testMorph() throws SQLException, XAException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         Statement preStatement = getConnection().createStatement();
         preStatement.execute("create table fooMorph (a int)");
         preStatement.executeUpdate("insert into APP.fooMorph values (0)");
@@ -420,6 +431,8 @@ public void testMorph() throws SQLException, XAException {
          */
         conn.setAutoCommit(false);
         Statement s = conn.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         s.executeUpdate("insert into APP.fooMorph values (2001)");
         // no rows expected
         XATestUtil.checkXATransactionView(conn, null);
@@ -432,6 +445,8 @@ public void testMorph() throws SQLException, XAException {
          */
 
         conn.setAutoCommit(true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         s.executeUpdate("insert into APP.fooMorph values (2002)");
         XATestUtil.checkXATransactionView(conn, null);
 
@@ -447,6 +462,8 @@ public void testMorph() throws SQLException, XAException {
                 "UserTransaction" } };
         XATestUtil.checkXATransactionView(conn, expectedRows);
         s.executeUpdate("insert into APP.fooMorph values (2003)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
 
         /*
          * -- disallowed commit; -- disallowed rollback; -- disallowed
@@ -485,6 +502,8 @@ public void testMorph() throws SQLException, XAException {
         // set, will execute but ResultSet will have close on commit
 
         // DERBY-1158 query with holdable statement
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         s.executeQuery("select * from APP.fooMorph where A >= 2000").close();
         s.close();
 
@@ -496,6 +515,8 @@ public void testMorph() throws SQLException, XAException {
         /*
          * select * from foo; xa_end xa_success 1; xa_prepare 1;
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         ResultSet rs = s.executeQuery("select * from APP.fooMorph where A >= 2000");
         expectedRows = new String[][] { { "2001" }, { "2002" }, { "2003" } };
 
@@ -556,6 +577,8 @@ public void testMorph() throws SQLException, XAException {
          */
         conn = xac.getConnection();
         s = conn.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         s.executeUpdate("insert into APP.fooMorph values (2005)");
         conn.commit();
         conn.setAutoCommit(false);
@@ -583,6 +606,8 @@ public void testMorph() throws SQLException, XAException {
                 { "2005" }, { "2007" } };
         JDBC.assertFullResultSet(rs, expectedRows);
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
+//IC see: https://issues.apache.org/jira/browse/DERBY-3319
         conn.rollback();
         conn.close();
 
@@ -594,6 +619,8 @@ public void testMorph() throws SQLException, XAException {
         conn = xac.getConnection();
         conn.setAutoCommit(false);
         s = conn.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         s.executeUpdate("delete from app.fooMorph");
         rs = s.executeQuery("select * from APP.fooMorph");
         JDBC.assertEmpty(rs);
@@ -646,6 +673,8 @@ public void testMorph() throws SQLException, XAException {
          * null order by gxid,username; select * from foo;
          */
         s = conn.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         s.executeUpdate("delete from APP.fooMorph");
         rs = s.executeQuery("select * from APP.fooMorph where A >= 2000");
         JDBC.assertEmpty(rs);
@@ -661,6 +690,12 @@ public void testMorph() throws SQLException, XAException {
 
         conn = xac.getConnection();
         s = conn.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         rs = s.executeQuery("select * from APP.fooMorph where A >= 2000");
         expectedRows = new String[][] { { "2001" }, { "2002" }, { "2003" },
                 { "2005" }, { "2007" } };
@@ -677,6 +712,8 @@ public void testMorph() throws SQLException, XAException {
      * upon calling close() on them.
      */
     public void testDerby4310PreparedStatement() throws SQLException, XAException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         XADataSource xads = J2EEDataSource.getXADataSource();
         J2EEDataSource.setBeanProperty(xads, "databaseName", "wombat");
 
@@ -807,6 +844,8 @@ public void testDerby966() throws SQLException, XAException {
         assertEquals(ResultSet.HOLD_CURSORS_OVER_COMMIT, sdh
                 .getResultSetHoldability());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         checkHeldRS(conn, sdh, sdh.executeQuery("select * from app.foo966"));
         PreparedStatement psdh = conn.prepareStatement("SELECT * FROM APP.foo966");
         PreparedStatement psdh_d = conn
@@ -819,6 +858,8 @@ public void testDerby966() throws SQLException, XAException {
                 ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT);
         assertEquals(ResultSet.HOLD_CURSORS_OVER_COMMIT, shh
                 .getResultSetHoldability());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         checkHeldRS(conn, shh, shh.executeQuery("select * from app.foo966"));
         PreparedStatement pshh = conn.prepareStatement("SELECT * FROM APP.foo966",
                 ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
@@ -836,6 +877,8 @@ public void testDerby966() throws SQLException, XAException {
         assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, sch
                 .getResultSetHoldability());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         checkHeldRS(conn, sch, sch.executeQuery("select * from app.foo966"));
         PreparedStatement psch = conn.prepareStatement("SELECT * FROM APP.foo966",
                 ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
@@ -854,6 +897,8 @@ public void testDerby966() throws SQLException, XAException {
         Statement sdc = conn.createStatement();
         assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, sdc
                 .getResultSetHoldability());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         checkHeldRS(conn, sdc, sdc.executeQuery("select * from app.foo966"));
         PreparedStatement psdc = conn.prepareStatement("SELECT * FROM APP.foo966");
         PreparedStatement psdc_d = conn
@@ -866,6 +911,8 @@ public void testDerby966() throws SQLException, XAException {
                 ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT);
         assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, psdc
                 .getResultSetHoldability());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         checkHeldRS(conn, shc, shc.executeQuery("select * from app.foo966"));
         PreparedStatement pshc = conn.prepareStatement("SELECT * FROM APP.foo966",
                 ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
@@ -883,6 +930,8 @@ public void testDerby966() throws SQLException, XAException {
                 ResultSet.CONCUR_READ_ONLY, ResultSet.CLOSE_CURSORS_AT_COMMIT);
         assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, scc
                 .getResultSetHoldability());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         checkHeldRS(conn, scc, scc.executeQuery("select * from app.foo966"));
         PreparedStatement pscc = conn.prepareStatement("SELECT * FROM APP.foo966",
                 ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
@@ -899,6 +948,8 @@ public void testDerby966() throws SQLException, XAException {
         // Revert back to holdable
         conn.setHoldability(ResultSet.HOLD_CURSORS_OVER_COMMIT);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         ResultSet rs = sdh.executeQuery("SELECT * FROM APP.foo966");
         rs.next();
         // before commit
@@ -911,6 +962,8 @@ public void testDerby966() throws SQLException, XAException {
 
         // ensure a transaction is active to test DERBY-1025
         rs = sdh.executeQuery("SELECT * FROM APP.foo966");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
 
         // This switch to global is ok because conn
         // is in auto-commit mode, thus the start performs
@@ -920,11 +973,14 @@ public void testDerby966() throws SQLException, XAException {
         xar.start(xid, XAResource.TMNOFLAGS);
 
         // Statements not returning ResultSet's should be ok
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         sdh.executeUpdate("DELETE FROM APP.foo966 where A < -99");
         shh.executeUpdate("DELETE FROM APP.foo966 where A < -99");
         sch.executeUpdate("DELETE FROM APP.foo966 where A < -99");
 
         ArrayList<ResultSet> openRS = new ArrayList<ResultSet>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // Statements obtained while default was hold.
         // All should work, holability will be downgraded
@@ -940,11 +996,14 @@ public void testDerby966() throws SQLException, XAException {
         openRS.add(psch.executeQuery());
 
         // Statements not returning ResultSet's should be ok
+//IC see: https://issues.apache.org/jira/browse/DERBY-1159
         psdh_d.executeUpdate();
         pshh_d.executeUpdate();
         psch_d.executeUpdate();
 
         // Statements not returning ResultSet's should be ok
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
         sdc.executeUpdate("DELETE FROM APP.foo966 where A < -99");
         shc.executeUpdate("DELETE FROM APP.foo966 where A < -99");
         scc.executeUpdate("DELETE FROM APP.foo966 where A < -99");
@@ -961,6 +1020,7 @@ public void testDerby966() throws SQLException, XAException {
         openRS.add(pscc.executeQuery());
 
         // Statements not returning ResultSet's should be ok
+//IC see: https://issues.apache.org/jira/browse/DERBY-1159
         psdc_d.executeUpdate();
         pshc_d.executeUpdate();
         pscc_d.executeUpdate();
@@ -971,6 +1031,7 @@ public void testDerby966() throws SQLException, XAException {
         // JDBC 4.0 method getHoldabilty to ensure the
         // holdability is reported correctly.
         int orsCount = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (ResultSet ors : openRS) {
             ors.clearWarnings();
             orsCount++;
@@ -999,6 +1060,8 @@ public void testDerby966() throws SQLException, XAException {
         // DERBY2481 Client does not downgrade PreparedStatement holdability
         if (!usingDerbyNetClient()) {
             PreparedStatement psglobalhold = conn.prepareStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
                     "SELECT * FROM APP.foo966", ResultSet.TYPE_FORWARD_ONLY,
                     ResultSet.CONCUR_READ_ONLY,
                     ResultSet.HOLD_CURSORS_OVER_COMMIT);
@@ -1042,6 +1105,7 @@ public void testDerby966() throws SQLException, XAException {
         // test, clearWarnings throws an error if the ResultSet
         // is closed.
         int crsCount = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (ResultSet crs : openRS) {
             try {
                 crs.clearWarnings();
@@ -1432,6 +1496,7 @@ private static void checkHeldRS(Connection conn, Statement s, ResultSet rs)
     public static void zeroArg() {  }
 
     public static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(XATest.class);
 
@@ -1492,6 +1557,7 @@ private void assertGlobalXactCount(int expectedCount ) throws SQLException {
      * @return test suite
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("XATest");
         // no XA for JSR169
         if (JDBC.vmSupportsJSR169())
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java
index 3f91bd5916..c6f0610373 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATransactionTest.java
@@ -112,6 +112,7 @@ public void testGlobalXIDinTransactionTable() throws Exception {
             bid[i] = (byte) (64 - i);
         }
         Xid xid = XATestUtil.getXid(0x1234, gid, bid);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
 
         // get the stuff required to execute the global transaction
         xaConn = xaDataSource.getXAConnection();
@@ -145,6 +146,7 @@ public void testGlobalXIDinTransactionTable() throws Exception {
 
             // there should be at least one globaltransaction in progress
             assertTrue(rs.next());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
 
             // check whether the xid obtained matches the original xid
             Xid rXid = parseXid(rs.getString(1));
@@ -214,6 +216,7 @@ public void testXATransactionTimeout() throws Exception {
         int timeoutStatementsToExecute = 66;
 
         /* Specifies the number of total executed statements per one
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
            commited statement in timeout related test. */
         int timeoutCommitEveryStatement = 3;
 
@@ -227,6 +230,7 @@ public void testXATransactionTimeout() throws Exception {
         stm.execute("create table XATT (i int, text char(10))");
 
         XADataSource xaDataSource = J2EEDataSource.getXADataSource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
         XAConnection[] xaConn = new XAConnection[timeoutStatementsToExecute];
         XAResource xaRes = null;
         Connection conn = null;
@@ -253,6 +257,7 @@ public void testXATransactionTimeout() throws Exception {
                 // with failure.
                 try {
                     xaRes.end(xid, XAResource.TMFAIL);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
                     fail();
                 } catch (XAException ex) {
                     if (ex.errorCode < XAException.XA_RBBASE
@@ -271,6 +276,7 @@ public void testXATransactionTimeout() throws Exception {
         }
 
         ResultSet rs = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
 
         stm = getConnection().createStatement();
         rs = stm.executeQuery("select count(*) from XATT");
@@ -297,6 +303,7 @@ public void testXATransactionTimeout() throws Exception {
             // Run this kind of statement just to be sure
             // it will not finish before it will time out
             rs = stm.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
                  "select count(*) from sys.syscolumns a, sys.syscolumns b, "
                + "sys.syscolumns c, sys.syscolumns d, sys.syscolumns e "
                + "group by a.referenceid, b.referenceid, c.referenceid, "
@@ -483,6 +490,7 @@ public void testForgetExceptionDerby1016NOTA() throws XAException, SQLException
                           + XAeForget.errorCode  + "  calling forget on a committed transaction",
                         XAException.XAER_NOTA, XAeForget.errorCode);
         } finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5529
             s.executeUpdate("DROP TABLE Derby1016");
             conn.commit();
             s.close();
@@ -583,6 +591,7 @@ public void testDerby5562ReadOnlyTimeout()
     static Xid createXid(int gtrid, int bqual) throws XAException {
         byte[] gid = new byte[2]; gid[0]= (byte) (gtrid % 256); gid[1]= (byte) (gtrid / 256);
         byte[] bid = new byte[2]; bid[0]= (byte) (bqual % 256); bid[1]= (byte) (bqual / 256);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         return XATestUtil.getXid(0x1234, gid, bid);
     }
 
@@ -593,6 +602,7 @@ static Xid createXid(int gtrid, int bqual) throws XAException {
       * @return The xid object corresponding to the xid specified in a string.
       */
     private static Xid parseXid(String str) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
         assertNotNull(str);
         assertTrue(str.matches("\\(\\p{Digit}+,\\p{XDigit}+,\\p{XDigit}+\\)"));
 
@@ -615,6 +625,7 @@ private static Xid parseXid(String str) {
             bqual[i] = (byte) Integer.parseInt(bqualS.substring(2*i, 2*i + 2), 16);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         return XATestUtil.getXid(fmtid, gtid, bqual);
     }
 
@@ -625,6 +636,7 @@ public XATransactionTest(String name) {
     public static Test suite() {
         // the test requires XADataSource to run
         if (JDBC.vmSupportsJDBC3()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
             Test test = TestConfiguration.defaultSuite(XATransactionTest.class);
             // Set the lock timeout back to the default, because when
             // running in a bigger suite the value may have been
@@ -633,6 +645,7 @@ public static Test suite() {
             return test;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(
             "XATransactionTest cannot run without XA support");
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
index 8ec7499277..feda1db239 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
@@ -43,70 +43,114 @@ private _Suite(String name) {
 	public static Test suite() {
 
         BaseTestSuite suite = new BaseTestSuite("jdbcapi");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(BlobSetBytesBoundaryTest.suite());
 		suite.addTest(ConcurrencyTest.suite());
         suite.addTest(DaylightSavingTest.suite());
 		suite.addTest(HoldabilityTest.suite());
         suite.addTest(Derby5158Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1893
+//IC see: https://issues.apache.org/jira/browse/DERBY-1982
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
 		suite.addTest(LobLengthTest.suite()); 
 		suite.addTest(ProcedureTest.suite());
 		suite.addTest(SURQueryMixTest.suite());
 		suite.addTest(SURTest.suite());
 		suite.addTest(UpdatableResultSetTest.suite());
 		suite.addTest(UpdateXXXTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1971
 		suite.addTest(URCoveringIndexTest.suite());
 		suite.addTest(ResultSetCloseTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1895
 		suite.addTest(BlobClob4BlobTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1979
 		suite.addTest(CharacterStreamsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2293
 		suite.addTest(BatchUpdateTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2005
 		suite.addTest(StreamTest.suite());
 		suite.addTest(DboPowersTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2257
 		suite.addTest(BlobStoredProcedureTest.suite());
 		suite.addTest(ClobStoredProcedureTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2304
+//IC see: https://issues.apache.org/jira/browse/DERBY-1982
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
 		suite.addTest(CallableTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2429
 		suite.addTest(ResultSetMiscTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2452
 		suite.addTest(PrepStmtMetaDataTest.suite());
 		suite.addTest(ScrollResultSetTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1889
 		suite.addTest(LobStreamsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1962
 		suite.addTest(ResultSetJDBC30Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
 		suite.addTest(DatabaseMetaDataTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2324
 		suite.addTest(ClosedObjectTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2463
 		suite.addTest(SetTransactionIsolationTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
 		suite.addTest(AuthenticationTest.suite());
 		if (!JDBC.vmSupportsJSR169()) {
 		    // DERBY-5069 Suites.All fails with InvocationTargetException
+//IC see: https://issues.apache.org/jira/browse/DERBY-2492
 		    suite.addTest(DriverTest.suite());
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-3828
 		suite.addTest(SURijTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2841
 		suite.addTest(NullSQLTextTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2981
 		suite.addTest(PrepStmtNullTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2942
 		suite.addTest(StatementJdbc30Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3203
 		suite.addTest(StatementJdbc20Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2646
         suite.addTest(ClobTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2830
         suite.addTest(BlobUpdatableStreamTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2726
         suite.addTest(AIjdbcTest.suite());
         suite.addTest(LargeDataLocksTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3000
+//IC see: https://issues.apache.org/jira/browse/DERBY-1790
         suite.addTest(DMDBugsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3410
         suite.addTest(DataSourceTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3568
         suite.addTest(SavepointJdbc30Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3587
         suite.addTest(RelativeTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3797
         suite.addTest(metadataMultiConnTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3990
         suite.addTest(ResultSetStreamTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
+//IC see: https://issues.apache.org/jira/browse/DERBY-2017
         suite.addTest(InternationalConnectSimpleDSTest.suite());
         suite.addTest(Derby2017LayerATest.suite());
         suite.addTest(LobRsGetterTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
 
         // Old harness .java tests that run using the HarnessJavaTest
         // adapter and continue to use a single master file.
         suite.addTest(JDBCHarnessJavaTest.suite());
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1897
         if (JDBC.vmSupportsJDBC3())
         {
             // Tests that do not run under JSR169
             // DERBY-2403 blocks ParameterMappingTest from running
             // under JSR169
             suite.addTest(ParameterMappingTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2411
 
             // Class requires javax.sql.PooledConnection
             // even to load, even though the suite method
@@ -116,36 +160,53 @@ public static Test suite() {
             // Tests JDBC 3.0 ability to establish a result set of 
             // auto-generated keys.
             suite.addTest(AutoGenJDBC30Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2398
 
             // Test uses DriverManager
+//IC see: https://issues.apache.org/jira/browse/DERBY-1496
             suite.addTest(DriverMgrAuthenticationTest.suite());
             // Tests uses JDBC 3.0 datasources
             suite.addTest(PoolDSAuthenticationTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2576
             suite.addTest(PoolXADSCreateShutdownDBTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5165
             suite.addTest(Derby5165Test.suite());
             suite.addTest(XADSAuthenticationTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2551
             suite.addTest(XATransactionTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4310
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
             suite.addTest(XATest.suite());
             
             // Test uses JDBC 3.0 datasources, and javax.naming.Reference etc.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
             suite.addTest(DataSourceReferenceTest.suite());
             suite.addTest(DataSourceSerializationTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1318
 
             // Test uses DriverManager, Pooled and XADataSources, and
             // an inner class implements ConnectionEventListener.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3410
             suite.addTest(J2EEDataSourceTest.suite());
             // Test requires ClientConnectionPoolDataSource.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3325
+//IC see: https://issues.apache.org/jira/browse/DERBY-3306
             suite.addTest(ClientConnectionPoolDataSourceTest.suite());
             // Test requires ClientConnectionPoolDataSource.
             suite.addTest(StatementPoolingTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3329
 
             //suite to test updatable reader for clob in embedded driver
+//IC see: https://issues.apache.org/jira/browse/DERBY-2823
             suite.addTest (ClobUpdatableReaderTest.suite());
             
             //truncate test for clob
             suite.addTest (ClobTruncateTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2800
 
             //JSR169 does not support ParameterMetaData
+//IC see: https://issues.apache.org/jira/browse/DERBY-2862
             suite.addTest(ParameterMetaDataJdbc30Test.suite());
             suite.addTest(CacheSessionDataTest.suite());
 
@@ -154,8 +215,10 @@ public static Test suite() {
             // functionality. 
             // Also, LDAPAuthentication needs properties passed in or is 
             // pointless (unless we can find a test LDAP Server)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3659
             String ldapServer=getSystemProperty("derbyTesting.ldapServer");
             if (ldapServer == null || ldapServer.length() < 1)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                 suite.addTest(new BaseTestSuite(
                     "LDAPAuthenticationTest and XAJNDITest require " +
                     "derbyTesting.ldap* properties."));
@@ -171,6 +234,7 @@ public static Test suite() {
             suite.addTest(InternationalConnectTest.suite());
 
             // Test requires java.sql.DriverManager
+//IC see: https://issues.apache.org/jira/browse/DERBY-5664
             suite.addTest(AutoloadTest.fullAutoloadSuite());
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/connectionJdbc20.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/connectionJdbc20.java
index 0b03f5a41e..301db7a45b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/connectionJdbc20.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/connectionJdbc20.java
@@ -76,6 +76,7 @@ public static void main(String[] args) {
             load_data(connreturn);
             
 			// read the data   of each type with all the possible functions
+//IC see: https://issues.apache.org/jira/browse/DERBY-721
 			ResultSet rs = stmt.executeQuery("select " + 
 							 "c1," + 
 							 "c2," + 
@@ -98,6 +99,7 @@ public static void main(String[] args) {
                         get_using_string(rs, i);
 			
 			get_using_ascii_stream(rs, i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-721
 
                         if(i < 4 ) // only c1 , c2, c3
                         {
@@ -114,6 +116,7 @@ public static void main(String[] args) {
                     System.out.println("Got Different Statement Object");
                 
                 rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-721
 		rs = stmt.executeQuery("select " + 
 				       "c1," + 
 				       "c2," + 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/maxfieldsize.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/maxfieldsize.java
index 76ab9a4fb7..c90547e581 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/maxfieldsize.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/maxfieldsize.java
@@ -59,6 +59,7 @@ public static void main(String[] args) {
 		Statement stmt;
 
 		// start by cleaning up, just in case
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 		String[] testObjects = {"table tab1", "table tab2"};
 		
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataMultiConnTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataMultiConnTest.java
index 6b2c2faa00..3b2db9d41f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataMultiConnTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadataMultiConnTest.java
@@ -40,6 +40,7 @@ public metadataMultiConnTest(String name) {
 	}
 
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(metadataMultiConnTest.class);
 	}
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetJdbc20.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetJdbc20.java
index 62c01e7c03..19465e74e0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetJdbc20.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultsetJdbc20.java
@@ -62,6 +62,7 @@ public static void main(String[] args) {
 			stmt = con.createStatement();
 			// first clean up
 			TestUtil.cleanUpTest(stmt, testObjects);
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 
       //create a table, insert a row, do a select from the table,
       //get the resultset meta data and go through each column in
@@ -98,6 +99,7 @@ public static void main(String[] args) {
 
 			rs.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 			TestUtil.cleanUpTest(stmt, testObjects);
 			stmt.close();
 			con.close();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/rsgetXXXcolumnNames.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/rsgetXXXcolumnNames.java
index 43647c5037..5553d8a1db 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/rsgetXXXcolumnNames.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/jdbcapi/rsgetXXXcolumnNames.java
@@ -31,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class rsgetXXXcolumnNames {
 
     public static void main(String[] args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-229
         test1(args);
     }
     
@@ -53,6 +54,7 @@ public static void test1(String []args) {
                         stmt = con.createStatement(); 
 
                         // first cleanup in case we're using useprocess false
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
                         String[] testObjects = {"table caseiscol"};
                         TestUtil.cleanUpTest(stmt, testObjects);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AggBuiltinTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AggBuiltinTest.java
index c62ab36ecb..f8948330dd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AggBuiltinTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AggBuiltinTest.java
@@ -72,6 +72,7 @@ public void testBuiltinAggregates() throws Exception
             min();
             
             // Variance population
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
             var_pop();
             // Variance sample (n - 1)
             var_samp();
@@ -82,6 +83,7 @@ public void testBuiltinAggregates() throws Exception
         	stddev_samp();
 
             // bugs
+//IC see: https://issues.apache.org/jira/browse/DERBY-7041
             derby7041();
         	
         } finally {
@@ -106,6 +108,7 @@ private void derby7041() throws SQLException
     {
         x
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-7041
              "CREATE TABLE T1_7041\n" +
              "(\n" +
              "	T1_7041_KEY INTEGER,\n" +
@@ -4392,6 +4395,7 @@ private void min() throws SQLException {
     }
 
     private void var_pop() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
         x("create table t (i int, s smallint, l bigint,"
             + "             c char(10), v varchar(50), lvc long varchar,"
             + "             d double precision, r real, "
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AggregateClassLoadingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AggregateClassLoadingTest.java
index 9335bd96bd..7debaf9c26 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AggregateClassLoadingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AggregateClassLoadingTest.java
@@ -73,6 +73,7 @@ public static Test suite() {
 		 * but the tests continue to pass. 
 		 */		
 		return SecurityManagerSetup.noSecurityManager(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new CleanDatabaseTestSetup(
                 new BaseTestSuite(AggregateClassLoadingTest.class,
                                    "AggregateClassLoadingTest")) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AlterTableTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AlterTableTest.java
index 445c82d3ce..edc38f15fc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AlterTableTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AlterTableTest.java
@@ -54,12 +54,14 @@ public AlterTableTest(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("AlterTableTest Test");
         suite.addTest(TestConfiguration.defaultSuite(AlterTableTest.class));
         return TestConfiguration.sqlAuthorizationDecorator(suite);
     }
 
     private void createTestObjects(Statement st) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         Connection conn = getConnection();
         conn.setAutoCommit(false);
         CleanDatabaseTestSetup.cleanDatabase(conn, false);
@@ -95,6 +97,7 @@ private void createTestObjects(Statement st) throws SQLException {
 
     private void checkWarning(Statement st, String expectedWarning)
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         SQLWarning sqlWarn = (st == null) ?
                 getConnection().getWarnings() : st.getWarnings();
         assertNotNull("Expected warning but found none", sqlWarn);
@@ -163,6 +166,7 @@ public void testAddColumn() throws Exception {
         st.executeUpdate("alter table t1 add column c4 int check(c4 = 1)");
 
         // Newly-added column does not appear in existing view:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         ResultSet rs = st.executeQuery("select * from v1");
         JDBC.assertColumnNames(rs, new String[]{"C1"});
         JDBC.assertFullResultSet(rs, new String[][]{{"1"}, {"2"}});
@@ -184,6 +188,8 @@ public void testAddColumn() throws Exception {
         // select * prepared statements do see added columns after 
         // alter table
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5459
+//IC see: https://issues.apache.org/jira/browse/DERBY-2402
         rs = pSt.executeQuery();
         JDBC.assertColumnNames(rs, new String[]{"C1", "C2"});
         JDBC.assertFullResultSet(rs, new String[][]{
@@ -200,6 +206,7 @@ public void testAddColumn() throws Exception {
         JDBC.assertFullResultSet(rs, new String[][]{{"1", "0"}});
 
         st.executeUpdate("drop table t0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         rollback();
         rs = st.executeQuery(" select  * from t0");
         JDBC.assertColumnNames(rs, new String[]{"C1"});
@@ -270,6 +277,7 @@ public void testAddColumn() throws Exception {
         JDBC.assertUnorderedResultSet(rs, expRS, true);
 
         rollback();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
 
         st.executeUpdate(
                 " create function countopens() returns varchar(128) " +
@@ -277,6 +285,7 @@ public void testAddColumn() throws Exception {
                 "'org.apache.derbyTesting.functionTests.util.T_ConsistencyChecker." +
                 "countOpens'");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         commit();
         // do consistency check on scans, etc.
 
@@ -894,6 +903,9 @@ public void testAddIdentityColumn2() throws SQLException {
         // Generated identity values cannot grow beyond the limits of
         // the data type.
         s.execute("insert into t0 values 1,2,3,4");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6961
+//IC see: https://issues.apache.org/jira/browse/DERBY-6961
+//IC see: https://issues.apache.org/jira/browse/DERBY-6961
         assertStatementError(EXHAUSTED_IDENTITY_COLUMN, s,
                 "alter table t0 add column id smallint generated always as "
                 + "identity (start with 30000, increment by 1000)");
@@ -909,6 +921,9 @@ public void testAddIdentityColumn2() throws SQLException {
                     { "2", "31000" },
                     { "3", "32000" },
                 });
+//IC see: https://issues.apache.org/jira/browse/DERBY-6961
+//IC see: https://issues.apache.org/jira/browse/DERBY-6961
+//IC see: https://issues.apache.org/jira/browse/DERBY-6961
         assertStatementError(EXHAUSTED_IDENTITY_COLUMN, s, "insert into t0(c1) values 4");
         rollback();
 
@@ -977,6 +992,7 @@ public void testDropObjects() throws Exception {
 
         // tr1 is dropped, tr2 still OK
         st.executeUpdate("drop trigger tr1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         ResultSet rs = st.executeQuery("select * from tab5");
         JDBC.assertColumnNames(rs, new String[]{"C1"});
         JDBC.assertDrainResults(rs, 0);
@@ -997,6 +1013,7 @@ public void testDropObjects() throws Exception {
 
         rs = st.executeQuery("select * from tab2");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         String[] expColNames = {"C1", "C2", "C3", "C4", "C5"};
         JDBC.assertColumnNames(rs, expColNames);
         JDBC.assertDrainResults(rs, 0);
@@ -1026,6 +1043,7 @@ public void testDropObjects() throws Exception {
         expColNames = new String[]{"C2", "C3", "C4"};
         JDBC.assertColumnNames(rs, expColNames);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         String[][] expRS = {
                     {"9", "2.5", "88"},
                     {"10", "3.5", "99"},
@@ -1126,6 +1144,7 @@ public void testDropObjects() throws Exception {
         st.executeUpdate("drop view vw4");
 
         rollback();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
 
         // check that dropping a column will drop backing index on 
         // referencing table
@@ -1157,6 +1176,8 @@ public void testDropObjects() throws Exception {
                 "t.tablename = 'REFTT1'");
         JDBC.assertSingleValueResultSet(rs, "1");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         rollback();
     }
 
@@ -1205,6 +1226,7 @@ public void testAddConstraint() throws Exception {
         //duplicating a key value in a primary key not allowed
         assertStatementError("23505", st, "insert into t0_1 values (1, 1)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         ResultSet rs = st.executeQuery("select * from t0_1");
         JDBC.assertColumnNames(rs, new String[]{"C1", "C2"});
         JDBC.assertFullResultSet(rs, new String[][]{{"1", "1"}});
@@ -1275,9 +1297,11 @@ public void testAddConstraint() throws Exception {
         rs = st.executeQuery(
                 " select * from t0_1");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         String[] expColNames = {"C1", "C2"};
         JDBC.assertColumnNames(rs, expColNames);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         String[][] expRS = {
                     {"1", "1"},
                     {"2", "2"},
@@ -1357,6 +1381,7 @@ public void testAddConstraint() throws Exception {
 
         assertCompileError("42Y55", "alter table xxx add check(c2 = 1)");
         st.executeUpdate("create table xxx(c1 int, c2 int)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         PreparedStatement pSt =
                 prepareStatement("alter table xxx add check(c2 = 1)");
         assertUpdateCount(pSt, 0);
@@ -1373,6 +1398,7 @@ public void testAddConstraint() throws Exception {
 
         rs = st.executeQuery(
                 "select tablename, " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                 "SYSCS_UTIL.SYSCS_CHECK_TABLE('" + DerbyConstants.TEST_DBO +
                 "', tablename) from " + "sys.systables where tabletype = 'T'");
 
@@ -1436,8 +1462,10 @@ public void testDropConstraint() throws Exception {
 
         // verify the consistency of the indexes on the user tables
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         ResultSet rs = st.executeQuery(
                 "select tablename, " + "SYSCS_UTIL.SYSCS_CHECK_TABLE('" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                 DerbyConstants.TEST_DBO + "', tablename) from " +
                 "sys.systables where tabletype = 'T' and tablename = 'T0_1'");
 
@@ -1452,6 +1480,7 @@ public void testDropConstraint() throws Exception {
 
         // verify that alter table works after drop/recreate of table
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         PreparedStatement pSt =
                 prepareStatement("alter table t0_1 drop constraint p2");
 
@@ -1507,6 +1536,8 @@ public void testDropConstraint() throws Exception {
 
         rs = st.executeQuery(
                 "select tablename, " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                 "SYSCS_UTIL.SYSCS_CHECK_TABLE('" + DerbyConstants.TEST_DBO +
                 "', tablename) from " + "sys.systables where tabletype = 'T'");
 
@@ -1598,12 +1629,14 @@ public void testWithSchema() throws Exception {
 
         // schemaname should be DerbyConstants.TEST_DBO
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         ResultSet rs = st.executeQuery(
                 "select schemaname, constraintname from " +
                 "sys.sysconstraints c, sys.sysschemas s where " +
                 "s.schemaid = c.schemaid order by 1");
 
         JDBC.assertFullResultSet(rs, new String[][]{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                     {DerbyConstants.TEST_DBO, "P1"},
                     {DerbyConstants.TEST_DBO, "NEWCONS"}
                 });
@@ -1614,6 +1647,7 @@ public void testWithSchema() throws Exception {
         st.executeUpdate(
                 " alter table x drop constraint " +
                 DerbyConstants.TEST_DBO + ".newcons");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
 
         st.executeUpdate(
                 " alter table x add constraint newcons primary key (x)");
@@ -1639,6 +1673,7 @@ public void testWithSchema() throws Exception {
         st.executeUpdate(
                 "alter table x drop constraint " +
                 DerbyConstants.TEST_DBO + ".newcons");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
 
         // bad schema name(table x is not in the same schema of constraint)
         assertStatementError("42X85", st,
@@ -1659,6 +1694,7 @@ public void testWithSchema() throws Exception {
                 "sys.sysconstraints c, sys.sysschemas s where " +
                 "s.schemaid = c.schemaid order by 1");
         JDBC.assertFullResultSet(rs, new String[][]{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                     {DerbyConstants.TEST_DBO, "P1"},
                     {DerbyConstants.TEST_DBO, "CON"}
                 });
@@ -1675,6 +1711,7 @@ public void testWithSchema() throws Exception {
                 "sys.sysconstraints c, sys.sysschemas s where " +
                 "s.schemaid = c.schemaid order by 1");
         JDBC.assertFullResultSet(rs, new String[][]{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                     {DerbyConstants.TEST_DBO, "P1"},
                     {DerbyConstants.TEST_DBO, "CON"}
                 });
@@ -1684,6 +1721,7 @@ public void testWithSchema() throws Exception {
         // add constraint, default to table schema
 
         st.executeUpdate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                 "alter table " + DerbyConstants.TEST_DBO +
                 ".x add constraint con2 check (x > 1)");
 
@@ -1695,6 +1733,7 @@ public void testWithSchema() throws Exception {
                 "sys.sysconstraints c, sys.sysschemas s where " +
                 "s.schemaid = c.schemaid order by 1,2");
         JDBC.assertFullResultSet(rs, new String[][]{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                     {DerbyConstants.TEST_DBO, "CON"},
                     {DerbyConstants.TEST_DBO, "CON2"},
                     {DerbyConstants.TEST_DBO, "P1"}
@@ -1735,6 +1774,7 @@ public void testTemporaryTable() throws Exception {
         st.executeUpdate("insert into t1 values (1, 1)");
 
         ResultSet rs = st.executeQuery("select * from t1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
 
         String[] expColNames = {"C1", "C2"};
         JDBC.assertColumnNames(rs, expColNames);
@@ -1764,10 +1804,12 @@ public void testTemporaryTable() throws Exception {
                 " alter table t1 add constraint C1_PLUS_C2 check " +
                 "((c1 + c2) < 100)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         PreparedStatement pSt = prepareStatement(
                 "alter table t1 drop constraint C1_PLUS_C2");
 
         st.executeUpdate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                 " alter table " + DerbyConstants.TEST_DBO +
                 ".t1 drop constraint " + DerbyConstants.TEST_DBO +
                 ".C1_PLUS_C2");
@@ -1895,6 +1937,7 @@ private void checkValStartInc(Statement st, String nm, String v,
      * @throws SQLException if a database error occurs
      */
     private void testAlterColumnNullability(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6644
             Statement st, boolean standardSyntax) throws SQLException {
         final String setNotNull = standardSyntax ? "SET NOT NULL" : "NOT NULL";
         final String dropNotNull = standardSyntax ? "DROP NOT NULL" : "NULL";
@@ -1909,6 +1952,7 @@ private void testAlterColumnNullability(
         st.executeUpdate("insert into atmcn_1 values (1,1)");
 
         ResultSet rs = st.executeQuery("select * from atmcn_1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
 
         String[] expColNames = {"A", "B"};
         JDBC.assertColumnNames(rs, expColNames);
@@ -1920,6 +1964,7 @@ private void testAlterColumnNullability(
         JDBC.assertFullResultSet(rs, expRS, true);
 
         st.executeUpdate("alter table atmcn_1 alter column a " + setNotNull);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6644
 
         // should fail because a cannot be null
 
@@ -1940,6 +1985,7 @@ private void testAlterColumnNullability(
 
         JDBC.assertFullResultSet(rs, expRS, true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6644
         st.executeUpdate("alter table atmcn_1 alter column b " + dropNotNull);
         st.executeUpdate("insert into atmcn_1 (a) values (1)");
 
@@ -1961,6 +2007,7 @@ private void testAlterColumnNullability(
 
         assertStatementError("X0Y80", st,
                 "alter table atmcn_1 alter column b " + setNotNull);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6644
 
         // show that a column which is part of the PRIMARY KEY 
         // cannot be modified NULL
@@ -1971,6 +2018,7 @@ private void testAlterColumnNullability(
 
         assertStatementError("42Z20", st,
                 " alter table atmcn_2 alter column a " + dropNotNull);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6644
 
         st.executeUpdate(
                 " create table atmcn_3 (a integer not null, b " +
@@ -1982,6 +2030,7 @@ private void testAlterColumnNullability(
 
         assertStatementError("42Z20", st,
                 " alter table atmcn_3 alter column b " + dropNotNull);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6644
 
         // verify that the keyword "column" in the ALTER TABLE ... 
         // ALTER COLUMN ... statement is optional:
@@ -1990,6 +2039,7 @@ private void testAlterColumnNullability(
                 "create table atmcn_4 (a integer not null, b integer)");
 
         st.executeUpdate("alter table atmcn_4 alter a " + dropNotNull);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6644
 
         //set column, part of unique constraint, to null
 
@@ -1998,6 +2048,7 @@ private void testAlterColumnNullability(
                 "not null unique)");
 
         st.executeUpdate("alter table atmcn_5 alter column b " + dropNotNull);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6644
 
         // SET NOT NULL on an already not nullable column, or DROP NOT NULL
         // on an already nullable column, should be a no-op.
@@ -2052,6 +2103,7 @@ public void testAlterColumn() throws Exception {
         st.executeUpdate("insert into atmod_1 (b) values ('b')");
 
         ResultSet rs = st.executeQuery("select * from atmod_1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6644
 
         JDBC.assertColumnNames(rs, new String[]{"A", "B"});
 
@@ -2149,6 +2201,7 @@ public void testAlterColumn() throws Exception {
 
         st.executeUpdate("rename column renc_2.c1 to c2");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         DatabaseMetaData dbmd = getConnection().getMetaData();
         rs = dbmd.getColumns(null, null, "RENC_2", "C2");
         assertTrue(rs.next());
@@ -2163,6 +2216,7 @@ public void testAlterColumn() throws Exception {
         assertFalse(rs.next());
 
         if (usingEmbedded()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
             dbmd = getConnection().getMetaData();
             rs = dbmd.getIndexInfo(null, null, "RENC_2", false, false);
             assertTrue(rs.next());
@@ -2192,6 +2246,7 @@ public void testAlterColumn() throws Exception {
         st.executeUpdate(
                 "rename column renc_3.b to newbie");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         dbmd = getConnection().getMetaData();
         rs = dbmd.getColumns(null, null, "RENC_3", "NEWBIE");
         assertTrue(rs.next());
@@ -2206,6 +2261,7 @@ public void testAlterColumn() throws Exception {
         assertFalse(rs.next());
 
         if (usingEmbedded()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
             dbmd = getConnection().getMetaData();
             rs = dbmd.getIndexInfo(null, null, "RENC_3", false, false);
             assertTrue(rs.next());
@@ -2253,6 +2309,7 @@ public void testAlterColumn() throws Exception {
                 "rename column renc_4.c1 to unq_c1");
         
         if (usingEmbedded()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
             dbmd = getConnection().getMetaData();
             rs = dbmd.getIndexInfo(null, null, "RENC_4", false, false);
             assertTrue(rs.next());
@@ -2278,6 +2335,7 @@ public void testAlterColumn() throws Exception {
                 "rename column renc_5.c5 to unq_c5");
         
         if (usingEmbedded()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
             dbmd = getConnection().getMetaData();
             rs = dbmd.getIndexInfo(null, null, "RENC_5", false, false);
             assertTrue(rs.next());
@@ -2389,6 +2447,7 @@ public void testAlterColumn() throws Exception {
         // prepared statement on it. The rename of the column will 
         // be successful; the open statement will get errors when 
         // it tries to re-execute.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         setAutoCommit(false);
         PreparedStatement pSt =
                 prepareStatement("select * from renc_6 where a = ?");
@@ -2402,6 +2461,7 @@ public void testAlterColumn() throws Exception {
         }
         rs = pSt.executeQuery();
         String[] expColNames = {"A", "BB_GUN", "C"};
+//IC see: https://issues.apache.org/jira/browse/DERBY-6644
 
         JDBC.assertColumnNames(rs, expColNames);
 
@@ -2422,6 +2482,7 @@ public void testAlterColumn() throws Exception {
                 "42X04", pSt);
 
         setAutoCommit(true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
 
         // Demonstrate that you cannot rename a column in a 
         // synonym, and demonstrate that renaming a column in the 
@@ -2482,6 +2543,7 @@ public void testAlterColumn() throws Exception {
         // cause the following test to fail. Right now, the following
         // test accepts the incorrect metadata length obtained through
         // the resultset's metadata after ALTER TABLE has been performed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         setAutoCommit(false);
         //Create table and load data
         st.executeUpdate(
@@ -2492,6 +2554,7 @@ public void testAlterColumn() throws Exception {
         	ps.setInt(1, i); 
         	ps.executeUpdate(); 
     	} 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         commit();
         //Open a resultset on the table which will be altered because
         // the resultset has been exhausted. The alter table will fail
@@ -2809,6 +2872,7 @@ public void testDropColumn() throws Exception {
         JDBC.assertFullResultSet(st.executeQuery(" select * from atdc_1"),
                 new String[][]{{"1", "1"}});
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         ResultSet rs =
                 st.executeQuery(
                 " select columnname,columnnumber,columndatatype from " +
@@ -2926,6 +2990,7 @@ public void testDropColumn() throws Exception {
                 " alter table atdc_1_02 drop column a cascade");
 
         if (usingEmbedded()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
             checkWarning(st, "01500");
         }
 
@@ -3145,6 +3210,7 @@ public void testDropColumn() throws Exception {
         rs =
                 st.executeQuery("select * from atdc_vw_1");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         String[] expColNames = {"VW_B"};
         JDBC.assertColumnNames(rs, expColNames);
         JDBC.assertDrainResults(rs, 0);
@@ -3182,6 +3248,8 @@ public void testDropColumn() throws Exception {
         // drop column restrict should fail because trigger is defined to 
         // fire on the update of the column. But cascade should succeed
         // and drop the dependent trigger
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
         createTableAndInsertData(st, "ATDC_6", "A", "B");
         sysdependsRowCountBeforeCreateTrigger = numberOfRowsInSysdepends(st);
         st.executeUpdate(
@@ -3201,6 +3269,8 @@ public void testDropColumn() throws Exception {
         JDBC.assertEmpty(st.executeQuery(
                 " select triggername from sys.systriggers where " +
                 "triggername='ATDC_6_TRIGGER_1'"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
         Assert.assertEquals("# of rows in SYS.SYSDEPENDS should reduce",
         		numberOfRowsInSysdepends(st),sysdependsRowCountBeforeCreateTrigger);
         st.executeUpdate("drop table ATDC_6");
@@ -3228,6 +3298,8 @@ public void testDropColumn() throws Exception {
         JDBC.assertEmpty(st.executeQuery(
                 " select triggername from sys.systriggers where " +
                 "triggername='ATDC_11_TRIGGER_1'"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
         Assert.assertEquals("# of rows in SYS.SYSDEPENDS should reduce",
         		numberOfRowsInSysdepends(st),sysdependsRowCountBeforeCreateTrigger);
         st.executeUpdate("drop table ATDC_11");
@@ -3246,6 +3318,8 @@ public void testDropColumn() throws Exception {
                 " REFERENCING NEW AS newt OLD AS oldt "+
                 " for each row select oldt.b from atdc_12");
         sysdependsRowCountAfterCreateTrigger = numberOfRowsInSysdepends(st);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
 
         // We got an error because Derby detected the dependency of 
         // the triggers
@@ -3265,6 +3339,8 @@ public void testDropColumn() throws Exception {
         JDBC.assertEmpty(st.executeQuery(
         		" select triggername from sys.systriggers where " +
         		"triggername in ('ATDC_12_TRIGGER_1', 'ATDC_12_TRIGGER_2')"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
         Assert.assertEquals("# of rows in SYS.SYSDEPENDS should reduce",
         		numberOfRowsInSysdepends(st),sysdependsRowCountBeforeCreateTrigger);
         st.executeUpdate("drop table ATDC_12");
@@ -3297,6 +3373,8 @@ public void testDropColumn() throws Exception {
                 " REFERENCING OLD AS oldt "+
                 " for each row select oldt.b from atdc_13");
         sysdependsRowCountAfterCreateTrigger = numberOfRowsInSysdepends(st);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
 
         assertStatementError("X0Y25", st,
         		"alter table atdc_13 drop column b restrict");
@@ -3304,6 +3382,8 @@ public void testDropColumn() throws Exception {
             	{"ATDC_13_TRIGGER_2"}, {"ATDC_13_TRIGGER_3"},
             	{"ATDC_13_TRIGGER_4"}, {"ATDC_13_TRIGGER_5"},
             	{"ATDC_13_TRIGGER_6"}});
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
         Assert.assertEquals("# of rows in SYS.SYSDEPENDS should not change",
         		numberOfRowsInSysdepends(st),sysdependsRowCountAfterCreateTrigger);
         
@@ -3316,6 +3396,8 @@ public void testDropColumn() throws Exception {
         		"'ATDC_13_TRIGGER_2', 'ATDC_13_TRIGGER_3'," +
         		"'ATDC_13_TRIGGER_4', 'ATDC_13_TRIGGER_5'," +
         		"'ATDC_13_TRIGGER_6')"));        
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
         Assert.assertEquals("# of rows in SYS.SYSDEPENDS should reduce",
         		numberOfRowsInSysdepends(st),sysdependsRowCountBeforeCreateTrigger);
         st.executeUpdate("drop table ATDC_13");
@@ -3335,6 +3417,8 @@ public void testDropColumn() throws Exception {
             st.executeQuery(" select * from atdc_16_tab2");
         JDBC.assertFullResultSet(rs, new String[][]{{"1","11","111"}});
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
         sysdependsRowCountBeforeCreateTrigger = numberOfRowsInSysdepends(st);
         st.executeUpdate(
                 " create trigger atdc_16_trigger_1 " +
@@ -3358,6 +3442,8 @@ public void testDropColumn() throws Exception {
         rs =
             st.executeQuery(" select * from atdc_16_tab2");
         JDBC.assertFullResultSet(rs, new String[][]{{"1","11","333"}});
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
         Assert.assertEquals("# of rows in SYS.SYSDEPENDS should reduce",
               		numberOfRowsInSysdepends(st),sysdependsRowCountAfterCreateTrigger);
         st.executeUpdate("drop table ATDC_16_TAB1");
@@ -3723,6 +3809,8 @@ public void testDropColumn() throws Exception {
             st.executeQuery(" select * from atdc_15_tab2");
         JDBC.assertFullResultSet(rs, new String[][]{{"1","22"}});
         st.executeUpdate("alter table atdc_15_tab1 drop column a1 restrict");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
         Assert.assertEquals("# of rows in SYS.SYSDEPENDS should not change",
         		numberOfRowsInSysdepends(st),sysdependsRowCountAfterCreateTrigger);
         st.executeUpdate("update atdc_15_tab1 set b1=33");
@@ -3734,6 +3822,8 @@ public void testDropColumn() throws Exception {
         JDBC.assertFullResultSet(rs, new String[][]{{"1","33"}});
         st.executeUpdate("drop table ATDC_15_TAB1");
         st.executeUpdate("drop table ATDC_15_TAB2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
 
         st.executeUpdate(
                 " create table atdc_7 (a int, b int, c int, primary key (a))");
@@ -3769,6 +3859,7 @@ public void testDropColumn() throws Exception {
                 st.executeQuery(
                 " select GRANTEE,GRANTOR,TYPE,COLUMNS from sys.syscolperms");
         JDBC.assertFullResultSet(rs, new String[][]{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                     {"BRYAN", DerbyConstants.TEST_DBO, "s", "{0, 1, 2}"}
                 });
 
@@ -3788,6 +3879,8 @@ public void testDropColumn() throws Exception {
                 st.executeQuery(
                 " select GRANTEE,GRANTOR,TYPE,COLUMNS from sys.syscolperms");
         JDBC.assertFullResultSet(rs, new String[][]{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                     {"BRYAN", DerbyConstants.TEST_DBO, "s", "{0, 1}"}
                 });
 
@@ -3843,6 +3936,8 @@ public void testDropColumn() throws Exception {
 
     //Create table and insert data necessary for ALTER TABLE DROP COLUMN test
     private void createTableAndInsertData(Statement s, String tableName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5079
+//IC see: https://issues.apache.org/jira/browse/DERBY-4984
     		String column1, String column2)
     throws SQLException {
         s.execute("CREATE TABLE " + tableName + " (" + 
@@ -3968,6 +4063,8 @@ public void testJira3177()
                 "Message_Data_ID INTEGER NOT NULL , CONSTRAINT " +
                 "d3177_MESSAGES_id_pk PRIMARY KEY(id) )");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         ResultSet rs =
                 st.executeQuery(
                 " select COLUMNNAME, COLUMNNUMBER, COLUMNDATATYPE, " +
@@ -4115,6 +4212,7 @@ public void testJira3177()
         st.executeUpdate(
                 " alter table D3177_messages drop column message_data_id");
         checkWarning(st, "01500");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
 
         st.executeUpdate("drop table d3177_BinaryData");
         assertUpdateCount(st, 1, "update d3177_SchemaVersion set version=6");
@@ -4268,6 +4366,7 @@ public void testJira3355() throws Exception {
     
     public void testJira4256() throws SQLException{
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4256
         Statement st = createStatement();
         createTestObjects(st);
         
@@ -4278,6 +4377,7 @@ public void testJira4256() throws SQLException{
         InputStream stream;
                
         st.executeUpdate("create table clob_tab(c1 int,clob_col clob(10K))");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         commit();
         
         PreparedStatement pSt =
@@ -4290,6 +4390,7 @@ public void testJira4256() throws SQLException{
         assertStatementError("XJ001", pSt);
         pSt.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         rollback();
         
         st.executeUpdate("ALTER TABLE clob_tab ALTER COLUMN "
@@ -4310,6 +4411,7 @@ public void testJira4256() throws SQLException{
         st.executeUpdate("CREATE TABLE blob_tab ( C1 INTEGER," +
                                 "blob_col BLOB(10K) NOT NULL)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         commit();
         
         pSt = prepareStatement("INSERT INTO blob_tab values (?,?)");
@@ -4321,6 +4423,7 @@ public void testJira4256() throws SQLException{
         assertStatementError("22001", pSt);
         pSt.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         rollback();
         
         st.executeUpdate("ALTER TABLE blob_tab ALTER COLUMN "
@@ -4344,6 +4447,7 @@ public void testJira4256() throws SQLException{
      * name contains a double quote character.
      */
     public void testDerby5157_addColumnWithDefaultValue() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5157
         setAutoCommit(false);
         Statement s = createStatement();
         s.execute("create schema \"\"\"\"");
@@ -4535,6 +4639,7 @@ public void test_5679_longRows() throws Exception
         ps.setBytes( 5, after_4 );
         ps.executeUpdate();
         vetBytes_5679( conn, afterRow );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5713
         rollback();
         conn.setAutoCommit( true );
 
@@ -4856,6 +4961,7 @@ public void test_6882_import() throws Exception
     public void test_6961_setCycle() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6961
 
         // SMALLINT
         vet_6961_cycling
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiSignatures.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiSignatures.java
index 24cb2af58e..82cb45039a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiSignatures.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiSignatures.java
@@ -1392,6 +1392,7 @@ public  class   AnsiSignatures
          Integer[] smallintarg
          )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         bigintarg[ 0 ] = 1L;
         booleanarg[ 0 ] = Boolean.TRUE;
         doublearg[ 0 ] = 1.0;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiSignaturesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiSignaturesTest.java
index 047edafc4b..5aabb154c2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiSignaturesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiSignaturesTest.java
@@ -88,6 +88,7 @@ public AnsiSignaturesTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.defaultSuite(
             AnsiSignaturesTest.class);
 
@@ -104,6 +105,7 @@ public  void    test_boolean_boolean_boolean()
         throws Exception
     {
         declareAndRunFunction
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
             ( "boolean_boolean_boolean", "boolean", new String[] { "boolean" }, "true", "true" );
     }
     public  void    test_boolean_Boolean_boolean()
@@ -391,6 +393,7 @@ public  void    test_clob_Clob_String()
         throws Exception
     {
         Connection  conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
 
         declareAndRunFunction
             ( "clob_Clob_String", "clob", new String[] { "varchar( 10 )" }, "'3'", "3" );
@@ -463,6 +466,7 @@ public  void    test_smallint_bad_Short_Short()
     ///////////////////////////////////////////////////////////////////////////////////
 
     public  void    test_boolean_badreturn_byte_int()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4657
         throws Exception
     {
         declareAndFailFunction
@@ -532,6 +536,7 @@ public  void    test_longvarbinary_badreturn_bytes_bytes()
     ///////////////////////////////////////////////////////////////////////////////////
 
     public  void    test_boolean_amb_boolean_boolean()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
         throws Exception
     {
         declareAndFailFunction
@@ -647,6 +652,7 @@ public  void    test_double_amb_byte_double()
     ///////////////////////////////////////////////////////////////////////////////////
 
     public  void    test_boolean_unres_boolean()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
         throws Exception
     {
         declareAndFailFunction
@@ -732,6 +738,7 @@ public  void    test_double_unres_Double()
     ///////////////////////////////////////////////////////////////////////////////////
 
     public  void    test_wrapperOutputArgs()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4958
         throws Exception
     {
         Connection  conn = getConnection();
@@ -900,6 +907,7 @@ private String  doubleQuote( String raw )
      * Prepare a statement and report its sql text.
      */
     protected PreparedStatement   chattyPrepare( Connection conn, String text )
+//IC see: https://issues.apache.org/jira/browse/DERBY-4066
         throws SQLException
     {
         println( "Preparing statement:\n\t" + text );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiTrimTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiTrimTest.java
index f8de736a54..54a10a01ad 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiTrimTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AnsiTrimTest.java
@@ -57,6 +57,7 @@ public AnsiTrimTest(String name) {
      * o.a.dT.ft.tests.replicationTests.StandardTests.
      */
     public static void decorate(Statement s)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3163
     throws SQLException
     {
         s.executeUpdate("create table tt (id int, v varchar(16), c char(16), cl clob(10240))");
@@ -65,6 +66,7 @@ public static void decorate(Statement s)
         s.executeUpdate("insert into nt values (null)");
     }
    public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("AnsiTrimTest");
         suite.addTestSuite(AnsiTrimTest.class);
         return new CleanDatabaseTestSetup(suite) {
@@ -106,6 +108,7 @@ public void testTrimCharIsExpr()
         positiveTest(
                 "SELECT count(*) FROM tt  " +
                 "WHERE id = 1 AND (trim (leading substr(v,1,1) from v)) = 'bcaca'", 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         positiveTest(
                 "select trim (both (case when length(v) = 6 then 'a' else 'b' end) from v) from tt",
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ArithmeticTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ArithmeticTest.java
index 6483849529..1759ab6fe4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ArithmeticTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ArithmeticTest.java
@@ -52,6 +52,7 @@ public static Test suite(){
      * @throws SQLException 
      */
     public void testTypes() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5986
         String[] tableNames = { "smallint_r", "t", "bigint_r", "decimal_r" };
         String[] types = { "smallint", "int", BIGINT, DECIMAL };
         BigInteger[][] boundaries = {
@@ -87,6 +88,7 @@ public void testTypes() throws SQLException {
      * @throws SQLException 
      */
     private void doBasically(String tableName, String type)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5986
             throws SQLException {
         String sql = "create table " + tableName + "(i " + 
             type + ", j " + type + ")";
@@ -204,6 +206,7 @@ private void doBasically(String tableName, String type)
                     {"1", "101", "0", "0", "10"},
                     {"-2", "-102", "0", "0", "-10"}
                 };
+//IC see: https://issues.apache.org/jira/browse/DERBY-5986
         if (type.equals(DECIMAL)) {
             // With DECIMAL, the fraction part won't be truncated from i/j.
             result[1][3] = "0.100000000000000000000";
@@ -294,6 +297,7 @@ private void doBasically(String tableName, String type)
      * @throws SQLException 
      */
     private void doOverflow(String tableName, String type,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5986
             BigInteger negativeBoundary, BigInteger positiveBoundary)
         throws SQLException
     {
@@ -307,6 +311,7 @@ private void doOverflow(String tableName, String type,
         sql = "insert into " + tableName + " values (" 
                 + i + "," + positiveBoundary + ")";
         assertUpdateCount(st, 1, sql);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5986
 
         sql = "select i + j from " + tableName;
         assertStatementError("22003", st, sql);
@@ -321,6 +326,7 @@ private void doOverflow(String tableName, String type,
         assertStatementError("22003", st, sql);
 
         sql = "insert into " + tableName + " values "
+//IC see: https://issues.apache.org/jira/browse/DERBY-5986
                 + "(" + negativeBoundary + ", 0)";
         assertUpdateCount(st, 1, sql);
 
@@ -382,6 +388,7 @@ private void doOverflow(String tableName, String type,
             // arithmetic operation below won't lose precision when dividing
             // by two.
             final boolean negativeBoundaryIsEven = !negativeBoundary.testBit(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5986
 
             //different from arithmetic. This can support better test.
             sql = "select i / 2 * 2 - 1 from " + tableName;
@@ -423,6 +430,7 @@ private void doOverflow(String tableName, String type,
      * @throws SQLException 
      */
     private void doMixedTypeImpl(String tableName, String type,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5986
         BigInteger i) throws SQLException{
         String sql = "create table " + tableName 
             + " (y "  + type+ ")" ;
@@ -474,6 +482,7 @@ private void doMixedTypeImpl(String tableName, String type,
      * @throws SQLException
      */
     public void testMixedType() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5986
         String[] types = {"smallint", BIGINT, DECIMAL};
         String[] tableNames = {"smallint_r", "bigint_r", "decimal_r"};
         BigInteger[] testValues = {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AutoIncrementTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AutoIncrementTest.java
index 98513c69fa..5e3e2365a2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AutoIncrementTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AutoIncrementTest.java
@@ -121,6 +121,7 @@ private static void createSchemaObjects(Statement st)
 		st.execute("create table variantt2 (c21 int generated always as identity (start with 201, increment by 5), c22 int)");
 		st.execute("create trigger variantt1tr1 after insert on variantt1 for each row insert into variantt2 (c22) values (1)");
 		st.execute("create table restartt1 (rec11 int generated by default as identity(start with 2, increment by 2), c12 int)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6935
 		st.execute("create table cycle1 (rec21 int generated by default as identity(start with 2, increment by 2), c32 int)");
 		st.execute("create table t1lock(lockc11 int generated by default as identity (start with 1, increment by 1), c12 int)");
 		st.execute("create unique index t1locki1 on t1lock(lockc11)");
@@ -158,6 +159,7 @@ public void testderbyIncrementTest() throws Exception
 	{
 		ResultSet rs;
 		Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs = s.executeQuery("select COLUMNNAME, AUTOINCREMENTVALUE, AUTOINCREMENTSTART, AUTOINCREMENTINC from sys.syscolumns where COLUMNNAME in ('A_ZERO','A_ONE', 'A_TWO', 'A_THREE') order by COLUMNNAME");
 		String [][]expectedRows=
             {
@@ -219,6 +221,7 @@ public void testsimpleincrement() throws Exception
 		s.executeUpdate("insert into ai_short (i) values (1)");
 		s.executeUpdate("insert into ai_short (i) values (2)");
 		s.executeUpdate("insert into ai_short (i) values (33)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs = s.executeQuery("select * from ai_short order by i");
 		String[][]expectedRows=new String[][]{{"0","0"},{"1","2"},{"2","4"},{"33","6"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -254,6 +257,7 @@ public void testonegeneratedcolumn() throws Exception
 		ResultSet rs;
 		Statement s = createStatement();
 		Integer i= 1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		while (i.intValue()< 11)
 		{
@@ -266,8 +270,10 @@ public void testonegeneratedcolumn() throws Exception
 			mysql="insert into ai_single4 (i) values ("+i.toString()+")";
 			s.executeUpdate(mysql);
 			int j=i.intValue()+1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			i= j;
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs = s.executeQuery("select a.i, a0, a1, a2, a3 from ai_single1 a join ai_single2 b on a.i = b.i join ai_single3 c on a.i = c.i join ai_single4 d on a.i = d.i order by a.i");
 		String[][]expectedRows=new String[][]{{"1","-1","1","0","-100"},{"2","-2","2","1","-90"},
 				{"3","-3","3","2","-80"},{"4","-4","4","3","-70"},
@@ -381,6 +387,7 @@ public void testSchema() throws Exception
 		rs=s.executeQuery("select a.i, a1, a2 from app.tab3schema a join app.tab4schema b on a.i = b.i");
 		expectedRows=new String[][]{{"1","0","0"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select a.i, a1, a2 from tab1schema a join tab2schema b on a.i = b.i order by a.i");
 		expectedRows=new String[][]{{"1","100","100"},{"2","101","99"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -397,6 +404,7 @@ public void testSchema() throws Exception
 		s.executeUpdate("drop table BPP.tab4schema");
 		s.executeUpdate("drop schema BPP restrict");
 		s.executeUpdate("insert into tab3 values null");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from tab1 order by s1");
 		expectedRows=new String[][]{{"1","1"},{"2","2"},{"3","3"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -404,6 +412,7 @@ public void testSchema() throws Exception
 		s.executeUpdate("create table tab2 (lvl int, s1  bigint generated always as identity)");
 		s.executeUpdate("create trigger tab1_after2 after insert on tab3 referencing new as newrow for each row insert into tab2 (lvl) values 1,2,3");
 		s.executeUpdate("insert into tab3 values null");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from tab2 order by lvl");
 		expectedRows=new String[][]{{"1","1"},{"2","2"},{"3","3"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -428,6 +437,7 @@ public void testadditionalSysCol() throws Exception
 		s.executeUpdate("insert into t1_2 (x) values (1),(2),(3),(4),(5)");
 		s.executeUpdate("insert into t2_2 (x) values (1),(2),(3),(4),(5)");		
 		s.executeUpdate("insert into t3_2 (x) values (1),(2),(3),(4),(5)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select a.x, s1, s2, s0 from t1_2 a join t2_2 b on a.x = b.x join t3_2 c on a.x = c.x order by a.x");
 		expectedRows=new String[][]{{"1","1","2","0"},{"2","2","3","1"},{"3","3","4","2"},{"4","4","5","3"},{"5","5","6","4"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -439,6 +449,7 @@ public void testadditionalSysCol() throws Exception
 		s.executeUpdate("insert into trigtest (lvl) values (3),(4)");
 		s.executeUpdate("insert into trigtest (lvl) values (5),(6)");
 		s.executeUpdate("insert into trigtest (lvl) values (7),(8)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from trigtest order by s1");
 		expectedRows=new String[][]{{"1","0"},{"2","1"},{"3","2"},{"4","3"},{"5","4"},{"6","5"},{"7","6"},{"8","7"},{"9","8"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -451,6 +462,7 @@ public void testadditionalSysCol() throws Exception
 		s.executeUpdate("insert into t1_2 (x) values (1),(2),(3),(4),(5)");
 		s.executeUpdate("insert into t2_2 (x) values (1),(2),(3),(4),(5)");
 		s.executeUpdate("insert into t3_2 (x) values (1),(2),(3),(4),(5)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select a.x, s1, s2, s0 from t1_2 a join t2_2 b on a.x = b.x join t3_2 c on a.x = c.x order by a.x");
 		expectedRows=new String[][]{{"1","6","7","5"},{"2","7","8","6"},{"3","8","9","7"},{"4","9","10","8"},{"5","10","11","9"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -468,6 +480,7 @@ public void testadditionalSysCol() throws Exception
 		s.executeUpdate("insert into t1_2 (x) values (1),(2),(3),(4),(5)");
 		s.executeUpdate("insert into t2_2 (x) values (1),(2),(3),(4),(5)");
 		s.executeUpdate("insert into t3_2 (x) values (1),(2),(3),(4),(5)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select a.x, s1, s2, s0 from t1_2 a join t2_2 b on a.x = b.x join t3_2 c on a.x = c.x order by a.x");
 		expectedRows=new String[][]{{"1","12","13","11"},{"2","13","14","12"},{"3","14","15","13"},{"4","15","16","14"},{"5","16","17","15"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -489,6 +502,7 @@ public void testsyslocks()throws Exception
 		setAutoCommit(false);
 		s.execute("insert into lockt1 (x) values (1)");
 		s.execute("insert into lockt1 (x) values (2)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from lockt1 order by x");
 		String[][]expectedRows=new String[][]{{"1","0"},{"2","1"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -542,6 +556,7 @@ public void testColoumnSpecs() throws Exception
 		s.executeUpdate("insert into t1_col (x) values null");
 		//-- switch the order of the columns
 		s.executeUpdate("insert into t1_col (y, x) values (default, 'cc')");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from t1_col order by y");
 		String[][]expectedRows=new String[][]{{"aa","1"},{"bb","2"},{"yy","3"},{null,"4"},{"cc","5"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -559,6 +574,7 @@ public void testbug3450() throws Exception
 		ps.execute();
 		ps.setString(1, "three");;
 		ps.execute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from testme order by autonum");
 		String[][]expectedRows=new String[][]{{"one","1"},{"two","2"},{"three","3"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -568,6 +584,7 @@ public void testbug3450() throws Exception
 		ps.execute();
 		ps.setString(1, "four");
 		ps.execute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from testme order by autonum");
 		expectedRows=new String[][]{{"one","1"},{"two","2"},{"three","3"},{"four","4"},{"four","5"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -603,6 +620,7 @@ public void testnegativeinvalidtype() throws Exception
 		assertStatementError("42X49", pst,"create table ni (x int, y int generated always as identity (start with  9223372036854775808))");
 		assertStatementError("42X49", pst,"create table ni (x int, y bigint  generated always as identity (start with  -9223372036854775809))");
 		s.executeUpdate("insert into ai_neg (y) values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9),(10)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from ai_neg order by x");
 		String[][]expectedRows=new String[][]{{"1","0"},{"2","1"},{"3","2"},{"4","3"},{"5","4"},{"6","5"},{"7","6"},{"8","7"},{"9","8"},{"10","9"},{"11","10"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -636,6 +654,7 @@ public  void testOverflow()throws Exception
 		s.executeUpdate("insert into ai_over2 (x) values (1),(2),(3),(4),(5),(6),(7),(8)");
 		assertStatementError("2200H", pst,"insert into ai_over2 (x) values (9),(10)");
 		String[][]expectedRows=new String[][]{{"1","-32760"},{"2","-32761"},{"3","-32762"},{"4","-32763"},{"5","-32764"},{"6","-32765"},{"7","-32766"},{"8","-32767"}};
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from ai_over2 order by x");
 		JDBC.assertFullResultSet(rs,expectedRows);		
 		s.executeUpdate("insert into ai_over3 (x) values (1)");
@@ -702,6 +721,7 @@ public void testIdentity()throws Exception
                 expectedRows);
         assertUpdateCount(pst, 0, "alter table base drop column y");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=pst.executeQuery("select * from base order by x");
         expectedRows = new String[][]{{"1"},{"2"},{"3"},{"4"},{"5"},{"6"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -713,6 +733,7 @@ public void testIdentity()throws Exception
 		expectedRows=new String[][]{{"2","0"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
 		s.executeUpdate("insert into idt1(c2) values (IDENTITY_VAL_LOCAL())");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from idt1 order by c1");
 		expectedRows=new String[][]{{"1","8"},{"2","1"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -726,6 +747,7 @@ public void testIdentity()throws Exception
 		rs=s.executeQuery("values IDENTITY_VAL_LOCAL()");
 		expectedRows=new String[][]{{"2"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from idt1 order by c1");
 		expectedRows=new String[][]{{"1","8"},{"2","1"},{"3","8"},{"4","9"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -767,6 +789,7 @@ public void testdefaultautoincrement() throws Exception
 		assertStatementError("42Z23", pst,"insert into autoinct1 values (default), (default), (2)");
 		assertStatementError("42Z23", pst,"insert into autoinct1 values (default), (default), (2), (default)");
 		s.executeUpdate("insert into autoinct1 values (default), (default)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from autoinct1 order by c1");
 		expectedRows=new String[][]{{"1"},{"2"},{"3"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -792,6 +815,7 @@ public void testdefaultautoincrement() throws Exception
 		expectedRows=new String[][]{{"1"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
 		s.executeUpdate("insert into autoinct3 values (default)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from autoinct3 order by c1");
 		expectedRows=new String[][]{{"1"},{"4"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -802,6 +826,7 @@ public void testdefaultautoincrement() throws Exception
 		assertStatementError("42Z23",pst,"insert into autoinct3 values (default), (default), (2), (default)");
 		assertStatementError("42Z23",pst,"insert into autoinct3 select * from autoinct1");
 		s.executeUpdate("insert into autoinct3 values (default), (default)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from autoinct3 order by c1");
 		expectedRows=new String[][]{{"1"},{"4"},{"7"},{"10"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -826,6 +851,7 @@ public void testwithIncrement()throws Exception
 		Statement pst=createStatement();
 		s.execute("insert into withinct1(i) values(1)");
 		s.execute("insert into withinct1(i) values(1)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from withinct1 order by withinct1_autogen");
 		String[][]expectedRows=new String[][]{{"1","1"},{"1","2"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -846,6 +872,7 @@ public void testwithIncrement()throws Exception
 		s.execute("insert into withinctempt2(i,withinct2_autogen) values(2,2)");		
 		s.execute("insert into withinctempt2(i) values(2)");
 		s.execute("insert into withinctempt2(i) values(2)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from withinctempt2 order by withinct2_autogen, i");
 		expectedRows=new String[][]
             {
@@ -894,6 +921,7 @@ public void testunique()throws Exception
 		s.execute("insert into uniquet1(i) values(1)");
 		s.execute("insert into uniquet1(i) values(1)");
 		String[][]expectedRows=new String[][]{{"1","100"},{"1","120"}};
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from uniquet1 order by t1_autogen");
 		JDBC.assertFullResultSet(rs,expectedRows);
 		s.execute("insert into uniquet2(i) values(1)");
@@ -907,6 +935,7 @@ public void testunique()throws Exception
 		s.execute("insert into uniquetempt1(i) values(2)");
 		s.execute("insert into uniquetempt1(i) values(2)");
 		expectedRows=new String[][]{{"2","100"},{"2","120"}};
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from uniquetempt1 order by t1_autogen");
 		JDBC.assertFullResultSet(rs,expectedRows);
 		
@@ -923,6 +952,7 @@ public void testunique()throws Exception
 		assertStatementError("23505",s,"insert into uniquet3(i) values(3)");
 		assertStatementError("23505",s,"insert into uniquet3(i) values(4)");
 		s.execute("insert into uniquet3(i) values(5)");		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select i,uniquet3_autogen from uniquet3 order by i");
 		//Utilities.showResultSet(rs);
 
@@ -936,6 +966,7 @@ public void testunique()throws Exception
 		assertStatementError("23505",s,"insert into uniquet4(i) values(3)");
 		assertStatementError("23505",s,"insert into uniquet4(i) values(4)");
 		s.execute("insert into uniquet4(i) values(5)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select i,uniquet4_autogen from uniquet4 order by i");
 		expectedRows=new String[][]{{"1","0"},{"2","1"},{"5","2"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
@@ -997,6 +1028,7 @@ public void testidvalVariants()throws Exception
 		String[][]expectedRows=new String[][]{{"101"}};
 		JDBC.assertFullResultSet(rs,expectedRows);
 		rs=s.executeQuery("select * from variantt1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		expectedRows=new String[][]
             {
                 {"101","1"}
@@ -1025,6 +1057,7 @@ public void testrestart()throws Exception
 		expectedRows=new String[][]{{"REC11","2","2","2"}};									  
 		JDBC.assertFullResultSet(rs,expectedRows);
 		s.execute("insert into restartt1(c12) values(9999)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from restartt1 order by c12");
 		expectedRows=new String[][]
             {
@@ -1046,12 +1079,14 @@ public void testrestart()throws Exception
 	// added by DERBY-6903:
 	//
 	public void testDerby6903AlterCycleSimple()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6935
 			throws Exception
 	{
 		Statement s=createStatement();
 		ResultSet rs;
 
 		s.execute("alter table cycle1 alter column rec21 set CYCLE");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6959
 
 		rs=s.executeQuery("select COLUMNNAME, AUTOINCREMENTVALUE, AUTOINCREMENTSTART, AUTOINCREMENTINC, AUTOINCREMENTCYCLE " +
 				"       from sys.syscolumns where COLUMNNAME = 'REC21'");
@@ -1097,6 +1132,7 @@ public void testDerby6904AlterCycleSimple()
 		assertStatementError("42X01",s,"alter table restartt1 alter column c12 restart with cycle");
 
         // c12 is not an autoincrement column:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6959
 		assertStatementError("42837",s,"alter table restartt1 alter column c12 set cycle");
 		assertStatementError("42837",s,"alter table restartt1 alter column c12 set no cycle");
 
@@ -1108,6 +1144,7 @@ public void testDerby6904AlterCycleSimple()
 		JDBC.assertFullResultSet(rs,expectedRows);
 
         s.execute("alter table restartt1 alter column rec11 set cycle");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6959
 
 		rs=s.executeQuery("select COLUMNNAME, AUTOINCREMENTCYCLE " +
                           "       from sys.syscolumns where COLUMNNAME = 'REC11'");
@@ -1248,6 +1285,7 @@ public void TESTD1644()throws Exception
 		s.execute("insert into D1644 (d1644c2, d1644c1) values (27, 28), (default, 29), (30, 31)");
 		s.execute("insert into D1644 (d1644c2) values default, default, default, default");
 		s.execute("insert into D1644 (d1644c2, d1644c1) values (default, 128),(default, 129),(default, 131)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from D1644 order by d1644c1, d1644c2");
 		String[][]expectedRows=new String[][]
             {
@@ -1321,6 +1359,7 @@ public void testDerby2902()throws Exception
 		s.execute("insert into d4006 values default");
 		s.execute("alter table d4006 alter column x with default 'def'");
 		s.execute("insert into d4006 values default");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6500
 		rs=s.executeQuery("select * from d4006 order by x");
 		String[][]expectedRows=new String[][]
             {
@@ -1333,12 +1372,16 @@ public void testDerby2902()throws Exception
 		assertStatementError("42XA7",s,"alter table d4006 alter column y default 42");
 		assertStatementError("42XA7",s,"alter table d4006 alter column y default null");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6545
 		assertStatementError( "42XA7", s, "alter table d4006_a alter column z default 99" );
 		assertStatementError( "42XA7", s, "alter table d4006_a alter column z default null" );
 	}
 	
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5687
+//IC see: https://issues.apache.org/jira/browse/DERBY-4437
 		return new CleanDatabaseTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new BaseTestSuite(AutoIncrementTest.class, "AutoIncrementTest")) {
 			protected void decorateSQL(Statement s)
 			throws SQLException
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AwareVTITest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AwareVTITest.java
index 75df0c2045..ec203ff7f4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AwareVTITest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/AwareVTITest.java
@@ -76,6 +76,7 @@ public AwareVTITest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             AwareVTITest.class);
         Test        result = new CleanDatabaseTestSetup( suite );
@@ -139,6 +140,7 @@ private void    vetBasic( Connection conn, String schema, String function ) thro
     public void test_02_StringColumnVTI() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
 
         String[][]  rows = new String[][]
             {
@@ -174,6 +176,7 @@ public void test_02_StringColumnVTI() throws Exception
     public void test_03_ArchiveVTI() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
 
         goodStatement
             (
@@ -242,6 +245,7 @@ public  static  class   UnnamedColumnsVTI    extends StringArrayVTI
     {
         public  UnnamedColumnsVTI( String[][] rows )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
             super( null, rows );
         }
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java
index d0ca1e0108..4c7a0009ca 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java
@@ -254,10 +254,12 @@ private void validSingleRow(String[] exected, boolean[] useClob, ResultSet rs)
 
     public void tearDown() throws Exception {
         dropTable(BIG_TABLE_NAME);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5710
         super.tearDown();
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("BigDataTest");
         suite.addTest(TestConfiguration.defaultSuite(BigDataTest.class));
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java
index b5f3a7c375..53e93f8a19 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java
@@ -81,6 +81,7 @@ public BooleanValuesTest(String name)
     {
         super(name);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4674
         _supportsXML = XML.classpathMeetsXMLReqs();
     }
 
@@ -96,6 +97,7 @@ public BooleanValuesTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test result = (BaseTestSuite)TestConfiguration.defaultSuite(
             BooleanValuesTest.class);
 
@@ -122,6 +124,7 @@ protected void    setUp()
         if ( !tableExists( conn, "ALL_TYPES" ) )
         {
             StringBuffer buffer;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4674
 
             //
             // create table
@@ -149,10 +152,12 @@ protected void    setUp()
                  "    time_col  TIME,\n" +
                  "    timestamp_col  TIMESTAMP,\n" +
                  "    varchar_col  VARCHAR(10),\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4674
                 "    varchar_for_bit_data_col  VARCHAR (10) FOR BIT DATA\n"
                  );
             if ( _supportsXML )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4658
                 buffer.append( "    ,xml_col  XML\n" );
             }
             buffer.append( ")\n" );
@@ -184,6 +189,7 @@ protected void    setUp()
                  "    time_col,\n" +
                  "    timestamp_col,\n" +
                  "    varchar_col,\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4674
                  "    varchar_for_bit_data_col\n"
                  );
             if ( _supportsXML )
@@ -213,6 +219,7 @@ protected void    setUp()
                  "    time('15:09:02'),\n" +
                  "    timestamp('1962-09-23 03:23:34.234'),\n" +
                  "    '0',\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4674
                  "    X'DE'\n"
                  );
             if ( _supportsXML )
@@ -241,6 +248,7 @@ protected void    setUp()
                  "    time('15:09:02'),\n" +
                  "    timestamp('1962-09-23 03:23:34.234'),\n" +
                  "    '1',\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4674
                  "    X'DE'\n"
                  );
             if ( _supportsXML )
@@ -269,6 +277,7 @@ protected void    setUp()
                  "    time('15:09:02'),\n" +
                  "    timestamp('1962-09-23 03:23:34.234'),\n" +
                  "    '2',\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4674
                  "    X'DE'\n"
                   );
             if ( _supportsXML )
@@ -297,6 +306,7 @@ protected void    setUp()
                  "    time('15:09:02'),\n" +
                  "    timestamp('1962-09-23 03:23:34.234'),\n" +
                  "    'baffle',\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4674
                  "    X'DE'\n"
                  );
             if ( _supportsXML )
@@ -310,6 +320,7 @@ protected void    setUp()
             goodStatement( conn, buffer.toString() );
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4658
         if ( !tableExists( conn, "BOOLEANSTRING" ) )
         {
             //
@@ -396,6 +407,7 @@ protected void    setUp()
                  );
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
         if ( !routineExists( conn, "BOOLEANVALUE" ) )
         {
             //
@@ -410,6 +422,7 @@ protected void    setUp()
                  );
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4716
         if ( !tableExists( conn, "BOOLEAN_TABLE" ) )
         {
             //
@@ -473,6 +486,7 @@ public void test_01_datatypeCount() throws Exception
         while ( rs.next() ) { actualTypeCount++; }
         rs.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
         assertEquals( 22, actualTypeCount );
     }
 
@@ -543,6 +557,7 @@ public void test_05_undefinedIllegalOutliers() throws Exception
         // We don't test the XML datatype on JDK 1.4 because the Xalan
         // packages are in the wrong location there.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4674
         if ( _supportsXML )
         {
             expectCompilationError
@@ -697,6 +712,7 @@ private void vetBadImplicitCastFromBoolean( Connection conn, String columnName )
     public void test_07_booleanLiterals() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4583
 
         assertResults
             (
@@ -728,6 +744,7 @@ public void test_07_booleanLiterals() throws Exception
     public void test_08_stringCasts() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4658
 
         assertResults( conn, "values ( cast( 'true' as boolean ) )", new String[][] { { "true" } }, false );
         assertResults( conn, "values ( cast( 'false' as boolean ) )", new String[][] { { "false" } }, false );
@@ -830,6 +847,7 @@ public void test_09_explicitCasts() throws Exception
              false
              );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
         assertResults
             (
              conn,
@@ -901,6 +919,7 @@ public void vet4704()
 
     public void test_10_nullabilityOfCastFromLiteral() throws SQLException {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4658
 
         ResultSet rs = s.executeQuery("values cast('true' as boolean)");
         JDBC.assertNullability(rs, new boolean[] { false });
@@ -939,6 +958,7 @@ public void test_10_nullabilityOfCastFromLiteral() throws SQLException {
     public void test_11_booleanFunctionParameters() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
 
         assertResults
             (
@@ -981,6 +1001,7 @@ private void assertScalarResult( PreparedStatement ps, String result ) throws Ex
     public void test_12_booleanColumns() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4716
 
         goodStatement( conn, "insert into boolean_table( key_col, boolean_col ) values ( 0, true ), ( 1, false ), ( 2, null )" );
         assertResults
@@ -1073,6 +1094,7 @@ private void vetStringInsert( Connection conn, String columnName ) throws Except
     public void test_13_sortOrder() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4716
 
         goodStatement( conn, "create table booleanUnindexed( a boolean )" );
         goodStatement( conn, "create table booleanIndexed( a boolean )" );
@@ -1115,6 +1137,7 @@ public void test_13_sortOrder() throws Exception
     public void test_14_defaults() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4716
 
         goodStatement( conn, "create table booleanDefaults( a int, b boolean default true, c boolean default false, d boolean default null )" );
         goodStatement( conn, "insert into booleanDefaults( a ) values ( 0 )" );
@@ -1158,6 +1181,7 @@ public void test_14_defaults() throws Exception
     public void test_15_selectList() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4720
 
         assertResults
             (
@@ -1190,6 +1214,7 @@ public void test_15_selectList() throws Exception
     public void test_16_alterTable() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4716
 
         goodStatement( conn, "create table booleanAlter( a int )" );
         goodStatement( conn, "insert into booleanAlter( a ) values ( 0 ), ( 1 ), ( 2 )" );
@@ -1531,6 +1556,7 @@ public void test_21_triggers() throws Exception
      */
     public void test_22_binary_operators() throws SQLException {
         setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5971
 
         // Create a table with two columns containing all combinations of
         // legal boolean values.
@@ -1675,6 +1701,7 @@ public void test_22_binary_operators() throws SQLException {
      */
     public void test_23_select_distinct() throws SQLException {
         setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5971
 
         Statement s = createStatement();
         assertUpdateCount(s, 6, "insert into boolean_table(boolean_col) "
@@ -1778,6 +1805,7 @@ private void minion_4889( Connection conn, int value, boolean expectedBooleanRes
 
         ps.setInt( 1, 5 );
         ps.setString( 2, "setObject( Byte )" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         ps.setObject( 3, (byte) value );
         ps.execute();
 
@@ -2059,6 +2087,7 @@ public void test_5063_updateBytes() throws SQLException {
     public void test_5918() throws Exception
     {
         setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5918
 
         Statement s = createStatement();
         s.execute("create table derby5918_1(b boolean)");
@@ -2189,11 +2218,13 @@ public void test_6363() throws SQLException {
 
     public static Blob makeSimpleBlob() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4932
         return new HarmonySerialBlob( new byte[] { 1 } );
     }
     
     public static String booleanValue( Boolean b )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4659
         if ( b == null ) { return "Null value"; }
         else if ( b.booleanValue() ) { return "True value"; }
         else { return "False value"; }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Bug5054Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Bug5054Test.java
index 131895ec85..d265ecb684 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Bug5054Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Bug5054Test.java
@@ -58,6 +58,7 @@ protected void initializeConnection(Connection conn) throws SQLException {
      *         run.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Bug5054Test");
         Test test = new CleanDatabaseTestSetup(TestConfiguration
                 .embeddedSuite(Bug5054Test.class)) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CaseExpressionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CaseExpressionTest.java
index ba4d8f8a4d..f9f0c8f094 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CaseExpressionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CaseExpressionTest.java
@@ -273,6 +273,7 @@ public void testBooleanExpressions() throws SQLException {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)
             TestConfiguration.embeddedSuite(CaseExpressionTest.class);
 
@@ -300,6 +301,7 @@ private void testCaseExpressionQuery(Statement st,
         int row;
 
         for (colType = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
             colType < SQLUtilities.SQLTypes.length;
             colType++)
         {
@@ -524,6 +526,7 @@ public void testParameters() throws SQLException {
      */
     public void testUntypedNulls() throws SQLException {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6566
 
         // Before DERBY-2002, Derby accepted a CASE expression to have an
         // untyped NULL in all the result branches. Verify that an error
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CastingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CastingTest.java
index 7384586c4e..4de640efdd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CastingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CastingTest.java
@@ -96,6 +96,7 @@ public CastingTest(String name) {
     public static int BLOB_OFFSET = 16;
 
     public static int[] jdbcTypes = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2523
         java.sql.Types.SMALLINT,
         java.sql.Types.INTEGER,
         java.sql.Types.BIGINT,
@@ -299,6 +300,7 @@ public CastingTest(String name) {
         new TypedColumn( "varcharCol", "varchar( 5 )", true ),
         new TypedColumn( "longVarcharCol", "long varchar", false ),
         new TypedColumn( "clobCol", "clob", false ),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
         new TypedColumn( "booleanCol", "boolean", true ),
     };
     
@@ -325,6 +327,7 @@ public CastingTest(String name) {
     protected void setUp() throws SQLException {
         Statement scb = createStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
         for (int type = 0; type < SQLUtilities.SQLTypes.length; type++) {
             String typeName = SQLUtilities.SQLTypes[type];
             String tableName = getTableName(type);
@@ -353,6 +356,7 @@ protected void setUp() throws SQLException {
                 }
             }
         scb.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
         commit();
     }
 
@@ -392,6 +396,7 @@ && isNotStorableException(se)
             }
 
         scb.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
         commit();
     }
 
@@ -401,6 +406,7 @@ public void testExplicitCasts() throws SQLException {
 
         // Try Casts from each type to the
         for (int sourceType = 0; sourceType < SQLUtilities.SQLTypes.length; sourceType++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
 
             String sourceTypeName = SQLUtilities.SQLTypes[sourceType];
             //System.out.print("/*" + sourceTypeName + "*/ {");
@@ -416,16 +422,20 @@ public void testExplicitCasts() throws SQLException {
                         // For casts from Character types use strings that can
                         // be converted to the targetType.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
                         String convertString = getCompatibleString(sourceType,
                                 targetType, dataOffset);
 
                         String query =
                             "VALUES CAST (CAST (" + convertString + " AS "
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
                                 + SQLUtilities.SQLTypes[sourceType] + ") AS "
                                 + SQLUtilities.SQLTypes[targetType] + " )";
                         ResultSet rs = s.executeQuery(query);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
                         rs.next();
                         String val = rs.getString(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2523
                         ResultSetMetaData rsmd = rs.getMetaData();
                         assertEquals(rsmd.getColumnType(1), jdbcTypes[targetType]);
                         rs.close();
@@ -492,6 +502,7 @@ public void testExplicitCasts() throws SQLException {
         }
 
         commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
 
     }
 
@@ -501,6 +512,8 @@ public void testComparisons() throws SQLException {
 
         // Comparison's using literals
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
         for (int type = 0; type < SQLUtilities.SQLTypes.length; type++) {
             try {
                 int dataOffset = 1; // don't use null values
@@ -509,9 +522,11 @@ public void testComparisons() throws SQLException {
                 String compareSQL = "SELECT distinct c FROM " + tableName
                         + " WHERE c = " + SQLData[type][dataOffset];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
                 ResultSet rs = scb.executeQuery(compareSQL);
                 //JDBC.assertDrainResults(rs);
                 // should return 1 row
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
                 assertTrue(rs.next());
                 rs.close();
             } catch (SQLException se) {
@@ -522,6 +537,8 @@ public void testComparisons() throws SQLException {
 
         // Try to compare each sourceType with the targetType
         for (int dataOffset = 0; dataOffset < SQLData[0].length; dataOffset++)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
             for (int sourceType = 0; sourceType < SQLUtilities.SQLTypes.length; sourceType++) {
                 String sourceTypeName = SQLUtilities.SQLTypes[sourceType];
                 for (int targetType = 0; targetType < SQLUtilities.SQLTypes.length; targetType++) {
@@ -530,6 +547,7 @@ public void testComparisons() throws SQLException {
 
                         // For assignments Character types use strings that can
                         // be converted to the targetType.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
                         String convertString = getCompatibleString(sourceType,
                                 targetType, dataOffset);
 
@@ -546,6 +564,7 @@ public void testComparisons() throws SQLException {
                                 + sourceTypeName + ")";
 
                     
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
                         ResultSet rs = scb.executeQuery(compareSQL);
                         JDBC.assertDrainResults(rs);
                         
@@ -562,6 +581,7 @@ && isNotComparableException(se)
             }
         scb.close();
         commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
 
     }
 
@@ -1095,7 +1115,9 @@ public void testDateTimeToTimestamp() throws SQLException {
 
     protected void tearDown() throws SQLException, Exception {
         Statement scb = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
         for (int type = 0; type < SQLUtilities.SQLTypes.length; type++) {
             String typeName = SQLUtilities.SQLTypes[type];
             String tableName = getTableName(type);
@@ -1106,6 +1128,7 @@ protected void tearDown() throws SQLException, Exception {
         }
 
         scb.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2382
         commit();
         super.tearDown();
     }
@@ -1132,6 +1155,7 @@ private static String getTableName(int type) {
      */
 
     private static String getShortTypeName(int type) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
         String typeName = SQLUtilities.SQLTypes[type];
         String shortName = typeName;
         int parenIndex = typeName.indexOf('(');
@@ -1203,6 +1227,7 @@ private static boolean isNotComparableException(SQLException se) {
     }
 
     private static void checkSupportedCast(int sourceType, int targetType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
         String description = " Cast from " + SQLUtilities.SQLTypes[sourceType] + " to "
                 + SQLUtilities.SQLTypes[targetType];
 
@@ -1220,6 +1245,7 @@ private static void checkSupportedAssignment(int sourceType, int targetType) {
     }
 
     private static void checkSupportedComparison(int sourceType, int targetType) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
         String description = " Comparison of " + SQLUtilities.SQLTypes[sourceType] + " to "
                 + SQLUtilities.SQLTypes[targetType];
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8Test.java
index 4d38f706cb..006a58e533 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CharUTF8Test.java
@@ -59,6 +59,7 @@ protected void initializeConnection(Connection conn) throws SQLException {
 	 *         run.
 	 */
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new CleanDatabaseTestSetup(
             new BaseTestSuite(CharUTF8Test.class)) {
 
@@ -77,6 +78,7 @@ protected void setUp() throws Exception {
 	protected void tearDown() throws Exception {
         // Forget the statements to allow them to be gc'ed. They will be
         // closed in super.tearDown().
+//IC see: https://issues.apache.org/jira/browse/DERBY-5707
         psSet = null;
         psGet = null;
 		super.tearDown();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CheckConstraintTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CheckConstraintTest.java
index 4ae245ac53..4f488a7cbe 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CheckConstraintTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CheckConstraintTest.java
@@ -48,6 +48,7 @@ public CheckConstraintTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("checkConstraint Test");
         suite.addTest(TestConfiguration.defaultSuite(CheckConstraintTest.class));
 
@@ -59,6 +60,7 @@ public static Test suite()
     public void testNotAllowedInCheckConstraints() throws Exception
     {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         Statement st = createStatement();
         setAutoCommit(false);
         
@@ -111,6 +113,7 @@ public void testNotAllowedInCheckConstraints() throws Exception
         
         // alter table t1 drop constraint asdf
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         rollback();
         
         // alter table t1 drop constraint asdf forward references 
@@ -123,6 +126,7 @@ public void testNotAllowedInCheckConstraints() throws Exception
             " create table neg2(c1 int constraint asdf check(c2 "
             + "= 1), c2 int)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         rollback();
     }
     public void testCheckConstraints() throws SQLException{
@@ -150,6 +154,7 @@ public void testCheckConstraints() throws SQLException{
         assertStatementError("23513", st,
             " insert into pos1 values 10");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         ResultSet rs = st.executeQuery("select * from pos1");
         
         String[] expColNames = {"C1"};
@@ -198,6 +203,7 @@ public void testCheckConstraints() throws SQLException{
         
         JDBC.assertFullResultSet(rs, expRS, true);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         rollback();
         
         // conflicting constraints, should fail
@@ -222,6 +228,7 @@ public void testCheckConstraints() throws SQLException{
         assertStatementError("23513", st,
             "insert into negcks values (2, 3, 3)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         rollback();
         
         // same source and target tables
@@ -233,6 +240,7 @@ public void testCheckConstraints() throws SQLException{
         st.executeUpdate(
             " insert into pos1 values (1, 2), (2, 3), (3, 4)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         commit();
         // these should work
         
@@ -274,6 +282,7 @@ public void testCheckConstraints() throws SQLException{
         
         JDBC.assertFullResultSet(rs, expRS, true);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         rollback();
         
         // these should fail
@@ -316,6 +325,7 @@ public void testCheckConstraints() throws SQLException{
         st.executeUpdate(
             " drop table pos1");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         commit();
         // union under insert
         
@@ -389,6 +399,7 @@ public void testCheckConstraints() throws SQLException{
         
         JDBC.assertFullResultSet(rs, expRS, true);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         rollback();
     }
     
@@ -409,6 +420,7 @@ public void testPositionalUpdate() throws SQLException{
         st.executeUpdate(
             " create index i1 on t1(c1)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         Statement st1 = createStatement();
         st1.setCursorName("c1");
         ResultSet rs1 = st1.executeQuery(
@@ -426,6 +438,7 @@ public void testPositionalUpdate() throws SQLException{
         st1.close();
         rs1.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         Statement st2 = createStatement();
         st2.setCursorName("c2");
         ResultSet rs2 = st2.executeQuery(
@@ -442,6 +455,7 @@ public void testPositionalUpdate() throws SQLException{
         st2.close();
         rs2.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         Statement st3 = createStatement();
         st3.setCursorName("c3");
         ResultSet rs3 = st3.executeQuery(
@@ -463,6 +477,7 @@ public void testPositionalUpdate() throws SQLException{
         st3.close();
         rs3.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         ResultSet rs = st.executeQuery("select * from t1");
         
         String[] expColNames = {"C1", "C2"};
@@ -477,6 +492,7 @@ public void testPositionalUpdate() throws SQLException{
         
         JDBC.assertFullResultSet(rs, expRS, true);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         rollback();
         
         // complex expressions
@@ -520,6 +536,7 @@ public void testPositionalUpdate() throws SQLException{
         
         JDBC.assertFullResultSet(rs, expRS, true);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         rollback();
     }
     
@@ -564,6 +581,7 @@ public void testBuiltInFunctions() throws SQLException{
         assertStatementError("23513", st,
             "insert into maxIntTab values 2147483647");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         rollback();
         
         // verify that inserts, updates and statements with forced 
@@ -575,6 +593,7 @@ public void testBuiltInFunctions() throws SQLException{
         st.executeUpdate(
             " insert into t1 values 1, 2, 3, 4, 5");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         commit();
         
         PreparedStatement pSt1 = prepareStatement(
@@ -593,6 +612,7 @@ public void testBuiltInFunctions() throws SQLException{
         assertStatementError("23505", pSt2);
 
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         ResultSet rs = pSt3.executeQuery();
         
         String[] expColNames = {"C1"};
@@ -614,6 +634,7 @@ public void testBuiltInFunctions() throws SQLException{
         // rollback and verify that constraints are enforced and 
         // select succeeds
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         rollback();
         
         assertStatementError("23505", pSt1);
@@ -646,6 +667,7 @@ public void testBuiltInFunctions() throws SQLException{
         st.executeUpdate(
             "create table t1(c1 int constraint asdf check(c1 = 1))");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         PreparedStatement pSt = prepareStatement(
             "insert into t1 values (?)");
         
@@ -730,6 +752,7 @@ public void testBuiltInFunctions() throws SQLException{
             {"C"}
         };
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4908
         JDBC.assertUnorderedResultSet(rs, expRS, true);
         
         assertStatementError("42Y55", st,
@@ -815,10 +838,12 @@ public void testBuiltInFunctions() throws SQLException{
         JDBC.assertFullResultSet(rs, expRS, true);
         
         // Cleanup:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4392
         st.executeUpdate("drop table t4");
         st.executeUpdate("drop table t3");
         st.executeUpdate("drop table t2");
         st.executeUpdate("drop table t1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         commit();
         
         // DERBY-2989
@@ -860,6 +885,7 @@ public void testJira4282() throws SQLException
             return;
 
         Statement st = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
 
         st.executeUpdate(
             "create table t4282(c1 int, c2 int, constraint ck1 "
@@ -884,6 +910,7 @@ public void testJira4282() throws SQLException
         st1.close();
         st.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5106
         dropTable("t4282");
     }
     // This test verifies that if the PRIMARY KEY constraint mentions a
@@ -893,6 +920,7 @@ public void testJira4282() throws SQLException
     public void testPrimaryKeyPageSizeDerby3947()
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5712
         Statement st = createStatement();
         st.executeUpdate("create table d3947 (x varchar(1000) primary key)");
         char[] chars = new char[994];
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CoalesceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CoalesceTest.java
index 20cb04b16e..3032d5c3be 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CoalesceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CoalesceTest.java
@@ -167,6 +167,7 @@ public class CoalesceTest extends BaseJDBCTestCase
         "create table tD (c1 int, c2 char(254))",
         "create table tB (c1 char(254), c2 char(40), vc1 varchar(253), vc2 varchar(2000), lvc1 long varchar, lvc2 long varchar, clob1 CLOB(200), clob2 CLOB(33K))",
         "create table tC (cbd1 char(254) for bit data, cbd2 char(40) for bit data, vcbd1 varchar(253) for bit data, vcbd2 varchar(2000) for bit data, lvcbd1 long varchar for bit data, lvcbd2 long varchar for bit data, blob1 BLOB(200), blob2 BLOB(33K))",	
+//IC see: https://issues.apache.org/jira/browse/DERBY-2016
         "create table tAggr (i int)"
     };
 
@@ -215,6 +216,7 @@ protected void decorateSQL(Statement stmt) throws SQLException
 
     public void testCoalesceSyntax() throws Throwable
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         Statement s = createStatement();
         s.executeUpdate("insert into tA (c1) values(1)");
 
@@ -235,6 +237,7 @@ public void testCoalesceSyntax() throws Throwable
         s.executeUpdate("insert into value values(null,1)");
         dumpRS(s.executeQuery("select coalesce(value,c12) from value"), "COL1(datatype : INTEGER, precision : 10, scale : 0) null 1 ");  
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         assertCompileError("42610", "select coalesce(?,?) from tA");
         assertCompileError("42610", "select value(?,?) from tA");
     }
@@ -310,12 +313,14 @@ public void testCompatibleDatatypesCombinations() throws Throwable
                 "COL1(datatype : TIME, precision : 8, scale : 0) null 15:30:20 15:30:20 null ",
                 "COL1(datatype : TIME, precision : 8, scale : 0) null 15:30:20 15:30:20 15:30:20 ",
                 "COL1(datatype : TIME, precision : 8, scale : 0) null 15:30:20 15:30:20 15:30:20 ",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
                 "COL1(datatype : TIMESTAMP, precision : 29, scale : 9) null 2000-01-01 15:30:20.0 2000-01-01 15:30:20.0 null ",
                 "", "",
                 "COL1(datatype : BLOB, precision : 1024, scale : 0) null null null null "
         };
 
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
 
         int index = 0;
         for (int firstColumnType = 0; firstColumnType < SQLTypes.length; firstColumnType++) {
@@ -500,6 +505,7 @@ public void testAllDatatypesCombinations() throws  Throwable
                 "COL1(datatype : TIME, precision : 8, scale : 0) null 15:30:20 15:30:20 null ",
                 "COL1(datatype : TIME, precision : 8, scale : 0) null 15:30:20 15:30:20 null ",
                 "","","","","","","","","","","","","","","","",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
                 "COL1(datatype : TIMESTAMP, precision : 29, scale : 9) null 2000-01-01 15:30:20.0 2000-01-01 15:30:20.0 null ",
                 "COL1(datatype : TIMESTAMP, precision : 29, scale : 9) null 2000-01-01 15:30:20.0 2000-01-01 15:30:20.0 null ",
                 "","","","","","","","","","","","","","","","",
@@ -510,6 +516,7 @@ public void testAllDatatypesCombinations() throws  Throwable
                 "COL1(datatype : BLOB, precision : 1024, scale : 0) null null null null "
         };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         Statement s = createStatement();
         int index = 0;
 
@@ -548,6 +555,7 @@ else if (!isSupportedCoalesce(firstColumnType,secondColumnType)  && sqle.getSQLS
 
     public void testDateCoalesce() throws Throwable
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         Statement s = createStatement();
         s.executeUpdate("insert into tF values(null, null, null)");
         s.executeUpdate("insert into tF values(date('1992-01-02'), '1992-01-03', '1992-01-04')");
@@ -573,6 +581,7 @@ public void testDateCoalesce() throws Throwable
 
         s.executeUpdate("insert into tF values(date('1992-01-01'), 'I am char', 'I am varchar')");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         assertStatementError("22007", s, "select coalesce(charCol,dateCol) from tF");
         assertStatementError("22007", s, "select value(charCol,dateCol) from tF");
         assertStatementError("22007", s, "select coalesce(varcharCol,dateCol) from tF");
@@ -607,6 +616,7 @@ public void testTimeCoalesce() throws Throwable
 
         s.executeUpdate("insert into tG values(time('12:30:33'), 'I am char', 'I am varchar')");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         assertStatementError("22007", s, "select coalesce(charCol,timeCol) from tG");
         assertStatementError("22007", s, "select value(charCol,timeCol) from tG");
         assertStatementError("22007", s, "select coalesce(charCol,timeCol) from tG");
@@ -621,10 +631,12 @@ public void testTimeCoalesce() throws Throwable
 
     public void testTimeStampCoalesce() throws Throwable
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         Statement s = createStatement();
         s.executeUpdate("insert into tH values(null, null, null)");
         s.executeUpdate("insert into tH values(timestamp('1992-01-01 12:30:30'), '1992-01-01 12:30:31', '1992-01-01 12:30:32')");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4614
         String expectedValue = "COL1(datatype : TIMESTAMP, precision : 29, scale : 9) null 1992-01-01 12:30:30.0 ";
         String expectedValue1 = "COL1(datatype : TIMESTAMP, precision : 29, scale : 9) null 1992-01-01 12:30:31.0 ";
         String expectedValue2 = "COL1(datatype : TIMESTAMP, precision : 29, scale : 9) null 1992-01-01 12:30:32.0 ";
@@ -646,6 +658,7 @@ public void testTimeStampCoalesce() throws Throwable
 
         s.executeUpdate("insert into tH values(timestamp('1992-01-01 12:30:33'), 'I am char', 'I am varchar')");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         assertStatementError("22007", s, "select coalesce(charCol,timestampCol) from tH");
         assertStatementError("22007", s, "select value(charCol,timestampCol) from tH");
         assertStatementError("22007", s, "select coalesce(charCol,timestampCol) from tH");
@@ -754,6 +767,7 @@ public void testMiscellaneousCoalesce() throws SQLException
 
         };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         Statement s = createStatement();
         PreparedStatement ps;
 
@@ -785,6 +799,7 @@ public void testMiscellaneousCoalesce() throws SQLException
         try {
             ps.setString(1,"abc");
             dumpRS(ps.executeQuery(), "");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
             fail("Expected statement to fail");
         }
         catch (SQLException sqle) {
@@ -835,6 +850,7 @@ public void testCharCoalesce() throws Throwable
 
         };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         Statement s = createStatement();
         s.executeUpdate("insert into tB values('c1 not null', 'c2 not null', 'vc1 not null', 'vc2 not null', 'lvc1 not null', 'lvc2 not null', 'clob1 not null', 'clob2 not null')");
         s.executeUpdate("insert into tB values('c1 not null but c2 is', null, 'vc1 is not null but vc2 is', null, null, null,null,null)");
@@ -913,6 +929,7 @@ public void testCharForBitDataCoalesce() throws SQLException, UnsupportedEncodin
                 "COL1(datatype : BLOB, precision : 33792, scale : 0) 626c6f6231206e6f74206e756c6c null 626c6f6231206e6f74206e756c6c20616761696e null "
         };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         PreparedStatement ps =
                 prepareStatement("insert into tC values (?,?,?,?,?,?,?,?)");
         ps.setBytes(1, "cbd1 not null".getBytes("US-ASCII"));
@@ -954,6 +971,7 @@ public void testCharForBitDataCoalesce() throws SQLException, UnsupportedEncodin
 
         int index = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         Statement s = createStatement();
         dumpRS(s.executeQuery("select coalesce(cbd1,cbd2) from tC"), expectedValues[index++]);
         dumpRS(s.executeQuery("select value(cbd1,cbd2) from tC"), expectedValues[index++]);
@@ -978,6 +996,7 @@ public void testCharForBitDataCoalesce() throws SQLException, UnsupportedEncodin
         dumpRS(s.executeQuery("select coalesce(lvcbd1,lvcbd2) from tC"), expectedValues[index++]);
         dumpRS(s.executeQuery("select value(lvcbd1,lvcbd2) from tC"), expectedValues[index++]);		
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         assertStatementError("42815", s, "select coalesce(blob1,cbd1) from tC");
         assertStatementError("42815", s, "select value(blob1,cbd1) from tC");
         assertStatementError("42815", s, "select coalesce(cbd1,blob2) from tC");
@@ -998,12 +1017,14 @@ public void testCharForBitDataCoalesce() throws SQLException, UnsupportedEncodin
 
     public void testAggregateDerby2016() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2016
         String[] expectedValues = {
             "COL1(datatype : INTEGER, precision : 10, scale : 0) 2 ",
             "COL1(datatype : INTEGER, precision : 10, scale : 0) 55 ",
             "COL1(datatype : INTEGER, precision : 10, scale : 0) 1 ",
         };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         Statement s = createStatement();
         int index = 0;
 
@@ -1038,6 +1059,7 @@ public void testAggregateDerby2016() throws SQLException
      * CoalesceFunctionNode didn't remap column references correctly.
      */
     public void testColumnRemappingDerby4342() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         JDBC.assertSingleValueResultSet(createStatement().executeQuery(
                 "select t1.smallintcol from " +
                 "AllDataTypesTable t1 join AllDataTypesTable t2 " +
@@ -1053,6 +1075,7 @@ public void testColumnRemappingDerby4342() throws SQLException {
      * properly categorized in CoalesceFunctionNode.
      */
     public void testPredicateCategorizationDerby4594() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5704
         Statement s = createStatement();
         s.execute("create table d4594_t1 (a1 int)");
         s.execute("create table d4594_t2 (a2 int)");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
index a03700aa2a..1506272271 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
@@ -62,6 +62,7 @@ public CollationTest(String name) {
 
     /** Test cases to run with English case-sensitive collation. */
     private final static String[] ENGLISH_CASE_SENSITIVE = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
         "testEnglishCollation",
         "testUsingClauseAndNaturalJoin",
         "testNullColumnInInsert",
@@ -73,6 +74,7 @@ public CollationTest(String name) {
         "testUsingClauseAndNaturalJoin",
         "testNullColumnInInsert",
         "testDerby6227",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6890
         "testDerby6890",
     };
 
@@ -110,16 +112,22 @@ public void testDefaultCollation() throws SQLException {
 
       setAutoCommit(false);
       Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
       PreparedStatement ps;
       ResultSet rs;
       
       setUpTable(s);
 
       //The collation should be UCS_BASIC for this database
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
       checkLangBasedQuery(s, 
       		"VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('derby.database.collation')",
 			new String[][] {{"UCS_BASIC"}});
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
       checkLangBasedQuery(s, "SELECT ID, NAME FROM CUSTOMER ORDER BY NAME",
       		new String[][] {{"4","Acorn"},{"0","Smith"},{"1","Zebra"},
       		{"6","aacorn"}, {"2","\u0104corn"},{"5","\u015Amith"},{"3","\u017Bebra"} });   
@@ -159,6 +167,7 @@ public void testDefaultCollation() throws SQLException {
       checkLangBasedQuery(s, "SELECT ID, NAME FROM APP.CUSTOMER WHERE NAME <= 'Smith' ",
       		new String[][] {{"0","Smith"}, {"4","Acorn"} });   
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
       s.executeUpdate("set schema APP");
       //Following sql will not fail in a database which uses UCS_BASIC for
       //user schemas. Since the collation of user schemas match that of system
@@ -176,6 +185,7 @@ public void testDefaultCollation() throws SQLException {
       //Do some testing using CASE WHEN THEN ELSE
       //following will work with no problem for a database with UCS_BASIC
       //collation for system and user schemas
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
       checkLangBasedQuery(s, "SELECT TABLENAME FROM SYS.SYSTABLES WHERE CASE " +
       		" WHEN 1=1 THEN TABLENAME ELSE 'c' END = 'SYSCOLUMNS'",
       		new String[][] {{"SYSCOLUMNS"} });   
@@ -226,6 +236,7 @@ public void testDefaultCollation() throws SQLException {
       		new String[][] {{"SYSCOLUMNS"} });   
 
       //Test USER/CURRENT_USER/SESSION_USER
+//IC see: https://issues.apache.org/jira/browse/DERBY-2724
       checkLangBasedQuery(s, "SELECT count(*) FROM CUSTOMER WHERE "+ 
       		"CURRENT_USER = 'APP'",
       		new String[][] {{"7"}});   
@@ -237,11 +248,13 @@ public void testDefaultCollation() throws SQLException {
       		new String[][] {{"Acorn"}});   
 
       //Do some testing with CHAR/VARCHAR functions
+//IC see: https://issues.apache.org/jira/browse/DERBY-2722
       s.executeUpdate("set schema SYS");
       checkLangBasedQuery(s, "SELECT CHAR(ID) FROM APP.CUSTOMER WHERE " +
       		" CHAR(ID)='0'", new String[] [] {{"0"}});
       
       s.executeUpdate("set schema APP");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2722
       if (XML.classpathMeetsXMLReqs())
       	checkLangBasedQuery(s, "SELECT XMLSERIALIZE(x as CHAR(10)) " +
       			" FROM xmlTable, SYS.SYSTABLES WHERE " +
@@ -253,6 +266,7 @@ public void testDefaultCollation() throws SQLException {
       //following test won't fail.
       s.executeUpdate("set schema APP");
       ps = prepareStatement("SELECT TABLENAME FROM SYS.SYSTABLES WHERE " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
       		" ? = TABLENAME");
       ps.setString(1, "SYSCOLUMNS");
       rs = ps.executeQuery();
@@ -378,10 +392,12 @@ public void testPolishCollation() throws SQLException {
       setUpTable(s);
 
       //The collation should be TERRITORY_BASED for this database
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
       checkLangBasedQuery(s, 
       		"VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('derby.database.collation')",
 			new String[][] {{"TERRITORY_BASED"}});
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
       checkLangBasedQuery(s, "SELECT ID, NAME FROM CUSTOMER ORDER BY NAME",
       		new String[][] {{"6","aacorn"}, {"4","Acorn"}, {"2","\u0104corn"},
       		{"0","Smith"},{"5","\u015Amith"}, {"1","Zebra"},{"3","\u017Bebra"} });
@@ -428,6 +444,7 @@ public void testPolishCollation() throws SQLException {
 
       //Do some testing with MAX/MIN operators
       s.executeUpdate("set schema APP");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
       checkLangBasedQuery(s, "SELECT MAX(NAME) maxName FROM CUSTOMER ORDER BY maxName ",
       		new String[][] {{"\u017Bebra"}});   
       checkLangBasedQuery(s, "SELECT MIN(NAME) minName FROM CUSTOMER ORDER BY minName ",
@@ -476,10 +493,12 @@ public void testNorwayCollation() throws SQLException {
       setUpTable(s);
 
       //The collation should be TERRITORY_BASED for this database
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
       checkLangBasedQuery(s, 
       		"VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('derby.database.collation')",
 			new String[][] {{"TERRITORY_BASED"}});
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
       checkLangBasedQuery(s, "SELECT ID, NAME FROM CUSTOMER ORDER BY NAME",
       		new String[][] {{"4","Acorn"}, {"2","\u0104corn"},{"0","Smith"},
       		{"5","\u015Amith"}, {"1","Zebra"},{"3","\u017Bebra"}, {"6","aacorn"} });
@@ -522,7 +541,9 @@ public void testNorwayCollation() throws SQLException {
       assertStatementError("42818", s, "SELECT ID, NAME FROM APP.CUSTOMER WHERE NAME <= 'Smith' ");
 
       //Do some testing with MAX/MIN operators
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
       s.executeUpdate("set schema APP");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
       checkLangBasedQuery(s, "SELECT MAX(NAME) maxName FROM CUSTOMER ORDER BY maxName ",
       		new String[][] {{"aacorn"}});   
       checkLangBasedQuery(s, "SELECT MIN(NAME) minName FROM CUSTOMER ORDER BY minName ",
@@ -591,6 +612,7 @@ public void testNullColumnInInsert() throws SQLException {
    * @throws SQLException
   */
 public void testUsingClauseAndNaturalJoin() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
       setAutoCommit(false);
       Statement s = createStatement();
       String collation; 
@@ -1223,15 +1245,20 @@ private void joinTesting(Statement s,
   */
 public void testEnglishCollation() throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
       setAutoCommit(false);
       Statement s = createStatement();
       setUpTable(s);
 
       //The collation should be TERRITORY_BASED for this database
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
       checkLangBasedQuery(s,
       		"VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('derby.database.collation')",
 			new String[][] {{"TERRITORY_BASED"}});
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2335
       checkLangBasedQuery(s, "SELECT ID, NAME FROM CUSTOMER ORDER BY NAME",
       		new String[][] {{"6","aacorn"},{"4","Acorn"},{"2","\u0104corn"},{"0","Smith"},
       		{"5","\u015Amith"},{"1","Zebra"},{"3","\u017Bebra"} });
@@ -1243,6 +1270,7 @@ public void testEnglishCollation() throws SQLException {
       //In English, 'aacorn' is < 'Acorn'
       checkLangBasedQuery(s, "SELECT ID, NAME FROM CUSTOMER where 'aacorn' < 'Acorn'",
       		new String[][] {{"0","Smith"}, {"1","Zebra"}, {"2","\u0104corn"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
       		{"3","\u017Bebra"}, {"4","Acorn"}, {"5","\u015Amith"},
 			{"6","aacorn"} });
 
@@ -1251,6 +1279,7 @@ public void testEnglishCollation() throws SQLException {
       		new String[][] {{"0","Smith"}, {"2","\u0104corn"}, {"4","Acorn"},
       		{"6","aacorn"} });
       checkLangBasedQuery(s, "SELECT ID, NAME FROM CUSTOMER WHERE NAME between 'Acorn' and 'Zebra' ",
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
       		new String[][] {{"0","Smith"}, {"1","Zebra"}, {"2","\u0104corn"},
       		{"4","Acorn"}, {"5","\u015Amith"} });
       //After index creation, the query above will return same data but in
@@ -1271,6 +1300,7 @@ public void testEnglishCollation() throws SQLException {
       //Do some testing with MAX/MIN operators
       s.executeUpdate("set schema APP");
       checkLangBasedQuery(s, "SELECT MAX(NAME) maxName FROM CUSTOMER ORDER BY maxName ",
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
       		new String[][] {{"\u017Bebra"}});
       checkLangBasedQuery(s, "SELECT MIN(NAME) minName FROM CUSTOMER ORDER BY minName ",
       		new String[][] {{"aacorn"}});
@@ -1287,6 +1317,9 @@ public void testEnglishCollation() throws SQLException {
   */
 public void testSwedishCaseInsensitiveCollation() throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
       setAutoCommit(false);
       Statement s = createStatement();
       setUpTable(s);
@@ -1327,7 +1360,11 @@ public void testSwedishCaseInsensitiveCollation() throws SQLException {
       assertStatementError("42818", s, "SELECT ID, NAME FROM APP.CUSTOMER WHERE NAME <= 'Smith' ");
 
       //Do some testing with MAX/MIN operators
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
       s.executeUpdate("set schema APP");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
       checkLangBasedQuery(s, "SELECT MAX(NAME) maxName FROM CUSTOMER ORDER BY maxName ",
       		new String[][] {{"\u017Bebra"}});
       checkLangBasedQuery(s, "SELECT MIN(NAME) minName FROM CUSTOMER ORDER BY minName ",
@@ -1344,6 +1381,9 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     
     Connection conn = s.getConnection();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
     s.executeUpdate("set schema APP");
     //Following sql will fail because the compilation schema is user schema
     //and hence the character constant "CUSTOMER" will pickup the collation
@@ -1379,6 +1419,9 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     //collation of the rhs as per SQL standard. Once DERBY-2678 is fixed, we
     //don't need to use the CAST on this query to make it work (we are doing
     //that in the next test).
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
+//IC see: https://issues.apache.org/jira/browse/DERBY-2599
     assertStatementError("42818", s, "SELECT TABLENAME FROM SYS.SYSTABLES WHERE CASE " +
     		" WHEN 1=1 THEN TABLENAME ELSE 'c' END = 'SYSCOLUMNS'");
     //CASTing the result of the CASE expression will solve the problem in the
@@ -1478,6 +1521,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     		new String[][] {{"SYSCOLUMNS"} });   
 
     //Do some testing with CHAR/VARCHAR functions
+//IC see: https://issues.apache.org/jira/browse/DERBY-2722
     s.executeUpdate("set schema SYS");
     //Following will work because both operands are = have the collation type
     //of UCS_BASIC
@@ -1506,6 +1550,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     //following will fail because we are trying to compare UCS_BASIC 
     //(CURRENT_USER) with territory based ("APP" taking it's collation from
     //compilation schema which is user schema at this time). 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2724
     assertStatementError("42818", s, "SELECT count(*) FROM CUSTOMER WHERE "+
     		"CURRENT_USER = 'APP'");  
     //The problem above can be fixed by CASTing CURRENT_USER so that the 
@@ -1537,6 +1582,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     		"CURRENT SCHEMA = 'SYS'", new String[][] {{"7"}});   
     
     s.executeUpdate("set schema APP");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2722
     if (XML.classpathMeetsXMLReqs()) {
         assertStatementError("42818", s, "SELECT XMLSERIALIZE(x as CHAR(10)) " +
         		" FROM xmlTable, SYS.SYSTABLES WHERE " + 
@@ -1559,6 +1605,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     //At this point, just create a function which involves character strings
     //in it's definition. In subsequent checkin, there will be collation 
     //related testing using this function's return value
+//IC see: https://issues.apache.org/jira/browse/DERBY-2723
     s.executeUpdate("set schema APP");
     s.executeUpdate("CREATE FUNCTION CONCAT_NOCALL(VARCHAR(10), VARCHAR(10)) "+
     		" RETURNS VARCHAR(20) RETURNS NULL ON NULL INPUT EXTERNAL NAME " + 
@@ -1579,6 +1626,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     //has collation type of UCS_BASIC
     s.executeUpdate("set schema APP");
     ps = prepareStatement("SELECT TABLENAME FROM SYS.SYSTABLES WHERE " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
     		" ? = TABLENAME");
     ps.setString(1, "SYSCOLUMNS");
     rs = ps.executeQuery();
@@ -1627,6 +1675,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     //The following will fail because the left hand side of LIKE has collation
     //derivation of NONE where as the right hand side has collation derivation
     //of IMPLICIT
+//IC see: https://issues.apache.org/jira/browse/DERBY-2793
     assertStatementError("42ZA2", s, "SELECT TABLENAME FROM SYS.SYSTABLES " +
     		" WHERE TABLENAME || 'AA' LIKE 'SYSCOLUMNS '");   
     //To fix the problem, we can use CAST on the left hand side so it's 
@@ -1677,6 +1726,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     //COALESCE will have collation type of UCS_BASIC and that is the same
     //collation that the ? on rhs of = will get.
     ps = prepareStatement("SELECT TABLENAME FROM SYS.SYSTABLES WHERE " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
 	" COALESCE(TABLENAME, ?) = ?");   
     ps.setString(1, " ");
     ps.setString(2, "SYSCOLUMNS ");
@@ -1724,6 +1774,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     //CAST string will compare fine with the output of TRIM. Note CAST always
     //picks up the collation of the compilation schema.
     ps = prepareStatement("SELECT TABLENAME FROM SYS.SYSTABLES WHERE " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
     		" TRIM('a' FROM ?) = CAST(TABLENAME AS CHAR(10))");
     ps.setString(1, "aSYSCOLUMNS");
     rs = ps.executeQuery();
@@ -1745,6 +1796,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     //but TABLENAME has collation of UCS_BASIC and hence LOCATE will fail 
     //because the collation types of it's two operands do not match
     ps = prepareStatement("SELECT TABLENAME FROM SYS.SYSTABLES WHERE " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
     		" LOCATE(?, TABLENAME) != 0");
     ps.setString(1, "ABC");
     rs = ps.executeQuery();
@@ -1761,6 +1813,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     //context which in this case will be collation of TABLENAME which has 
     //collation type of UCS_BASIC. 
     ps = prepareStatement("SELECT COUNT(*) FROM CUSTOMER WHERE ? IN " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
     		" (SELECT TABLENAME FROM SYS.SYSTABLES)");
     ps.setString(1, "SYSCOLUMNS");
     rs = ps.executeQuery();
@@ -1807,6 +1860,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     JDBC.assertFullResultSet(rs,new String[][] {{"9"}});
     //following will fail because NAME has collation type of territory based
     //but 'abc' has collation type of UCS_BASIC
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
     assertStatementError("42818", s, "DELETE FROM APP.CUSTOMER WHERE NAME = 'abc'");
     //changing to APP schema will fix the problem
     s.executeUpdate("set schema APP");
@@ -1836,6 +1890,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     		" y char(100))");
     s.execute("create table assocout(x char(10))");
     ps = prepareStatement("insert into assoc values (?, 'hello')");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     ps.setString(1, "10");
     ps.executeUpdate();     
     
@@ -1893,6 +1948,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     if (XML.classpathMeetsXMLReqs()) {
         checkLangBasedQuery(s, "SELECT ID, XMLSERIALIZE(V AS CLOB) " +
         		" FROM DERBY_2961 ORDER BY 1",
+//IC see: https://issues.apache.org/jira/browse/DERBY-3027
         		new String[][] {{"1",null}});
     }
     
@@ -1933,6 +1989,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     
     s.executeUpdate("create table a (vc varchar(30))");
     s.executeUpdate("insert into a values(CURRENT_DATE)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3222
     rs = s.executeQuery("select vc from a where vc <= CURRENT_DATE");
     
     assertEquals(1,JDBC.assertDrainResults(rs));
@@ -1941,6 +1998,7 @@ private void commonTestingForTerritoryBasedDB(Statement s) throws SQLException{
     JDBC.assertDrainResults(rs,1);
     rs = s.executeQuery("select vc from a where vc <= LOWER(CURRENT_DATE)");
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
     JDBC.assertDrainResults(rs,1);    
     rs = s.executeQuery("select vc from a where vc <=  '' || CURRENT_DATE");
     
@@ -2025,6 +2083,7 @@ private void setUpTable(Statement s) throws SQLException {
             ps.executeUpdate();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2722
     s.execute("create table xmlTable (x xml)");
     s.executeUpdate("insert into xmlTable values(null)");
 
@@ -2061,6 +2120,7 @@ private void checkLangBasedQuery(Statement s, String query, String[][] expectedR
  * locale xx.
  */
 public void testMissingCollatorSupport() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
       String createDBurl = ";create=true;territory=xx;collation=TERRITORY_BASED";
 	  try {
 		  //Use following utility method rather than 
@@ -2084,21 +2144,26 @@ public void testMissingCollatorSupport() throws SQLException {
    */
   public static Test suite() {
       
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
       BaseTestSuite suite = new BaseTestSuite("CollationTest");
       //Add the test case for a locale which does not exist. We have asked for
       //locale as 'xx' and since there is not support Collator support for such
       //a locale, we will get an exception during database create time.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
       TestCase missingCollatorDbTest = new CollationTest(
     		  "testMissingCollatorSupport");
       suite.addTest(missingCollatorDbTest);
 
         suite.addTest(new CleanDatabaseTestSetup(
                 new CollationTest("testDefaultCollation")));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
         suite.addTest(collatedSuite("en", false, ENGLISH_CASE_SENSITIVE));
         suite.addTest(collatedSuite("en", true, ENGLISH_CASE_INSENSITIVE));
          
         // Only add tests for other locales if they are in fact supported 
         // by the jvm.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3224
+//IC see: https://issues.apache.org/jira/browse/DERBY-3176
         Locale[] availableLocales = Collator.getAvailableLocales();
         boolean norwegian = false; 
         boolean polish = false;
@@ -2119,6 +2184,7 @@ public static Test suite() {
             }
         }
         if(norwegian) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
             suite.addTest(collatedSuite("no", false, NORWEGIAN_CASE_SENSITIVE));
         }
         if(polish) {
@@ -2127,6 +2193,7 @@ public static Test suite() {
         if(french) {
             suite.addTest(collatedSuite("fr", false, FRENCH_CASE_SENSITIVE));
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4604
         if(swedish && !hasBuggySwedishLocale()) {
             suite.addTest(collatedSuite("sv", true, SWEDISH_CASE_INSENSITIVE));
         }
@@ -2162,8 +2229,10 @@ private static boolean hasBuggySwedishLocale() {
    * @return suite of tests to run for the given locale
    */
   private static Test collatedSuite(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
           String locale, boolean caseInsensitive, String[] testNames)
   {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
       BaseTestSuite suite =
           new BaseTestSuite("CollationTest:territory=" + locale);
 
@@ -2181,10 +2250,12 @@ private static Test collatedSuite(
       
       if ("en".equals(locale)) {
     	  suite.addTest(DatabaseMetaDataTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2656
           suite.addTest(BatchUpdateTest.embeddedSuite());
           suite.addTest(GroupByExpressionTest.suite());
           suite.addTest(UpdatableResultSetTest.suite());    	  
       }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1748
       return caseInsensitive
 		  ? Decorator.territoryCollatedCaseInsensitiveDatabase(suite, locale)
 		  : Decorator.territoryCollatedDatabase(suite, locale);
@@ -2195,6 +2266,7 @@ private static Test collatedSuite(
      */
     public void test_5951() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
         Statement s = createStatement();
         
         s.execute("CREATE TABLE derby5951( a clob )");
@@ -2205,6 +2277,7 @@ public void test_5951() throws Exception
              "external name 'org.apache.derbyTesting.functionTests.tests.lang.CollationTest.makeClob'\n"
              );
         s.executeUpdate("INSERT INTO derby5951 VALUES( makeClob( 'a' ) )");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5951
         ResultSet rs = s.executeQuery("select * from derby5951");
         JDBC.assertSingleValueResultSet(rs, "a");
         
@@ -2289,6 +2362,7 @@ public void testDerby6227() throws SQLException {
         JDBC.assertFullResultSet(s.executeQuery(sql), expectedRows);
     }
     public void testDerby6890()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6890
                 throws SQLException
     {
         Statement s = createStatement();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
index ed8f9876c0..5e397c6440 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
@@ -59,6 +59,7 @@
 T10: (DONE) alter table compress with indexes
 T11: (DONE) alter table drop column with indexes
 T12: (DONE) alter table add column with index
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 T13: (DONE) bulk insert into empty table, with and without indexes
 T14: (DONE) bulk insert replace, with and without indexes
 
@@ -82,6 +83,7 @@
             of Database.
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
 <p>
 NOTE: The prefix "ci_test" is used for tests that require a case insensitive
       collation order.
@@ -502,6 +504,7 @@ private void checkLangBasedQuery(
 
     private void checkParamQuery(
     String      query, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
     String[]      param,
     int    paramNumber,
     String[][]  expectedResult, 
@@ -529,6 +532,7 @@ private void checkParamQuery(
 
 
         // re-execute it to test path through the cache
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
         for (int i=0; i < paramNumber;i++)
         {
         	ps.setString(i+1, param[i]);
@@ -584,6 +588,7 @@ protected void doImportTable(
     String      schemaName, 
     String      tableName, 
     String      fileName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2703
     String      colDel, 
     String      charDel, 
     String      codeset,
@@ -713,6 +718,7 @@ private void setUpTable() throws SQLException
             "CREATE TABLE CUSTOMER(" +
                 "D1 CHAR(200), D2 CHAR(200), D3 CHAR(200), D4 INT, " + 
                 "ID INT, NAME VARCHAR(40), NAME2 VARCHAR(40))");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
         PreparedStatement ps = 
             prepareStatement("INSERT INTO CUSTOMER VALUES(?,?,?,?,?,?,?)");
@@ -738,6 +744,7 @@ private void setUpTable() throws SQLException
 
     private void addSomeMoreCustomers( int counter ) throws SQLException
     { addSomeMoreCustomers( counter, true, true ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6890
 
     private void addSomeMoreCustomers( int counter, boolean useD1, boolean useD2 ) throws SQLException
     {
@@ -940,6 +947,7 @@ private void runDERBY_2703(int db_index)
      * rules could cause this to happen as well.
      */
     public void ci_testDerby5367()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
             throws SQLException {
         assertFalse(isDatabaseBasicCollation());
         setAutoCommit(true);
@@ -1061,6 +1069,7 @@ private void checkSimpleCompare(
             // now check prepared query
 
             // '<' test
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
             checkParamQuery(
                 "SELECT ID, NAME FROM CUSTOMER where NAME < ? ORDER BY NAME",
                 new String[] {NAMES[expected_order[i]]},
@@ -1073,6 +1082,7 @@ private void checkSimpleCompare(
                 true);
 
             // '<=' test
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
             checkParamQuery(
                 "SELECT ID, NAME FROM CUSTOMER where NAME <= ? ORDER BY NAME",
                 new String[] {NAMES[expected_order[i]]},
@@ -1085,6 +1095,7 @@ private void checkSimpleCompare(
                 true);
 
             // '=' test
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
             checkParamQuery(
                 "SELECT ID, NAME FROM CUSTOMER where NAME = ? ORDER BY NAME",
                 new String[] {NAMES[expected_order[i]]},
@@ -1097,6 +1108,7 @@ private void checkSimpleCompare(
                 true);
 
             // '>=' test
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
             checkParamQuery(
                 "SELECT ID, NAME FROM CUSTOMER where NAME >= ? ORDER BY NAME",
                 new String[] {NAMES[expected_order[i]]},
@@ -1109,6 +1121,7 @@ private void checkSimpleCompare(
                 true);
 
             // '>' test
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
             checkParamQuery(
                 "SELECT ID, NAME FROM CUSTOMER where NAME > ? ORDER BY NAME",
                 new String[] {NAMES[expected_order[i]]},
@@ -1133,6 +1146,7 @@ private void checkSimpleCompare(
      **/
     private void checkTwoPersistentCompare(
     int[]       expected_order)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         throws SQLException
     {
         Statement s  = createStatement();
@@ -1290,6 +1304,7 @@ private void runLikeTests(
 
             // varchar column - constant pattern
             checkLangBasedQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2717
                 "SELECT ID, NAME_VARCHAR FROM CUSTOMER " + 
                     "WHERE NAME_VARCHAR LIKE '" + LIKE_TEST_CASES[i] + "'",
                 full_row_single_value(
@@ -1298,6 +1313,7 @@ private void runLikeTests(
                 true);
 
             // varchar column - parameter pattern
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
             checkParamQuery(
                 "SELECT ID, NAME_VARCHAR FROM CUSTOMER " + 
                     "WHERE NAME_VARCHAR LIKE ?",
@@ -1318,6 +1334,7 @@ private void runLikeTests(
                 true);
 
             // long varchar column - parameter
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
             checkParamQuery(
                 "SELECT ID, NAME_LONGVARCHAR FROM CUSTOMER " + 
                     "WHERE NAME_LONGVARCHAR LIKE ?",
@@ -1338,6 +1355,7 @@ private void runLikeTests(
                 true);
 
             // clob column - parameter
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
             checkParamQuery(
                 "SELECT ID, NAME_CLOB FROM CUSTOMER WHERE NAME_CLOB LIKE ?",
                 new String[] {LIKE_TEST_CASES[i]},
@@ -1359,6 +1377,7 @@ private void runLikeTests(
 
             // char column, char includes blank padding so alter all these
             // tests cases to match for blanks at end also.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
             checkParamQuery(
                 "SELECT ID, NAME_CHAR FROM CUSTOMER WHERE NAME_CHAR LIKE ?",
                 new String[] {LIKE_CHAR_TEST_CASES[i] + "%"},
@@ -1378,6 +1397,7 @@ private void runLikeTests(
             "SELECT * from SYS.SYSCOLUMNS where COLUMNNAME like ?";
         String zero_row_syscat_query_param2 = 
             "SELECT * from SYS.SYSCOLUMNS where ? like COLUMNNAME";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
         String zero_row_syscat_query_param3 = 
             "SELECT count(*) from SYS.SYSCOLUMNS where ? like ?";
 
@@ -1401,6 +1421,7 @@ private void runLikeTests(
                     new String[] {"nonmatchiing"}, 1, null, true);
             checkParamQuery(
                     zero_row_syscat_query_param3, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
                     new String[] {"nonmatching", "matching"}, 2, 
                     new String[][] {{"0"}}, true);
         }
@@ -1416,6 +1437,7 @@ private void runLikeTests(
                     new String[] {"nonmatchiing"}, 1, null, true);
             checkParamQuery(
                     zero_row_syscat_query_param3, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2777
                     new String[] {"nonmatching", "123"}, 2, 
                     new String[][] {{"0"}}, true);
         }
@@ -1489,6 +1511,7 @@ private void runAlterTableDropColumn(
         throws SQLException 
     {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6890
 
         setUpTable();
 
@@ -1535,6 +1558,8 @@ private void runAlterTableAddColumn(
         runQueries(db_index, null, null);
 
         addSomeMoreCustomers( 100 );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6890
+//IC see: https://issues.apache.org/jira/browse/DERBY-6890
 
         dropTable();
 
@@ -1574,6 +1599,7 @@ private void runBulkInsert(
         // import empty_file.dat into EMPTY_TABLE 
         doImportTable(
                 "APP", "EMPTY_TABLE", emptyFileName, "|", "`", null, 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5749
 
         commit();
 
@@ -1757,6 +1783,7 @@ private void runDerby2670()
         PreparedStatement ps = prepareStatement("insert into t values ?");
         for (int i = 0; i < rows.length; i++) {
             ps.setString(1, rows[i]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2703
             ps.executeUpdate();
         }
         ps.close();
@@ -1871,6 +1898,7 @@ private void runDerby2670()
      * of conglomerates.
      */
     private void runDerby5530TruncateIndex()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5530
             throws SQLException {
         setAutoCommit(false);
         Statement s = createStatement();
@@ -1967,9 +1995,11 @@ private void runTestIter(
         runLikeTests(db_index);
 
         runDerby5530TruncateNoIndex();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5530
 
         runDerby5530TruncateIndex();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6890
         dropTable();
         runAlterTableDropColumn(db_index);
 
@@ -2035,13 +2065,17 @@ public static Test suite()
     {
         // only test in embedded mode, all tests are server side actions.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("CollationTest2");
         suite.addTest(new CollationTest2("testDefaultCollation"));
         suite.addTest(collatedTest("en", "testEnglishCollation"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
         suite.addTest(caseInsensitiveCollationSuite());
         
         // Only add tests for other locales if they are in fact supported 
         // by the jvm.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3224
+//IC see: https://issues.apache.org/jira/browse/DERBY-3176
         Locale[] availableLocales = Collator.getAvailableLocales();
         boolean norwegian = false; 
         boolean polish = false;
@@ -2088,9 +2122,11 @@ private static Test collatedTest(String locale, String fixture)
      * @return A suite of tests.
      */
     private static Test caseInsensitiveCollationSuite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("Case insensitive specific tests");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5367
         suite.addTest(new CollationTest2("ci_testDerby5367")); 
         return Decorator.territoryCollatedCaseInsensitiveDatabase(
                 suite, "en_US");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ColumnDefaultsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ColumnDefaultsTest.java
index d74222b9f3..2fd27e8016 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ColumnDefaultsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ColumnDefaultsTest.java
@@ -41,6 +41,7 @@ public ColumnDefaultsTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ColumnDefaultsTest Test");
         suite.addTest(TestConfiguration.defaultSuite(ColumnDefaultsTest.class));
         return suite;
@@ -48,6 +49,7 @@ public static Test suite()
 
     public void testNegativeTestsForColumnDefaults() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
         Statement st = createStatement();
         
         //? in default
@@ -134,6 +136,7 @@ public void testNegativeTestsForColumnDefaults() throws Exception
 
 
         // DERBY-4426
+//IC see: https://issues.apache.org/jira/browse/DERBY-4426
         assertStatementError("42Y85", st,
             " insert into neg values (default) union values (default)");
 
@@ -157,6 +160,7 @@ public void testPositiveTestsForColumnDefaults()
     {
         
         // positive 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
         Statement st = createStatement();
         
         //create tables
@@ -171,6 +175,7 @@ public void testPositiveTestsForColumnDefaults()
         
         st.executeUpdate( " insert into t1 (c4) values 4");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
         ResultSet rs = st.executeQuery("select c1, c2, c4 from t1");
         
         String[] expColNames = {"C1", "C2", "C4"};
@@ -403,6 +408,7 @@ public void testPositiveTestsForColumnDefaults()
 
         // DERBY-4426: make sure we don't forbid inside a multi-value table
         // constructor since this is represented as a UnionNode
+//IC see: https://issues.apache.org/jira/browse/DERBY-4426
         st.executeUpdate( "delete from t7");
         st.executeUpdate( "insert into t7 values 1, default");
         rs = st.executeQuery( " select * from t7");
@@ -433,6 +439,7 @@ public void testJira331()
         throws SQLException
     {
         // JIRA issue Derby-331
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
         Statement st = createStatement();
         
         st.executeUpdate(
@@ -444,6 +451,7 @@ public void testJira331()
         assertStatementError("23505", st,
             " insert into t_331 values (4, default)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
         ResultSet rs = st.executeQuery( " select * from t_331");
         
         String[] expColNames = {"A", "B"};
@@ -465,6 +473,7 @@ public void testJira3013()
         throws SQLException
     {
         // begin DERBY-3013
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
         Statement st = createStatement();
         
         st.executeUpdate(
@@ -481,6 +490,7 @@ public void testJira3013()
             "insert into tabWithUserAndSchemaDefaults values "
             + "(default, default, default, default)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
         ResultSet rs = st.executeQuery(
             " select * from tabWithUserAndSchemaDefaults");
         
@@ -509,12 +519,17 @@ public void testJira3013()
         st.executeUpdate(
             " drop table tabWithUserAndSchemaDefaults");
                
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
+//IC see: https://issues.apache.org/jira/browse/DERBY-5714
         rollback();
         st.close();
     }
 
     public void testDerby118_and_5829 () throws SQLException {
         Statement st = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5829
 
         /*
          * Lift restriction that even VARCHAR can max have 254 chars in
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CommentTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CommentTest.java
index 61bf299cb2..f45bff61cf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CommentTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CommentTest.java
@@ -52,6 +52,7 @@ public CommentTest(String name)
     */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4338
         return TestConfiguration.defaultSuite(CommentTest.class);
     }
 
@@ -67,6 +68,7 @@ public void testBracketedComments() throws Exception
             new String [][] {{"1"}});
 
         JDBC.assertFullResultSet(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4338
             stmt.executeQuery("-- eof comment\nVALUES 1"),
             new String [][] {{"1"}});
 
@@ -130,7 +132,9 @@ public void testBracketedComments() throws Exception
         assertCompileError("42X02", "VALUES 1 /* comment /* nested */");
 
         // just comments generates syntax error
+//IC see: https://issues.apache.org/jira/browse/DERBY-3242
         assertCompileError("42X01", "/* this is a comment */");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4338
         assertCompileError("42X01", "/* this is a comment */ /* /* foo */ */");
         assertCompileError(
             "42X01",
@@ -214,6 +218,7 @@ public void testWrongKeywordLexing_derby4338() throws Exception
             s.executeQuery("select\"TABLEID\" from sys.systables"));
 
         // Added for DERBY-4748.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4748
         assertCompileError("42X01", "commit");
         assertCompileError("42X01", "commit;");
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CompressTableTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CompressTableTest.java
index 1597f5cf20..897caf4506 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CompressTableTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CompressTableTest.java
@@ -121,6 +121,7 @@ public void testConcurrentInvalidation() throws Exception {
         // Object used by the main thread to tell the helper thread to stop.
         // The helper thread stops once the value is set to true.
         final AtomicBoolean stop = new AtomicBoolean();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // Holder for anything thrown by the run() method in the helper thread.
         final Throwable[] error = new Throwable[1];
@@ -133,6 +134,7 @@ public void testConcurrentInvalidation() throws Exception {
         Thread t = new Thread() {
             public void run() {
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                     while (!stop.get()) {
                         JDBC.assertSingleValueResultSet(ps.executeQuery(), "1");
                     }
@@ -155,6 +157,7 @@ public void run() {
             }
         } finally {
             // We're done, so tell the helper thread to stop.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             stop.set(true);
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConcurrentImplicitCreateSchema.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConcurrentImplicitCreateSchema.java
index 8b220da4e6..4be763ded4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConcurrentImplicitCreateSchema.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConcurrentImplicitCreateSchema.java
@@ -56,6 +56,7 @@ class CreateTable implements Runnable
         CreateTable(int id, int schemaId, 
                     ConcurrentImplicitCreateSchema test) 
             throws SQLException, IllegalAccessException, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                    ClassNotFoundException, InstantiationException, NoSuchMethodException,
                    java.lang.reflect.InvocationTargetException
         {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConglomerateSharingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConglomerateSharingTest.java
index 6fa028f15b..613f7371cf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConglomerateSharingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConglomerateSharingTest.java
@@ -273,6 +273,7 @@ public void testConstraintDrops() throws SQLException
         // foreign key DROPC_FK2 is a unique index. It is not deterministic
         // which index will be checked first, so accept any of the three.
         checkStatementError("23505", st,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6342
             "insert into dropc_t2 values (1, 2, 4)",
             "DROPC_UIX2", "DROPC_UC1", "DROPC_FK2");
 
@@ -322,6 +323,7 @@ public void testConstraintDrops() throws SQLException
         // error message.
         checkStatementError("23505", st,
             "insert into dropc_t2 values (1, 2, 4)", "DROPC_UIX2", "DROPC_FK2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6342
 
         // This statement both violates the foreign key DROPC_FK1 and
         // attempts to insert a duplicate value into the column C. Expect
@@ -493,6 +495,7 @@ public void testConstraintDrops() throws SQLException
      * @throws SQLException
      */
     public void testUniqueConstraintWithNullsBackingIndex ()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3502
         throws SQLException
     {
         PreparedStatement countCongloms =
@@ -772,6 +775,7 @@ private void countConglomerates(String tableName,
      *   at least one of them
      */
     private void checkStatementError(String sqlState,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6342
         Statement st, String query, String... violatedConstraints)
         throws SQLException
     {
@@ -786,6 +790,7 @@ private void checkStatementError(String sqlState,
             assertSQLState(sqlState, se);
 
             boolean foundConstraint = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6342
             for (String c : violatedConstraints) {
                 if (se.getMessage().contains(c)) {
                     foundConstraint = true;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConnectTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConnectTest.java
index 8aa748a4b0..0ed182a90e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConnectTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConnectTest.java
@@ -47,6 +47,7 @@ public static Test suite() {
         if ( JDBC.vmSupportsJSR169())
             // Test uses DriverManager which
             // is not supported with JSR169
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                         return 
             new BaseTestSuite("empty ConnectTest:DriverManager not supported");
         else  {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java
index 484110d1c7..b694643a91 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ConstraintCharacteristicsTest.java
@@ -94,7 +94,9 @@ public ConstraintCharacteristicsTest(String name) {
     public static Test suite() {
         final String nameRoot = ConstraintCharacteristicsTest.class.getName();
         final BaseTestSuite suite = new BaseTestSuite(nameRoot);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6666
         suite.addTest(baseSuite1(nameRoot + ":embedded 1"));
         suite.addTest(TestConfiguration.clientServerDecorator(
                 baseSuite1(nameRoot + ":client 1")));
@@ -115,7 +117,9 @@ public static Test suite() {
     private static Test baseSuite3(final String name) {
 
         final BaseTestSuite suite = new BaseTestSuite(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         suite.addTest(new ConstraintCharacteristicsTest(
                 "testDeferredRowsInvalidation"));
         suite.addTest(new ConstraintCharacteristicsTest(
@@ -131,6 +135,7 @@ private static Test baseSuite3(final String name) {
     
     private static Test baseSuite2(final String name) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6666
         final BaseTestSuite suite = new BaseTestSuite(name);
         final Properties systemProperties = new Properties();
         systemProperties.setProperty("derby.language.logQueryPlan", "true");
@@ -144,8 +149,10 @@ private static Test baseSuite2(final String name) {
 
     private static Test baseSuite1(final String name) {
         final BaseTestSuite suite = new BaseTestSuite(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(new ConstraintCharacteristicsTest(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                       "testSyntaxAndBinding"));
         suite.addTest(new ConstraintCharacteristicsTest(
                       "testDropNotNullOnUniqueColumn"));
@@ -175,11 +182,14 @@ private static Test baseSuite1(final String name) {
                       "testXA"));
         suite.addTest(new ConstraintCharacteristicsTest(
                       "testAlmostRemovedAllDups"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         suite.addTest(new ConstraintCharacteristicsTest(
                       "testCheckConstraintsWithDeferredRows"));
         suite.addTest(new ConstraintCharacteristicsTest(
                      "testSeveralCheckConstraints"));
         suite.addTest(new ConstraintCharacteristicsTest(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                      "testDerby6670_a"));
         suite.addTest(new ConstraintCharacteristicsTest(
                      "testDerby6670_b"));
@@ -191,6 +201,7 @@ private static Test baseSuite1(final String name) {
         final Properties systemProperties = new Properties();
         systemProperties.setProperty(
             "derby.locks.waitTimeout", Integer.toString(500));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6437
 
         return new SupportFilesSetup(
                 new SystemPropertyTestSetup(suite, systemProperties, true));
@@ -199,10 +210,12 @@ private static Test baseSuite1(final String name) {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final Statement s = createStatement();
         s.executeUpdate("create table referenced(" +
                         "    i int primary key, j int default 0)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if ((usingEmbedded() && !exportFilesCreatedEmbedded) ||
             (usingDerbyNetClient() && !exportFilesCreatedClient)) {
 
@@ -216,6 +229,9 @@ protected void setUp() throws Exception {
             // Create a file for import that contains duplicate rows,
             // see testImport and testDerby6374.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
             expImpDataFile =
                 SupportFilesSetup.getReadWrite("t.data").getPath();
             expImpDataWithNullsFile =
@@ -236,6 +252,7 @@ protected void setUp() throws Exception {
             s.executeUpdate("drop table t_with_nulls");
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         s.close();
         setAutoCommit(false);
     }
@@ -250,6 +267,7 @@ protected void tearDown() throws Exception {
     }
 
     public void testSyntaxAndBinding() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6708
         final Connection c = getConnection();
         final Statement s = c.createStatement();
 
@@ -259,6 +277,7 @@ public void testSyntaxAndBinding() throws SQLException {
 
         assertTableLevelDefaultBehaviorAccepted(c, s);
         assertTableLevelNonDefaultAccepted(s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         //
         //   A L T E R    C O N S T R A I N T    C H A R A C T E R I S T I C S
@@ -271,6 +290,7 @@ public void testSyntaxAndBinding() throws SQLException {
 
         // not default behavior, expect error until feature implemented
         assertStatementError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             NOT_IMPLEMENTED, s,
             "alter table t alter constraint c not enforced");
 
@@ -282,6 +302,7 @@ public void testSyntaxAndBinding() throws SQLException {
 
         // Unknown constraint name
         assertStatementError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             LANG_DROP_OR_ALTER_NON_EXISTING_C, s,
             "alter table t alter constraint cuckoo not enforced");
 
@@ -297,9 +318,11 @@ public void testSyntaxAndBinding() throws SQLException {
         // Unknown constraint name
         assertStatementError(LANG_OBJECT_NOT_FOUND, s,
                              "set constraints cuckoo deferred");
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         assertStatementError(LANG_DB2_DUPLICATE_NAMES , s,
                 "set constraints c,c deferred");
         c.rollback();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         //
         //   C O L U M N    L E V E L    C O N S T R A I N T S
@@ -307,6 +330,7 @@ public void testSyntaxAndBinding() throws SQLException {
 
         assertColumnLevelDefaultBehaviorAccepted(c, s);
         assertColumnLevelNonDefaultAccepted(s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         // Characteristics are not currently allowed for NOT NULL,
         // since Derby does not represent NOT NULL as a constraint,
@@ -330,6 +354,7 @@ public void testSyntaxAndBinding() throws SQLException {
      */
     public void testCreateConstraintDictionaryEncodings() throws SQLException {
         final Statement s = getConnection().createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         for (String[] ch : defaultCharacteristics) {
             assertDictState(s, ch[0], ch[1]);
@@ -358,6 +383,7 @@ public void testCreateConstraintDictionaryEncodings() throws SQLException {
      */
     public void testAlterConstraintDictionaryEncodings() throws SQLException {
         final Statement s = getConnection().createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         for (String[] ch : defaultCharacteristics) {
             s.executeUpdate(
@@ -372,6 +398,7 @@ public void testAlterConstraintDictionaryEncodings() throws SQLException {
         for (String[] ch : nonDefaultCharacteristics) {
             if (ch[0].contains("not enforced")) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 assertStatementError(NOT_IMPLEMENTED,
                         s,
                         "create table t(i int, constraint c primary key(i) " +
@@ -398,6 +425,7 @@ public void testAlterConstraintDictionaryEncodings() throws SQLException {
      * @throws SQLException
      */
     public void testAlterConstraintInvalidation() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (usingDerbyNetClient()) {
             // Skip, since we need to see inside an embedded connection here
             return;
@@ -412,7 +440,9 @@ public void testAlterConstraintInvalidation() throws SQLException {
         ps.execute();
 
         s.executeUpdate("alter table t alter constraint c enforced ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6741
         final LanguageConnectionContext lcc = getLCC( c );
         final GenericPreparedStatement derbyPs =
                 (GenericPreparedStatement)lcc.getLastActivation().
@@ -430,6 +460,7 @@ public void testAlterConstraintInvalidation() throws SQLException {
             "create table t(i int not null, j int, constraint c unique(i)"};
 
     static final String[] uniqueSpec = { // corresponding to above forms
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             "primary key(i)",
             "unique(i)",
             "unique(i)"};
@@ -438,6 +469,7 @@ public void testAlterConstraintInvalidation() throws SQLException {
             "create table t(i int, j int, constraint c check (i > 0)"};
 
     static final String[] fkForms = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             "create table t(i int, j int, " +
             "    constraint c foreign key(i) references referenced(i)"};
 
@@ -465,11 +497,13 @@ public void testDatabaseMetaData() throws SQLException {
         // Test that our constraint backing index is still reported as unique
         // even if we implement it as physically non-unique when deferrable:
         // logically it is still a unique index.
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final Statement s = createStatement();
         s.executeUpdate(
             "create table t(i int not null " +
             "    constraint c primary key deferrable initially immediate)");
         final DatabaseMetaData dbmd = s.getConnection().getMetaData();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         ResultSet rs = dbmd.getIndexInfo(null, null, "T", false, false);
         rs.next();
         assertEquals("false", rs.getString("NON_UNIQUE"));
@@ -555,6 +589,7 @@ public void testLockingForUniquePK() throws SQLException {
             c2.setAutoCommit(false);
 
             final Statement s2 = c2.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             assertStatementError(LOCK_TIMEOUT, s2, "insert into t1 values 4");
         } finally {
             if (c2 != null) {
@@ -602,11 +637,15 @@ public void testLockingForUniquePK() throws SQLException {
             c2 = openDefaultConnection();
             c2.setAutoCommit(false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             final Statement s2 = c2.createStatement();
             s2.executeUpdate("insert into t2 values 4");
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             assertCommitError(LOCK_TIMEOUT, c2);
         } finally {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 if (c2 != null) {
                     c2.rollback();
                     c2.close();
@@ -622,6 +661,8 @@ public void testLockingForUniquePK() throws SQLException {
         // Thread 2: insert same row (duplicate)
         c2 = openDefaultConnection();
         c2.setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final Statement s2 = c2.createStatement();
         s2.executeUpdate("insert into t2 values 5");
 
@@ -642,6 +683,7 @@ public void testLockingForUniquePK() throws SQLException {
         s.executeUpdate("insert into t2 values 11,11");
 
         // next delete one of the duplicates,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final Statement us = createStatement(
                 ResultSet.TYPE_FORWARD_ONLY,
                 ResultSet.CONCUR_UPDATABLE);
@@ -663,6 +705,7 @@ public void testLockingForUniquePK() throws SQLException {
 
     public void testBasicDeferral() throws SQLException {
         final Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         for (String sCF : setConstraintsForms) {
             int idx = 0;
@@ -721,6 +764,7 @@ public void testBasicDeferral() throws SQLException {
                             {"3", "31"}});
 
                     // Try to set immediate mode, and detect violation
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     assertStatementError(LANG_DEFERRED_DUP_VIOLATION_S,
                                          s,
                                          sCF + " immediate");
@@ -740,6 +784,8 @@ public void testBasicDeferral() throws SQLException {
 
                     // Setting immediate now should work again:
                     s.executeUpdate(sCF + " immediate");
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     assertStatementError(LANG_DUPLICATE_KEY_CONSTRAINT,
                                          s,
                                          "insert into t values (2,30)");
@@ -750,6 +796,7 @@ public void testBasicDeferral() throws SQLException {
                     // Duplicate insert should now work
                     s.executeUpdate(
                         "insert into t values (2,19),(2,21),(3,31)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     assertStatementError(LANG_DEFERRED_DUP_VIOLATION_S,
                                          s,
                                          sCF + " immediate");
@@ -785,6 +832,7 @@ public void testBasicDeferral() throws SQLException {
                             {"3", "31"}});
 
                     // Now try to commit, which should lead to rollback
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     assertCommitError(LANG_DEFERRED_DUP_VIOLATION_T,
                                       getConnection());
 
@@ -812,6 +860,7 @@ public void testBasicDeferral() throws SQLException {
                     // We can't add a constraint with immediate checking
                     // because of the existing duplicates.
                     assertStatementError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                         LANG_DUPLICATE_KEY_CONSTRAINT,
                         s,
                         "alter table t add constraint c " + uniqueSpec[idx]);
@@ -835,11 +884,13 @@ public void testBasicDeferral() throws SQLException {
                             {"3", "31"}});
 
                     // But since we still have duplicates, the commit will fail
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     assertCommitError(LANG_DEFERRED_DUP_VIOLATION_T,
                                       getConnection());
 
                     checkConsistencyOfBaseTableAndIndex(s);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
                 } finally {
                     idx++;
@@ -985,6 +1036,8 @@ public void testBasicDeferral() throws SQLException {
                             {"-4", "31"}});
 
                     // Now try to commit, which should lead to rollback
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     assertCommitError(LANG_DEFERRED_CHECK_VIOLATION_T,
                                       getConnection());
 
@@ -1054,6 +1107,7 @@ public void testBasicDeferral() throws SQLException {
      */
     public void testRoutines() throws SQLException {
         final Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         //
         //   P R I M A R Y   K E Y,   U N I Q U E   C O N S T R A I N T S
@@ -1071,6 +1125,7 @@ public void testRoutines() throws SQLException {
 
                 declareCalledNested(s);
                 assertStatementError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                         LANG_DEFERRED_DUP_VIOLATION_T,
                         s,
                         "call calledNested(false)");
@@ -1092,6 +1147,7 @@ public void testRoutines() throws SQLException {
 
                     s.executeUpdate(setConstraintForm + " immediate");
                     declareCalledNested(s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     assertStatementError(LANG_DEFERRED_DUP_VIOLATION_T,
                             s,
                             "call calledNested(false)");
@@ -1114,6 +1170,7 @@ public void testRoutines() throws SQLException {
                         "insert into t values " + rs2Values(initialContents));
 
                 declareCalledNested(s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 s.executeUpdate("call calledNested(false)");
             } finally {
                 rollback();
@@ -1161,6 +1218,7 @@ public void testRoutines() throws SQLException {
                             "call calledNested(true)");
                 } finally {
                     dropTable("t");
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     commit();
                 }
             }
@@ -1189,6 +1247,7 @@ public void testRoutines() throws SQLException {
                 s.executeUpdate(
                    "insert into t values " + rs2Values(negatedInitialContents));
                 declareCalledNestedSetImmediate(s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 assertStatementError(LANG_DEFERRED_CHECK_VIOLATION_S,
                                      s, "call calledNestedSetImmediate()");
             } finally {
@@ -1306,6 +1365,7 @@ public void testDeferredRowsInvalidation() throws SQLException {
         commit();
 
         //   D r o p   t h e   t a b l e
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         s.executeUpdate("create table t(i int, " +
                         "  constraint c primary key (i) initially deferred)");
         s.executeUpdate("insert into t values 1,2,2,3");
@@ -1539,6 +1599,7 @@ public void testImport() throws SQLException {
                 s.executeUpdate("set constraints c deferred");
 
                 // import and implicit commit leads to checking
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 assertStatementError(
                     LANG_DEFERRED_DUP_VIOLATION_T, s,
                     "call SYSCS_UTIL.SYSCS_IMPORT_TABLE (" +
@@ -1559,6 +1620,7 @@ public void testImport() throws SQLException {
                 s.executeUpdate("set constraints c deferred");
 
                 // import and implicit commit leads to checking
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 assertStatementError(
                     LANG_DEFERRED_DUP_VIOLATION_T, s,
                     "call SYSCS_UTIL.SYSCS_IMPORT_TABLE (" +
@@ -1576,6 +1638,7 @@ public void testImport() throws SQLException {
                 commit();
 
                 // import and implicit commit leads to checking
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 assertStatementError(
                     LANG_DEFERRED_DUP_VIOLATION_T, s,
                     "call SYSCS_UTIL.SYSCS_IMPORT_TABLE (" +
@@ -1592,6 +1655,7 @@ public void testImport() throws SQLException {
                 s.executeUpdate("alter table t drop constraint c");
                 s.executeUpdate("truncate table t");
                 commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
                 //
                 //   C H E C K   C O N S T R A I N T
@@ -1601,6 +1665,7 @@ public void testImport() throws SQLException {
                     "add constraint c check (i > 0) initially deferred");
 
                 // import and implicit commit leads to checking
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 assertStatementError(
                     LANG_DEFERRED_CHECK_VIOLATION_T, s,
                     "call SYSCS_UTIL.SYSCS_IMPORT_TABLE (" +
@@ -1622,6 +1687,7 @@ public void testImport() throws SQLException {
     // be non-unique was incomplete in the deferrable case.
     public void testDropNotNullOnUniqueColumn() throws SQLException {
         final Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         s.executeUpdate("create table constraintest (" +
                 "val1 varchar (20) not null, " +
@@ -1634,10 +1700,12 @@ public void testDropNotNullOnUniqueColumn() throws SQLException {
 
         s.executeUpdate("insert into constraintest(val1) values 'name1'");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         assertStatementError(
             LANG_DUPLICATE_KEY_CONSTRAINT, s,
             "insert into constraintest(val1) values 'name1'");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final PreparedStatement ps = prepareStatement(
                 "insert into constraintest(val1) values (?)");
         ps.setString(1, null);
@@ -1649,6 +1717,7 @@ public void testDropNotNullOnUniqueColumn() throws SQLException {
 
     public void testDerby6374() throws SQLException {
         final Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         s.executeUpdate("create table t(i int)");
 
@@ -1662,6 +1731,7 @@ public void testDerby6374() throws SQLException {
                 s.executeUpdate("alter table t add constraint c unique(i)");
                 commit();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 assertStatementError(
                     LANG_DUPLICATE_KEY_CONSTRAINT, s,
                     "call SYSCS_UTIL.SYSCS_IMPORT_TABLE (" +
@@ -1677,6 +1747,7 @@ public void testDerby6374() throws SQLException {
     }
 
     public void testXA() throws SQLException, XAException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final XADataSource xads = J2EEDataSource.getXADataSource();
         J2EEDataSource.setBeanProperty(xads, "databaseName", "wombat");
 
@@ -1745,6 +1816,7 @@ public void testXA() throws SQLException, XAException {
                     fail("Expected XA commit to fail due to " +
                          "constraint violation");
                 } catch (XAException xe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6666
                     if (xe.errorCode == -3) {
                         System.err.println("huff");
                     } else {
@@ -1773,6 +1845,7 @@ public void testXA() throws SQLException, XAException {
     // deferrable: compress recreates the index.
     public void testCompressTableOKUnique() throws SQLException {
         final Statement stmt = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         stmt.executeUpdate(
                 "create table table1(" +
                 "name1 int unique deferrable initially immediate, " +
@@ -1787,6 +1860,7 @@ public void testCompressTableOKUnique() throws SQLException {
             // The following should run into problem because of constraint
             // on name1
             assertStatementError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 LANG_DUPLICATE_KEY_CONSTRAINT, stmt,
                 "insert into table1 values(1,22,222)");
 
@@ -1818,6 +1892,7 @@ public void testCompressTableOKUnique() throws SQLException {
     }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6708
     final static long NO_OF_INSERTED_ROWS = (1024L * 4);
     public void testManySimilarDuplicates() throws SQLException {
         if (usingDerbyNetClient()) {
@@ -1828,6 +1903,7 @@ public void testManySimilarDuplicates() throws SQLException {
         final Connection c = getConnection();
         c.setAutoCommit(false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final Statement s = c.createStatement();
         try {
             s.executeUpdate(
@@ -1844,7 +1920,9 @@ public void testManySimilarDuplicates() throws SQLException {
             for (long l=0; l < NO_OF_INSERTED_ROWS; l++) {
                 ps.executeUpdate();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             c.commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             fail();
         } catch (SQLException e) {
             assertSQLState(LANG_DEFERRED_DUP_VIOLATION_T, e);
@@ -1897,6 +1975,7 @@ public void testAlmostRemovedAllDups() throws SQLException {
                     {"9","9"}});
             commit();
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             assertSQLState(LANG_DEFERRED_DUP_VIOLATION_T, e);
         } finally {
             dropTable("t");
@@ -1958,6 +2037,7 @@ private static void dropTab1(final Connection c) throws SQLException {
      */
     public void testLockingForUniquePKWithCommit () throws Exception {
         setupTab1(getConnection());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6708
 
         try {
             for (int i = 0; i < 4; i++) {
@@ -1983,6 +2063,7 @@ public void testLockingForUniquePKWithCommit () throws Exception {
      */
     public void testLockingForUniquePKWithRollback () throws Exception {
         setupTab1(getConnection());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6708
 
         try {
             for (int i = 0; i < 4; i++) {
@@ -2008,6 +2089,7 @@ public void testLockingForUniquePKWithRollback () throws Exception {
      */
     public void testCheckConstraintsWithDeferredRows () throws
             SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         final Statement s = createStatement();
 
@@ -2025,6 +2107,7 @@ public void testCheckConstraintsWithDeferredRows () throws
             s.executeUpdate("insert into tab1 values (4)");
             s.executeUpdate("insert into tab1 values (3)");
             s.executeUpdate("insert into tab1 select c1-3 from tab1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             assertCommitError(LANG_DEFERRED_CHECK_VIOLATION_T,
                               getConnection());
 
@@ -2037,6 +2120,7 @@ public void testCheckConstraintsWithDeferredRows () throws
             s.executeUpdate("update tab1 as grr set c1=-1 where c1 = 2 and " +
                     "((select max(c1) from tab1 where grr.c1 > 0) > 0)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             assertCommitError(LANG_DEFERRED_CHECK_VIOLATION_T,
                               getConnection());
 
@@ -2154,7 +2238,9 @@ public void testSeveralCheckConstraints () throws SQLException {
      * @throws java.lang.Exception
      */
     private static void executeThreads (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6708
         final ConstraintCharacteristicsTest thisTest,
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final int isolation1,
         final int isolation2,
         final boolean commit) throws Exception {
@@ -2184,6 +2270,7 @@ private static void executeThreads (
                 dbo1.commit();
                 t.join();
                 assertNull("isolation levels: " + isolation1
+//IC see: https://issues.apache.org/jira/browse/DERBY-6437
                             + " " + isolation2 + ": exception " + 
                         dbo2.getException(), dbo2.getException());
             }
@@ -2221,7 +2308,9 @@ private Xid doXAWorkUniquePK(final Statement s, final XAResource xar)
     }
 
     private Xid doXAWorkCheck(final Statement s, final XAResource xar)
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             throws SQLException, XAException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final Xid xid = XATestUtil.getXid(1,05,32);
         // Start work on a transaction branch
         xar.start(xid, XAResource.TMNOFLAGS);
@@ -2256,6 +2345,7 @@ private void assertXidRolledBack(final XAResource xar, final Xid xid) {
      */
     private static String rs2Values(final String[][] rs) {
         final StringBuilder sb = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         for (String[] row : rs) {
             sb.append('(');
@@ -2334,7 +2424,11 @@ private static void checkConsistencyOfBaseTableAndIndex(Statement s)
     private final static String[] illegalAlterCharacteristics;
 
     static {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final List<String> characteristics = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         characteristics.addAll(Arrays.asList(defaultCharacteristics[0]));
         characteristics.addAll(Arrays.asList(nonDefaultCharacteristics[0]));
         characteristics.addAll(Arrays.asList(illegalCharacteristics));
@@ -2368,12 +2462,14 @@ private static void checkConsistencyOfBaseTableAndIndex(Statement s)
      */
     private static void assertTableLevelNonDefaultAccepted(
             final Statement s) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         for (String ct : tableConstraintTypes) {
             for (String[] ch : nonDefaultCharacteristics) {
                 // Only primary key and unique implemented
                 if (ch[0].contains("not enforced")) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                     assertStatementError(NOT_IMPLEMENTED,
                             s,
                             "create table t(i int, constraint c " +
@@ -2396,11 +2492,15 @@ private static void assertTableLevelNonDefaultAccepted(
      */
     private static void assertColumnLevelNonDefaultAccepted(
             final Statement s) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
         for (String ct : columnConstraintTypes) {
             for (String[] ch : nonDefaultCharacteristics) {
                 // Only primary key and unique implemented
                 if (ch[0].contains("not enforced")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
 
                     assertStatementError(NOT_IMPLEMENTED,
                             s,
@@ -2425,11 +2525,15 @@ private static void assertColumnLevelNonDefaultAccepted(
      * @throws SQLException
      */
     private static void assertTableLevelDefaultBehaviorAccepted (
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             final Connection c,
             final Statement s) throws SQLException {
 
         for (String ct : tableConstraintTypes) {
             for (String[] ch : defaultCharacteristics) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                 assertUpdateCount(s, 0,
                     "create table t(i int, constraint c " + ct + ch[0] + ")");
                 c.rollback();
@@ -2447,11 +2551,15 @@ private static void assertTableLevelDefaultBehaviorAccepted (
      * @throws SQLException
      */
     private static void assertColumnLevelDefaultBehaviorAccepted (
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             final Connection c,
             final Statement s) throws SQLException {
 
         for (String ct : columnConstraintTypes) {
             for (String ch[] : defaultCharacteristics) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                 assertUpdateCount(s, 0,
                     "create table t(i int " + ct + ch[0] + ")");
                 c.rollback();
@@ -2471,11 +2579,13 @@ private static void assertColumnLevelDefaultBehaviorAccepted (
      * @throws SQLException
      */
     private void assertDictState(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             final Statement s,
             final String characteristics,
             final String code) throws SQLException {
 
         for (String ct: tableConstraintTypes) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             try {
                 s.executeUpdate(
                     "create table t(i int, constraint c " + ct + " " +
@@ -2492,6 +2602,7 @@ private void assertDictState(
                     rollback();
                 }
             } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 if (characteristics.contains("not enforced")) {
                     assertSQLState(NOT_IMPLEMENTED, e);
                 } else {
@@ -2511,12 +2622,14 @@ private void assertDictState(
      * @throws SQLException
      */
     private void assertAlterDictState(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             final Statement s,
             final String enforcement) throws SQLException {
 
         final String oldState = getOldState(s);
         final String newState = computeNewState(oldState, enforcement);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (!enforcement.contains("not enforced")) {
             s.executeUpdate("alter table t alter constraint c " +
                     enforcement);
@@ -2525,12 +2638,14 @@ private void assertAlterDictState(
                             "    where constraintname = 'C'"),
                     new String[][]{{newState}});
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             assertStatementError(NOT_IMPLEMENTED, s,
                     "alter table t alter constraint c " + enforcement);
         }
     }
 
     private String getOldState(final Statement s) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final ResultSet rs = s.executeQuery(
                 "select state from sys.sysconstraints " +
                 "    where constraintname = 'C'");
@@ -2544,22 +2659,30 @@ private String getOldState(final Statement s) throws SQLException {
 
 
     private String computeNewState(String oldState, String enforcement) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         return inverseState.get(oldState)[
             enforcement.equals("enforced") ? 0 : 1];
     }
 
     private void assertCreateInconsistentCharacteristics(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             final Statement s,
             final String characteristics) throws SQLException {
 
         for (String ct: tableConstraintTypes) {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
                 s.executeUpdate(
                     "create table t(i int, constraint c " + ct + " " +
                     characteristics + ")");
                 fail("wrong characteristics unexpectedly passed muster");
                 rollback();
             } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
                 assertSQLState(LANG_INCONSISTENT_C_CHARACTERISTICS, e);
             }
         }
@@ -2575,12 +2698,14 @@ private void assertAlterInconsistentCharacteristics(
             fail("wrong characteristics unexpectedly passed muster");
             rollback();
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             assertSQLState(LANG_SYNTAX_ERROR, e);
         }
     }
 
     private void declareCalledNested(final Statement s) throws SQLException {
         s.executeUpdate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             "create procedure calledNested(isCheckConstraint boolean)" +
             "  language java parameter style java" +
             "  external name '" +
@@ -2589,6 +2714,7 @@ private void declareCalledNested(final Statement s) throws SQLException {
     }
 
     private void declareCalledNestedFk(final Statement s) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         s.executeUpdate(
             "create procedure calledNestedFk()" +
             "  language java parameter style java" +
@@ -2623,6 +2749,7 @@ public static void calledNested(final boolean isCheckConstraint)
 
     public static void calledNestedFk() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         final Connection c =
             DriverManager.getConnection("jdbc:default:connection");
         final Statement cStmt = c.createStatement();
@@ -2646,6 +2773,7 @@ public static void calledNestedSetImmediate() throws SQLException
     }
 
     private void dontThrow(Statement st, String stm) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         try {
             st.executeUpdate(stm);
         } catch (SQLException e) {
@@ -2667,6 +2795,8 @@ private void dontThrow(Statement st, String stm) {
      * @throws SQLException
      */
     public void testDerby6670_a() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6670
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         final Connection c = getConnection();
         Statement s = createStatement();
 
@@ -2853,6 +2983,7 @@ public void testDerby6670_b() throws SQLException {
      * @throws SQLException
      */
     public void testDerby6666() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6666
         final Statement s = createStatement();
         s.executeUpdate("create table t1(x int primary key)");
         s.executeUpdate(
@@ -2925,6 +3056,7 @@ public void testDerby6773() throws Exception
      */
     public  static  LanguageConnectionContext    getLCC( final Connection conn )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6741
         return AccessController.doPrivileged
             (
              new PrivilegedAction<LanguageConnectionContext>()
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CreateTableFromQueryTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CreateTableFromQueryTest.java
index 5ef43e2ef7..a18329aaf8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CreateTableFromQueryTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CreateTableFromQueryTest.java
@@ -54,6 +54,7 @@ public CreateTableFromQueryTest(String name)
      * o.a.dT.ft.tests.replicationTests.StandardTests.
      */
     public static void decorate(Statement stmt)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3163
          throws SQLException
     {
         // create base tables t1 and t2
@@ -74,6 +75,7 @@ public static Test suite()
 
             protected void decorateSQL(Statement stmt) throws SQLException
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3163
                 decorate(stmt);
             }
         };
@@ -185,6 +187,7 @@ public void testCreateTableWithGroupByInQuery() throws Exception
     public void testDerby6956() throws Exception
     {
         Statement stmt = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6956
 
         stmt.executeUpdate(
             "CREATE TABLE DERBYTEST6956 " +
@@ -270,6 +273,7 @@ public void testDerby6956() throws Exception
      */
     public void testBaseTableDoesNotExist() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
         assertStatementError("42X05", createStatement(),
             "create table t3 as select * from t4 with no data");
     }
@@ -280,6 +284,7 @@ public void testBaseTableDoesNotExist() throws Exception
      */
     public void testParametersNotAllowed() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
         assertStatementError("42X99", createStatement(),
             "create table t3 as select * from t1 where i = ? with no data");
     }
@@ -290,6 +295,7 @@ public void testParametersNotAllowed() throws Exception
      */
     public void testDuplicateColumnName() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
         assertStatementError("42X12", createStatement(),
             "create table t3 (c1,c2,c1) "
                 + "as select i, s, f from t1 with no data");
@@ -302,6 +308,7 @@ public void testDuplicateColumnName() throws Exception
      */
     public void testColumnCountMismatch() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
         assertStatementError("42X70", createStatement(),
             "create table t3 (c1,c2,c3) as select i,s from t1 with no data");
     }
@@ -313,6 +320,7 @@ public void testColumnCountMismatch() throws Exception
      */
     public void testSystemGeneratedColumnName() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
         assertStatementError("42909", createStatement(),
             "create table t3 as select i, 2*i from t1 with no data");
     }
@@ -323,6 +331,7 @@ public void testSystemGeneratedColumnName() throws Exception
      */
     public void testNullValues() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
         assertStatementError("42X07", createStatement(),
             "create table t3 (x) as values null with no data");
     }
@@ -333,6 +342,7 @@ public void testNullValues() throws Exception
      */
     public void testUnimplementedWithDataClause() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
         assertStatementError("0A000", createStatement(),
             "create table t3 as select * from t1 with data");
     }
@@ -343,6 +353,7 @@ public void testUnimplementedWithDataClause() throws Exception
     public void testInvalidDataType() throws Exception
     {
         Statement stmt = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
 
         // USER (Java Object)
         assertStatementError("42X71", stmt,
@@ -357,6 +368,7 @@ private void positiveTest(String sql, String [] columnNames,
             String [] nullability, String [] types) throws Exception
     {
         Statement stmt = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
 
         // create table
         stmt.executeUpdate(sql);
@@ -374,6 +386,7 @@ private void positiveTest(String sql, String [] columnNames,
                     types[col], rs.getString("TYPE_NAME"));
             col++;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
         rs.close();
         Assert.assertEquals("Unexpected column count:",
                 columnNames.length, col);
@@ -385,6 +398,7 @@ private void positiveTest(String sql, String [] columnNames,
      */
     protected void setUp() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5706
         setAutoCommit(false);
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java
index 271574c3d5..9a8aaa2be9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CurrentOfTest.java
@@ -46,6 +46,7 @@ public CurrentOfTest(String name) {
      * Create a suite of tests.
      */
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("CurrentOfTest");
 		suite.addTestSuite(CurrentOfTest.class);
 		//To run the test in both embedded and client/server mode
@@ -139,6 +140,7 @@ public void testReadOnlyCursors() throws SQLException {
     */
 	public void testDelete() throws SQLException {
 		PreparedStatement select, delete;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 		Statement delete1,delete2;
 		ResultSet cursor;
 		String tableRows = "select i, c from t for read only";
@@ -160,6 +162,7 @@ public void testDelete() throws SQLException {
 
 		// TEST: cursor and target table mismatch
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 		assertCompileError("42X28","delete from s where current of " + cursor.getCursorName()); 
 		
 		// TEST: find the cursor during compilation
@@ -168,6 +171,7 @@ public void testDelete() throws SQLException {
 		// TEST: delete before the cursor is on a row
 		assertStatementError("24000", delete);
 		cursor.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 		assertEquals(1956, cursor.getInt(1));
 		
 		// TEST: find the cursor during execution and it is on a row
@@ -188,6 +192,7 @@ public void testDelete() throws SQLException {
 		if (usingEmbedded())
 			assertStatementError("24000", delete);
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
 			assertStatementError("42X30", delete);
 		
 		
@@ -201,7 +206,9 @@ public void testDelete() throws SQLException {
 		
 		// TEST: no cursor with that name exists
 		delete2 = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4777
 		assertStatementError("42X30", delete2,"delete from t where current of myCursor" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 		expectedRows = new Object[][]{{new String("456"),new String("hi yourself")},                                       
 				   					  {new String("3"),new String("you are the one")}}; 
 		JDBC.assertFullResultSet(delete1.executeQuery(tableRows), expectedRows, true);
@@ -219,6 +226,7 @@ public void testDelete() throws SQLException {
         assertUpdateCount(delete, 1);
         
         delete.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
         delete1.close();        
         cursor.close();
         select.close();
@@ -237,6 +245,7 @@ public void testDelete() throws SQLException {
 	public void testUpdate() throws SQLException {
 		PreparedStatement select;
 		PreparedStatement update;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 		Statement select1,update2;
 		ResultSet cursor;
 		String tableRows = "select i, c from t for read only";
@@ -253,11 +262,13 @@ public void testUpdate() throws SQLException {
 
 		select = prepareStatement("select I, C from t for update of I");
 		cursor = select.executeQuery(); // cursor is now open
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 		assertCompileError("42X31", "update t set C = 'abcde' where current of "+ cursor.getCursorName());
 		cursor.close();
 		select.close();
 
 		//Making sure we have the correct rows in the table to begin with
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 		select1 = createStatement();
 		Object[][] expectedRows = new Object[][]{{new String("1956"),new String("hello world")},                                       
 				 {new String("456"),new String("hi yourself")},                                       
@@ -276,6 +287,7 @@ public void testUpdate() throws SQLException {
 		// TEST: cursor and target table mismatch
 
 		assertCompileError("42X29","update s set i=1 where current of " + cursor.getCursorName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 
 		// TEST: find the cursor during compilation
 		update = prepareStatement("update t set i=i+10, c='Gumby was here' where current of "
@@ -286,6 +298,7 @@ public void testUpdate() throws SQLException {
 
 		// TEST: find the cursor during execution and it is on a row
 		cursor.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 		assertEquals(1956,cursor.getInt(1));
 		assertUpdateCount(update, 1);
 
@@ -295,6 +308,7 @@ public void testUpdate() throws SQLException {
 		// skip a row and update another row so that two rows will
 		// have been removed from the table when we are done.
 		cursor.next(); // skip this row
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 		assertEquals(456,cursor.getInt(1));
 		cursor.next();
 		assertEquals(180,cursor.getInt(1));
@@ -309,6 +323,7 @@ public void testUpdate() throws SQLException {
 		// TEST: update off a closed cursor
 		cursor.close();
 		select.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
 		assertStatementError("42X30", update);
 		update.close();
 
@@ -318,6 +333,7 @@ public void testUpdate() throws SQLException {
 		update2.close();
 		
 		//Verifyin we have the correct updated rows in the table at the end
+//IC see: https://issues.apache.org/jira/browse/DERBY-2283
 		expectedRows = new Object[][]{{new String("1976"),new String("Gumby was here")},                                       
 				 {new String("456"),new String("hi yourself")},                                       
 				 {new String("190"),new String("Gumby was here")},                                      
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CurrentSchemaTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CurrentSchemaTest.java
index 75712e6f51..e3c4d6ee1e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CurrentSchemaTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CurrentSchemaTest.java
@@ -34,6 +34,7 @@ public CurrentSchemaTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("CurrentSchemaTest");
         suite.addTest(TestConfiguration.defaultSuite(CurrentSchemaTest.class));
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CursorTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CursorTest.java
index 90dc1b774a..30c3cc8f53 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CursorTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/CursorTest.java
@@ -49,6 +49,7 @@ public CursorTest(String name) {
      * @throws SQLException
      */
     public void testCursor() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2299
         PreparedStatement select;
         ResultSet cursor;
 
@@ -196,6 +197,7 @@ public void derby2417testSetCursorNextExecute() throws SQLException
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("CursorTest");
         
         suite.addTest(TestConfiguration.defaultSuite(CursorTest.class));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DB2IsolationLevelsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DB2IsolationLevelsTest.java
index 847202520a..8722227f0b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DB2IsolationLevelsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DB2IsolationLevelsTest.java
@@ -44,6 +44,7 @@ public DB2IsolationLevelsTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("DB2IsolationLevelsTest Test");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DBInJarTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DBInJarTest.java
index fd5a8883f7..2ace194463 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DBInJarTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DBInJarTest.java
@@ -234,6 +234,7 @@ private void createDerby2354Database() throws SQLException {
     }
     
     protected static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(DBInJarTest.class);
         // Don't run with security manager, we need access to user.dir to archive
@@ -258,6 +259,7 @@ protected void decorateSQL(Statement stmt) throws SQLException
     }
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DBInJarTest");
         suite.addTest(baseSuite("DBInJarTest:embedded"));
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DBOAccessTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DBOAccessTest.java
index ec18d0be9b..4de50a5979 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DBOAccessTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DBOAccessTest.java
@@ -162,6 +162,7 @@ public static Test suite()
         Test    unauthorizedRun = TestConfiguration.embeddedSuite( NoAuthorization.class );
         unauthorizedRun = new SupportFilesSetup( unauthorizedRun, testFiles );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite();
         suite.addTest( authorizedRun );
         suite.addTest( unauthorizedRun );
@@ -229,6 +230,7 @@ public  void    testSYSUSERS() throws Exception
         goodStatement( dboConnection, "create view v2 as select username, hashingscheme, lastmodified from sys.sysusers" );
         if ( authorizationIsOn() ) { goodStatement( dboConnection, "grant select on v2 to public" ); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6221
         goodStatement( dboConnection, "create view v3 as select username, hashingscheme, lastmodified from sys.sysusers where password is null" );
         if ( authorizationIsOn() ) { goodStatement( dboConnection, "grant select on v3 to public" ); }
 
@@ -246,6 +248,7 @@ private void    vetDBO_OKProbes( Connection conn, boolean shouldSucceed )
         vetUserProbes( conn, shouldSucceed, "select count(*) from sys.sysusers", ONLY_DBO );
         vetUserProbes( conn, shouldSucceed, "select username, hashingscheme, lastmodified from sys.sysusers", ONLY_DBO );
         vetUserProbes( conn, shouldSucceed, "select username from sys.sysusers", ONLY_DBO );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6221
         vetUserProbes( conn, shouldSucceed, "select username, lastmodified from sys.sysusers", ONLY_DBO );
         vetUserProbes( conn, shouldSucceed, "select username, lastmodified from sys.sysusers where username = 'FRED'", ONLY_DBO );
 
@@ -264,6 +267,7 @@ private void    vetUnauthorizedProbes( Connection conn, boolean shouldSucceed, S
         vetUserProbes( conn, shouldSucceed, "select password from sys.sysusers", expectedSQLState );
         vetUserProbes( conn, shouldSucceed, "select username, password from sys.sysusers", expectedSQLState );
         vetUserProbes( conn, shouldSucceed, "select username from sys.sysusers where password = 'foo'", expectedSQLState );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6221
         vetUserProbes( conn, shouldSucceed, "select username, lastmodified from sys.sysusers where password is not null", expectedSQLState );
         vetUserProbes( conn, shouldSucceed, "select * from test_dbo.v3", expectedSQLState );
     }
@@ -286,6 +290,7 @@ private void    vetUnauthorizedProbes( Connection conn, boolean shouldSucceed, S
      */
     public  void    test_6616() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6616
         Connection  dboConnection = openUserConnection( TEST_DBO );
         Connection  janetConnection = openUserConnection( JANET );
 
@@ -379,6 +384,7 @@ private void    vet6616( Connection conn, boolean shouldSucceed, String routineN
         }
         catch (SQLException se)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
             if ( shouldSucceed )
             {
                 fail( routineName + " should have succeeded", se );
@@ -451,6 +457,10 @@ else if (SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT.equals( routin
         {
             try {
                 SystemProcedures.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT( null, (short) 0 );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
                 fail();
             }
             catch (SQLException se) { vetError( NULL_BACKUP_DIRECTORY, se ); }
@@ -466,6 +476,7 @@ else if ( SYSCS_CHECK_TABLE.equals( routineName ) )
         else if (INSTALL_JAR.equals( routineName ) )
         {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
                 SystemProcedures.INSTALL_JAR( SupportFilesSetup.getReadOnlyFileName("foo"), "bar", 1 );
                 fail();
             }
@@ -535,6 +546,9 @@ else if ( SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE.equals( routineName ) )
             try {
                 SystemProcedures.SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE
                     ( "TEST_DBO", "BAR", null, "1,3,4", "WIBBLE", null, null, null, (short) 1 );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
                 fail();
             }
             catch (SQLException se) { vetError( NO_SUCH_TABLE, se ); }
@@ -544,6 +558,7 @@ else if ( SYSCS_BULK_INSERT.equals( routineName ) )
             try {
                 SystemProcedures.SYSCS_BULK_INSERT
                     ( "TEST_DBO", "BAR", "WIBBLE", "wombat" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
                 fail();
             }
             catch (SQLException se) { vetError( SYNTAX_ERROR, se ); }
@@ -588,6 +603,7 @@ else if (SYSCS_CREATE_USER.equals( routineName ) )
         {
             try {
                 SystemProcedures.SYSCS_CREATE_USER( "foo", "bar" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
                 fail();
             }
             catch (SQLException se) { vetError( FIRST_CREDENTIALS, se ); }
@@ -604,6 +620,8 @@ else if (SYSCS_DROP_USER.equals( routineName ) )
         {
             try {
                 SystemProcedures.SYSCS_DROP_USER( "foo" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
                 fail();
             }
             catch (SQLException se) { vetError( UNKNOWN_USER, se ); }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
index ba9ae317bc..66c293d5b7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
@@ -371,6 +371,9 @@ private static void getResourceTests(Connection conn) throws SQLException
      */
     public void testAlterTable() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2036
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         Statement s = createStatement();
         s.executeUpdate("ALTER TABLE EMC.CONTACTS ADD COLUMN OK SMALLINT");
         JDBC.assertFullResultSet(
@@ -411,6 +414,7 @@ public void testAlterTable() throws SQLException
      */
     public void testClassPathRollback() throws SQLException, MalformedURLException
     {        
+//IC see: https://issues.apache.org/jira/browse/DERBY-2033
         getConnection().setAutoCommit(false);
         replaceJar("dcl_emc2.jar", "EMC.MAIL_APP");
 
@@ -543,6 +547,8 @@ public void testSignedJar() throws SQLException, MalformedURLException
         
         ps.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2033
+//IC see: https://issues.apache.org/jira/browse/DERBY-2083
         signersTests(getConnection());
         
     }
@@ -645,6 +651,8 @@ public void testRemoveJar() throws SQLException
      */
     public void testCreateDatabaseJar() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2033
+//IC see: https://issues.apache.org/jira/browse/DERBY-2083
         CallableStatement cs = prepareCall(
                 "CALL SYSCS_UTIL.SYSCS_CHECKPOINT_DATABASE()");
         cs.executeUpdate();
@@ -660,8 +668,10 @@ public void testCreateDatabaseJar() throws Exception
 
         cs.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         final String db = getTestConfiguration().getDefaultDatabaseName();
         AccessController.doPrivileged
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         (new java.security.PrivilegedExceptionAction<Void>() {
             public Void run() throws Exception {
                 createArchive("dclt.jar", new File(backupDir, db), "dbro");;
@@ -679,6 +689,7 @@ public Void run() throws Exception {
     public void testDatabaseInJar() throws SQLException
     {
         File jarFile = SupportFilesSetup.getReadOnly("dclt.jar");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
         String dbName = "jar:(" +
                 PrivilegedFileOpsForTests.getAbsolutePath(jarFile) + ")dbro";
         
@@ -700,6 +711,7 @@ public void testDatabaseInClasspath() throws SQLException
      */
     public void testLoadJavaClassIndirectly() throws SQLException, MalformedURLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-538
         loadJavaClass(
                 "org.apache.derbyTesting.databaseclassloader.cracker.C1.simple",
                 "38000");
@@ -820,6 +832,7 @@ private static void readOnlyTest(DataSource ds) throws SQLException
             assertStatementError("25502", s,
                     "CALL EMC.ADDCONTACT(3, 'really@is_read_only.gov')");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-552
             getResourceTests(conn);
             
             // DERBY-553: Disabled on Java 5 due to JVM bug
@@ -855,6 +868,7 @@ private static void readOnlyTest(DataSource ds) throws SQLException
      */
     public void testClassLoadOrdering() throws SQLException, MalformedURLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2331
         Statement s = createStatement();
         
         s.executeUpdate("CREATE SCHEMA OT");
@@ -894,6 +908,7 @@ public void testClassLoadOrdering() throws SQLException, MalformedURLException
         installJar("dcl_ot2.jar", "OT.OT2");
         installJar("dcl_ot3.jar", "OT.OT3");
               
+//IC see: https://issues.apache.org/jira/browse/DERBY-2331
         checkLoading("123");
         checkLoading("132");
         checkLoading("213");
@@ -946,6 +961,7 @@ private void checkLoading(String order) throws SQLException
         
         // Tests the classes loaded indirectly by
         // code in an installed jar file.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2331
         checkCorrectLoader("OrderObject1", ps1, ps2, ps3);
         checkCorrectLoader("OrderObject2", ps1, ps2, ps3);
         checkCorrectLoader("OrderObject3", ps1, ps2, ps3);
@@ -985,6 +1001,7 @@ private void checkCorrectLoader(String className,
      */
     public void testIndirectLoading() throws SQLException, MalformedURLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2331
         Statement s = createStatement();
         
         s.executeUpdate("CREATE SCHEMA ID");
@@ -1031,6 +1048,7 @@ public void testIndirectLoading() throws SQLException, MalformedURLException
     public void testTableFunctionInJar() throws SQLException, MalformedURLException
     {
         String jarName = "EMC.DUMMY_VTI";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4126
 
         installJar("dummy_vti.jar", jarName );
 
@@ -1067,6 +1085,7 @@ public void testTableFunctionInJar() throws SQLException, MalformedURLException
              "language java\n" +
              "parameter style DERBY_JDBC_RESULT_SET\n" +
              "reads sql data\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5352
              "external name 'MissingClass.dummyVTI'\n"
              );
 
@@ -1104,6 +1123,7 @@ public void testTableFunctionInJar() throws SQLException, MalformedURLException
 
         // drop the useless function
         s.executeUpdate( "drop function dummyVTI2\n" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5352
 
         setDBClasspath(null);
         
@@ -1335,6 +1355,7 @@ private void derby2035Workaround() throws SQLException
         // setting the change does see it!
         // 
         getConnection().close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
         getTestConfiguration().shutdownDatabase(); 
     }
     
@@ -1344,6 +1365,8 @@ private void derby2035Workaround() throws SQLException
      */
     private static void createArchive(String jarName, File dbDir, String dbName)
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2033
+//IC see: https://issues.apache.org/jira/browse/DERBY-2083
 
         assertTrue(dbDir.isDirectory());
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java
index a63e23eba0..48e6682125 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DateTimeTest.java
@@ -54,6 +54,7 @@ public DateTimeTest(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DateTimeTest");
         suite.addTest(baseSuite("DateTimeTest:Embedded"));
         suite.addTest(TestConfiguration
@@ -62,6 +63,7 @@ public static Test suite() {
     }
 
     protected static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(DateTimeTest.class);
         return new CleanDatabaseTestSetup(suite) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeadlockDetectionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeadlockDetectionTest.java
index 80a1136ba3..5da8ec1a1c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeadlockDetectionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeadlockDetectionTest.java
@@ -82,6 +82,7 @@ public void testDerby3980_repeatable_read() throws Exception {
         final Barrier readLockBarrier = new Barrier(threads.length);
 
         // Exceptions seen by the threads.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         final List<Exception> exceptions =
                 Collections.synchronizedList(new ArrayList<Exception>());
 
@@ -183,6 +184,7 @@ public void testDerby5073_dodgy_victims() throws Exception {
         // The transactions that have exclusive locks should attempt to lock
         // another row than the one they already have locked, otherwise there
         // will be no deadlock.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         final List<Exception> exceptions =
                 Collections.synchronizedList(new ArrayList<Exception>());
         for (int i = 0; i < threads.length; i++) {
@@ -225,6 +227,8 @@ public void run() {
             conns[i].close();
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Exception e : exceptions) {
             if (e instanceof SQLException) {
                 assertSQLState(DEADLOCK, (SQLException) e);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeadlockModeTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeadlockModeTest.java
index 9d43952810..9f8f5825da 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeadlockModeTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeadlockModeTest.java
@@ -84,6 +84,7 @@ public void testThreadsUpdatingTable() throws Exception {
     private void createThreads(Thread [] t) throws SQLException {
         for (int i = 0; i < THREAD_COUNT; i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
             final Connection c = openDefaultConnection();
             t[i] = new Thread(new Runnable() {
                 public void run() {threadWorker(c); }});
@@ -143,6 +144,7 @@ private void threadWorker(Connection threadConnection) {
                 threadConnection.commit();
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
             threadConnection.close();
         } catch (Exception e) {
             synchronized(syncObject){
@@ -152,6 +154,7 @@ private void threadWorker(Connection threadConnection) {
     }
     
     protected static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(DeadlockModeTest.class);
         return new CleanDatabaseTestSetup(
@@ -175,6 +178,7 @@ protected void decorateSQL(Statement stmt) throws SQLException
     } 
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DeadlockModeTest ");
         suite.addTest(
                 baseSuite("DeadlockModeTest:embedded")
@@ -182,6 +186,7 @@ public static Test suite() {
         
         /* JSR169 does not have encryption support */
         if ( JDBC.vmSupportsJDBC3() ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
             suite.addTest(Decorator.encryptedDatabase(
                     baseSuite("DeadlockModeTest:encrypted")));
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaJDBC30Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaJDBC30Test.java
index 7ffd718677..291c439dfd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaJDBC30Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaJDBC30Test.java
@@ -55,6 +55,7 @@ public DeclareGlobalTempTableJavaJDBC30Test(String name)
         super(name);
     }	
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite();
         suite.addTest(TestConfiguration.embeddedSuite(
                 DeclareGlobalTempTableJavaJDBC30Test.class));
@@ -69,6 +70,7 @@ public static Test suite() {
      * @return A suite of tests being run with client only
      */
     private static Test getClientSuite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Client/Server");
         // skip the tests with more than 1 savepoint -  
         // see (lack of support described in) DERBY-3687
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaTest.java
index f98799eb20..3db90df737 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DeclareGlobalTempTableJavaTest.java
@@ -55,6 +55,7 @@ public DeclareGlobalTempTableJavaTest(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2895
 	return TestConfiguration.defaultSuite(DeclareGlobalTempTableJavaTest.class);
     }
     protected void setUp() throws Exception {
@@ -761,6 +762,7 @@ public void testPreparedStatement2() throws SQLException {
      *  @throws SQLException 
      */
     public void testTempTableDDLRollbackbehaviour1() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2895
         Statement s = createStatement();
         s.executeUpdate("declare global temporary table SESSION.t1(c11 int, c12 int) on commit preserve rows  not logged");
         JDBC.assertSingleValueResultSet(s.executeQuery("select count(*) from SESSION.t1") , "0");
@@ -1175,6 +1177,7 @@ public void testDMLRollback2() throws SQLException {
      * See DERBY-5614.
      */
     public void testVtiInsertIntoGTT()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5614
             throws SQLException {
         Statement s = createStatement();
         s.executeUpdate("DECLARE GLOBAL TEMPORARY TABLE SESSION.vtitogtt(" +
@@ -1218,6 +1221,7 @@ public void dropSchemaTables() throws SQLException {
         Statement s = createStatement();
         // Query the meta data to avoid filling the log with lots of
         // table-not-found error messages.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5614
         ResultSet rs = getConnection().getMetaData().getTables(
                 null, "SESSION", "%", null);
         while (rs.next()) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby5005Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby5005Test.java
index ce78e251a7..e29470970f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby5005Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby5005Test.java
@@ -43,6 +43,7 @@ public Derby5005Test(String name) {
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("Derby5005Test");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(makeSuite());
         // suite.addTest(
@@ -59,6 +60,7 @@ public static Test suite()
     private static Test makeSuite()
     {
         return new CleanDatabaseTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new BaseTestSuite(Derby5005Test.class)) {
                 protected void decorateSQL(Statement s)
                         throws SQLException {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby5652.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby5652.java
index 9855ab77dc..ca5f1cdbbf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby5652.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby5652.java
@@ -63,6 +63,7 @@ public class Derby5652 extends BaseJDBCTestCase
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite( "Derby5652" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         Test    test = new Derby5652( "basicTest" );
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java
index 9d20e8d48d..9e63efced5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby6587Test.java
@@ -40,6 +40,7 @@ public Derby6587Test(String name) {
     }
 
     public static Test suite(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Derby6587Test");
         suite.addTest(baseSuite("Derby6587:embedded"));
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby6725GetDatabaseName.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby6725GetDatabaseName.java
index 545310096b..4ee6be5c08 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby6725GetDatabaseName.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Derby6725GetDatabaseName.java
@@ -60,6 +60,7 @@ public void testDatabaseName() throws SQLException {
     }
     
     private void checkDbName(Connection conn, String expectedDbName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6725
         File    systemDir = new File( "system" );
         File    dbDir = new File( systemDir, expectedDbName );
         String  databasePath = PrivilegedFileOpsForTests.getAbsolutePath( dbDir );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java
index 7c1e6a5459..b17d676b43 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DistinctTest.java
@@ -47,7 +47,9 @@ public DistinctTest(String name) {
 	}
 	
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test s = new BaseTestSuite(DistinctTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2491
 		Properties p = new Properties();
 		p.put("derby.optimizer.noTimeout", "true");
 		Test t = new SystemPropertyTestSetup(s, p);
@@ -453,6 +455,7 @@ public void testDistinctInsertWithGeneratedColumn() throws SQLException {
 		assertEquals(2, s.executeUpdate("insert into destWithAI(c12) select distinct(c31) from source"));
 		
 		// we should not see gaps in the autoincrement column
+//IC see: https://issues.apache.org/jira/browse/DERBY-4457
 		String [][] expected = { {"1"}, {"2"} };
 		JDBC.assertFullResultSet(
 				s.executeQuery("select c11 from destWithAI order by c11"),
@@ -559,6 +562,7 @@ public void testDistinctStoreSort() throws SQLException {
                                      {"1", "1"},
         		                     {"2", "2"}, 
         		                     {"2", "1"} };
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
 		JDBC.assertUnorderedResultSet(s.executeQuery(
 			"select * from td, (select distinct x from td) as sub(x)"),
 			expected);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DropTableTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DropTableTest.java
index 8ccb077844..aa27eabfcc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DropTableTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DropTableTest.java
@@ -241,6 +241,7 @@ public void testDropTableDropView() throws SQLException{
         assertStatementError("42X01", st, " drop view vt1 restrict");
         assertStatementError("42X01", st, " drop view vt1 cascade");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4438
         st.executeUpdate( "drop view vvt1"); // Clean up.
         st.executeUpdate( "drop view  vt1"); // Clean up.
         st.executeUpdate( "drop table  t1"); // Clean up.
@@ -315,6 +316,7 @@ public void testDropTableIndexesDropped() throws SQLException{
         
         st1.close();
         st.executeUpdate("drop table T1"); // Clean up
+//IC see: https://issues.apache.org/jira/browse/DERBY-4438
 
         //pretend all of the above didn't happen
         setAutoCommit(true);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DummyOptTrace.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DummyOptTrace.java
index 159a354dba..1c7aea6a52 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DummyOptTrace.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DummyOptTrace.java
@@ -108,6 +108,7 @@ public  void    traceCurrentPlanAvoidsSort( CostEstimate bestCost, CostEstimate
     public  void    traceCheapestPlanSoFar( int planType, CostEstimate currentCost ) {}
     public  void    traceSortNeededForOrdering( int planType, RequiredRowOrdering requiredRowOrdering ) {}
     public  void    traceRememberingBestJoinOrder
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         ( int joinPosition, int[] bestJoinOrder, int planType, CostEstimate planCost, JBitSet assignedTableMap ) {}
     public  void    traceSkippingBecauseTooMuchMemory( int maxMemoryPerTable ) {}
     public  void    traceCostOfNScans( int tableNumber, double rowCount, CostEstimate cost ) {}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DynamicLikeOptimizationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DynamicLikeOptimizationTest.java
index 7ddffc6c9a..65b9661a78 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DynamicLikeOptimizationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/DynamicLikeOptimizationTest.java
@@ -44,6 +44,7 @@
 public class DynamicLikeOptimizationTest extends BaseJDBCTestCase {
     /** All rows in the cei table. */
     private static final Object[][] CEI_ROWS = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         { 0, "Alarms", "AlarmDisk999" },
         { 1, "Alarms", "AlarmFS-usr" },
         { 2, "Alarms", "AlarmPower" },
@@ -60,6 +61,7 @@ public DynamicLikeOptimizationTest(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite tests =
             new BaseTestSuite("DynamicLikeOptimizationTest");
 
@@ -320,6 +322,7 @@ private void testGeneratedPredicates(PreparedStatement ps,
                                          String[][][] rows)
             throws SQLException {
         Object[] args = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             null, 1, "", "%", "%f", "%g", "asd%", "_%", "%_",
             "_asdf", "_asdf %", "%asdf"
         };
@@ -408,6 +411,7 @@ public void testEscapeWithBackslash() throws SQLException {
             "(name LIKE ? escape '\\') and (source like ? escape '\\') " +
             "order by source asc, name asc");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<String[], Object[][]> inputOutput =
                 new HashMap<String[], Object[][]>();
         inputOutput.put(
@@ -450,6 +454,7 @@ public void testEscapeWithBackslash() throws SQLException {
             new Object[][] { CEI_ROWS[8] });
         inputOutput.put(new String[] {"Bogus", "Name"}, new Object[][] {});
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Map.Entry<String[], Object[][]> entry : inputOutput.entrySet()) {
             String[] args = entry.getKey();
             Object[][] rows = entry.getValue();
@@ -531,6 +536,7 @@ public void testEscapedEscapeCharacterPrecedingFirstWildcard()
      * predicate is rewritten to &gt;=, &lt; and LIKE.
      */
     public void testDynamicLikeOptimization() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2642
         Statement s = createStatement();
         ResultSet rs = s.executeQuery( 
           		"VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY('derby.database.collation')");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
index b8abfc751c..4fa0c97389 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
@@ -43,10 +43,13 @@ public ErrorCodeTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("errorcode Test");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
         suite.addTest(TestConfiguration.defaultSuite(ErrorCodeTest.class));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5251
         return new LocaleTestSetup(suite, Locale.ENGLISH);
     }
 
@@ -54,6 +57,7 @@ public void test_errorcode() throws Exception
     {
         ResultSet rs = null;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         Statement s = createStatement();
         
         s.executeUpdate(
@@ -80,6 +84,7 @@ public void test_errorcode() throws Exception
        // -- test ErrorMessages VTI        
         rs = s.executeQuery(
             "select * from SYSCS_DIAG.error_Messages  where "
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
             + "CAST(sql_state AS CHAR(5)) = '07000'");
          
         String [][] expRS = new String [][]
@@ -97,6 +102,7 @@ public void test_errorcode() throws Exception
         		{"08001","A connection could not be established because the security token is larger than the maximum allowed by the network protocol.","40000"},
         		{"08001","A connection could not be established because the user id has a length of zero or is larger than the maximum allowed by the network protocol.","40000"},
         		{"08001","A connection could not be established because the password has a length of zero or is larger than the maximum allowed by the network protocol.","40000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-4009
         		{"08001","A connection could not be established because the external name (EXTNAM) has a length of zero or is larger than the maximum allowed by the network protocol.","40000"},
         		{"08001","A connection could not be established because the server name (SRVNAM) has a length of zero or is larger than the maximum allowed by the network protocol.","40000"},
         		{"08001","Required Derby DataSource property {0} not set.","40000"},
@@ -118,14 +124,19 @@ public void test_errorcode() throws Exception
         		{"08004","Database connection refused.","40000"},
         		{"08004","User '{0}' cannot shut down database '{1}'. Only the database owner can perform this operation.","40000"},
         		{"08004","User '{0}' cannot (re)encrypt database '{1}'. Only the database owner can perform this operation.","40000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-6061
         		{"08004","User '{0}' cannot upgrade database '{1}'. Only the database owner can perform this operation.","40000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3021
         		{"08004","Connection refused to database '{0}' because it is in replication slave mode.","40000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3189
+//IC see: https://issues.apache.org/jira/browse/DERBY-2954
         		{"08004","User '{0}' cannot issue a replication operation on database '{1}'. Only the database owner can perform this operation.","40000"},
         		{"08004","Missing permission for user '{0}' to shutdown system [{1}].","40000"},
         		{"08004","Cannot check system permission to create database '{0}' [{1}].","40000"},
         		{"08004","Missing permission for user '{0}' to create database '{1}' [{2}].","40000"},
         		{"08004","Connection authentication failure occurred. Either the supplied credentials were invalid, or the database uses a password encryption scheme not compatible with the strong password substitution security mechanism. If this error started after upgrade, refer to the release note for DERBY-4483 for options.","40000"},
         		{"08004","Username or password is null or 0 length.","40000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                 {"08004","User '{0}' cannot decrypt database '{1}'. Only the database owner can perform this operation.","40000"},
         		{"08006","An error occurred during connect reset and the connection has been terminated.  See chained exceptions for details.","40000"},
         		{"08006","SocketException: '{0}'","40000"},
@@ -136,6 +147,7 @@ public void test_errorcode() throws Exception
         		{"08006","A network protocol error was encountered and the connection has been terminated: {0}","40000"},
         		{"08006","org.apache.derby.jdbc.EmbeddedDriver is not registered with the JDBC driver manager","40000"},
         		{"08006","Database '{0}' shutdown.","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
                 {"08006","Database '{0}' dropped.","45000"},
         		{"0A000","The DRDA command {0} is not currently implemented.  The connection has been terminated.","40000"},
         		{"57017","There is no available conversion for the source code page, {0}, to the target code page, {1}.  The connection has been terminated.","40000"},
@@ -159,16 +171,19 @@ public void test_errorcode() throws Exception
         		{"58015","The DDM object 0x{0} is not supported.  The connection has been terminated.","40000"},
         		{"58016","The DDM parameter 0x{0} is not supported.  The connection has been terminated.","40000"},
         		{"58017","The DDM parameter value 0x{0} is not supported.  An input host variable may not be within the range the server supports.  The connection has been terminated.","40000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         		{"XBDA0","Login timeout exceeded.","40000"},
         		{"XBM01","Startup failed due to an exception. See next exception for details. ","45000"},
         		{"XBM02","Startup failed due to missing functionality for {0}. Please ensure your classpath includes the correct Derby software.","45000"},
         		{"XBM03","Supplied value '{0}' for collation attribute is invalid, expecting UCS_BASIC or TERRITORY_BASED.","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3320
         		{"XBM04","Collator support not available from the JVM for the database's locale '{0}'.","45000"},
         		{"XBM05","Startup failed due to missing product version information for {0}.","45000"},
         		{"XBM06","Startup failed. An encrypted database cannot be accessed without the correct boot password.  ","45000"},
         		{"XBM07","Startup failed. Boot password must be at least 8 bytes long.","45000"},
         		{"XBM08","Could not instantiate {0} StorageFactory class {1}.","45000"},
         		{"XBM0A","The database directory '{0}' exists. However, it does not contain the expected '{1}' file. Perhaps Derby was brought down in the middle of creating this database. You may want to delete this directory and try creating the database again.","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-5283
 			{"XBM0B","Failed to edit/write service properties file: {0}","45000"},
 			{"XBM0C","Missing privilege for operation '{0}' on file '{1}': {2}", "45000"},
         		{"XBM0G","Failed to start encryption engine. Please make sure you are running Java 2 and have downloaded an encryption provider such as jce and put it in your class path. ","45000"},
@@ -177,6 +192,7 @@ public void test_errorcode() throws Exception
         		{"XBM0J","Directory {0} already exists.","45000"},
         		{"XBM0K","Unknown sub-protocol for database name {0}.","45000"},
         		{"XBM0L","Specified authentication scheme class {0} does implement the authentication interface {1}.","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-5741
         		{"XBM0M","Error creating an instance of a class named '{0}'. This class name was the value of the derby.authentication.provider property and was expected to be the name of an application-supplied implementation of org.apache.derby.authentication.UserAuthenticator. The underlying problem was: {1}","45000"},
         		{"XBM0N","JDBC Driver registration with java.sql.DriverManager failed. See next exception for details. ","45000"},
         		{"XBM0P","Service provider is read-only. Operation not permitted. ","45000"},
@@ -184,6 +200,7 @@ public void test_errorcode() throws Exception
         		{"XBM0R","Unable to remove File {0}.  ","45000"},
         		{"XBM0S","Unable to rename file '{0}' to '{1}'","45000"},
         		{"XBM0T","Ambiguous sub-protocol for database name {0}.   ","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-4628
         		{"XBM0X","Supplied locale description '{0}' is invalid, expecting ln[_CO[_variant]]\nln=lower-case two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.","45000"},
         		{"XBM0Y","Backup database directory {0} not found. Please make sure that the specified backup path is right.","45000"},
         		{"XBM0Z","Unable to copy file '{0}' to '{1}'. Please make sure that there is enough space and permissions are correct. ","45000"},
@@ -191,8 +208,10 @@ public void test_errorcode() throws Exception
         		{"XJ004","Database '{0}' not found.","40000"},
         		{"XJ015","Derby system shutdown.","50000"},
         		{"XJ028","The URL '{0}' is not properly formed.","40000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-4598
         		{"XJ040","Failed to start database '{0}' with class loader {1}, see the next exception for details.","40000"},
         		{"XJ041","Failed to create database '{0}', see the next exception for details.","40000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
                 {"XJ048","Conflicting boot attributes specified: {0}","40000"},
         		{"XJ049","Conflicting create attributes specified.","40000"},
         		{"XJ05B","JDBC attribute '{0}' has an invalid value '{1}', valid values are '{2}'.","40000"},
@@ -201,6 +220,7 @@ public void test_errorcode() throws Exception
         		{"XN022","A write chain that has transmitted data to the server cannot be reset until the request is finished and the chain terminated.","40000"},
         		{"XN023","The stream specified by parameter #{0} is locator-based and requires a nested request on the same connection to be materialized. This is not supported.","40000"},
         		{"XN024","Encountered an exception which terminated the connection, while reading from the stream specified by parameter #{0}. The Exception had this message: '{1}'.","40000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3254
         		{"XRE20","Failover performed successfully for database '{0}', the database has been shutdown.","45000"},
         		{"XSDB0","Unexpected exception on in-memory page {0}","45000"},
         		{"XSDB1","Unknown page format at page {0}","45000"},
@@ -209,16 +229,22 @@ public void test_errorcode() throws Exception
         		{"XSDB4","Page {0} is at version {1}, the log file contains change version {2}, either there are log records of this page missing, or this page did not get written out to disk properly.","45000"},
         		{"XSDB5","Log has change record on page {0}, which is beyond the end of the container.","45000"},
         		{"XSDB6","Another instance of Derby may have already booted the database {0}.","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
         		{"XSDB7","Warning: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result and may have already occurred.","45000"},
         		{"XSDB8","Warning: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result if 2 instances of Derby boot on the same database at the same time.  The derby.database.forceDatabaseLock=true property has been set, so the database will not boot until the db.lck is no longer present.  Normally this file is removed when the first instance of Derby to boot on the database exits, but it may be left behind in some shutdowns.  It will be necessary to remove the file by hand in that case.  It is important to verify that no other VM is accessing the database before deleting the db.lck file by hand.","45000"},
         		{"XSDB9","Stream container {0} is corrupt.","45000"},
         		{"XSDBA","Attempt to allocate object {0} failed.","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3725
         		{"XSDBB", "Unknown page format at page {0}, page dump follows: {1} ", "45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3727
         		{"XSDBC", "Write of container information to page 0 of container {0} failed.  See nested error for more information. ", "45000"},
         		{"XSDG0","Page {0} could not be read from disk.","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3729
         		{"XSDG1","Page {0} could not be written to disk, please check if the disk is full, or if a file system limit, such as a quota or a maximum file size, has been reached.","45000"},
         		{"XSDG2","Invalid checksum on Page {0}, expected={1}, on-disk version={2}, page dump follows: {3}","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-1958
         		{"XSDG3","Meta-data for {0} could not be accessed to {1} {2}","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-6504
                 {"XSDG4","Unrecoverable internal error encountered while attempting to read low level metadata about the table or index. Please provide your support organization with the following exception information: Failed: arraycopy of embryonic page byte[{0}] to container information byte[{1}]. Values of variables and constants: MAX_BORROWED_SPACE: {2}, BORROWED_SPACE_OFFSET({3}) + BORROWED_SPACE_LENG({4}) = {5}; arraycopylength: {6}; embryonic page {7}.","45000"},
         		{"XSDG5","Database is not in create mode when createFinished is called.","45000"},
         		{"XSDG6","Data segment directory not found in {0} backup during restore. Please make sure that backup copy is the right one and it is not corrupted.","45000"},
@@ -229,6 +255,7 @@ public void test_errorcode() throws Exception
         		{"XSLA1","Log Record has been sent to the stream, but it cannot be applied to the store (Object {0}).  This may cause recovery problems also.","45000"},
         		{"XSLA2","System will shutdown, got I/O Exception while accessing log file.","45000"},
         		{"XSLA3","Log Corrupted, has invalid data in the log stream.","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-6157
         		{"XSLA4","Error encountered when attempting to write the transaction recovery log. Most likely the disk holding the recovery log is full. If the disk is full, the only way to proceed is to free up space on the disk by either expanding it or deleting files not related to Derby. It is also possible that the file system and/or disk where the Derby transaction log resides is read-only. The error can also be encountered if the disk or file system has failed.","45000"},
         		{"XSLA5","Cannot read log stream for some reason to rollback transaction {0}.","45000"},
         		{"XSLA6","Cannot recover the database.","45000"},
@@ -236,6 +263,7 @@ public void test_errorcode() throws Exception
         		{"XSLA8","Cannot rollback transaction {0}, trying to compensate {1} operation with {2}","45000"},
         		{"XSLAA","The store has been marked for shutdown by an earlier exception.","45000"},
         		{"XSLAB","Cannot find log file {0}, please make sure your logDevice property is properly set with the correct path separator for your platform.","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-5885
         		{"XSLAC","Database at {0} has a format incompatible with the current version of software. It may have been created by or upgraded by a later version.","45000"},
         		{"XSLAD","Log Record at instant {2} in log file {3} corrupted. Expected log record length {0}, real length {1}.","45000"},
         		{"XSLAE","Control file at {0} cannot be written or updated.","45000"},
@@ -248,6 +276,7 @@ public void test_errorcode() throws Exception
         		{"XSLAM","Cannot verify database format at {1} due to IOException: {0}","45000"},
         		{"XSLAN","Database at {0} has an incompatible format with the current version of the software.  The database was created by or upgraded by version {1}.","45000"},
         		{"XSLAO","Recovery failed unexpected problem: {0}.","45000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
         		{"XSLAP","Database at {0} is at version {1}. Beta databases cannot be upgraded.","45000"},
         		{"XSLAQ","Cannot create log file at directory {0}.","45000"},
         		{"XSLAR","Unable to copy log file '{0}' to '{1}' during restore. Please make sure that there is enough space and permissions are correct. ","45000"},
@@ -258,9 +287,11 @@ public void test_errorcode() throws Exception
         		{"XSTB3","Cannot abort transaction because the log manager is null, probably due to an earlier error.","50000"},
         		{"XSTB5","Creating database with logging disabled encountered unexpected problem.","50000"},
         		{"XSTB6","Cannot substitute a transaction table with another while one is already in use.","50000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
                 {"XXXXX","Normal database session close.","40000"},
                 {"XRE04","Could not establish a connection to the peer of the replicated database '{0}' on address '{1}:{2}'.","40000"},
                 {"XRE04","Connection lost for replicated database '{0}'.","40000"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
                 {"XRE05","The log files on the master and slave are not in synch for replicated database '{0}'. The master log instant is {1}:{2}, whereas the slave log instant is {3}:{4}. This is fatal for replication - replication will be stopped.","40000"},
                 {"XRE09","Cannot start replication slave mode for database '{0}'. The database has already been booted.","40000"},
                 {"XRE11","Could not perform operation '{0}' because the database '{1}' has not been booted.","40000"},
@@ -269,6 +300,7 @@ public void test_errorcode() throws Exception
                 {"XRE41","Replication operation 'failover' or 'stopSlave' refused on the slave database because the connection with the master is working. Issue the 'failover' or 'stopMaster' operation on the master database instead.","40000"},
                 {"XRE42","Replicated database '{0}' shutdown.","40000"}};
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2647
         JDBC.assertUnorderedResultSet(rs, expectedRows);
         s.executeUpdate("drop table t");
         commit();        
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ErrorMessageTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ErrorMessageTest.java
index 375075df5e..8068ccdad3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ErrorMessageTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ErrorMessageTest.java
@@ -47,6 +47,7 @@ public ErrorMessageTest(String name) {
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("ErrorMessageTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         if (JDBC.vmSupportsJSR169()) {
             // Foundation 1.1 doesn't support the regex classes. Return an
@@ -140,6 +141,7 @@ public void testWaitTimeout() throws SQLException {
     public void testDeadlockTimeout()
             throws SQLException, InterruptedException {
         setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4323
 
         // Make the main transaction (T1) lock row 1 exclusively
         Statement s = createStatement();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ExistsWithSubqueriesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ExistsWithSubqueriesTest.java
index 22fbb4e633..29a7a4a0a0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ExistsWithSubqueriesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ExistsWithSubqueriesTest.java
@@ -74,6 +74,7 @@ public ExistsWithSubqueriesTest(String name)
     public static Test suite()
     {
        BaseTestSuite suite = new BaseTestSuite("EXISTS with SET operations");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         /* This is a language/optimization test so behavior will be the
          * same for embedded and client/server.  Therefore we only need
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForBitDataTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForBitDataTest.java
index f1a6c48a36..1c1a2230a0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForBitDataTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForBitDataTest.java
@@ -631,6 +631,8 @@ public void testTypes() throws SQLException {
         /* testValues fixture */
 	public void testValues() throws SQLException {
                 // Empty the table before inserting 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3224
+//IC see: https://issues.apache.org/jira/browse/DERBY-3176
                 Statement deleteStmt = createStatement();
                 deleteStmt.execute("delete from FBDVAL.T001");
 		PreparedStatement psI = prepareStatement("INSERT INTO FBDVAL.T001 VALUES(?, ?, ?, ?, ?)");
@@ -881,6 +883,7 @@ public void testEncodedLengths() throws SQLException, IOException {
          * Create a suite of tests.
          **/
         public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite = new BaseTestSuite("ForBitTestData");
         	suite.addTest(baseSuite("ForBitTestData:embedded"));
         	suite.addTest(TestConfiguration.clientServerDecorator(baseSuite("ForBitTestData:client")));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForUpdateTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForUpdateTest.java
index 943fe33ba4..5ae30e4586 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForUpdateTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForUpdateTest.java
@@ -56,6 +56,7 @@ protected void initializeConnection(Connection conn) throws SQLException {
          * Create a suite of tests.
          **/
         public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite = new BaseTestSuite("ForUpdateTest");
         	suite.addTest(baseSuite("ForUpdateTest:embedded"));
         	suite.addTest(TestConfiguration.clientServerDecorator(baseSuite("ForUpdateTest:client")));
@@ -73,6 +74,8 @@ protected void decorateSQL(Statement s) throws SQLException
 				s.execute("create table t2 ( s smallint, c char(10), r real, ts timestamp )");
                                 s.execute("create table t3 (i int not null constraint t3pk primary key, b char(10))");
 				s.execute("create table t4 (c1 int)");	
+//IC see: https://issues.apache.org/jira/browse/DERBY-3224
+//IC see: https://issues.apache.org/jira/browse/DERBY-3176
                                 s.execute("create index t3bi on t3(b)");
                                 s.execute("insert into t3 values (1, 'hhhh'), (2, 'uuuu'), (3, 'yyyy'), (4, 'aaaa'), (5, 'jjjj'), (6, 'rrrr')");
                                 s.execute("insert into t3 values (7, 'iiii'), (8, 'wwww'), (9, 'rrrr'), (10, 'cccc'), (11, 'hhhh'), (12, 'rrrr')");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysDeferrableTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysDeferrableTest.java
index 4addaed0da..6a40201c2c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysDeferrableTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ForeignKeysDeferrableTest.java
@@ -77,6 +77,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class ForeignKeysDeferrableTest extends BaseJDBCTestCase
 {
     private static final String  LANG_DEFERRED_DUPLICATE_KEY_CONSTRAINT_T
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
                                                                     = "23506";
     private static final String  LANG_DEFERRED_FK_CONSTRAINT_T = "23516";
     private static final String  LANG_DEFERRED_FK_CONSTRAINT_S = "23517";
@@ -96,6 +97,7 @@ public ForeignKeysDeferrableTest(String name) {
 
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite();
         suite.addTest(new SupportFilesSetup(
                 embeddedSuite(ForeignKeysDeferrableTest.class)));
@@ -865,6 +867,7 @@ public void testAddConstraint() throws SQLException {
      */
     public void testFKPlusUnique() throws SQLException {
         Statement s = createStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
             ResultSet.TYPE_FORWARD_ONLY,
             ResultSet.CONCUR_UPDATABLE);
 
@@ -876,6 +879,7 @@ public void testFKPlusUnique() throws SQLException {
             // behavior is the same since we do not support SQL in before
             // triggers, so test both with the same fixtures.
             // CASCADE is tested separately later.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
             final String[] refActions = {
                 "ON DELETE NO ACTION ON UPDATE NO ACTION",
                 "ON DELETE RESTRICT ON UPDATE RESTRICT" };
@@ -919,6 +923,7 @@ public void testFKPlusUnique() throws SQLException {
                 // Try again, but this time delete both duplicate rows. The
                 // second delete should fail.
                 s.executeUpdate("insert into ref_t values (1,3)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
                 rs = s.executeQuery("select * from ref_t");
                 rs.next();
                 rs.deleteRow();
@@ -932,6 +937,7 @@ public void testFKPlusUnique() throws SQLException {
                 }
 
                 s.executeUpdate("insert into ref_t values (1,4), (1,5)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
 
                 // direct delete code path
                 assertStatementError(LANG_FK_VIOLATION, s, "delete from ref_t");
@@ -1186,6 +1192,7 @@ public void testFKPlusUnique() throws SQLException {
     }
 
     public void testSelfReferential() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6576
         Statement s = createStatement();
         try {
 
@@ -1258,6 +1265,7 @@ public void testInsertTrigger() throws SQLException {
     public  void    test_6668() throws Exception
     {
         Connection  conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6668
 
         goodStatement
             (
@@ -1291,6 +1299,7 @@ public  void    test_6668() throws Exception
      * constraints erroneously shared a physical conglomerate.
      */
     public void testSharedConglomerates() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6665
         setAutoCommit(false);
         Statement s = createStatement();
         s.execute("create table d6665_t1(x int primary key)");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/FullCollationTests.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/FullCollationTests.java
index b6a4abc313..8e43453cff 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/FullCollationTests.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/FullCollationTests.java
@@ -34,6 +34,7 @@ public class FullCollationTests extends BaseTestSuite {
      */
     public static Test suite() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("FullCollationTests:territory=" +"no_NO");
         suite.addTest(new CollationTest("testNorwayCollation"));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsHelper.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsHelper.java
index 796c6197ea..57c4f1d1ef 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsHelper.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsHelper.java
@@ -250,6 +250,7 @@ public  void    assertDeterministic( Connection conn, String routineName, boolea
      * Assert that a table has the correct column types.
      */
     protected void assertColumnTypes( Connection conn, String tableName, String[][] columnTypes )
+//IC see: https://issues.apache.org/jira/browse/DERBY-3923
         throws Exception
     {
         PreparedStatement   ps = chattyPrepare
@@ -366,6 +367,7 @@ protected void assertColumnTypes( Connection conn, String tableName, String[][]
      */
     protected <T> ArrayList<T> fill( T[] raw )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return new ArrayList<T>(Arrays.asList(raw));
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsPermsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsPermsTest.java
index 500bf05754..7891d9777a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsPermsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsPermsTest.java
@@ -79,6 +79,7 @@ public GeneratedColumnsPermsTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             GeneratedColumnsPermsTest.class);
 
@@ -161,6 +162,7 @@ public  void    test_001_basicPermissions()
              "select a from test_dbo.t_bp_1 order by a",
              new String[][]
              {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
                  { "2", },
              },
              false
@@ -197,6 +199,7 @@ public  void    test_001_basicPermissions()
              "select * from test_dbo.t_bp_1 order by a",
              new String[][]
              {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
                  { "3", "-3", },
              },
              false
@@ -216,6 +219,8 @@ public  void    test_001_basicPermissions()
              LACK_TABLE_PRIV,
              "insert into test_dbo.t_bp_1( a ) values ( 100 )"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
         goodStatement
             (
              janetConnection,
@@ -263,6 +268,8 @@ public  void    test_001_basicPermissions()
              "select * from test_dbo.t_bp_1 order by a",
              new String[][]
              {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
                  { "4", "-4", },
                  { "100", "-100", },
              },
@@ -280,6 +287,7 @@ public  void    test_001_basicPermissions()
         goodStatement
             (
              janetConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
              "delete from test_dbo.t_bp_1 where a = 4"
              );
         assertResults
@@ -400,6 +408,7 @@ public  void    test_002_functionPermissions()
              janetConnection,
              "update test_dbo.t_fp_1 set a = a + 1"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
         goodStatement
             (
              janetConnection,
@@ -411,8 +420,11 @@ public  void    test_002_functionPermissions()
              "select * from test_dbo.t_fp_1 order by a",
              new String[][]
              {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
                  { "102", "-102", },
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
                  { "200", "-200", },
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
                  { "201", "-201", },
              },
              false
@@ -600,6 +612,7 @@ public  void    test_004_functionSchema()
              new String[][]
              {
                  { "101", "-101", },
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
                  { "101", "-101", },
              },
              false
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java
index c144c0409e..a4781a4e8b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GeneratedColumnsTest.java
@@ -92,6 +92,7 @@ public GeneratedColumnsTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             GeneratedColumnsTest.class);
 
@@ -119,6 +120,9 @@ public static Test suite()
      * DERBY-6414 - support updating identity columns with DEFAULT keyword.
      */
     public void testDerby_6414() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
         Statement s = createStatement();
         ResultSet rs = null;
         setAutoCommit(false);
@@ -510,6 +514,7 @@ public void testDerby_4448_4451() throws SQLException {
      */
     public void testDerby_4426() throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4426
         Statement s = createStatement();
         ResultSet rs = null;
         setAutoCommit(false);
@@ -602,6 +607,7 @@ public  void    test_001_determinism_of_stored_system_routines()
 
             RoutineAliasInfo    rai = (RoutineAliasInfo) rs.getObject( 5 );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3570
             if ( isSystemAlias ) { assertFalse( aliasName, rai.isDeterministic() ); }
         }
 
@@ -1077,6 +1083,7 @@ public  void    test_007_basicTriggers()
         goodStatement
             (
              conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3931
              "create function f_bt_minus\n" +
              "(\n" +
              "    a int\n" +
@@ -1134,6 +1141,7 @@ public  void    test_007_basicTriggers()
         goodStatement
             (
              conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3931
              "create table t1_trig( a int, b int generated always as ( f_bt_minus(a) ), c int )\n"
              );
         goodStatement
@@ -1257,6 +1265,7 @@ public  void    test_007_basicTriggers()
                  { "before_insert_statement_trigger: [ -1, -1, -1 ]" },
                  { "after_insert_row_trigger: [ 1, -1, null ]" },
                  { "after_insert_row_trigger: [ 2, -2, null ]" },
+//IC see: https://issues.apache.org/jira/browse/DERBY-4779
                  { "after_insert_row_trigger: [ 3, -3, null ]" },
                  { "after_insert_statement_trigger: [ -1, -1, -1 ]" },
              }
@@ -1310,6 +1319,7 @@ public  void    test_008_basicForeignKeys()
         goodStatement
             (
              conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3931
              "create function f_bfk_minus\n" +
              "(\n" +
              "    a int\n" +
@@ -1339,6 +1349,7 @@ public  void    test_008_basicForeignKeys()
         goodStatement
             (
              conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3931
              "create table t4_for( a int, b int generated always as ( f_bfk_minus(a) ) references t3_for( b ), c int )"
              );
         
@@ -1457,6 +1468,7 @@ public  void    test_009_basicDefaultInfo()
      * </p>
      */
     public  void    test_010_updateDefaultLiteral()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3922
         throws Exception
     {
         Connection  conn = getConnection();
@@ -2691,6 +2703,8 @@ public  void    test_017_padding()
              "create table t_cc_varchar\n" +
              "(\n" +
              "    a varchar( 10 ),\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5749
+//IC see: https://issues.apache.org/jira/browse/DERBY-5749
              "    b char( 5 ) generated always as( cast(upper( a ) as char(5))),\n" +
              "    c char( 10 ) generated always as( upper( a ) ),\n" +
              "    d char( 15 ) generated always as( upper( a ) ),\n" +
@@ -2797,6 +2811,7 @@ public  void    test_018_alterDatatype()
         goodStatement
             (
              conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5749
              "create table t_atac_3( a varchar( 5 ), b varchar( 5 ) generated always as ( cast(upper( a ) as varchar(5)) ) )"
              );
         goodStatement
@@ -3783,6 +3798,7 @@ public  void    test_021_dropFunction()
      * </p>
      */
     public  void    test_022_omitDatatype()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3923
         throws Exception
     {
         Connection  conn = getConnection();
@@ -4627,6 +4643,7 @@ public  void    test_022_omitDatatype()
      * </p>
      */
     public  void    test_023_drivingSelect()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3950
         throws Exception
     {
         Connection  conn = getConnection();
@@ -5529,6 +5546,7 @@ public  void    test_028_bulkImport()
      * </p>
      */
     public  void    test_029_derby_4145()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4145
         throws Exception
     {
         expectCompilationError
@@ -5544,6 +5562,7 @@ public  void    test_029_derby_4145()
      * </p>
      */
     public  void    test_030_derby_4146()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4146
         throws Exception
     {
         Connection  conn = getConnection();
@@ -5714,6 +5733,7 @@ public  void    test_031_derby_4413()
         assertResults
             (
                 conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4460
                 "select * from t_4413 order by i, j",
                 new String[][]
                 {
@@ -5729,6 +5749,8 @@ public  void    test_031_derby_4413()
     }
 
     public void test_derby_4425()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4425
+//IC see: https://issues.apache.org/jira/browse/DERBY-4419
         throws Exception
     {
         Connection conn = getConnection();
@@ -5746,6 +5768,7 @@ public void test_derby_4425()
 
     // Derby 4779
     public void test_derby_4779()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4779
         throws Exception
     {
     	Connection conn = getConnection();
@@ -5762,6 +5785,7 @@ public void test_derby_4779()
          "parameter style java\n" +
          "deterministic\n" +
          "no sql\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5304
          "external name 'org.apache.derbyTesting.functionTests.tests.lang.GeneratedColumnsTest.signum'\n"
         );
 
@@ -5811,6 +5835,7 @@ public void test_derby_4779()
 
     // Derby 5749
     public void test_derby_5749()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5749
         throws Exception
     {
         Connection conn = getConnection();
@@ -5848,6 +5873,7 @@ public void test_derby_5749()
 
     // Derby 6346
     public void test_derby_6346()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6346
         throws Exception
     {
         Connection conn = getConnection();
@@ -6108,6 +6134,7 @@ public void test_6361_compilationSchemaDeleted() throws SQLException {
     // read the counter of the number of times that the minus function has been
     // called
     private int readMinusCounter( Connection conn )
+//IC see: https://issues.apache.org/jira/browse/DERBY-3932
         throws Exception
     {
         PreparedStatement   ps = chattyPrepare( conn, "values ( f_readMinusCounter() )" );
@@ -6211,6 +6238,7 @@ public static   Integer minus( Integer a )
         _minusCounter++;
 
         if ( a == null ) { return null; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         else { return -a.intValue(); }
     }
     
@@ -6221,6 +6249,7 @@ public static   int readMinusCounter()
 
     public static   int signum( int i )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5304
         if ( i > 0 ) { return 1; }
         else if ( i == 0 ) { return 0; }
         else { return -1; }
@@ -6238,6 +6267,7 @@ public  static  ResultSet  triggerReport()
 
         for ( int i = 0; i < count; i++ )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             rows[ i ] = new String[] { _triggerReports.get( i ) };
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java
index ff1250e996..ced4fb37ee 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GetPropertyInfoTest.java
@@ -51,6 +51,7 @@ public static void main(String[] args) throws SQLException,
 		try
 		{
 			Properties info = new Properties();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(driver);
 			clazz.getConstructor().newInstance();
 			Driver cDriver = DriverManager.getDriver(protocol);
@@ -76,6 +77,7 @@ public static void main(String[] args) throws SQLException,
 				{
 					System.out.print(attributes[j].name + " - value: " + attributes[j].value);
 					// Also check on the other PropertyInfo fields
+//IC see: https://issues.apache.org/jira/browse/DERBY-1618
 					String[] choices = attributes[j].choices;
 					System.out.print(" - description: " 
 						+ attributes[j].description +
@@ -139,6 +141,7 @@ public static void main(String[] args) throws SQLException,
 				{
 					System.out.print(attributes[j].name + " - value: " + attributes[j].value);
 					// Also check on the other PropertyInfo fields
+//IC see: https://issues.apache.org/jira/browse/DERBY-1618
 					String[] choices = attributes[j].choices;
 					System.out.print(" - description: " 
 						+ attributes[j].description +
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
index d55d65d28c..074a7e2a97 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeDDLTest.java
@@ -63,6 +63,7 @@ public GrantRevokeDDLTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         if (JDBC.vmSupportsJSR169()) {
              // return empty suite;
             return new BaseTestSuite("GrantRevokeDDLTest");
@@ -93,6 +94,7 @@ public void testGrantRevokeDDL() throws Exception
         String [] expColNames;
         
         // Invalidating all the stored statements by dbo will work
+//IC see: https://issues.apache.org/jira/browse/DERBY-5578
         cSt = prepareCall(
             "call SYSCS_UTIL.SYSCS_INVALIDATE_STORED_STATEMENTS()");
         assertUpdateCount(cSt, 0);
@@ -139,6 +141,7 @@ public void testGrantRevokeDDL() throws Exception
         
         st_satConnection.executeUpdate(
             "create table satheesh.tsat(i int not null primary "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
             + "key, j int, noselect int)");
         
         st_satConnection.executeUpdate(
@@ -163,6 +166,7 @@ public void testGrantRevokeDDL() throws Exception
             " grant update(i) on satheesh.tsat to bar");
         
         rs = st_satConnection.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select GRANTEE, GRANTOR, SELECTPRIV, DELETEPRIV, INSERTPRIV, UPDATEPRIV, REFERENCESPRIV, TRIGGERPRIV from sys.systableperms ORDER BY GRANTEE, GRANTOR");
         
         expColNames = new String [] {"GRANTEE", "GRANTOR", "SELECTPRIV", "DELETEPRIV", "INSERTPRIV", "UPDATEPRIV", "REFERENCESPRIV", "TRIGGERPRIV"};
@@ -182,6 +186,8 @@ public void testGrantRevokeDDL() throws Exception
         // Following revokes should fail. Only owner can revoke 
         // permissions
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42506", st_barConnection,
             "revoke select on satheesh.tsat from public");
         
@@ -287,6 +293,7 @@ public void testGrantRevokeDDL() throws Exception
         // Check success by looking at systableperms directly for now
         
         rs = st_satConnection.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             "select GRANTEE, GRANTOR, SELECTPRIV, DELETEPRIV, INSERTPRIV, UPDATEPRIV, REFERENCESPRIV, TRIGGERPRIV from sys.systableperms order by GRANTEE, GRANTOR");
         
         expColNames = new String [] {"GRANTEE", "GRANTOR", "SELECTPRIV", "DELETEPRIV", "INSERTPRIV", "UPDATEPRIV", "REFERENCESPRIV", "TRIGGERPRIV"};
@@ -309,6 +316,7 @@ public void testGrantRevokeDDL() throws Exception
         // Check success by looking at systableperms directly for now
         
         rs = st_satConnection.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             "select GRANTEE, GRANTOR, SELECTPRIV, DELETEPRIV, INSERTPRIV, UPDATEPRIV, REFERENCESPRIV, TRIGGERPRIV from sys.systableperms ORDER BY GRANTEE, GRANTOR");
         
         expColNames = new String [] {"GRANTEE", "GRANTOR", "SELECTPRIV", "DELETEPRIV", "INSERTPRIV", "UPDATEPRIV", "REFERENCESPRIV", "TRIGGERPRIV"};
@@ -375,6 +383,8 @@ public void testGrantRevokeDDL() throws Exception
         st_satConnection.executeUpdate(
             " grant select on v1 to bar");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42509", st_satConnection,
             " grant insert on v1 to foo");
         
@@ -425,6 +435,7 @@ public void testGrantRevokeDDL() throws Exception
         
         rs = st_satConnection.executeQuery(
             " select SCHEMANAME, AUTHORIZATIONID from sys.sysschemas where schemaname not "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6446
             + "like 'SYS%' and schemaname not like 'TEST_DBO%' ORDER BY SCHEMANAME");
         
         expColNames = new String [] {"SCHEMANAME", "AUTHORIZATIONID"};
@@ -459,6 +470,8 @@ public void testGrantRevokeDDL() throws Exception
         
         // All these DDLs should fail.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42507", st_swiperConnection,
             "create table NotMyTable (i int, j int)");
         
@@ -487,10 +500,13 @@ public void testGrantRevokeDDL() throws Exception
         
         // Some simple DML tests. Should all fail.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_swiperConnection,
             "select * from satheesh.tsat");
         
         assertStatementError("42500", st_swiperConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
             " insert into satheesh.tsat(i, j) values (1, 2)");
         
         assertStatementError("42502", st_swiperConnection,
@@ -506,6 +522,7 @@ public void testGrantRevokeDDL() throws Exception
         
         
         st_satConnection.executeUpdate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
             " grant select(i, j), update(j) on tsat to swiper");
         
         st_satConnection.executeUpdate(
@@ -518,6 +535,8 @@ public void testGrantRevokeDDL() throws Exception
         
         // Now some of these should pass
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_swiperConnection,
             "select * from satheesh.tsat");
         
@@ -530,6 +549,7 @@ public void testGrantRevokeDDL() throws Exception
         JDBC.assertEmpty(rs);
         
         assertStatementError("42502", st_swiperConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
             " select i from satheesh.tsat where noselect=2");
         
         rs = st_swiperConnection.executeQuery(
@@ -541,8 +561,11 @@ public void testGrantRevokeDDL() throws Exception
         
         JDBC.assertEmpty(rs);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_swiperConnection,
             " select i from satheesh.tsat where 2 > (select "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
             + "count(noselect) from satheesh.tsat)");
         
         rs = st_swiperConnection.executeQuery(
@@ -561,6 +584,7 @@ public void testGrantRevokeDDL() throws Exception
             " update satheesh.tsat set j=2 where i=2");
         
         assertStatementError("42502", st_swiperConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
             " update satheesh.tsat set j=2 where noselect=1");
         
         rs = st_swiperConnection.executeQuery(
@@ -580,8 +604,13 @@ public void testGrantRevokeDDL() throws Exception
         
         JDBC.assertEmpty(rs);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_swiperConnection,
             " select b from satheesh.table1 t1, satheesh.tsat t2 "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
             + "where t1.a = t2.noselect");
         
         rs = st_swiperConnection.executeQuery(
@@ -593,7 +622,12 @@ public void testGrantRevokeDDL() throws Exception
                 
         JDBC.assertEmpty(rs);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_swiperConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
             " select * from satheesh.table1, (select noselect from "
             + "satheesh.tsat) table2");
         
@@ -611,6 +645,8 @@ public void testGrantRevokeDDL() throws Exception
         
         // Should fail
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42500", st_swiperConnection,
             "create trigger trig_sat1 after update on "
             + "satheesh.tsat for each statement values 1");
@@ -653,6 +689,8 @@ public void testGrantRevokeDDL() throws Exception
         
         // set connection swiperConnection
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42500", st_swiperConnection,
             " create trigger trig_sat1 after update on "
             + "satheesh.tsat for each statement values 1");
@@ -793,6 +831,10 @@ public void testGrantRevokeDDL() throws Exception
         
         // set connection swiperConnection
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42504", st_swiperConnection,
             " values f_abs(-5)");
         
@@ -850,6 +892,8 @@ public void testGrantRevokeDDL() throws Exception
         
         // Negative tests. Should all fail
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42508", st_swiperConnection,
             "create schema myFriend");
         
@@ -890,6 +934,7 @@ public void testGrantRevokeDDL() throws Exception
             " create schema authorization testSchema");
         
         rs = st.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6446
             " select SCHEMANAME, AUTHORIZATIONID from sys.sysschemas where schemaname not like 'TEST_DBO%' order by SCHEMANAME");
         
         expColNames = new String [] {"SCHEMANAME", "AUTHORIZATIONID"};
@@ -898,8 +943,10 @@ public void testGrantRevokeDDL() throws Exception
         expRS = new String [][]
         {
             {"APP", "APP"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             {"DERBY", "DERBY"},
             {"GEORGE", "GEORGE"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             {"MYDODO", "DODO"},
             {"MYFRIEND", "TEST_DBO"},
             {"MYSCHEMA", "ME"},
@@ -929,6 +976,8 @@ public void testGrantRevokeDDL() throws Exception
         // schemas.. Should fail
         
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42508", st_swiperConnection,
             " create table mywork.t1(i int)");
         
@@ -941,6 +990,8 @@ public void testGrantRevokeDDL() throws Exception
         Connection monicaConnection = openUserConnection("monica");
         Statement st_monicaConnection = monicaConnection.createStatement();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42508", st_monicaConnection,
             " create table mywork.t1 ( i int)");
         
@@ -986,6 +1037,7 @@ public void testGrantRevokeDDL() throws Exception
         // Should still work, as DBA
         
         rs = st.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             "select * from swiper.swiperTab order by i,j");
         
         expColNames = new String [] {"I", "J"};
@@ -1002,6 +1054,7 @@ public void testGrantRevokeDDL() throws Exception
             " insert into swiper.swiperTab values (2,2)");
         
         rs = st.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from swiper.swiperTab order by i,j");
         
         expColNames = new String [] {"I", "J"};
@@ -1038,6 +1091,8 @@ public void testGrantRevokeDDL() throws Exception
         
         // Try granting or revoking from system tables. Should fail
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42509", st,
             "grant select on sys.systables to sam");
         
@@ -1100,6 +1155,7 @@ public void testGrantRevokeDDL() throws Exception
         cSt = samConnection.prepareCall(
             " call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('SAM', 'SAMTABLE', 1)");
         assertUpdateCount(cSt, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         cSt.close();
         
         cSt = samConnection.prepareCall(
@@ -1114,6 +1170,7 @@ public void testGrantRevokeDDL() throws Exception
         cSt = samConnection.prepareCall(
             "call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('SWIPER', 'MYTAB', 1)");
         assertStatementError("38000", cSt);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         cSt.close();
         
         cSt = samConnection.prepareCall(
@@ -1134,7 +1191,10 @@ public void testGrantRevokeDDL() throws Exception
         cSt = samConnection.prepareCall(
             "call SYSCS_UTIL.SYSCS_EXPORT_TABLE('SAM', "
             + "'SAMTABLE' , 'extinout/table.dat', null, null, null)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42504", cSt);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2735
         cSt.close();
         
         cSt = samConnection.prepareCall(
@@ -1160,6 +1220,7 @@ public void testGrantRevokeDDL() throws Exception
         assertStatementError("42504", cSt);
         cSt.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2772
         cSt = samConnection.prepareCall(
         "CALL SYSCS_UTIL.SYSCS_EMPTY_STATEMENT_CACHE()");
             assertStatementError("42504", cSt);
@@ -1294,6 +1355,8 @@ public void testGrantRevokeDDL() throws Exception
  
         // following select will fail because no permissions
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta3,
             "select * from mamta1.t11");
         
@@ -1305,6 +1368,8 @@ public void testGrantRevokeDDL() throws Exception
         
         // following select will fail because no permissions
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta4,
             "select * from mamta1.t11");
         
@@ -1328,6 +1393,8 @@ public void testGrantRevokeDDL() throws Exception
         }
         
         rs = st_mamta1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from mamta1.t11 order by c111");
         
         expColNames = new String [] {"C111"};
@@ -1390,6 +1457,8 @@ public void testGrantRevokeDDL() throws Exception
         // following will fail because no select permissions on 
         // all the columns
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta2,
             "select * from mamta1.t11");
         
@@ -1398,6 +1467,8 @@ public void testGrantRevokeDDL() throws Exception
         // following will fail because no update permission on 
         // column c113
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta3,
             "update mamta1.t11 set c113=3");
         
@@ -1419,6 +1490,8 @@ public void testGrantRevokeDDL() throws Exception
         // following will fail because no select permission on 
         // column c112
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta4,
             "select c112 from mamta1.t11");
         
@@ -1473,6 +1546,7 @@ public void testGrantRevokeDDL() throws Exception
             " insert into t11 values(2)");
         
         rs = st_mamta1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from t11 order by c111");
         
         expColNames = new String [] {"C111"};
@@ -1580,6 +1654,8 @@ public void testGrantRevokeDDL() throws Exception
         // since mamta3 is not dba, following will fail because no 
         // access to mamta2.v22
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta3,
             "create view v31 as select * from mamta2.v22");
         
@@ -1605,6 +1681,8 @@ public void testGrantRevokeDDL() throws Exception
         
         // should fail
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("4250A", st_mamta2,
             "grant select on v22 to mamta3");
         
@@ -1633,6 +1711,8 @@ public void testGrantRevokeDDL() throws Exception
         // privilege on v23 to mamta3
         
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("4250A", st_mamta2,
             " grant select on v23 to mamta3");
         
@@ -1722,6 +1802,8 @@ public void testGrantRevokeDDL() throws Exception
         // following will fail because no execute permissions on 
         // mamta1.f_abs1
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42504", st_mamta2,
             "create view v25(c251) as (values mamta1.f_abs1(-1))");
         
@@ -1828,6 +1910,8 @@ public void testGrantRevokeDDL() throws Exception
         // following will fail because no access on column 
         // mamta1.t14.c142
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta2,
             "create view v26 as (select * from mamta1.t14 where c142=1)");
         
@@ -1844,6 +1928,7 @@ public void testGrantRevokeDDL() throws Exception
             "create view v27 as (select c141 from mamta1.t14)");
         
         rs = st_mamta2.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from v27 order by c141");
         
         expColNames = new String [] {"C141"};
@@ -1960,6 +2045,7 @@ public void testGrantRevokeDDL() throws Exception
             + "from mamta1.t11ViewTest as t1, mamta1.t12ViewTest as t2");
         
         rs = st_mamta2.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from v21ViewTest order by c111, c122");
         
         expColNames = new String [] {"C111", "C122"};
@@ -2080,6 +2166,7 @@ public void testGrantRevokeDDL() throws Exception
         // dba can do select from that view
         
         rs = st.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             "select * from mamta2.v21ViewTest order by c111");
         
         expColNames = new String [] {"C111", "C122"};
@@ -2117,6 +2204,8 @@ public void testGrantRevokeDDL() throws Exception
         // mamta3 has not been granted select privileges on 
         // mamta2.v21ViewTest
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta3,
             "select * from mamta2.v21ViewTest");
         
@@ -2553,6 +2642,7 @@ public void testGrantRevokeDDL() throws Exception
             "grant select on v21ViewTest to mamta3");
         
         rs = st_mamta2.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from v21ViewTest order by c111");
         
         expColNames = new String [] {"C111", "C112"};
@@ -2583,6 +2673,8 @@ public void testGrantRevokeDDL() throws Exception
         // following should fail because not all the privileges 
         // are in place
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta3,
             "create trigger tr31t31TriggerTest after insert on "
             + "t31TriggerTest for each statement insert into "
@@ -2904,6 +2996,9 @@ public void testGrantRevokeDDL() throws Exception
         // view is back in action
         
         rs = st_mamta2.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             "select * from v21ViewTest order by c111");
         
         expColNames = new String [] {"C111"};
@@ -3072,6 +3167,7 @@ public void testGrantRevokeDDL() throws Exception
             + "from mamta1.t11ViewTest as t1, mamta1.t12ViewTest as t2");
         
         rs = st_mamta2.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from v21ViewTest order by c111");
         
         expColNames = new String [] {"C111", "C122"};
@@ -3087,6 +3183,10 @@ public void testGrantRevokeDDL() throws Exception
         
         // grant permission to mamta3, should fail
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("4250A", st_mamta2,
             "grant select on v21ViewTest to mamta3");
         
@@ -4067,6 +4167,8 @@ public void testGrantRevokeDDL() throws Exception
         // following should fail because mamta2 doesn't have 
         // trigger permission on mamta1.t11TriggerTest
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42500", st_mamta2,
             "create trigger tr11t11TriggerTest after insert on "
             + "mamta1.t11TriggerTest for each statement insert into "
@@ -4090,6 +4192,8 @@ public void testGrantRevokeDDL() throws Exception
         // following will fail becuae mamta2 has TRIGGER privilege 
         // but not INSERT privilege on mamta1.t11TriggerTest
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42500", st_mamta2,
             "insert into mamta1.t11TriggerTest values(3)");
         
@@ -4260,6 +4364,8 @@ public void testGrantRevokeDDL() throws Exception
         // will fail because mamta2 doesn't have INSERT privilege 
         // on mamta3.t31TriggerTest
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42500", st_mamta2,
             "insert into mamta3.t31TriggerTest values(1)");
         
@@ -4315,6 +4421,10 @@ public void testGrantRevokeDDL() throws Exception
         // set connection mamta1
         
         rs = st_mamta1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from t12RoutineTest order by c121");
         
         expColNames = new String [] {"C121"};
@@ -4329,6 +4439,8 @@ public void testGrantRevokeDDL() throws Exception
         JDBC.assertFullResultSet(rs, expRS, true);
         
         rs = st_mamta1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from t13TriggerTest order by c131");
         
         expColNames = new String [] {"C131"};
@@ -4482,6 +4594,8 @@ public void testGrantRevokeDDL() throws Exception
         
         JDBC.assertFullResultSet(rs, expRS, true);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("4250A", st_mamta3,
             " grant select on v21ViewTest to mamta2");
         
@@ -4505,6 +4619,10 @@ public void testGrantRevokeDDL() throws Exception
         
         // should fail
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta2,
             "select * from mamta3.v21ViewTest");
         
@@ -4540,6 +4658,8 @@ public void testGrantRevokeDDL() throws Exception
             " create view v21ViewTest as select * from "
             + "mamta1.t11TriggerTest");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("4250A", st_mamta2,
             " grant select on v21ViewTest to mamta4");
         
@@ -4565,6 +4685,8 @@ public void testGrantRevokeDDL() throws Exception
         assertStatementError("42X94", st_mamta4,
             " drop trigger tr41t41");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta4,
             " create trigger tr41t41 after insert on "
             + "t41TriggerTest for each statement insert into "
@@ -4577,6 +4699,7 @@ public void testGrantRevokeDDL() throws Exception
             " insert into t41TriggerTest values(2)");
         
         rs = st_mamta4.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from t41TriggerTest order by c411");
         
         expColNames = new String [] {"C411"};
@@ -4593,6 +4716,9 @@ public void testGrantRevokeDDL() throws Exception
         // set connection mamta1
         
         rs = st_mamta1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from t11TriggerTest order by c111");
         
         expColNames = new String [] {"C111"};
@@ -4609,6 +4735,8 @@ public void testGrantRevokeDDL() throws Exception
         // set connection mamta2
         
         rs = st_mamta2.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from v21ViewTest order by c111");
         
         expColNames = new String [] {"C111"};
@@ -4634,11 +4762,17 @@ public void testGrantRevokeDDL() throws Exception
         
         // will fail because no permissions on mamta4.t41TriggerTest
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42500", st_mamta3,
             "insert into mamta4.t41TriggerTest values(1)");
         
         // will fail because no permissions on mamta2.v21ViewTest
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta3,
             "select * from mamta2.v21ViewTest");
         
@@ -4911,6 +5045,8 @@ public void testGrantRevokeDDL() throws Exception
         // following attempt to create insert trigger again will 
         // fail because trigger privilege has been revoked.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42500", st_mamta2,
             "create trigger tr11t11 after insert on "
             + "mamta1.t11TriggerRevokeTest for each "
@@ -5229,6 +5365,7 @@ public void testGrantRevokeDDL() throws Exception
         // of 2 insert triggers
         
         rs = st_mamta1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             "select * from t11TriggerRevokeTest order by c111");
         
         expColNames = new String [] {"C111"};
@@ -5374,6 +5511,8 @@ public void testGrantRevokeDDL() throws Exception
         
         rs = st_mamta1.executeQuery(
             " select GRANTEE, GRANTOR, SELECTPRIV, DELETEPRIV, INSERTPRIV, UPDATEPRIV, REFERENCESPRIV, TRIGGERPRIV from sys.systableperms where "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             + "grantee='SAMMY' or grantee='USER1' order by GRANTEE, GRANTOR");
         
         expColNames = new String [] {"GRANTEE", "GRANTOR", "SELECTPRIV", "DELETEPRIV", "INSERTPRIV", "UPDATEPRIV", "REFERENCESPRIV", "TRIGGERPRIV"};
@@ -5425,6 +5564,7 @@ public void testGrantRevokeDDL() throws Exception
         
         rs = st_mamta1.executeQuery(
             " select GRANTEE, GRANTOR, GRANTOPTION from sys.sysroutineperms where "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             + "grantee='SAMMY' or grantee='USER3' order by GRANTEE, GRANTOR");
         
         expColNames = new String [] {"GRANTEE", "GRANTOR", "GRANTOPTION"};
@@ -5627,6 +5767,7 @@ public void testGrantRevokeDDL() throws Exception
         
         rs = st_mamta1.executeQuery(
             " select cast (ATAN(d) as DECIMAL(6,3)) AS ATAN FROM "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             + "SYSFUN_MATH_TEST order by atan");
         
         expColNames = new String [] {"ATAN"};
@@ -5733,6 +5874,8 @@ public void testGrantRevokeDDL() throws Exception
         
         // Try granting or revoking to mamta1. Should all fail
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42509", st_mamta1,
             "grant select on mamta1Table to mamta1");
         
@@ -5753,6 +5896,8 @@ public void testGrantRevokeDDL() throws Exception
         st.executeUpdate(
             " set schema mamta1");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42509", st,
             " grant select on mamta1Table to mamta1");
         
@@ -5834,6 +5979,10 @@ public void testGrantRevokeDDL() throws Exception
         
         // expect errors
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42500", st_user2,
             "lock table user1.t100 in exclusive mode");
         
@@ -5864,6 +6013,8 @@ public void testGrantRevokeDDL() throws Exception
         // attempt to grant this view to others, should fail since 
         // user2 does not have grant privilege on object user1.t1
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42506", st_user2,
             "grant select on user1.t1 to user3");
         
@@ -6007,6 +6158,9 @@ public void testGrantRevokeDDL() throws Exception
             "insert into t11TriggerRevokeTest values (5,505)");
         
         rs = st_mamta1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from t11TriggerRevokeTest order by c111");
         
         expColNames = new String [] {"C111", "C12"};
@@ -6024,6 +6178,9 @@ public void testGrantRevokeDDL() throws Exception
         JDBC.assertFullResultSet(rs, expRS, true);
         
         rs = st_mamta1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from t12TriggerRevokeTest order by c121");
         
         expColNames = new String [] {"C121", "C122", "C123"};
@@ -6144,6 +6301,7 @@ public void testGrantRevokeDDL() throws Exception
             + "mamta1.d1589t11ConstraintTest)");
 
         // DERBY-3743
+//IC see: https://issues.apache.org/jira/browse/DERBY-3743
         st.executeUpdate(
             "CREATE FUNCTION F_ABS(P1 INT) RETURNS INT NO "
             + "SQL RETURNS NULL ON NULL INPUT EXTERNAL NAME "
@@ -6161,6 +6319,7 @@ public void testGrantRevokeDDL() throws Exception
 
         // DERBY-3743b, test 1: multiple constraints, one routine dep per
         // constraint.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3743
         st.executeUpdate(
             "CREATE FUNCTION F_ABS2(P1 INT) RETURNS INT NO "
             + "SQL RETURNS NULL ON NULL INPUT EXTERNAL NAME "
@@ -6279,6 +6438,10 @@ public void testGrantRevokeDDL() throws Exception
         // should fail because mamta3 lost it's select permission 
         // on new column in table mamta2.t1Derby1847
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_mamta3,
             "select c3 from mamta2.t1Derby1847");
         
@@ -6425,6 +6588,10 @@ public void testGrantRevokeDDL() throws Exception
         try {
             ResultSet crs2 = ps_crs2.executeQuery();
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
             assertSQLState("42502", e);
         }
         
@@ -6450,6 +6617,7 @@ public void testGrantRevokeDDL() throws Exception
         rs = st_user1.executeQuery(
             " select c.grantee, c.type, c.columns from "
             + "sys.syscolperms c, sys.systables t where c.tableid = "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             + "t.tableid and t.tablename='D1847_C' order by grantee");
         
         expColNames = new String [] {"GRANTEE", "TYPE", "COLUMNS"};
@@ -6470,6 +6638,7 @@ public void testGrantRevokeDDL() throws Exception
         rs = st_user1.executeQuery(
             " select c.grantee, c.type, c.columns from "
             + "sys.syscolperms c, sys.systables t where c.tableid = "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             + "t.tableid and t.tablename='D1847_C' order by GRANTEE");
         
         expColNames = new String [] {"GRANTEE", "TYPE", "COLUMNS"};
@@ -7014,6 +7183,14 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // should fail
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             "select * from user1.t1 where i = 1");
         
@@ -7051,6 +7228,7 @@ public void testGrantRevokeDDL2() throws SQLException {
             " insert into t2 values (1, 'Yip', 10)");
         
         rs = st_user1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from t1 order by C1");
         
         expColNames = new String [] {"C1", "C2"};
@@ -7144,6 +7322,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // test SELECT privilege, expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             "select * from user1.t1");
         
@@ -7195,6 +7375,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         // try to grant privileges for public on user1.t1, expect 
         // error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42506", st_user2,
             "grant "
             + "select,insert,delete,update,references,trigger on "
@@ -7203,6 +7385,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         // try to grant all privileges for user2 on user1.t1, 
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42506", st_user2,
             "grant ALL PRIVILEGES on user1.t1 to user2");
         
@@ -7222,6 +7406,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         // try to revoke all privileges from user1 on table 
         // user1.t1, expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42509", st_user2,
             "revoke ALL PRIVILEGES on user1.t1 from user1");
         
@@ -7236,6 +7422,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // try revoking yourself from user2.t2, expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42509", st_user2,
             "revoke select on t2 from user2");
         
@@ -7300,6 +7488,7 @@ public void testGrantRevokeDDL2() throws SQLException {
             " grant execute on function F_ABS1 to user2");
         
         rs = st_user1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select GRANTEE, GRANTOR, SELECTPRIV, DELETEPRIV, INSERTPRIV, UPDATEPRIV, REFERENCESPRIV, TRIGGERPRIV from sys.systableperms order by GRANTEE, GRANTOR");
         
         expColNames = new String [] {"GRANTEE", "GRANTOR", "SELECTPRIV", "DELETEPRIV", "INSERTPRIV", "UPDATEPRIV", "REFERENCESPRIV", "TRIGGERPRIV"};
@@ -7321,6 +7510,7 @@ public void testGrantRevokeDDL2() throws SQLException {
         JDBC.assertDrainResults(rs, 0);
 
         rs = st_user1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select GRANTEE, GRANTOR, GRANTOPTION from sys.sysroutineperms order by GRANTEE, GRANTOR");
         
         expColNames = new String [] {"GRANTEE", "GRANTOR", "GRANTOPTION"};
@@ -7349,6 +7539,7 @@ public void testGrantRevokeDDL2() throws SQLException {
         // try to select from t1, ok
         
         rs = st_user2.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             "select * from user1.t1 order by C1");
         
         expColNames = new String [] {"C1", "C2"};
@@ -7365,6 +7556,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // try to insert from t1, expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42500", st_user2,
             "insert into user1.t1 values (5, 'e')");
         
@@ -7416,6 +7609,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42500", st_user2,
             "insert into user1.t1 values (2, 'abc', 'ABC')");
         
@@ -7445,6 +7640,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // user3 does not have permission to execute, expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42504", st_user3,
             "values user1.F_ABS1(-8)");
         
@@ -7577,6 +7774,11 @@ public void testGrantRevokeDDL2() throws SQLException {
         // ok, privileged
         
         rs = st_user3.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             "select * from user1.t1 order by C1");
         
         expColNames = new String [] {"C1", "C2", "C3"};
@@ -7608,6 +7810,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user3,
             "select * from user1.t1");
         
@@ -7697,6 +7901,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             "select * from user1.t4");
         
@@ -7716,6 +7922,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             "update user1.t4 set c1=10, c3=100");
         
@@ -7741,6 +7949,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             "select c2 from user1.t4");
         
@@ -7759,6 +7969,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42508", st_user2,
             "create table myschema.t5 (i int)");
         
@@ -7769,6 +7981,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42508", st_user2,
             "CREATE SCHEMA w3 AUTHORIZATION user2");
         
@@ -7782,6 +7996,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42508", st_user2,
             "CREATE SCHEMA myschema");
         
@@ -7809,6 +8025,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42507", st_user5,
             "DROP SCHEMA w3 RESTRICT");
         
@@ -7827,6 +8045,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             "select tablename from user1.sv1");
 
@@ -7906,6 +8126,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             "create view svc (i) as select * from user1.sva "
             + "union select * from user1.svb");
@@ -7924,6 +8146,7 @@ public void testGrantRevokeDDL2() throws SQLException {
             + "union select * from user1.svb");
         
         rs = st_user2.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from svc order by I");
         
         expColNames = new String [] {"I"};
@@ -7995,6 +8218,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error, don't have with grant option
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("4250A", st_user2,
             "grant select on user2.v02ap to user3");
         
@@ -8075,6 +8300,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             "create table rt2 (c1 int primary key not null, c2 "
             + "int not null, c3 int not null, constraint rt2fk "
@@ -8115,6 +8342,7 @@ public void testGrantRevokeDDL2() throws SQLException {
             "insert into rt2 values (3,3,3)");
         
         rs = st_user2.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from rt2 order by C1, C2, C3");
         
         expColNames = new String [] {"C1", "C2", "C3"};
@@ -8130,6 +8358,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect errors
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             "create table rt3 (c1 int primary key not null, c2 "
             + "int not null, c3 int not null, constraint rt3fk "
@@ -8227,6 +8457,9 @@ public void testGrantRevokeDDL2() throws SQLException {
             "insert into rt3 values (3)");
         
         // test multiple FKs
+//IC see: https://issues.apache.org/jira/browse/DERBY-3376
+//IC see: https://issues.apache.org/jira/browse/DERBY-1736
+//IC see: https://issues.apache.org/jira/browse/DERBY-1589
         st_user3.executeUpdate("drop table user3.rt3");
         st_user2.executeUpdate("drop table user2.rt2");
         st_user1.executeUpdate("drop table user1.rt1");
@@ -8322,6 +8555,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect errors
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42509", st_user2,
             "revoke execute on function ABS from user2 restrict");
         
@@ -8345,6 +8580,10 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42504", st_user2,
             "values user1.F_ABS1(10) + user1.F_ABS2(-10)");
         
@@ -8385,6 +8624,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // not allowed. expect errors, sanity check
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42509", st_user1,
             "grant ALL PRIVILEGES on sys.sysaliases to user2");
         
@@ -8627,6 +8868,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         CallableStatement cSt3 = user3.prepareCall(
             "CALL SQLJ.INSTALL_JAR ('bogus.jar','user2.bogus',0)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42504", cSt3);
         
         cSt3 = user3.prepareCall(
@@ -8771,6 +9014,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         cSt3 = user3.prepareCall(
             " CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE ('USER3', "
             + "'TABLEEXP1', 'myfile.del', null, null, null)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42504", cSt3);
         
         cSt3 = user3.prepareCall(
@@ -8795,6 +9040,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         cSt3 = user3.prepareCall(
             "CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY "
             + "('derby.locks.deadlockTimeout', '10')");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42504", cSt3);
         
         assertStatementError("42504", st_user3,
@@ -8819,6 +9066,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         // test check table routines, only db owner have privilege 
         // by default
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42504", st_user3,
             "VALUES SYSCS_UTIL.SYSCS_CHECK_TABLE('USER3', 'TABLEEXP1')");
         
@@ -8865,6 +9114,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect errors
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42507", st_user2,
             "drop synonym user1.s1");
         
@@ -8924,6 +9175,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // set connection user2
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             " select * from user1.t1000");
         
@@ -8951,6 +9204,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         user1.rollback();
         
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42502", st_user2,
             " select * from user1.t1000");
         
@@ -9208,6 +9463,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // DERBY-1858 expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42507", st_user2,
             "drop schema user4 restrict");
         
@@ -9283,6 +9540,7 @@ public void testGrantRevokeDDL2() throws SQLException {
         // -----------------------------------
         // Now try with column level privilege
         // DERBY-3736
+//IC see: https://issues.apache.org/jira/browse/DERBY-3736
         st_user1.executeUpdate(
             " grant select(i) on ttt2 to user2");
 
@@ -9314,6 +9572,10 @@ public void testGrantRevokeDDL2() throws SQLException {
         // expect error
 
         assertStatementError("42502", pSt2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
 
         // end of test case for DERBY-3736
         // --------------------------------
@@ -9336,6 +9598,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect error
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("42509", st_user1,
             "revoke select on user2.tshared0 from user2");
         
@@ -9447,6 +9711,7 @@ public void testGrantRevokeDDL2() throws SQLException {
         // set connection user4
         
         rs = st_user4.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from user2.tshared1 order by I");
         
         expColNames = new String [] {"I"};
@@ -9463,6 +9728,7 @@ public void testGrantRevokeDDL2() throws SQLException {
         JDBC.assertFullResultSet(rs, expRS, true);
         
         rs = st_user4.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from user3.tshared1 order by I");
         
         expColNames = new String [] {"I"};
@@ -9498,6 +9764,7 @@ public void testGrantRevokeDDL2() throws SQLException {
             " insert into user2.tshared1 select * from user3.tshared1");
         
         rs = st_user4.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from vshared1 order by I");
         
         expColNames = new String [] {"I"};
@@ -9515,6 +9782,7 @@ public void testGrantRevokeDDL2() throws SQLException {
         JDBC.assertFullResultSet(rs, expRS, true);
         
         rs = st_user4.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from vshared2 order by I");
         
         expColNames = new String [] {"I"};
@@ -9544,6 +9812,7 @@ public void testGrantRevokeDDL2() throws SQLException {
         JDBC.assertFullResultSet(rs, expRS, true);
         
         rs = st_user4.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from vshared4 order by I");
         
         expColNames = new String [] {"I"};
@@ -9552,6 +9821,9 @@ public void testGrantRevokeDDL2() throws SQLException {
         expRS = new String [][]
         {
             {"0"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             {"1"},
             {"2"},
             {"3"},
@@ -9562,6 +9834,8 @@ public void testGrantRevokeDDL2() throws SQLException {
         
         // expect errors
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         assertStatementError("4250A", st_user4,
             "grant select on vshared1 to user5");
         
@@ -9646,6 +9920,7 @@ public void testGrantRevokeDDL2() throws SQLException {
             " insert into t6 values (1, 10)");
         
         rs = st.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from user2.t7 order by C1");
         
         expColNames = new String [] {"C1", "C2", "C3"};
@@ -9711,6 +9986,7 @@ public void testGrantRevokeDDL2() throws SQLException {
             "insert into user1.t8 values (2, 20)");
         
         rs = st_user1.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from user1.t9 order by C1");
         
         expColNames = new String [] {"C1", "C2", "C3"};
@@ -9808,6 +10084,8 @@ public void testGrantRevokeDDL2() throws SQLException {
             " update user1.t10 set i=20");
         
         rs = st_user2.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from user1.t10 order by I, J");
         
         expColNames = new String [] {"I", "J"};
@@ -9934,6 +10212,9 @@ public void testGrantRevokeDDL2() throws SQLException {
         JDBC.assertFullResultSet(rs, expRS, true);
         
         rs = st_user5.executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
             " select * from user1.t11 order by I");
         
         expColNames = new String [] {"I"};
@@ -10132,6 +10413,7 @@ public void testRevokeDropsFKWithSharedConglom() throws SQLException
             new String [][] {{"1", "2"}, {"2", "3"}});
 
         st_mamta2.execute("drop table fkt2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5102
         st_mamta2.execute("drop schema mamta2 restrict");
         st_mamta1.execute("drop table pkt2");
         st_mamta1.execute("drop table pkt1");
@@ -10208,6 +10490,7 @@ public void testMinimumSelectPrivilegeRequirement() throws SQLException {
             { "values exists(select 1 from user1.t4191)",  new String[][] {{"false"}} },
             { "values exists(select * from user1.t4191)",  new String[][] {{"false"}} },
             { "select count(*) from (select 1 from user1.t4191) s", new String[][] {{"0"}} },
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             { "insert into user1.t4191_table3 select 1, 2 from user1.t4191", 0 },
             { "update user1.t4191_table3 set c31 = 1 where exists (select * from user1.t4191)", 0 },
             { "delete from user1.t4191_table3 where exists (select * from user1.t4191)", 0 },
@@ -10234,6 +10517,7 @@ public void testMinimumSelectPrivilegeRequirement() throws SQLException {
         // the minimum select privilege on the table, will work.
         user1St.execute("grant select(x) on t4191 to user2");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6411
         for (int i = 0; i < requireMinimumSelectPrivilege.length; i++) {
             String sql = (String) requireMinimumSelectPrivilege[i][0];
             Object expectedResult = requireMinimumSelectPrivilege[i][1];
@@ -10317,6 +10601,7 @@ public void testMinimumSelectPrivilegeRequirement() throws SQLException {
         //following queries will still work because there is still a 
         //select privilege on user1.t4191 available to user2
         rs = user2St.executeQuery("select count(*) from user1.t4191");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6411
         JDBC.assertSingleValueResultSet(rs, "0");
         rs = user2St.executeQuery("select count(1) from user1.t4191");
         JDBC.assertSingleValueResultSet(rs, "0");
@@ -10331,6 +10616,7 @@ public void testMinimumSelectPrivilegeRequirement() throws SQLException {
 		" ( select max(x) + 2 from user1.t4191 )");
 
         user1St.execute("drop table t4191");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5102
         user1St.execute("drop table t4191_table2");
         user1St.execute("drop view view_t4191_table3");
         user1St.execute("drop table t4191_table3");
@@ -10344,6 +10630,7 @@ public void testMinimumSelectPrivilegeRequirement() throws SQLException {
      * DERBY-3266
      */
     public void testGlobalTempTables() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3266
         Connection dbo  = getConnection();
         Statement dboSt = createStatement();
 
@@ -10365,6 +10652,7 @@ public void testGlobalTempTables() throws SQLException {
         dboSt.executeUpdate("create schema session");
         dboSt.executeUpdate("create table session.t2(i int)");
         dboSt.executeUpdate("insert into session.t2 values 2,22");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
         rs = dboSt.executeQuery("select * from session.t2 order by I");
         JDBC.assertFullResultSet(rs, new String [][] {{"2"}, {"22"}} );
 
@@ -10374,6 +10662,7 @@ public void testGlobalTempTables() throws SQLException {
         dboSt.executeUpdate("declare global temporary table t2(i int, j int) " +
                             "on commit preserve rows not logged");
         dboSt.executeUpdate("insert into session.t2 values (222,222),(2,2)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
         rs = dboSt.executeQuery("select * from session.t2 order by i");
         JDBC.assertFullResultSet(rs,
                                  new String [][] { {"2", "2"}, {"222", "222"}, } );
@@ -10392,6 +10681,7 @@ public void testGlobalTempTables() throws SQLException {
             ("declare global temporary table t4(i int, j int) " +
              "on commit preserve rows not logged");
         georgeSt.executeUpdate("insert into session.t4 values (4,4),(44,44)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
         rs = georgeSt.executeQuery("select * from session.t4 order by i");
         JDBC.assertFullResultSet(rs,
                                  new String [][] {{"4", "4"}, {"44", "44"}} );
@@ -10411,6 +10701,7 @@ public void testGlobalTempTables() throws SQLException {
         dbo.close();
         dbo = getConnection();
         dboSt = dbo.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
         rs = dboSt.executeQuery("select * from session.t2 order by i");
         JDBC.assertFullResultSet(rs, new String [][] {{"2"}, {"22"}} );
 
@@ -10418,6 +10709,7 @@ public void testGlobalTempTables() throws SQLException {
         rs.close();
 
         // Drop the objects created in this test case
+//IC see: https://issues.apache.org/jira/browse/DERBY-5102
         dboSt.execute("drop table session.t2");
         dboSt.execute("drop schema session restrict");
 
@@ -10446,6 +10738,7 @@ public void test_derby_4502() throws Exception
             "create view v_4502( a ) as select tablename from sys.systables");
 
         // Clean up
+//IC see: https://issues.apache.org/jira/browse/DERBY-5102
         st_mamta1.execute("drop view v_4502");
         st_mamta1.execute("drop schema mamta1 restrict");
     }
@@ -10570,6 +10863,7 @@ public void testAlterTablePrivilegesIntace() throws Exception {
         st_user1Connection.executeUpdate(
         		"drop table user1.t13");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5409
         st_user1Connection.executeUpdate("drop schema user1 restrict");
         st_user2Connection.executeUpdate("drop schema user2 restrict");
     }
@@ -10614,6 +10908,7 @@ public void testAlterTableWithPrivileges() throws Exception {
         st_user1Connection.executeUpdate(
                 " insert into user1.t12 values(91,91)");
         JDBC.assertFullResultSet(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6441
         		st_user1Connection.executeQuery(" select * from user1.t11 order by c111"),
                 new String[][]{{null, "1"}});
         
@@ -10642,6 +10937,7 @@ public void testAlterTableWithPrivileges() throws Exception {
         st_user1Connection.executeUpdate(
                 "drop table user1.t12");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5409
         st_user1Connection.executeUpdate("drop schema user1 restrict");
         st_user2Connection.executeUpdate("drop schema user2 restrict");
     }
@@ -10651,6 +10947,7 @@ public void testAlterTableWithPrivileges() throws Exception {
      * described on DERBY-6429. Tables are referenced in SET and WHERE clauses.
      */
     public void test_6429_tables()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -11477,6 +11774,7 @@ public void test_6429_tableFunctions()
      * described on DERBY-6434.
      */
     public void test_6434_insert()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -11724,6 +12022,7 @@ public void test_6434_insert()
      * described on DERBY-6434.
      */
     public void test_6434_delete()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -11950,6 +12249,7 @@ public void test_6434_delete()
      * described on DERBY-6434.
      */
     public void test_6434_select()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -12091,6 +12391,8 @@ public void test_6434_select()
      * Test that INSERT and UPDATEs run CHECK constraints with definer's rights.
      */
     public void test_6432()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
+//IC see: https://issues.apache.org/jira/browse/DERBY-6432
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -12231,6 +12533,8 @@ public void test_6432()
      * Test that INSERT and UPDATEs run generation expressions with definer's rights.
      */
     public void test_6433()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6434
+//IC see: https://issues.apache.org/jira/browse/DERBY-6433
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -12375,6 +12679,7 @@ public void test_6433()
      * types of the table columns.
      */
     public void test_6491()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6491
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java
index 4cc4f04e9f..392fcbfceb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GrantRevokeTest.java
@@ -58,6 +58,7 @@ public GrantRevokeTest(String name) {
 	 * statements. Metadata methods test also runs in client/server mode.
 	 */
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite();
 		
 		// following is useful for debugging the lock timeout seen in rollback tests,
@@ -75,6 +76,7 @@ public static Test suite() {
 	 */
 	public static Test basesuite() {
         Test test = new BaseTestSuite(GrantRevokeTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // DERBY-6238: Dump the contents of the lock table on lock timeout.
         // Helps debug intermittent lock timeouts seen in the test.
@@ -195,6 +197,7 @@ public void testSimpleGrant() throws Exception {
 		grant("select", "s1", "t1", users[1]);
 		assertSelectPrivilege(true, users[1], "s1", "t1", null);
 		assertSelectPrivilege(false, users[2], "s1", "t1", null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3661
 		assertSelectPrivilege(false, users[2], "s2", "t1", null);
 		assertSelectPrivilege(false, users[2], "s2", "t2", null);
 		revoke("select", "s1", "t1", users[1]);
@@ -217,6 +220,7 @@ public void testColumnPrivileges() throws Exception {
 		assertSelectPrivilege(false, users[4], "s1", "t1", new String[] {"c3"});
 		assertSelectPrivilege(false, users[4], "s1", "t1", null);
 		assertUpdatePrivilege(false, users[4], "S1", "T1", new String[] {"C1"});
+//IC see: https://issues.apache.org/jira/browse/DERBY-2893
 		assertUpdatePrivilege(true, users[4], "S1", "T1", new String[] {"C2", "C3"});
 		assertReferencesPrivilege(true, users[4], "s1", "t1", new String[] {"c1","c2","c3"});
 		revoke("select(c1),update(c3,c2),references(c3,c1,c2)", "s1", "t1", users[4]);
@@ -673,7 +677,9 @@ public void testGrantOnNonexistantFunction() throws Exception {
             grant("execute", "function s1", "nosuch", users[1]);
     	} catch (SQLException e) {
         	assertSQLState("42Y03", e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5252
         	if ( Locale.getDefault().getLanguage().equals("en") ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3610
         	    assertEquals("'S1.NOSUCH' is not recognized as a function.", e.getMessage());
         	}
         }
@@ -684,7 +690,9 @@ public void testGrantOnNonexistantFunctionForProcedure() throws Exception {
             grant("execute", "function s1", "p1", users[1]);
     	} catch (SQLException e) {
         	assertSQLState("42Y03", e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5252
             if ( Locale.getDefault().getLanguage().equals("en") ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3610
                 assertEquals("'S1.P1' is not recognized as a function.", e.getMessage());
             }
         }
@@ -703,7 +711,9 @@ public void testGrantOnNonexistantProcedure() throws Exception {
             grant("execute", "procedure s1", "nosuch", users[1]);
     	} catch (SQLException e) {
         	assertSQLState("42Y03", e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5252
         	if ( Locale.getDefault().getLanguage().equals("en") ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3610
         	    assertEquals("'S1.NOSUCH' is not recognized as a procedure.", e.getMessage());
         	}
         }
@@ -714,7 +724,9 @@ public void testGrantOnNonexistantProcedureForFunction() throws Exception {
             grant("execute", "procedure s1", "f2", users[1]);
     	} catch (SQLException e) {
         	assertSQLState("42Y03", e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5252
         	if ( Locale.getDefault().getLanguage().equals("en") ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3610
         	    assertEquals("'S1.F2' is not recognized as a procedure.", e.getMessage());
         	}
         }
@@ -780,6 +792,8 @@ public void testOtherUserCannotRevokeOwnerPrivileges() throws SQLException {
         try {
         	revoke(users[2], "select", "s1", "t1", "public");
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
             assertSQLState("42506", e);
         }
         try {
@@ -799,6 +813,8 @@ public void testOtherUserCannotRevokeOwnerPrivileges() throws SQLException {
         }
         
         // clean up
+//IC see: https://issues.apache.org/jira/browse/DERBY-3224
+//IC see: https://issues.apache.org/jira/browse/DERBY-3176
         revoke("select", "s1", "t1", "public");
         revoke("all privileges", "s1", "t1", users[1]);
         revoke("all privileges", "s1", "t1", users[2]);
@@ -1265,6 +1281,14 @@ public void assertReferencesPrivilege(boolean hasPrivilege, String user, String
         	    }
         	} catch (SQLException e) {
         		if (!hasPrivilege) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         			assertSQLState("42502", e);
         		} else {
                     printStackTrace(e);
@@ -1290,6 +1314,7 @@ public void assertReferencesPrivilege(boolean hasPrivilege, String user, String
      */
     public void assertTriggerPrivilege(boolean hasPrivilege, String user, String schema, String table) throws SQLException {
     	
+//IC see: https://issues.apache.org/jira/browse/DERBY-2893
     	Connection c = openUserConnection(user);
     	c.setAutoCommit(false);
     	
@@ -1305,6 +1330,10 @@ public void assertTriggerPrivilege(boolean hasPrivilege, String user, String sch
 
     	} catch (SQLException e) {
     		if (!hasPrivilege) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
     			assertSQLState("42500", e);
     		} else {
                 printStackTrace(e);
@@ -1386,6 +1415,10 @@ public void assertProcedurePrivilege(boolean hasPrivilege, String user, String s
                        hasPrivilege);
 		} catch (SQLException e) {
 			if (!hasPrivilege)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
 				assertSQLState("42504", e);
 			else {
                 printStackTrace(e);
@@ -1428,6 +1461,7 @@ public void assertPrivilegeMetadata(boolean hasPrivilege, String type, String us
         	// Derby doesn't currently support the for grant option, the
         	// grantor is always the object owner - in this test, TEST_DBO,
         	// and is_grantable is always 'NO'
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
           	    assertEquals(rs.getString(4),"TEST_DBO");
           	    assertEquals(rs.getString(7),"NO");
           	    if (rs.getString(6).equals(type)) {
@@ -1490,6 +1524,7 @@ public void assertPrivilegeMetadata(boolean hasPrivilege, String type, String us
     			// grantor is always the object owner - in this test, 
     			// TEST_DBO, and getColumnPrivileges casts 'NO' for 
     			// is_grantable for supported column-related privileges
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
 					assertEquals("TEST_DBO", cp.getString(5));
 					assertEquals("NO", cp.getString(8));
 					if (cp.getString(7).equals(type)) {
@@ -1585,6 +1620,7 @@ static String columnListAsString(String[] columns) {
     String[] getAllColumns(String schema, String table) throws SQLException
     {
     	DatabaseMetaData dbmd = getConnection().getMetaData();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> columnList = new ArrayList<String>();
         ResultSet rs = dbmd.getColumns( (String) null, schema, table, (String) null);
         while(rs.next())
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GroupByExpressionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GroupByExpressionTest.java
index 8f69129c86..151eed3a44 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GroupByExpressionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GroupByExpressionTest.java
@@ -126,6 +126,7 @@ public void testSimpleExpressions() throws Exception
      */
     public void testDerby4402AggregateInGroupBy() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4402
     	assertCompileError(
                 "42Y26", "select c1 from test group by sum(c3)");
     	assertCompileError(
@@ -292,6 +293,7 @@ public void testMiscExpressions() throws Exception
                 "select (cast (c1 as char(2))), count(*) from test " +
                 " group by (cast (c1 as char(2)))",
                 new Object[][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         {"1 ", 2}, 
                         {"2 ", 3}});
         
@@ -317,6 +319,7 @@ public void testMiscExpressions() throws Exception
                 new int[][] {{1,32}, {2, 21}});
         
         // Conditional Derby-2230.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2230
         verifyQueryResults(
                 "cond",
                 "select case when 1 = 1 then 'z' else substr('abc',1,1) end from test",
@@ -341,6 +344,7 @@ public void testMiscExpressions() throws Exception
                 "concat+substr",
                 "select substr(c||v, 1, 4), count(*) from alltypes group by substr(c||v, 1, 4)",
                 new Object[][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                         {"dupl", 14},
                         {"good", 1}});
 
@@ -409,6 +413,7 @@ public void testMiscExpressions() throws Exception
         verifyQueryResults(
                 "nullif-Q2",
                 "select nullif(c1,c2) from t3 group by nullif(c1,c2)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 new Object[][] { { 5 }, 
                                  { null } });
 
@@ -549,6 +554,7 @@ private Object[] intRow(int[] expected)
         Object[] arr = new Object[expected.length];
         for (int i = 0; i < expected.length; i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             arr[i] = expected[i];
         }
         return arr;
@@ -616,6 +622,7 @@ public GroupByExpressionTest(String name)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("GROUP BY expression tests");
         suite.addTestSuite(GroupByExpressionTest.class);
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java
index 1b59fe3b4e..626a5fbf46 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java
@@ -51,7 +51,9 @@ public GroupByTest(String name) {
 	}
 	
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3050
 		return new CleanDatabaseTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                 new BaseTestSuite(GroupByTest.class, "GroupByTest")) {
 			protected void decorateSQL(Statement s)
 				throws SQLException
@@ -121,6 +123,7 @@ private static void createSchemaObjects(Statement st)
         st.executeUpdate("insert into d2457_a values (1, 12), (2, 23), " +
                 "(3, 34), (4, 45), (5, 56)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4071
         st.executeUpdate("create table d4071(i int, v char(10))");
         st.executeUpdate("insert into d4071 " +
                          "       values (1, '0123456789')," +
@@ -1751,6 +1754,7 @@ public void testHavingWithInnerJoinDerby3880() throws SQLException {
 	public void testGroupByWithAliasToSameName() throws SQLException {
 
 		Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
 
 		String[][] expected1 = {{"1", "3"}, {"2", "2"}};
 		JDBC.assertUnorderedResultSet(
@@ -1827,6 +1831,7 @@ public void testDerbyOrderByOnAggregate() throws SQLException
 		JDBC.assertFullResultSet(
 				rs,
 				new Object[][]{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 						{3.0, 4},
 						{4.0, 2},
 						{7.0, 1}},
@@ -1839,6 +1844,7 @@ public void testDerbyOrderByOnAggregate() throws SQLException
 		JDBC.assertFullResultSet(
 				rs,
 				new Object[][]{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 						{7.0, 1},
 						{4.0, 2},
 						{3.0, 4}},
@@ -2246,6 +2252,7 @@ private static void doAllSetOperations(Statement s, String[] queries,
 
         for (int i = 0; i < queries.length; i++) {
             final String query1 = queries[i];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             final List<List<String>> rows1 =
                     resultArrayToList(expectedResults[i]);
 
@@ -2324,6 +2331,7 @@ private static void assertSetOpErrors(String sqlState,
      * String[][]}
      */
     private static String[][] union(Collection<List<String>> rows1,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                                     Collection<List<String>> rows2,
                                     boolean all) {
         Collection<List<String>> bagOrSet = newBagOrSet(all);
@@ -2344,6 +2352,7 @@ private static String[][] union(Collection<List<String>> rows1,
      * {@code String[][]}
      */
     private static String[][] except(Collection<List<String>> rows1,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                                      Collection<List<String>> rows2,
                                      boolean all) {
         Collection<List<String>> bagOrSet = newBagOrSet(all);
@@ -2367,6 +2376,7 @@ private static String[][] except(Collection<List<String>> rows1,
      * {@code String[][]}
      */
     private static String[][] intersect(Collection<List<String>> rows1,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                                         Collection<List<String>> rows2,
                                         boolean all) {
         Collection<List<String>> bagOrSet = newBagOrSet(all);
@@ -2389,6 +2399,7 @@ private static String[][] intersect(Collection<List<String>> rows1,
      */
     private static Collection<List<String>> newBagOrSet(boolean bag) {
         if (bag) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return new ArrayList<List<String>>();
         } else {
             return new HashSet<List<String>>();
@@ -2405,6 +2416,7 @@ private static Collection<List<String>> newBagOrSet(boolean bag) {
      */
     private static String[][] toResultArray(Collection<List<String>> rows) {
         String[][] results = new String[rows.size()][];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Iterator<List<String>> it = rows.iterator();
         for (int i = 0; i < results.length; i++) {
             List<String> row = it.next();
@@ -2423,6 +2435,7 @@ private static String[][] toResultArray(Collection<List<String>> rows) {
      * @return the values of {@code results} in a list of lists
      */
     private static List<List<String>> resultArrayToList(String[][] results) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<List<String>> rows =
                 new ArrayList<List<String>>(results.length);
         for (int i = 0; i < results.length; i++) {
@@ -2501,6 +2514,7 @@ public void testDerby3631AggregateInGroupByQuery() throws SQLException {
      * @throws SQLException
      */
     public void testDerby4071AggregateOnGroupByColumnInHaving() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4071
          Statement s = createStatement();
          ResultSet rs = s.executeQuery("SELECT MAX(i), COUNT(T.V) FROM d4071 T " +
                                        "    GROUP BY T.V HAVING COUNT(T.V) > 1");
@@ -2515,6 +2529,8 @@ public void testDerby4071AggregateOnGroupByColumnInHaving() throws SQLException
      * @throws SQLException
      */
     public void testDerby4450() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4450
+//IC see: https://issues.apache.org/jira/browse/DERBY-681
         setAutoCommit(false);
         Statement s = createStatement();
         ResultSet rs;
@@ -2542,6 +2558,8 @@ public void testDerby4450() throws SQLException {
      * @throws SQLException
      */
     public void testDerby4698() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4698
+//IC see: https://issues.apache.org/jira/browse/DERBY-3880
         setAutoCommit(false);
         Statement s = createStatement();
         ResultSet rs;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/HalfCreatedDatabaseTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/HalfCreatedDatabaseTest.java
index 2b6272266b..8d22cf4a51 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/HalfCreatedDatabaseTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/HalfCreatedDatabaseTest.java
@@ -74,6 +74,7 @@ public class HalfCreatedDatabaseTest extends BaseJDBCTestCase
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("HalfCreatedDatabaseTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest( decorateTest() );
         
@@ -83,6 +84,7 @@ public static Test suite()
     private static Test decorateTest()
     {
         Test test = new BaseTestSuite( HalfCreatedDatabaseTest.class );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         test = TestConfiguration.singleUseDatabaseDecorator( test, DB_NAME );
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/HoldCursorTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/HoldCursorTest.java
index d31feb3ce3..2e17e9899f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/HoldCursorTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/HoldCursorTest.java
@@ -47,6 +47,7 @@ public HoldCursorTest(String name) {
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("HoldCursorTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(baseSuite(true));
         suite.addTest(baseSuite(false));
@@ -57,6 +58,7 @@ public static Test suite() {
     private static Test baseSuite(boolean embeddedMode) {
         String name = "HoldCursorTest:" + (embeddedMode ? "embedded" : "client");
         BaseTestSuite suite = new BaseTestSuite(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // Add tests that every JVM jdk1.4 or above should be able to run.
         suite.addTestSuite(HoldCursorTest.class);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/IdentitySequenceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/IdentitySequenceTest.java
index 1a8c32e7c8..5c1c97ae97 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/IdentitySequenceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/IdentitySequenceTest.java
@@ -77,6 +77,7 @@ public IdentitySequenceTest( String name )
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         Test    cleanTest = new CleanDatabaseTestSetup
             (
@@ -658,6 +659,11 @@ public  void    testcycleOption()
 		// Support cycle option after altering the table.
         goodStatement( conn, "create table t( a int generated always as identity(start with 2147483647 cycle), b int)" );
 	goodStatement( conn, "alter table t alter column a set increment by 4" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 	goodStatement( conn ,"insert into t( b ) values ( 1 ), ( 2 )" );
         
 
@@ -686,6 +692,11 @@ public  void    testcycleOption()
         goodStatement( conn, "create table t( a int generated always as identity(increment by 2 cycle), b int)" );
 	goodStatement( conn, "alter table t alter column a restart with 2147483647" );
     goodStatement( conn ,"insert into t( b ) values ( 1 ), ( 2 )" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 
 	goodStatement( conn, "drop table t" );
 		// Alter table works fine without cycling with cycle option in the syntax.
@@ -708,6 +719,7 @@ public  void    testcycleOption()
              );
 
 	goodStatement( conn, "drop table t" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6935
 	goodStatement( conn, "create table t( A_6852 int generated always as identity(start with 7 increment by 2 cycle), b_6852 int)" );
 		//SELECT from sys.syscolumns with cycle option
         // ADDING AUTOINCREMENTCYCLE Derby-6905
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java
index 9a592cf415..ffeaf69c31 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java
@@ -163,6 +163,7 @@ public InListMultiProbeTest(String name)
      */
     protected void tearDown() throws Exception 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3140
         foreignIdToRowsMap = null;
         super.tearDown();
     }
@@ -173,6 +174,7 @@ protected void tearDown() throws Exception
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("IN-list MultiProbe Suite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         /* This is a language/optimization test so behavior will be the
          * same for embedded and client/server.  Therefore we only need
@@ -333,6 +335,7 @@ public void testMultiProbing() throws Exception
          */
         readAllRows(createStatement());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<QueryStrategy> strategies = new ArrayList<QueryStrategy>();
         Random ran = new Random(2);
         Connection c = getConnection();
@@ -388,6 +391,7 @@ public void testMultiProbing() throws Exception
     public void testMultipleStartStopPreds() throws Exception
     {
         Statement st = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2740
 
         // Following DDL inserts 80 rows.
         st.execute("create table ct (i int, c1 char(5), c2 char(10))");
@@ -1452,6 +1456,7 @@ private static void insertNDataRows(Connection conn, int numRows,
      * @param cnt Size of the IN list with which to query.
      */
     private void testOneSize(List<QueryStrategy> strategies, int cnt)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             throws SQLException
     {
         if (cnt > allIds.length)
@@ -1463,6 +1468,7 @@ private void testOneSize(List<QueryStrategy> strategies, int cnt)
             int numRows = strategy.testSize(cnt);
 
             ResultSet rs = st.executeQuery(GET_RUNTIME_STATS_QUERY);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2740
             if (!checkMultiProbeQueryPlan(rs, numRows))
             {
                 failedStrategy = strategy.getName();
@@ -1500,6 +1506,7 @@ private void readAllRows(Statement stmt)
         throws SQLException
     {
         ResultSet rs = stmt.executeQuery(SELECT_ALL);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         foreignIdToRowsMap = new TreeMap<String, List<DataRow>>();
         while (rs.next())
         {
@@ -1546,6 +1553,7 @@ private static String genUUIDValue(Random random)
      * to mean we expect an empty result set.
      */
     private void assertResultsAndQueryPlan(ResultSet rs,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2740
         String [][] expRS, Statement st) throws SQLException
     {
         int numRows = 0;
@@ -1736,6 +1744,7 @@ abstract class QueryStrategy
          * as well.  This comparator object allows that sort to happen using
          * the JVM's own sort algorithm.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Comparator<String[]> rowComparator = new Comparator<String[]>()
         {
             public int compare(String[] o1, String[] o2)
@@ -1771,6 +1780,7 @@ public final int testSize(int size)
             throws SQLException
         {
             Set<String> s = new HashSet<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
             /* A Set contains no duplicate elements.  So if we, in our
              * randomness, try to insert a duplicate value, it will be
@@ -1819,6 +1829,7 @@ protected int validate(String[] foreignIds, ResultSet results)
             throws SQLException
         {
             // This will be a list of String arrays.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             List<String[]> expected =
                     new ArrayList<String[]>(foreignIdToRowsMap.size());
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InPredicateTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InPredicateTest.java
index ceec5b7875..9ac9eefbef 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InPredicateTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InPredicateTest.java
@@ -163,6 +163,7 @@ public void testMixedTypes() throws SQLException {
 
         Object[][] expectedRows = {
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 2147483645,
                 2.14748365E9f,
                 2.14748365E9f,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InbetweenTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InbetweenTest.java
index 92f24fbaa6..92ac0055b3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InbetweenTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/InbetweenTest.java
@@ -49,6 +49,7 @@ public InbetweenTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("InbetweenTest Test");
         suite.addTest(DatabasePropertyTestSetup.singleProperty(
                 TestConfiguration.defaultSuite(InbetweenTest.class),
@@ -57,6 +58,7 @@ public static Test suite()
     }
 
     private void createTestObjects(Statement st) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         setAutoCommit(false);
         CleanDatabaseTestSetup.cleanDatabase(getConnection(), false);
         
@@ -178,6 +180,7 @@ private void createTestObjects(Statement st) throws SQLException {
             + "'15:47:28', null, null)");
         
         st.executeUpdate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4375
                 " insert into bt2 values (28, 82, null, '15:47:28', "
                 + "'"+Timestamp.valueOf("2007-02-23 15:47:27.544")+"', null)");
             
@@ -195,6 +198,7 @@ private void createTestObjects(Statement st) throws SQLException {
     
     public void testBetween() throws Exception {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         Statement st = createStatement();
         createTestObjects(st);
                 
@@ -237,6 +241,7 @@ public void testBetween() throws Exception {
         
         // positive tests type comparisons
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         ResultSet rs = st.executeQuery(
             "select i from t where i between s and r");
         
@@ -256,6 +261,7 @@ public void testBetween() throws Exception {
         
         expColNames = new String [] {"I"};
         JDBC.assertColumnNames(rs, expColNames);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         JDBC.assertSingleValueResultSet(rs, "0");
         
         rs = st.executeQuery(
@@ -312,6 +318,7 @@ public void testBetween() throws Exception {
         
         expColNames = new String [] {"I"};
         JDBC.assertColumnNames(rs, expColNames);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         JDBC.assertSingleValueResultSet(rs, "-1");
         
         rs = st.executeQuery(
@@ -321,6 +328,7 @@ public void testBetween() throws Exception {
         
         expColNames = new String [] {"I"};
         JDBC.assertColumnNames(rs, expColNames);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         JDBC.assertSingleValueResultSet(rs, "-1");
         
         //between 2 and 1
@@ -330,6 +338,7 @@ public void testBetween() throws Exception {
         
         expColNames = new String [] {"I","S","C","V","D","R","E","T","P"};
         JDBC.assertColumnNames(rs, expColNames);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         JDBC.assertEmpty(rs);
         
         rs = st.executeQuery(
@@ -345,6 +354,7 @@ public void testBetween() throws Exception {
         expColNames = new String [] {"I","S","C","V","D","R","E","T","P"};
         JDBC.assertColumnNames(rs, expColNames);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         String[][] expRS = {
             {"0","100","hello","everyone is here","200.0","300.0",
                      "1992-01-01","12:30:30","1992-01-01 12:30:30.0"},
@@ -601,6 +611,7 @@ public void testBetween() throws Exception {
         
         rs = st.executeQuery("values (2)");
         rs.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         ResultSetMetaData rsmd = rs.getMetaData();
         for (int i = 1;
                 i <= rsmd.getColumnCount(); i++) {
@@ -740,6 +751,7 @@ public void testBetween() throws Exception {
 
     public void testInList() throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         Statement st = createStatement();
         createTestObjects(st);     
         
@@ -782,6 +794,7 @@ public void testInList() throws SQLException {
         //positive tests
         //type comparisons
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         ResultSet rs = st.executeQuery(
             "select i from t where i in (s, r, i, d, 40e1)");
         
@@ -1265,6 +1278,7 @@ public void testInList() throws SQLException {
 
     public void testInBetween() throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         Statement st = createStatement();
         createTestObjects(st);
         
@@ -1274,6 +1288,7 @@ public void testInBetween() throws SQLException {
         st.executeUpdate(" insert into u values null");     
         st.executeUpdate(" insert into u values 2");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         ResultSet rs = st.executeQuery(
             " select * from u where c1 between 2 and 3");
         
@@ -1619,6 +1634,7 @@ public void testInBetween() throws SQLException {
     public void testBigInList() throws SQLException {
         // big in lists (test binary search)
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         Statement st = createStatement();
         createTestObjects(st);                
         
@@ -1866,6 +1882,7 @@ public void testCheckQueries() throws SQLException{
         // Check various queries for which left column is part of 
         // an index.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         Statement st = createStatement();
         createTestObjects(st);      
                 
@@ -1877,6 +1894,7 @@ public void testCheckQueries() throws SQLException{
         String[] expColNames = {"I", "C", "DE"};
         JDBC.assertColumnNames(rs, expColNames);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         String[][] expRS = {
             {"2", "two", "22.2"},
             {"8", "eight", "2.8"},
@@ -2551,6 +2569,7 @@ public void testCheckQueries() throws SQLException{
         
         // Prepared statement checks. Mix of constants and params.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         PreparedStatement pSt = prepareStatement(
             "select * from bt1 where i in (1, 8, 3, ?) order by i, c");
         
@@ -3359,6 +3378,7 @@ public void testNestedQueries() throws SQLException{
             " create view v3 as select de d from bt1 union "
             + "select d from bt2");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         ResultSet rs = st.executeQuery(
             " select * from V2, V3 where V2.i in (2,4) and V3.d "
             + "in (4.3, 7.1, 22.2)");
@@ -3500,6 +3520,7 @@ public void testBeetle4316() throws SQLException{
         st.executeUpdate(
             " insert into t2 values (4, 8), (8, 8), (7, 6), (5, 6)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         ResultSet rs = st.executeQuery(
             " select c1 from t1 where c1 in (2, sqrt(c2))");
         
@@ -3519,6 +3540,8 @@ public void testBeetle4316() throws SQLException{
             " select c1 from t1 where c1 in ('10', '5', '20') and c1 > 3"
             + "and c1 < 19");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         CallableStatement cSt = prepareCall(
             " call SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS(1)");
         assertUpdateCount(cSt, 0);
@@ -3688,6 +3711,7 @@ public void testBeetle4316() throws SQLException{
             "select c1 from t1 where c1 in ('9', '4', '8.0', '7.7',"
             + "	5.2, 6, '7.7', '4.9', '6.1')");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         PreparedStatement pSt = prepareStatement(
             "select c1 from t1 where c1 in (3, ?)");
         
@@ -3794,6 +3818,9 @@ public void testReproductionBeetle5135() throws SQLException{
         //reproduction for beetle 5135 ( long list of constants in 
         // IN clause)
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         Statement st = createStatement();
         createTestObjects(st);
         
@@ -3812,6 +3839,7 @@ public void testReproductionBeetle5135() throws SQLException{
         st.executeUpdate(" insert into t1 values(13037)");       
         st.executeUpdate(" insert into t1 values(9999)");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         ResultSet rs = st.executeQuery(
             " SELECT id FROM t1 WHERE id IN "
             + "(2,3,5,7,6,8,11,13,14,15,16,18,19"
@@ -4393,6 +4421,7 @@ public void testReproductionBeetle5135() throws SQLException{
             + ",4436,5162,5165,5170,5171,5173,5345,5174,5765,5177,5"
             + "750,5793,0) ORDER BY id");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
         String[] expColNames = {"ID"};
         JDBC.assertColumnNames(rs, expColNames);
         
@@ -4438,6 +4467,7 @@ public void testReproductionBeetle5135() throws SQLException{
         expColNames = new String [] {"C1"};
         JDBC.assertColumnNames(rs, expColNames);
         JDBC.assertSingleValueResultSet(rs, "0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5715
 
         rollback();
         st.close();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JitTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JitTest.java
index bb6e7e4c87..b993d7ed0c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JitTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JitTest.java
@@ -54,6 +54,7 @@ public static void main (String args[])
     } catch (Exception e) {
     	System.out.println("FAIL -- unexpected exception "+e);
     	JDBCDisplayUtil.ShowException(System.out, e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
       	e.printStackTrace(System.out);
     }
   }
@@ -128,6 +129,7 @@ private static int checkBadStartWithCols(Connection conn, int
   		Statement stmt = conn.createStatement();
   		ResultSet rs =stmt.executeQuery("select count(autoincrementstart) from"+
   				" sys.syscolumns c, sys.systables t, sys.sysschemas s WHERE"+
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
 				" t.schemaid =  s.schemaid and CAST(s.schemaname AS VARCHAR(128))= 'APP' and"+
 				" autoincrementstart > " +  maxautoincrementstart);
 
@@ -141,6 +143,7 @@ private static int checkBadStartWithCols(Connection conn, int
   		{
   			rs =stmt.executeQuery("select tablename, columnname,"+
   					" autoincrementstart from sys.syscolumns c, sys.systables t,"+
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
 					" CAST(sys.sysschemas AS VARCHAR(128)) s WHERE t.schemaid = s.schemaid and"+
 					" CAST(s.schemaname AS VARCHAR(128)) = 'APP' and autoincrementstart > 2 ORDER"+
 					" BY tablename");
@@ -170,6 +173,7 @@ private  static void dropAllAppTables(Connection conn) throws SQLException
   		ResultSet rs = stmt1.executeQuery("SELECT tablename from sys.systables"+
   				" t, sys.sysschemas s where t.schemaid = s.schemaid and"+
 				" CAST(s.schemaname AS VARCHAR(128)) = 'APP'");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
 
   		while (rs.next())
   		{
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JoinTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JoinTest.java
index cc257058b2..10453d35c4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JoinTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JoinTest.java
@@ -59,8 +59,11 @@ public static Test suite() {
      *
      */
     public void testNullabilityInValues() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4365
+//IC see: https://issues.apache.org/jira/browse/DERBY-3757
         Statement s = createStatement();
         assertStatementError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4405
         		VALUES_WITH_NULL, s,
         		"select a.* from (values (null)) a left outer join "+
         		"(values ('a')) b on 1=1");
@@ -78,6 +81,7 @@ public void testNullabilityInValues() throws SQLException {
         };
         JDBC.assertUnorderedResultSet(s.executeQuery(
         		"select a.* from (values ('a'),('b'),(cast(null as char(1)))) "
+//IC see: https://issues.apache.org/jira/browse/DERBY-4405
         		+ "a left outer join (values ('c'),('d')) b on 1=1"),
         		expectedResult);
     }
@@ -981,6 +985,7 @@ public void testSubqueryInON() throws SQLException {
      * @throws SQLException
      */
     public void testDerby4387() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4387
         setAutoCommit(false);
         Statement s = createStatement();
         ResultSet rs;
@@ -1025,6 +1030,7 @@ public void testDerby4387() throws SQLException {
      * null intolerant predicate. It uses a slimmed down toursdb dataset.
      */
     public void testDerby_4405() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4405
         setAutoCommit(false);
         Statement s = createStatement();
 
@@ -1852,6 +1858,9 @@ static void insertTourRow(PreparedStatement ps, int a, String b, String c)
      * preprocessing step of the optimizer.
      */
     public void testDerby_4679() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4679
+//IC see: https://issues.apache.org/jira/browse/DERBY-2526
+//IC see: https://issues.apache.org/jira/browse/DERBY-3023
         setAutoCommit(false);
         Statement s = createStatement();
 
@@ -1894,6 +1903,7 @@ public void testDerby_4679() throws SQLException {
                   "values ('dddd', '_5ZDlwWTeEd-Q8aOqWJPEIQ')," +
                   "       ('bbbb', '_5nN9mmTeEd-Q8aOqWJPEIQ')");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4679
         ResultSet rs = s.executeQuery(
             "select distinct t1.ITEM_ID, t1.state_id, t1.JZ_DISCRIMINATOR" +
             "    from " +
@@ -2012,6 +2022,7 @@ public void testDerby_4679() throws SQLException {
      * 
      */
     public void testDerby_4695() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4695
         setAutoCommit(false);
         Statement s = createStatement();
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JsonSuite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JsonSuite.java
index 553e1d8673..1617ca99c7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JsonSuite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/JsonSuite.java
@@ -57,6 +57,7 @@ public static Test suite()
         else
         {
             suite.addTest(SimpleJsonTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             suite.addTest(SimpleJsonPermsTest.suite());
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java
index 0fd3ad1d1f..7c41fbe6d2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangHarnessJavaTest.java
@@ -101,23 +101,27 @@ protected String getArea() {
      * included in the name of a test)
      */
     public static void main(String[] args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2799
         junit.textui.TestRunner.run(baseSuite("main()", args));
     }
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("jdbcapi: old harness java tests");
 
         suite.addTest(baseSuite("embedded", LANG_TESTS_BOTH));
         suite.addTest(baseSuite("embedded", LANG_TESTS_EMEBDDED));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1355
         suite.addTest(TestConfiguration.clientServerDecorator(
                 baseSuite("clientserver", LANG_TESTS_BOTH)));
         return suite;
     }
    
     private static Test baseSuite(String which, String[] set) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("lang: " + which);
         for (int i = 0; i < set.length; i++)
         {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java
index 1efa54364d..e9a4a59760 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java
@@ -63,7 +63,9 @@ protected void tearDown() throws Exception {
      * Default suite for running this test (embedded and client).
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         if (JDBC.vmSupportsJSR169()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(
                 "Empty LangProcedureTest. " +
                 "JSR169 does not support jdbc:default:connection");
@@ -97,6 +99,7 @@ public void testCreateRoutineErrors() throws SQLException {
 
         // The procedure name exceeds the max length.
         assertStatementError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
             "42622",
             s,
             "create procedure a234567890123456789012345678901234567890123"
@@ -170,6 +173,7 @@ public void testCreateRoutineErrors() throws SQLException {
 
         // RETURNS NULL ON NULL INPUT isn't allowed in procedures.
         assertStatementError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
             "42X01",
             s,
             "create procedure nullinput2() returns null on null input "
@@ -221,6 +225,7 @@ public void testMethodSignatureDerby258() throws SQLException {
         Statement s = createStatement();
 
         // int doesn't match String
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("create procedure SIGNATURE_BUG_DERBY_258_A(in A int) "
                 + "language java parameter style java "
                 + "external name 'java.lang.System.load(java.lang.String)'");
@@ -298,6 +303,7 @@ public void testMethodSignatureDerby258() throws SQLException {
      */
     public static void DERBY_3304(ResultSet[] rs1) throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         Connection conn =
             DriverManager.getConnection("jdbc:default:connection");
         Statement stm = conn.createStatement();
@@ -316,6 +322,7 @@ public static void DERBY_3304(ResultSet[] rs1) throws SQLException
     public void testDelayedClassChecking() throws SQLException {
         Statement s = createStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute(
             "create procedure noclass() language java " +
             "external name 'asdf.asdf' parameter style java");
@@ -355,6 +362,7 @@ public void testDuplicates() throws SQLException {
         s.execute("create schema S1");
         s.execute("create schema S2");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("create procedure    PROCDUP() language java " +
                   "external name 'okAPP.ok0' parameter style java");
 
@@ -398,11 +406,13 @@ public void testDuplicates() throws SQLException {
                 DBMetaDefinition, null);
 
         assertStatementError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
             "0A000",
             s,
             "create procedure S1.NOTYET() SPECIFIC fred language java " +
             "external name 'failAPP.fail0' parameter style java");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6039
         s.execute("drop procedure PROCDUP");
         s.execute("drop procedure s1.PROCDUP");
         s.execute("drop procedure s2.PROCDUP");
@@ -418,6 +428,7 @@ public void testAmbigiousMethods() throws SQLException {
         Statement s = createStatement();
 
         // ambiguous resolution - with result sets
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("create procedure ambiguous01(p1 integer, p2 char(20)) " +
                   "dynamic result sets 1 language java parameter style java " +
                   "external name '" + thisClassName + ".ambiguous1'");
@@ -458,6 +469,7 @@ private static void checkMatchingProcedures(Connection conn,
         boolean saveAutoCommit = conn.getAutoCommit();
         conn.setAutoCommit(false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         PreparedStatement ps = conn.prepareStatement(
             "select schemaname, alias, " +
             "    cast (((javaclassname || '.' ) || " +
@@ -507,6 +519,7 @@ public void testZeroArgProcedures() throws SQLException {
         Connection conn = getConnection();
 
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("create procedure za() language java external name '" +
                   thisClassName + ".zeroArg' parameter style java");
 
@@ -524,6 +537,7 @@ public void testZeroArgProcedures() throws SQLException {
         ps.close();
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
             prepareStatement("call za(?)");
             fail("FAIL - prepareStatement call za(?)");
         } catch (SQLException sqle) {
@@ -540,6 +554,7 @@ public void testZeroArgProcedures() throws SQLException {
         assertUpdateCountForProcedureWithNoResults(cs);
         cs.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         String[] sysAliasDefinition = {
             "APP.ZA AS " + thisClassName + ".zeroArg() " +
             "LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA"};
@@ -562,6 +577,7 @@ public void testSqlProcedures() throws SQLException {
         Statement s = createStatement();
 
         s.execute("create table t1(i int not null primary key, b char(15))");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute(
                 "create procedure ir(p1 int) " +
                 "modifies sql data dynamic result sets 0 language java " +
@@ -616,6 +632,7 @@ public void testSqlProcedures() throws SQLException {
 
         ir1.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         ir1 = conn.prepareCall("call APP.IR(?)");
         ir1.setInt(1, 7);
         ir1.execute();
@@ -631,6 +648,7 @@ public void testSqlProcedures() throws SQLException {
         ir2.execute();
 
         ir2.setInt(1, 6);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         ir2.setString(2, "'012345678");
         ir2.execute();
 
@@ -647,6 +665,7 @@ public void testSqlProcedures() throws SQLException {
         ResultSet rs = s.executeQuery("select * from t1");
         JDBC.assertFullResultSet(rs, t1Results);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         if (!conn.getAutoCommit()) {
             conn.commit();
         }
@@ -674,6 +693,7 @@ public void testDynamicResultSets() throws SQLException {
         assertStatementError(
                 "42X01",
                 s,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
                 "create procedure DRS(p1 int) " +
                 "parameter style java reads sql data dynamic result sets -1 " +
                 "language java external name '" +
@@ -686,6 +706,7 @@ public void testDynamicResultSets() throws SQLException {
 
         // Create a test table with some data that can be accessed by the
         // DRS procedure.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6039
         s.execute("create table t1(i int not null primary key, b char(15))");
         s.execute("insert into t1 values (1, 'int'), (2, 'int'), (3, 'int'), "
                 + "(7, 'int'), (4, '4'), (5, 'ir2'), (6, '''012345678')");
@@ -715,6 +736,7 @@ public void testDynamicResultSets() throws SQLException {
         JDBC.assertFullResultSet(rs, drsResult);
         drs1.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("create procedure DRS2(p1 int, p2 int) " +
                   "parameter style java reads sql data " +
                   "dynamic result sets 2 language java " +
@@ -796,6 +818,7 @@ public void testDynamicResultSets() throws SQLException {
 
             lastResultSet = drs2.getResultSet();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
             if ((pass == 1) || (pass == 2)) {
                 assertNotNull("expected resultset pass " + pass, lastResultSet);
             } else if (pass == 3) {
@@ -824,6 +847,7 @@ public void testDynamicResultSets() throws SQLException {
 
         // check that a procedure with dynamic result sets can not resolve to a
         // method with no ResultSet argument.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute(
             "create procedure irdrs(p1 int) dynamic result sets 1 " +
             "language java parameter style java external name '" +
@@ -897,6 +921,7 @@ public void testDynamicResultSets() throws SQLException {
         toomany.close();
         s.execute("drop procedure way.toomany");
         s.execute("drop schema way restrict");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6039
 
         // Run following test in embedded only until DERBY-3414 is fixed. As
         // identified in DERBY-3414, the rollback inside the java procedure
@@ -904,6 +929,7 @@ public void testDynamicResultSets() throws SQLException {
         if (usingEmbedded()) {
             boolean oldAutoCommit = conn.getAutoCommit();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
             s.execute(
                 "create table dellater1(i int not null primary key, " +
                 "                       b char(15))");
@@ -988,12 +1014,15 @@ public void testDynamicResultSets() throws SQLException {
             s.execute("drop table DELLATER2");
             s.execute("drop table DELLATER3");
             s.execute("drop procedure insertCausingRollback");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6039
 
             conn.setAutoCommit(oldAutoCommit);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6039
         s.execute("drop procedure drs");
         s.execute("drop procedure drs2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6039
         s.execute("drop table t1");
         commit();
 
@@ -1003,6 +1032,7 @@ public void testDynamicResultSets() throws SQLException {
 
     public void testResultSetsWithLobs() throws SQLException {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
 
         // Create objects.
         Statement s = createStatement();
@@ -1078,6 +1108,8 @@ public void testResultSetsWithLobs() throws SQLException {
      -auto commit is false
      -lock count before execution 0
      -lock count after execution 1
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
      -lock count after next on first rs 3 -&gt; 2 now FIXME: explain
      -lock count after first getMoreResults() 2
      -lock count after next on second rs 7
@@ -1086,6 +1118,7 @@ public void testResultSetsWithLobs() throws SQLException {
      -auto commit is true
      -lock count before execution 0
      -lock count after execution 1
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
      -lock count after next on first rs 3 -&gt; 2 now FIXME: explain
      -executing statement to force auto commit on open call statement
      -lock count after statement execution 0
@@ -1100,6 +1133,7 @@ private static void checkCommitWithMultipleResultSets(
         Connection conn = drs1.getConnection();
 
         // Do not run with client until DERBY-2510 is fixed
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         if (usingDerbyNetClient()) {
             return;
         }
@@ -1116,6 +1150,7 @@ private static void checkCommitWithMultipleResultSets(
 
         boolean oldAutoCommit = conn.getAutoCommit();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         if (action.equals("noautocommit")) {
             conn.setAutoCommit(false);
         } else {
@@ -1148,6 +1183,7 @@ private static void checkCommitWithMultipleResultSets(
         lrs = psLocks.executeQuery();
 
         JDBC.assertFullResultSet(lrs, new String[][] { { "2" } });
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
 
         boolean expectClosed = false;
 
@@ -1163,6 +1199,7 @@ private static void checkCommitWithMultipleResultSets(
 
             try {
                 rs.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
                 if (action.equals("autocommit")) {
                     fail("FAIL - result set open in auto commit mode after " +
                          "another statement execution");
@@ -1176,6 +1213,7 @@ private static void checkCommitWithMultipleResultSets(
         assertTrue("is there a second result", anyMore);
         lrs = psLocks.executeQuery();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         if (action.equals("statement")) {
             JDBC.assertFullResultSet(lrs, new String[][] { { "0" } });
         } else {
@@ -1230,6 +1268,7 @@ private void assertUpdateCountForProcedureWithNoResults(Statement s)
             throws SQLException {
         // DERBY-211 Network Server returns no result sets for a procedure call
         // that returns no result
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         if (usingEmbedded()) {
             assertEquals(0, s.getUpdateCount());
         } else {
@@ -1445,6 +1484,7 @@ public static void selectRows(int p1, int p2, ResultSet[] data1,
         ps.setInt(1, p2);
         data2[0] = ps.executeQuery();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         if (p2 == 99) {
             data2[0].close();
         }
@@ -1473,6 +1513,7 @@ public static void selectRows(String table, ResultSet[] rs)
         Connection conn = DriverManager
                 .getConnection("jdbc:default:connection");
         Statement stmt = conn.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         rs[0] = stmt.executeQuery("select * FROM " + table);
         conn.close();
     }
@@ -1482,6 +1523,7 @@ public void testParameterTypes() throws SQLException {
         Connection conn = getConnection();
         Statement s = createStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("create table PT1(A integer not null primary key, " +
                   "                 B char(10), C varchar(20))");
         s.execute(
@@ -1526,6 +1568,7 @@ public void testParameterTypes() throws SQLException {
         pt1.setInt(1, 40);
 
         // end blanks truncation of arguments
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         char[] c75 = new char[75]; Arrays.fill(c75, ' ');
         char[] c77 = new char[77]; Arrays.fill(c77, ' ');
         pt1.setString(2, "abc" + new String(c75));
@@ -1539,6 +1582,7 @@ public void testParameterTypes() throws SQLException {
         pt1.setString(2, "0123456789X");
         pt1.setString(3, "efgh  ");
         assertPreparedStatementError(LANG_STRING_TRUNCATION, pt1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
 
         pt1.setInt(1, 50);
         pt1.setString(2, "0123456789");
@@ -1610,6 +1654,7 @@ public void testParameterTypes() throws SQLException {
         pt2.close();
 
         s.execute("drop procedure PT2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
 
         s.execute(
             "create procedure PTSMALLINT2(" +
@@ -1638,6 +1683,7 @@ public void testParameterTypes() throws SQLException {
         checkMatchingProcedures(conn, "PT2", sysaliasDefinition,
                 dbMetadataDefinition, columnDefinition);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         CallableStatement ptsi = conn.prepareCall("call PTSMALLINT2(?, ?, ?)");
         ptsi.registerOutParameter(2, Types.SMALLINT);
         ptsi.registerOutParameter(3, Types.SMALLINT);
@@ -1674,6 +1720,7 @@ public void testParameterTypes() throws SQLException {
         assertEquals("wrong value for p_out", "6", ptsi.getObject(3).toString());
 
         // with setObject . Beetle 5439
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         ptsi.setObject(1, 6);
         ptsi.setObject(2, 3);
 
@@ -1686,6 +1733,7 @@ public void testParameterTypes() throws SQLException {
 
         ptsi.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("drop procedure PTSMALLINT2");
         s.execute("drop table PT1");
 
@@ -1696,6 +1744,7 @@ public void testOutparams() throws SQLException {
         Connection conn = getConnection();
         Statement s = createStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("create procedure OP1(out a int, in b int) " +
                 "parameter style java language java " +
                 "external name '" + thisClassName + ".outparams1'");
@@ -1750,6 +1799,7 @@ public void testOutparams() throws SQLException {
 
         op.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("create procedure OP2(inout a int, in b int) " +
             "parameter style java language java " +
             "external name '" + thisClassName + ".inoutparams2'");
@@ -1770,6 +1820,7 @@ public void testOutparams() throws SQLException {
                 dbMetadataDefinition, columnDefinition);
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
             s.execute("call OP2(?,?)");
             fail("FAIL execute succeeded on inout param with Statement");
         } catch (SQLException sqle) {
@@ -1795,6 +1846,7 @@ public void testOutparams() throws SQLException {
         }
 
         op = prepareCall("call OP2(?, ?)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
 
         op.registerOutParameter(1, Types.INTEGER);
         op.setInt(1, 3);
@@ -1805,6 +1857,7 @@ public void testOutparams() throws SQLException {
         op.close();
 
         // inout & out procedures with variable length
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute(
             "create procedure OP3(inout a char(10), in b int) " +
             "parameter style java language java " +
@@ -1821,6 +1874,7 @@ public void testOutparams() throws SQLException {
         op.close();
 
         // inout & out DECIMAL procedures with variable length
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute(
             "create procedure OP4(out a DECIMAL(4,2), in b varchar(255)) " +
             "parameter style java language java " +
@@ -1885,6 +1939,7 @@ public void testOutparams() throws SQLException {
             // try to set an out param
             try {
                 op.setBigDecimal(1, new BigDecimal("22.32"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
                 fail("FAIL - set out param to value");
             } catch (SQLException sqle) {
                 assertSQLState("XCL27", sqle);
@@ -1916,6 +1971,7 @@ public void testOutparams() throws SQLException {
             fail("FAIL OP4 GET 49.345 >" + op.getString(2) + "< null ? "
                     + op.wasNull());
         } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
             if (usingDerbyNetClient()) {
                 assertSQLState("XJ091", sqle);
             } else {
@@ -1971,6 +2027,7 @@ public void testOutparams() throws SQLException {
         op.execute();
         assertEquals("32.50", op.getBigDecimal(1).toString());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         op.execute();
         assertEquals("56.00", op.getBigDecimal(1).toString());
         assertFalse(op.wasNull());
@@ -2025,6 +2082,7 @@ public void testOutparams() throws SQLException {
 
         op.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         op = conn.prepareCall("call OP4INOUT(?, ?)");
         op.setString(2, "14");
         try {
@@ -2053,6 +2111,7 @@ public void testSQLControl() throws SQLException {
         Connection conn = getConnection();
         Statement s = createStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("create schema SQLC");
         s.execute("create table SQLC.SQLCONTROL_DML(I int)");
         s.execute("insert into SQLC.SQLCONTROL_DML values 4");
@@ -2240,6 +2299,7 @@ public void testSQLControl() throws SQLException {
                 sqlControl_3, sqlControl_4 };
         for (int i = 0; i < control.length; i++) {
             for (int k = 1; k <= 3; k++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
                 CallableStatement cs = conn.prepareCall("call SQLC.SQLCONTROL"
                         + k + "_" + i + " (?, ?, ?, ?, ?, ?, ?)");
                 // System.out.println("{");
@@ -2263,6 +2323,7 @@ public void testSQLControl() throws SQLException {
                  */
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
             if (control[i].length() == 0) {
                 // This default case (see test above) succeeds in
                 // creating the SQLCONTROL_DDL table, so remove it to
@@ -2311,6 +2372,7 @@ public void testSQLControl() throws SQLException {
                         "DROP SCHEMA SQL-UPDATE 0-EXECUTE OK" } };
 
         String[][] dmlSqlControl_1 = /* dmlSqlControl_1 */{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
                 { "call SQLC.SQLCONTROL2_0 (?, ?, ?, ?, ?, ?, ?) ",
                         "STATE-38001", "null", "null", "null", "null", "null",
                         "null" },
@@ -2385,6 +2447,8 @@ public void testSQLControl() throws SQLException {
                         "SET SCHEMA SQLC-UPDATE 0-EXECUTE OK",
                         "CREATE SCHEMA S-UPDATE 0-EXECUTE OK",
                         "DROP SCHEMA SQL-UPDATE 0-EXECUTE OK" },
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
                 { "call SQLC.SQLCONTROL2_1 (?, ?, ?, ?, ?, ?, ?) ",
                         "CREATE VIEW SQL-38001", "DROP VIEW SQLCO-38001",
                         "LOCK TABLE SQLC-38001", "VALUES 1,2,3-38001",
@@ -2414,6 +2478,7 @@ public void testSQLControl() throws SQLException {
         String[][][] dmlSqlControl = { dmlSqlControl_0, dmlSqlControl_1,
                 dmlSqlControl_2, dmlSqlControl_3, dmlSqlControl_4 };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         s.execute("create table SQLC.SQLCONTROL_DML(I int)");
         s.execute("insert into SQLC.SQLCONTROL_DML values 4");
         for (int i = 0; i < control.length; i++) {
@@ -2434,6 +2499,7 @@ public void testSQLControl() throws SQLException {
                      * if (p < 9) System.out.println(","); else
                      * System.out.println("}");
                      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
                     if (so == null) {
                         continue;
                     }
@@ -2452,6 +2518,7 @@ public void testSQLControl() throws SQLException {
         assertCallError(
                 usingEmbedded() ? "07004" : "07000",
                 "call SQLC.SQLCONTROL3_0 (?, ?, ?, ?, ?, ?, ?)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
 
         s.execute("drop table SQLC.SQLCONTROL_DML");
 
@@ -2539,6 +2606,7 @@ public static void parameter1(int a, String b, String c,
         ps.setString(3, c);
         ps.executeUpdate();
         ps.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         ps = conn.prepareStatement(
             "select a,b, length(b), c, length(c) from PT1 where a = ?");
         ps.setInt(1, a);
@@ -2576,6 +2644,7 @@ public static void inoutparams2(int[] p1, int p2) {
 
     public static void inoutparams3(String[] p1, int p2) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         if (p2 == 8) {
             p1[0] = "nad";
         } else if (p2 == 9) {
@@ -2653,6 +2722,7 @@ public static void sqlControl3(String[] e1, String[] e2, String[] e3,
             String[] e4, String[] e5, String[] e6, String[] e7)
             throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         Connection conn =
             DriverManager.getConnection("jdbc:default:connection");
 
@@ -2679,6 +2749,7 @@ public static void sqlControl4(int sqlc, String[] e1, String[] e2,
         Connection conn = DriverManager
                 .getConnection("jdbc:default:connection");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
         String sql = "call SQLC.SQLCONTROL2_" + sqlc
                 + " (?, ?, ?, ?, ?, ?, ?) ";
 
@@ -2699,6 +2770,7 @@ public static void sqlControl4(int sqlc, String[] e1, String[] e2,
             e7[0] = cs1.getString(6);
             e8[0] = cs1.getString(7);
         } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
             StringBuilder sb = new StringBuilder(128);
             sb.append("STATE");
             do {
@@ -2726,6 +2798,7 @@ private static void executeStatement(Statement s, String sql,
             String[] result) {
 
         StringBuilder sb = new StringBuilder(128);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
 
         int len = sql.length();
 
@@ -2758,6 +2831,7 @@ private static void executeStatement(Statement s, String sql,
                 sb.append("-");
                 String ss = sqle.getSQLState();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5945
                 if (ss == null) {
                     ss = "?????";
                 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java
index 408fbd6015..fe54f0032f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LangScripts.java
@@ -52,6 +52,7 @@ public final class LangScripts extends ScriptTestCase {
         "bit",
         "bit2",
         "stringtypes",
+//IC see: https://issues.apache.org/jira/browse/DERBY-3801
         "holdCursorIJ"
         };
     
@@ -61,7 +62,9 @@ public final class LangScripts extends ScriptTestCase {
      * run in emebdded.
      */
     private static final String[] EMBEDDED_TESTS = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3762
         "aggregate",        
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         "cast",
         "comparisons",
         "delete",
@@ -82,6 +85,7 @@ public final class LangScripts extends ScriptTestCase {
         "orderby",
         "positionedDelUpd",
         "refActions1",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6072
         "reopenScan",
         "schemas",
         "select",
@@ -90,6 +94,7 @@ public final class LangScripts extends ScriptTestCase {
         "union",
         "update",
         "valuesclause",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
         "xplain",
         };
     
@@ -119,6 +124,7 @@ public static void main(String[] args)
 	 */
 	public static Test suite() {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("LangScripts");
         suite.addTest(getSuite(CLIENT_AND_EMBEDDED_TESTS));
         suite.addTest(getSuite(EMBEDDED_TESTS));
@@ -128,6 +134,7 @@ public static Test suite() {
         // Set up the scripts run with the network client
         BaseTestSuite clientTests = new BaseTestSuite("LangScripts:client");
         clientTests.addTest(getSuite(CLIENT_AND_EMBEDDED_TESTS));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         Test client = TestConfiguration.clientServerDecorator(clientTests);
         
         // add those client tests into the top-level suite.
@@ -150,6 +157,7 @@ private LangScripts(String langTest){
       */
 	private static Test getSuite(String[] list)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("SQL scripts");
         for (int i = 0; i < list.length; i++)
             suite.addTest(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java
index 88e1fbdef5..46944f66c9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java
@@ -188,6 +188,7 @@ public void testDerby48SelfLockingRecoveryDeadlockDetectionOn ()
      * for a lock timeout whether diagnostics are on or not.
      */
     public void testDerby3678 ()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3678
             throws SQLException
     {
         Connection c1 = openUserConnection("newuser");
@@ -217,6 +218,7 @@ public void testDerby3678 ()
      */
     public void testOtherImplicitSchemaCreation () throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-48
         Connection c1 = openUserConnection("newuser");
         c1.setAutoCommit(false);
         Statement s1 = c1.createStatement();
@@ -332,6 +334,7 @@ protected void  tearDown() throws Exception {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("LazyDefaultSchemaCreationTest");
 
@@ -360,6 +363,7 @@ public static Test suite() {
                   2,   // deadlock timeout
                   1)); // wait timeout
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3678
             suites[i].addTest
                 (DatabasePropertyTestSetup.setLockTimeouts
                  (new DatabasePropertyTestSetup
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LojReorderTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LojReorderTest.java
index af2a8f25d0..726dd66af8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LojReorderTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LojReorderTest.java
@@ -45,6 +45,7 @@ public LojReorderTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("LojReorderTest Test");
         suite.addTest(TestConfiguration.defaultSuite(LojReorderTest.class));
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneBackupTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneBackupTest.java
index d27cb890c1..2d84820412 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneBackupTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneBackupTest.java
@@ -68,6 +68,7 @@ public class LuceneBackupTest extends GeneratedColumnsHelper
 
     private static  final   String      READ_POEMS_INDEX =
         "select p.originalAuthor, i.score\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         "from ruth.poems p, table ( ruth.poems__poemText( 'star', 1000, null ) ) i\n" +
         "where p.poemID = i.poemID and p.versionStamp = i.versionStamp\n" +
         "order by i.score desc\n";
@@ -114,6 +115,7 @@ public LuceneBackupTest( String name )
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             LuceneBackupTest.class );
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneCoarseAuthorizationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneCoarseAuthorizationTest.java
index 7561a401f8..ee18b2a960 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneCoarseAuthorizationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneCoarseAuthorizationTest.java
@@ -54,9 +54,11 @@ public class LuceneCoarseAuthorizationTest extends GeneratedColumnsHelper
     private static  final   String[]    LEGAL_USERS = { RUTH, READ_ONLY_USER, READ_WRITE_USER };
 
     public  static  final   String      ENGLISH_ANALYZER =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6544
         "org.apache.derbyTesting.functionTests.tests.lang.LuceneCoarseAuthorizationTest.getEnglishAnalyzer";
     public  static  final   String      STANDARD_ANALYZER =
         "org.apache.derbyTesting.functionTests.tests.lang.LuceneCoarseAuthorizationTest.getStandardAnalyzer";
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
     private static  final   String      LOAD_TOOL = "call syscs_util.syscs_register_tool( 'luceneSupport', true )";
     private static  final   String      UNLOAD_TOOL = "call syscs_util.syscs_register_tool( 'luceneSupport', false )";
@@ -101,6 +103,7 @@ public LuceneCoarseAuthorizationTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             LuceneCoarseAuthorizationTest.class);
 
@@ -110,6 +113,7 @@ public static Test suite()
 
         Test        coarseTest = new DatabasePropertyTestSetup( authenticatedTest, makeProperties() );
         Test        singleUseTest = TestConfiguration.singleUseDatabaseDecorator( coarseTest );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6544
 
         return singleUseTest;
     }
@@ -161,7 +165,9 @@ public  void    test_001_basic()
         goodStatement( readWriteConnection, INDEX_POEMS );
 
         String  readPoemsIndex =
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             "select p.originalAuthor, i.score\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             "from ruth.poems p, table ( ruth.poems__poemText( 'star', 1000, null ) ) i\n" +
             "where p.poemID = i.poemID and p.versionStamp = i.versionStamp\n" +
             "order by i.score desc\n";
@@ -189,10 +195,12 @@ public  void    test_001_basic()
              );
 
         String  listIndexes =
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             "select schemaName, tableName, columnName, indexDescriptorMaker from table( LuceneSupport.listIndexes() ) l";
         String[][]  defaultIndexList =
             new String[][]
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6544
                 { "RUTH", "POEMS", "POEMTEXT", ENGLISH_ANALYZER },
             };
 
@@ -244,6 +252,7 @@ public  void    test_001_basic()
         String[][]  standardIndexList =
             new String[][]
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                 { "RUTH", "POEMS", "POEMTEXT", STANDARD_ANALYZER },
             };
 
@@ -292,6 +301,7 @@ public  void    test_001_basic()
     public  static  LuceneIndexDescriptor    getEnglishAnalyzer()
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         return new EnglishIndexDescriptor();
     }
     
@@ -315,6 +325,7 @@ public  static void    createSchema( Connection conn )  throws Exception
     }
     public  static void    dropSchema( Connection conn )   throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         conn.prepareStatement( "drop table poems" ).execute();
     }
     public static void    createPoemsTable( Connection conn )
@@ -332,6 +343,7 @@ public static void    createPoemsTable( Connection conn )
              "    constraint poemsKey primary key( poemID, versionStamp )\n" +
              ")\n"
              ).execute();
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         PreparedStatement   ps = conn.prepareStatement( "insert into poems values ( ?, ?, ?, ?, ? )" );
 
@@ -388,6 +400,7 @@ public  static  class   EnglishIndexDescriptor extends LuceneUtils.DefaultIndexD
         
         public  Analyzer    getAnalyzer()   throws SQLException
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             return LuceneUtils.getAnalyzerForLocale( Locale.US );
         }
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneCollationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneCollationTest.java
index 3229cee2df..303cc65143 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneCollationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneCollationTest.java
@@ -142,6 +142,7 @@ public  void    test_002_basic()
         assertResults
             (
              conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "select * from table ( ruth.poems__poemText( 'star', 1000, null ) ) luceneResults order by poemID",
              new String[][]
              {
@@ -155,6 +156,7 @@ public  void    test_002_basic()
         assertResults
             (
              conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "select schemaName, tableName, columnName from table ( LuceneSupport.listIndexes() ) listindexes",
              new String[][]
              {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneInMemoryTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneInMemoryTest.java
index 9cf054b3d8..29286f5dd0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneInMemoryTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneInMemoryTest.java
@@ -44,6 +44,7 @@ public class LuceneInMemoryTest extends GeneratedColumnsHelper
     private static  final   String      LOAD_TOOL = "call syscs_util.syscs_register_tool( 'luceneSupport', true )";
     private static  final   String      UNLOAD_TOOL = "call syscs_util.syscs_register_tool( 'luceneSupport', false )";
     private static  final   String      INDEX_POEMS =
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         "call LuceneSupport.createIndex( 'app', 'poems', 'poemText', '" + LuceneCoarseAuthorizationTest.ENGLISH_ANALYZER + "' )";
     private static  final   String      DROP_POEMS_INDEX = "call LuceneSupport.dropIndex( 'app', 'poems', 'poemText' )";
 
@@ -84,6 +85,7 @@ public LuceneInMemoryTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite( "LuceneInMemoryTest" );
         
         Test    baseTest = TestConfiguration.embeddedSuite( LuceneInMemoryTest.class );
@@ -127,6 +129,7 @@ public  void    test_001_basic()
 
         String  readPoemsIndex =
             "select p.originalAuthor, i.score\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             "from poems p, table ( poems__poemText( 'star', 1000, null ) ) i\n" +
             "where p.poemID = i.poemID and p.versionStamp = i.versionStamp\n" +
             "order by i.score desc\n";
@@ -147,6 +150,7 @@ public  void    test_001_basic()
              );
 
         String  listIndexes =
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             "select schemaName, tableName, columnName, indexDescriptorMaker from table( LuceneSupport.listIndexes() ) l";
         String[][]  defaultIndexList =
             new String[][]
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneJarLoadingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneJarLoadingTest.java
index e38f2fe6b1..a6ea4d7ac4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneJarLoadingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneJarLoadingTest.java
@@ -125,6 +125,7 @@ public LuceneJarLoadingTest( String name )
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             LuceneJarLoadingTest.class );
 
@@ -192,6 +193,7 @@ public  void    test_001_basic()
      * </p>
      */
     public  void    test_002_apiPackage()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6600
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSuite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSuite.java
index 13669c2cee..5023d31a9f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSuite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSuite.java
@@ -42,7 +42,9 @@ public class LuceneSuite extends BaseTestCase
 
 	public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("LuceneSuite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         Properties  properties = TestConfiguration.getSystemProperties();
         
         //
@@ -66,9 +68,13 @@ else if (JDBC.HAVE_LUCENE_CORE && suffersFromDerby6650())
             suite.addTest(LuceneSupportTest.suite());
             suite.addTest(LuceneSupportPermsTest.suite());
             suite.addTest(LuceneCollationTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             suite.addTest(LuceneCoarseAuthorizationTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             suite.addTest(LuceneInMemoryTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             suite.addTest(LuceneBackupTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6600
             suite.addTest(LuceneJarLoadingTest.suite());
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java
index e38a9ba60f..bc0c74d918 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportPermsTest.java
@@ -151,15 +151,19 @@ public LuceneSupportPermsTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         String      luceneVersion = getSystemProperty( LUCENE_VERSION_PROPERTY );
         if ( luceneVersion != null ) { LUCENE_VERSION = luceneVersion; }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             LuceneSupportPermsTest.class);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         Test        secureTest = new SecurityManagerSetup( suite, POLICY_FILE );
         Test        authenticatedTest = DatabasePropertyTestSetup.builtinAuthentication
             ( secureTest, LEGAL_USERS, "LuceneSupportPermissions" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6546
         Test        authorizedTest = TestConfiguration.sqlAuthorizationDecoratorSingleUse( authenticatedTest, DB_NAME, true );
         Test        localizedTest = new LocaleTestSetup( authorizedTest, new Locale( LANGUAGE, COUNTRY ) );
 
@@ -193,6 +197,7 @@ public  void    test_001_basicNoGrant()
         goodStatement( dboConnection, LOAD_TOOL );
 
         // can't update a non-existent index
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         expectExecutionError
             ( ruthConnection, NONEXISTENT_INDEX, "call LuceneSupport.updateIndex( 'ruth', 'poems', 'poemText', null )" );
 
@@ -211,6 +216,7 @@ public  void    test_001_basicNoGrant()
             ( ruthConnection, NONEXISTENT_INDEX, "call LuceneSupport.updateIndex( 'ruth', 'poems', 'originalAuthor', null )" );
 
         // alice can't view an index created by ruth
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         String  viewPoemsIndex = "select * from table ( ruth.poems__poemText( 'star', 1000, null ) ) luceneResults order by poemID";
         expectExecutionError( aliceConnection, LACK_EXECUTE_PRIV, viewPoemsIndex );
 
@@ -229,6 +235,7 @@ public  void    test_001_basicNoGrant()
              );
 
         // alice can list indexes even on tables owned by ruth
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         String  listIndexes = "select schemaName, tableName, columnName from table ( LuceneSupport.listIndexes() ) listindexes";
         assertResults
             (
@@ -251,6 +258,7 @@ public  void    test_001_basicNoGrant()
         goodStatement( ruthConnection, UPDATE_POEMS_INDEX );
 
         // dropping the key does NOT prevent you from re-indexing
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         goodStatement( ruthConnection, DROP_PRIMARY_KEY );
         goodStatement( ruthConnection, UPDATE_POEMS_INDEX );
 
@@ -273,6 +281,7 @@ public  void    test_001_basicNoGrant()
         expectExecutionError( ruthConnection, NONEXISTENT_OBJECT, DROP_POEMS_INDEX );
 
         // verify that a primary key is necessary in order to index a table
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         dropSchema( ruthConnection );
         createSchema( ruthConnection, Types.INTEGER );
         goodStatement( ruthConnection, DROP_PRIMARY_KEY );
@@ -320,9 +329,11 @@ public  void    test_002_userGrant()
         }
 
         // but alice still needs select privilege on the base table columns
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         String  viewPoemsIndex = "select * from table ( ruth.poems__poemText( 'star', 1000, null ) ) luceneResults order by poemid";
         String[][]  viewPoemsIndexResults = new String[][]
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                 { "3", "3", "2", "0.22933942" },
                 { "4", "4", "3", "0.22933942" },
                 { "5", "5", "4", "0.26756266" },
@@ -389,6 +400,7 @@ public  void    test_003_loading()
         Connection  ruthConnection = openUserConnection( RUTH );
 
         createSchema( ruthConnection, Types.INTEGER );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         goodStatement( dboConnection, "grant execute on procedure syscs_util.syscs_register_tool to public" );
 
@@ -399,6 +411,7 @@ public  void    test_003_loading()
         expectExecutionError( dboConnection, DOUBLE_LOAD_ILLEGAL, LOAD_TOOL );
 
         // cannot index non-existent table or column
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         expectExecutionError( ruthConnection, NOT_INDEXABLE, "call LuceneSupport.createIndex( 'ruth', 'foo', 'poemText', null )" );
         expectExecutionError( ruthConnection, NOT_INDEXABLE, "call LuceneSupport.createIndex( 'ruth', 'poems', 'fooText', null )" );
         expectExecutionError( ruthConnection, NOT_INDEXABLE, "call LuceneSupport.createIndex( 'ruth', 'poems', 'versionStamp', null )" );
@@ -463,6 +476,7 @@ private void    vet_004( Connection ruthConnection, int jdbcType )
         assertResults
             (
              ruthConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "select p.originalAuthor, i.score\n" +
              "from ruth.poems p, table ( ruth.poems__poemText( 'star', 1000, null ) ) i\n" +
              "where p.poemID = i.poemID and p.versionStamp = i.versionStamp\n" +
@@ -501,6 +515,7 @@ public  void    test_005_deleteDirectory()
         String  physicalDBName = config.getPhysicalDatabaseName( dbName );
         String  dbPath = config.getDatabasePath( physicalDBName );
         File    dbDirectory = new File( dbPath );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6562
         File    luceneDirectory = new File( dbDirectory, "LUCENE" );
         File    ruthDirectory = new File( luceneDirectory, "RUTH" );
         File    poemsDirectory = new File( ruthDirectory, "POEMS" );
@@ -509,10 +524,12 @@ public  void    test_005_deleteDirectory()
         assertTrue( deleteFile( poemTextIndexDirectory ) );
 
         // but that doesn't stop you from deleting the index
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         goodStatement( ruthConnection, DROP_POEMS_INDEX );
         expectCompilationError
             (
              ruthConnection, NONEXISTENT_TABLE_FUNCTION,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "select * from table( ruth.textTable__textCol( 'one two three four five six seven eight nine ten', 100, null ) ) t"
              );
 
@@ -526,6 +543,7 @@ public  void    test_005_deleteDirectory()
      * </p>
      */
     public  void    test_006_changeAnalyzer()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -539,6 +557,7 @@ public  void    test_006_changeAnalyzer()
         assertResults
             (
              ruthConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "values ( substr( getDatabaseLocale(), 1, 2 ) )",
              new String[][]
              {
@@ -550,6 +569,8 @@ public  void    test_006_changeAnalyzer()
 
         String  query =
             "select p.originalAuthor, i.score\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             "from ruth.poems p, table ( ruth.poems__poemText( 'star', 1000, null ) ) i\n" +
             "where p.poemID = i.poemID and p.versionStamp = i.versionStamp\n" +
             "order by i.score desc\n";
@@ -571,6 +592,7 @@ public  void    test_006_changeAnalyzer()
         goodStatement
             ( ruthConnection,
               "call LuceneSupport.updateIndex( 'ruth', 'poems', 'poemText', '" + LuceneCoarseAuthorizationTest.STANDARD_ANALYZER + "' )" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
         assertResults
             (
@@ -591,6 +613,7 @@ public  void    test_006_changeAnalyzer()
         assertResults
             (
              ruthConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "select schemaName, tableName, columnName, luceneVersion, analyzer, indexDescriptorMaker\n" +
              "from table( LuceneSupport.listIndexes() ) l\n" +
              "order by schemaName, tableName, columnName\n",
@@ -599,6 +622,7 @@ public  void    test_006_changeAnalyzer()
                  {
                      "RUTH", "POEMS", "ORIGINALAUTHOR", LUCENE_VERSION,
                      "org.apache.lucene.analysis.en.EnglishAnalyzer",
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                      DEFAULT_INDEX_DESCRIPTOR
                  },
                  {
@@ -622,6 +646,7 @@ public  void    test_006_changeAnalyzer()
      * </p>
      */
     public  void    test_007_indexViews()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -657,7 +682,10 @@ public  void    test_007_indexViews()
 
         // vet index contents
         String  selectFromViewIndex =
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             "select p.originalAuthor, i.score\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             "from ruth.poems p, table ( ruth.poemView__poemText( 'star', 1000, null ) ) i\n" +
             "where p.poemID = i.poemID and p.versionStamp = i.versionStamp\n" +
             "order by i.score desc\n";
@@ -667,6 +695,7 @@ public  void    test_007_indexViews()
              selectFromViewIndex,
              new String[][]
              {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                  { "Walt Whitman", "0.26756266" },
                  { "Lord Byron", "0.22933942" },
                  { "John Milton", "0.22933942" },
@@ -676,6 +705,7 @@ public  void    test_007_indexViews()
 
         // vet index list
         String  selectIndexes =
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             "select schemaName, tableName, columnName, indexDescriptorMaker\n" +
             "from table( LuceneSupport.listIndexes() ) l\n" +
             "order by schemaName, tableName, columnName\n";
@@ -701,6 +731,7 @@ public  void    test_007_indexViews()
         goodStatement
             (
              ruthConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "call LuceneSupport.updateIndex( 'ruth', 'poemView', 'poemText', '" + LuceneCoarseAuthorizationTest.STANDARD_ANALYZER + "' )"
              );
         assertResults
@@ -722,6 +753,8 @@ public  void    test_007_indexViews()
              {
                  {
                      "RUTH", "POEMS", "POEMTEXT",
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                      DEFAULT_INDEX_DESCRIPTOR
                  },
                  {
@@ -746,6 +779,7 @@ public  void    test_007_indexViews()
              {
                  {
                      "RUTH", "POEMS", "POEMTEXT",
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                      DEFAULT_INDEX_DESCRIPTOR
                  },
              },
@@ -763,7 +797,9 @@ public  void    test_007_indexViews()
             (
              ruthConnection,
              "select *\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "from table ( ruth.poems__poemText( 'star', 1000, null ) ) i\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "order by i.score desc\n",
              new String[][]
              {
@@ -787,6 +823,7 @@ public  void    test_007_indexViews()
      * </p>
      */
     public  void    test_008_columnNames()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -833,6 +870,7 @@ public  void    test_008_columnNames()
      * </p>
      */
     public  void    test_009_searchArgs()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -847,6 +885,7 @@ public  void    test_009_searchArgs()
         assertResults
             (
              ruthConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "select * from table( ruth.textTable__textCol( 'one two three four five six seven eight nine ten', 100, null ) ) t",
              new String[][]
              {
@@ -868,6 +907,7 @@ public  void    test_009_searchArgs()
         assertResults
             (
              ruthConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "select * from table( ruth.textTable__textCol( 'one two three four five six seven eight nine ten', 3, null ) ) t",
              new String[][]
              {
@@ -882,6 +922,7 @@ public  void    test_009_searchArgs()
         assertResults
             (
              ruthConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "select * from table( ruth.textTable__textCol( 'one two three four five six seven eight nine ten', 4, 1.0 ) ) t",
              new String[][]
              {
@@ -897,6 +938,7 @@ public  void    test_009_searchArgs()
         assertResults
             (
              ruthConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "select * from table( ruth.textTable__textCol( 'one two three four five six seven eight nine ten', 100, 0.2 ) ) t",
              new String[][]
              {
@@ -908,6 +950,7 @@ public  void    test_009_searchArgs()
              );
         
         // try a different query parser
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         goodStatement( ruthConnection, "call LuceneSupport.dropIndex( 'ruth', 'textTable', 'textCol' )" );
         goodStatement
             (
@@ -939,6 +982,7 @@ public  void    test_009_searchArgs()
     }
     static  void    loadTestTable( Connection conn ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6600
         conn.prepareStatement
             (
              "create table textTable( keyCol int primary key, textCol clob )"
@@ -966,6 +1010,7 @@ static  void    loadTestTable( Connection conn ) throws Exception
              "( 108, 'bricks and mortar, tea, tears, turtle, soup, when in the course of human events' ),\n" +
              "( 109, 'bricks and mortar, tea, tears, turtle, soup, when in the course of human events you want' ),\n" +
              "( 110, 'bricks and mortar, tea, tears, turtle, soup, when in the course of human events you want better cell coverage' )\n"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6600
              ).execute();
     }
     static  void    unloadTestTable( Connection conn ) throws Exception
@@ -982,6 +1027,7 @@ static  void    unloadTestTable( Connection conn ) throws Exception
      * </p>
      */
     public  void    test_010_encryption()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -1024,6 +1070,7 @@ public  void    test_010_encryption()
      * </p>
      */
     public  void    test_011_fieldNames()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -1072,6 +1119,7 @@ public  void    test_011_fieldNames()
      * </p>
      */
     public  void    test_6602()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6602
         throws Exception
     {
         CD[]    columnDescriptors = new CD[]
@@ -1124,6 +1172,7 @@ private void    vet6602( Connection conn, CD cd )   throws Exception
             (
              conn,
              "call lucenesupport.createindex\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "( 'TEST_DBO', 't_6602', 'textcol', '" + LuceneCoarseAuthorizationTest.STANDARD_ANALYZER + "', ? )"
              );
         ps.setString( 1, cd.name );
@@ -1132,6 +1181,7 @@ private void    vet6602( Connection conn, CD cd )   throws Exception
         assertResults
             (
              conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              "select * from table( t_6602__textcol( 'abc or def', 3, null ) ) tc order by documentid",
              new String[][]
              {
@@ -1150,6 +1200,7 @@ private void    vet6602( Connection conn, CD cd )   throws Exception
      * </p>
      */
     public  void    test_6596_null_args()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6596
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -1161,6 +1212,7 @@ public  void    test_6596_null_args()
         // create index errors
         expectExecutionError
             ( dboConnection, ILLEGAL_NULL_ARG,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
               "call lucenesupport.createindex( null, 't_6596', 'c',  '" + LuceneCoarseAuthorizationTest.STANDARD_ANALYZER + "' )" );
         expectExecutionError
             ( dboConnection, ILLEGAL_NULL_ARG,
@@ -1187,6 +1239,7 @@ public  void    test_6596_null_args()
              },
              false
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         goodStatement( dboConnection, "call lucenesupport.updateindex( 'TEST_DBO', 't_6596', 'c',  '" + LuceneCoarseAuthorizationTest.STANDARD_ANALYZER + "' )" );
         
         // update index errors
@@ -1230,6 +1283,7 @@ public  void    test_6596_null_args()
      * </p>
      */
     public  void    test_6730()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -1256,6 +1310,7 @@ public  void    test_6730()
              ruthConnection,
              "create view v_6730_4 ( \"poemID\", \"poemText\" ) as select poemID, poemText from ruth.poems"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
         goodStatement
             (
              ruthConnection,
@@ -1318,6 +1373,7 @@ public  void    test_6730()
              "  '\"poemID\"'\n" +
              ")\n"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
         goodStatement
             (
              ruthConnection,
@@ -1391,6 +1447,7 @@ public  void    test_6730()
              "  null\n" +
              ")\n"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
         goodStatement
             (
              ruthConnection,
@@ -1428,6 +1485,7 @@ public  void    test_6730()
         goodStatement( ruthConnection, "drop view v_6730_3" );
         goodStatement( ruthConnection, "drop view v_6730_2" );
         goodStatement( ruthConnection, "drop view v_6730_1" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         dropSchema( ruthConnection );
     }
     private void vet6730( Connection conn ) throws Exception
@@ -1475,6 +1533,7 @@ private void vet6730( Connection conn ) throws Exception
              expectedResults,
              false
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
         assertResults
             (
              conn,
@@ -1500,6 +1559,7 @@ private void vet6730( Connection conn ) throws Exception
             { "RUTH", "V_6730_2", "poemText", "org.apache.lucene.analysis.en.EnglishAnalyzer" },
             { "RUTH", "V_6730_3", "POEMTEXT", "org.apache.lucene.analysis.en.EnglishAnalyzer" },
             { "RUTH", "V_6730_4", "poemText", "org.apache.lucene.analysis.en.EnglishAnalyzer" },
+//IC see: https://issues.apache.org/jira/browse/DERBY-6730
             { "RUTH", "V_6730_5", "c l o b", "org.apache.lucene.analysis.en.EnglishAnalyzer" },
             { "RUTH", "V_6730_6", "POEMTEXT", "org.apache.lucene.analysis.en.EnglishAnalyzer" },
         };
@@ -1523,6 +1583,7 @@ private void vet6730( Connection conn ) throws Exception
     private void    createSchema( Connection ruthConnection, int jdbcType )  throws Exception
     {
         createPoemsTable( ruthConnection, jdbcType );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         createLocaleFunction( ruthConnection );
     }
     private void    createPoemsTable( Connection conn, int jdbcType )
@@ -1586,6 +1647,7 @@ private void    createPoemsTable( Connection conn, int jdbcType )
     }
 
     private void    createPoemView( Connection conn )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws Exception
     {
         goodStatement
@@ -1596,6 +1658,7 @@ private void    createPoemView( Connection conn )
     }
     
     private void    createLocaleFunction( Connection conn )
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws Exception
     {
         goodStatement
@@ -1704,6 +1767,7 @@ private String  makeStringKey( int key )
     private void    dropSchema( Connection ruthConnection )    throws Exception
     {
         goodStatement( ruthConnection, "drop table poems" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         goodStatement( ruthConnection, "drop function getDatabaseLocale" );
     }
     
@@ -1715,6 +1779,7 @@ private void    dropSchema( Connection ruthConnection )    throws Exception
 
     /** Get the database locale */
     public  static  String  getDatabaseLocale()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         throws SQLException
     {
         return ConnectionUtil.getCurrentLCC().getDatabase().getLocale().toString();
@@ -1763,6 +1828,7 @@ public  static  byte[]  makeBytes( int initialValue )
     /** Alternative QueryParser maker, which forces the text to be a constant string */
     public  static  LuceneIndexDescriptor constantStringIndexDescriptor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         return new ConstantIndexDescriptor();
     }
     
@@ -1846,7 +1912,9 @@ public  static  class   ConstantQueryParser extends MultiFieldQueryParser
     {
         public  ConstantQueryParser
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              Version version,
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
              String[] fieldNames,
              Analyzer analyzer
              )
@@ -1867,6 +1935,7 @@ public  static  class   CD
 
         public  CD( String Name, String Type )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6602
             name = Name;
             type = Type;
         }
@@ -1879,6 +1948,7 @@ public  static  class   ConstantIndexDescriptor extends LuceneUtils.DefaultIndex
         public  ConstantIndexDescriptor() { super(); }
         
         public  QueryParser getQueryParser()
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             throws SQLException
         {
             return new ConstantQueryParser
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java
index b46b6f5381..7689f70552 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/LuceneSupportTest.java
@@ -70,8 +70,10 @@ public LuceneSupportTest(String name) {
 	
 	public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("LuceneSupportTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         Test    baseTest = TestConfiguration.embeddedSuite(LuceneSupportTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6544
         Test        singleUseTest = TestConfiguration.singleUseDatabaseDecorator( baseTest );
         Test        localizedTest = new LocaleTestSetup( singleUseTest, new Locale( "en", "US" ) );
 		
@@ -85,6 +87,7 @@ public void testCreateAndQueryIndex() throws Exception {
 		Statement s = createStatement();
 
         // verify that we are in an en Locale
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         getConnection().prepareStatement
             (
              "create function getDatabaseLocale() returns varchar( 20 )\n" +
@@ -105,6 +108,7 @@ public void testCreateAndQueryIndex() throws Exception {
         getConnection().prepareStatement( "drop function getDatabaseLocale" ).executeUpdate();
 	    
 		cSt = prepareCall
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             ( "call LuceneSupport.createIndex('lucenetest','titles','title', null )" );
 	    assertUpdateCount(cSt, 0);
 	    
@@ -117,6 +121,7 @@ public void testCreateAndQueryIndex() throws Exception {
             (
              s.executeQuery
              (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
               "select * from table ( lucenetest.titles__title( 'grapes', 1000, null ) ) luceneResults"
               ),
              expectedRows
@@ -130,6 +135,8 @@ public void testCreateAndQueryIndex() throws Exception {
             (
              s.executeQuery
              (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
               "select * from table ( lucenetest.titles__title( 'grapes', 1000, .75 ) ) luceneResults"
               ),
              expectedRows
@@ -139,6 +146,8 @@ public void testCreateAndQueryIndex() throws Exception {
             (
              s.executeQuery
              (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
               "select * from table ( lucenetest.titles__title( 'grapes',  1000, 0.5) ) luceneResults"
               )
              );
@@ -153,6 +162,7 @@ public void testCreateAndQueryIndex() throws Exception {
              s.executeQuery
              (
               "select title, author, publisher, documentID\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
               "from lucenetest.titles t, table ( lucenetest.titles__title( 'grapes', 1000, null ) ) l\n" +
               "where t.id = l.id\n" 
               ),
@@ -195,6 +205,7 @@ public void testUpdateIndex() throws Exception {
              );
 	    
 		cSt = prepareCall
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             ( "call LuceneSupport.updateIndex('lucenetest','titles','title', null)" );
 	    assertUpdateCount(cSt, 0);
 
@@ -207,6 +218,9 @@ public void testUpdateIndex() throws Exception {
              s.executeQuery
              (
               "select *\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
               "from table ( lucenetest.titles__title( 'mice', 1000, null ) ) luceneResults\n"
               ),
              expectedRows
@@ -223,6 +237,8 @@ public void testListIndex() throws Exception {
 		Statement s = createStatement();
 
 	    cSt = prepareCall
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
             ( "call LuceneSupport.createIndex('lucenetest','titles','title', null)" );
 	    assertUpdateCount(cSt, 0);
 	    
@@ -233,6 +249,7 @@ public void testListIndex() throws Exception {
 	    // leave out lastmodified as the date will change
 	    String[][] expectedRows = new String[][]
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                 { "LUCENETEST", "TITLES", "AUTHOR" },
 	    		{ "LUCENETEST", "TITLES", "TITLE" }
             };
@@ -251,6 +268,7 @@ public void testListIndex() throws Exception {
 
 	    expectedRows = new String[][]
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                 { "LUCENETEST", "TITLES", "AUTHOR" },
             };
 	    JDBC.assertFullResultSet
@@ -270,6 +288,7 @@ public void testListIndex() throws Exception {
             (
              s.executeQuery
              (
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
               "select schemaname, tablename, columnname from table ( LuceneSupport.listIndexes() ) listindexes"
               )
              );
@@ -293,6 +312,7 @@ public void testDropIndexBadCharacters() throws Exception {
 	
     public void testMultipleFields() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         println( "Running multi-field test." );
         
         Statement s = createStatement();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/MathTrigFunctionsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/MathTrigFunctionsTest.java
index 0d3ae2a5a3..b5b31fb721 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/MathTrigFunctionsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/MathTrigFunctionsTest.java
@@ -33,6 +33,7 @@ public class MathTrigFunctionsTest extends BaseJDBCTestCase {
 
    private static final double
             PRE_DERBY_3398_SMALLEST_NEG_DERBY_DOUBLE = -1.79769E+308;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
 
    private static final double
             SMALL_NEG_DOUBLE = -1.79768E+308;
@@ -54,7 +55,9 @@ public class MathTrigFunctionsTest extends BaseJDBCTestCase {
 			0.25, -0.25, 0.5, 0.0, -0.0, 1.0, -1.0 };
 
 	private static final double[] logValues = { 0.000000001, 0.25, 0.5, 1.0,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
            45.0, 90.0, 135.0, 180.0, 270, PRE_DERBY_3398_SMALLEST_POS_DERBY_DOUBLE,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6447
            PRE_DERBY_3398_LARGEST_POS_DERBY_DOUBLE, 10, 100, 1000, 10000,
            100000, 1000000, 10000000, 100000000, 1000000000};
 
@@ -96,6 +99,7 @@ public void testAcos() throws SQLException {
 		executeNullFn("ACOS");
 		debug();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES ACOS(?)");
         PreparedStatement psFN =
@@ -125,6 +129,7 @@ public void testAcos() throws SQLException {
 
 		/* test the case where the input value is out of range */
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
 			getValue(ps, 2.0);
 			fail("ACOS: Out of range test failed, input value is: " + 2.0);
 		} catch (SQLException sqlE) {
@@ -137,6 +142,7 @@ public void testAcos() throws SQLException {
 
 		/* test the case where the input value is out of range */
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
 			getValue(psFN, 2.0);
 			fail("ACOS: Out of range test failed, input value is: " + 2.0);
 		} catch (SQLException sqlE) {
@@ -173,6 +179,7 @@ public void testAsin() throws SQLException {
 		executeNullValues("ASIN");
 		executeNullFn("ASIN");
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES ASIN(?)");
         PreparedStatement psFN =
@@ -201,6 +208,7 @@ public void testAsin() throws SQLException {
 		}
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
 			getValue(ps, 2.0);
 			fail("ASIN: Out of range test failed, input value is: " + 2.0);
 		} catch (SQLException sqlE) {
@@ -211,6 +219,7 @@ public void testAsin() throws SQLException {
 					sqlE);
 		}
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
 			getValue(psFN, 2.0);
 			fail("ASIN: Out of range test failed, input value is: " + 2.0);
 		} catch (SQLException sqlE) {
@@ -242,6 +251,7 @@ public void testAtan() throws SQLException {
 		executeNullFn("ATAN");
 
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES ATAN(?)");
         PreparedStatement psFN =
@@ -284,6 +294,7 @@ public void testCos() throws SQLException {
 		executeNullValues("COS");
 		executeNullFn("COS");
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES COS(?)");
         PreparedStatement psFN =
@@ -330,6 +341,7 @@ public void testSin() throws SQLException {
 		executeNullFn("SIN");
 
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES SIN(?)");
         PreparedStatement psFN =
@@ -377,6 +389,7 @@ public void testTan() throws SQLException {
 
 		debug();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES TAN(?)");
         PreparedStatement psFN =
@@ -408,6 +421,7 @@ public void testTan() throws SQLException {
 	}
 
     public void testCot() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6447
         executeNullValues("COT");
         executeNullFn("COT");
         debug();
@@ -566,6 +580,7 @@ public void testDegrees() throws SQLException {
 		executeNullFn("DEGREES");
 
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES DEGREES(?)");
         PreparedStatement psFN =
@@ -597,6 +612,7 @@ public void testDegrees() throws SQLException {
 
 		try {
             // Yields -Infinity, so thould throw.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
             getValue(ps, PRE_DERBY_3398_SMALLEST_NEG_DERBY_DOUBLE);
 			fail("DEGREES: Out of range test failed, input value is: "
                    + PRE_DERBY_3398_SMALLEST_NEG_DERBY_DOUBLE);
@@ -609,6 +625,7 @@ public void testDegrees() throws SQLException {
 		}
 		try {
             // Yields -Infinity, so thould throw.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
             getValue(psFN, PRE_DERBY_3398_SMALLEST_NEG_DERBY_DOUBLE);
 			fail("DEGREES: Out of range test failed, input value is: "
                    + PRE_DERBY_3398_SMALLEST_NEG_DERBY_DOUBLE);
@@ -626,6 +643,7 @@ public void testDegrees() throws SQLException {
 
     // 2.2250738585072014E-308 remove when we move to compile with source level
     // Java 6. Cf Double.MIN_NORMAL.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
     final static double DOUBLE_MIN_NORMAL = 2.2250738585072014E-308; 
     
 	/**
@@ -646,6 +664,7 @@ public void testRadians() throws SQLException {
 		executeNullFn("RADIANS");
 
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES RADIANS(?)");
         PreparedStatement psFN =
@@ -678,11 +697,13 @@ public void testRadians() throws SQLException {
         // outside Derby context. First number: argument to ps and psFN, second
         // number: expected result. Actual results vary by JVM level. See DERBY-6755.
         double[][] inOut = new double[][] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
             {180.0d, java.lang.StrictMath.PI},
             {PRE_DERBY_3398_SMALLEST_NEG_DERBY_DOUBLE, -3.1375609430176863E306},
             {DOUBLE_MIN_NORMAL, 3.8834864931005E-310},
             {Double.MIN_VALUE, 0.0d},
             {Double.MAX_VALUE, 3.1375664143845866E306},
+//IC see: https://issues.apache.org/jira/browse/DERBY-6755
             {PRE_DERBY_3398_SMALLEST_POS_DERBY_DOUBLE, vmAtLeast( 1, 9 ) ? 3.883357585687384E-309 : 3.88335758568738E-309},
             {PRE_DERBY_3398_LARGEST_NEG_DERBY_DOUBLE, vmAtLeast( 1, 9 ) ? -3.883357585687384E-309 : -3.88335758568738E-309},
         };
@@ -713,6 +734,7 @@ public void testExp() throws SQLException {
 		executeNullFn("EXP");
 
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES EXP(?)");
         PreparedStatement psFN =
@@ -740,6 +762,7 @@ public void testExp() throws SQLException {
 		}
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
             getValue(ps, PRE_DERBY_3398_LARGEST_POS_DERBY_DOUBLE);
 			fail("EXP: Out of range test failed, input value is: "
                    + PRE_DERBY_3398_LARGEST_POS_DERBY_DOUBLE);
@@ -751,6 +774,7 @@ public void testExp() throws SQLException {
 					sqlE);
 		}
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
             getValue(psFN, PRE_DERBY_3398_LARGEST_POS_DERBY_DOUBLE);
 			fail("EXP: Out of range test failed, input value is: "
                    + PRE_DERBY_3398_LARGEST_POS_DERBY_DOUBLE);
@@ -783,6 +807,7 @@ public void testLog10() throws SQLException {
 		executeNullFn("LOG10");
 
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES LOG10(?)");
         PreparedStatement psFN =
@@ -809,6 +834,7 @@ public void testLog10() throws SQLException {
 		}
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
 			getValue(ps, 0.0);
 			fail("LOG10: Out of range test failed, input value is: " + 0.0);
 		} catch (SQLException sqlE) {
@@ -819,6 +845,7 @@ public void testLog10() throws SQLException {
 					sqlE);
 		}
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
 			getValue(ps, -1.0);
 			fail("LOG10: Out of range test failed, input value is: " + -1.0);
 		} catch (SQLException sqlE) {
@@ -830,6 +857,7 @@ public void testLog10() throws SQLException {
 		}
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
 			getValue(psFN, 0.0);
 			fail("LOG10: Out of range test failed, input value is: " + 0.0);
 		} catch (SQLException sqlE) {
@@ -840,6 +868,7 @@ public void testLog10() throws SQLException {
 					sqlE);
 		}
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
 			getValue(psFN, -1.0);
 			fail("LOG10: Out of range test failed, input value is: " + -1.0);
 		} catch (SQLException sqlE) {
@@ -869,6 +898,7 @@ public void testLog() throws SQLException {
 		executeNullFn("LOG");
 
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES LOG(?)");
         PreparedStatement psFN =
@@ -906,6 +936,7 @@ public void testLog() throws SQLException {
 					sqlE);
 		}
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
 			getValue(psFN, 0.0);
 			fail("LOG: Out of range test failed, input value is: " + 0.0);
 		} catch (SQLException sqlE) {
@@ -937,6 +968,7 @@ public void testLn() throws SQLException {
         // because it is not defined by JDBC.
 		// Object fnVal = executeNullFn("LN");
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES LN(?)");
 		for (int i = 0; i < logValues.length; i++) {
@@ -956,6 +988,8 @@ public void testLn() throws SQLException {
 		}
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
 			getValue(ps, 0.0);
 			fail("LOG: Out of range test failed, input value is: " + 0.0);
 		} catch (SQLException sqlE) {
@@ -997,6 +1031,7 @@ public void testCeil() throws SQLException {
 
 
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES CEIL(?)");
         
@@ -1042,6 +1077,7 @@ public void testCeiling() throws SQLException {
 
 		executeNullFn("CEILING");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES CEILING(?)");
         PreparedStatement psFN =
@@ -1098,6 +1134,7 @@ public void testFloor() throws SQLException {
 		executeNullFn("FLOOR");
 
 		debug();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         PreparedStatement ps =
             prepareStatement("VALUES FLOOR(?)");
         PreparedStatement psFN =
@@ -1123,6 +1160,21 @@ public void testFloor() throws SQLException {
 			assertEquals(expect, fVal, 0.0);
 
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         ps.close();
         psFN.close();
 	}
@@ -1158,6 +1210,7 @@ private double executeValues(String functionName, double value)
      * and return the double value from the single row returned.
      */
     private double getValue(PreparedStatement ps, double value)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
             throws SQLException {
         ps.setDouble(1, value);
         ResultSet rs = ps.executeQuery();
@@ -1207,6 +1260,7 @@ private void executeNullFn(String functionName) throws SQLException {
 		Statement stmt = createStatement();
 		ResultSet rs = stmt.executeQuery("values {fn  " + functionName
 				+ "(null)}");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2032
         rs.next(); // we know a single value will be returned.
         assertNull(rs.getObject(1));
         assertTrue(rs.wasNull());
@@ -1215,6 +1269,7 @@ private void executeNullFn(String functionName) throws SQLException {
 	}
 
 	private void debug(String message) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6447
         println(message);
 	}
 
@@ -1231,6 +1286,7 @@ public MathTrigFunctionsTest(String name) {
      * as the JDBC escape function testing is relevant for both drivers.
      */
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         return TestConfiguration.defaultSuite(MathTrigFunctionsTest.class);
 	}
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java
index 10fd6f098c..6283cb431a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/MergeStatementTest.java
@@ -145,6 +145,7 @@ public MergeStatementTest(String name)
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest( standardDecoration( false ) );
         suite.addTest( standardDecoration( true ) );
@@ -1724,6 +1725,9 @@ public  void    test_007_insertGeneratedColumnsAndDefaults()
 
         /* update an identity column with default should work once we change 
          * MergeStatement implementation to handle auto generated keys
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
         goodStatement
             ( dboConnection, 
               "merge into t1_007\n" +
@@ -2592,6 +2596,9 @@ public  void    test_014_basicUpdate()
               "on t1_014.c2 = t2_014.c2\n" +
               "when matched then update set c1 = default, c3 = default, c2 = 2 * t2_014.c2, c5 = default\n"
               );*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
 
         //
         // drop schema
@@ -2652,6 +2659,9 @@ public  void    atest_015_bug_6414()
         // column to the next DEFAULT value, i.e., the next value from the
         // sequence generator.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
         goodStatement
             ( dboConnection, 
               "update t1_bug_6414 set a = default, b = -b"
@@ -4704,6 +4714,7 @@ public  void    test_028_basicRowTrigger()
         goodStatement
             (
              dboConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
              "create function singlerow_028() returns table\n" +
              "( x int )\n" +
              "language java parameter style derby_jdbc_result_set no sql\n" +
@@ -4726,6 +4737,7 @@ public  void    test_028_basicRowTrigger()
              "referencing new as new\n" +
              "for each row\n" +
              "merge into t2_028\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
              "using table( singlerow_028() ) sr on t2_028.y = new.x\n" +
              "when not matched then insert ( y ) values ( new.x )\n"
              );
@@ -4757,6 +4769,7 @@ public  void    test_028_basicRowTrigger()
         //
         goodStatement( dboConnection, "drop table t1_028" );
         goodStatement( dboConnection, "drop table t2_028" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
         goodStatement( dboConnection, "drop function singlerow_028" );
     }
     
@@ -5494,6 +5507,7 @@ public  void    test_039_indexProbe()
         goodStatement
             (
              dboConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
              "create function sr_039() returns table\n" +
              "( i int )\n" +
              "language java parameter style derby_jdbc_result_set no sql\n" +
@@ -5520,6 +5534,7 @@ public  void    test_039_indexProbe()
             (
              dboConnection,
              "merge into t1_039\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
              "using table( sr_039() ) sr on ( x = 1 )\n" +
              "when matched then delete\n",
              1
@@ -5538,6 +5553,7 @@ public  void    test_039_indexProbe()
         //
         // drop schema
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
         goodStatement( dboConnection, "drop function sr_039" );
         goodStatement( dboConnection, "drop table t1_039" );
     }
@@ -5558,6 +5574,7 @@ public  void    test_040_valuesView()
         goodStatement
             (
              dboConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
              "create function sr_040() returns table\n" +
              "( i int )\n" +
              "language java parameter style derby_jdbc_result_set no sql\n" +
@@ -5585,6 +5602,7 @@ public  void    test_040_valuesView()
             (
              dboConnection,
              "merge into t1_040\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
              "using table( sr_040() ) sr on ( x = 1 )\n" +
              "when matched and y = 101 then delete\n" +
              "when matched and y = 102 then update set z = -1000\n" +
@@ -5609,6 +5627,7 @@ public  void    test_040_valuesView()
             (
              dboConnection,
              "merge into t1_040\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
              "using table( sr_040() ) sr on ( x = 3 )\n" +
              "when matched and y = 103 then delete\n" +
              "when matched and y = 102 then update set z = -10000\n" +
@@ -5633,6 +5652,7 @@ public  void    test_040_valuesView()
         //
         // drop schema
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
         goodStatement( dboConnection, "drop function sr_040" );
         goodStatement( dboConnection, "drop table t1_040" );
     }
@@ -5653,6 +5673,7 @@ public  void    test_041_cardinalityViolations()
         goodStatement
             (
              dboConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
              "create function sr_041() returns table\n" +
              "( i int )\n" +
              "language java parameter style derby_jdbc_result_set no sql\n" +
@@ -5713,6 +5734,7 @@ public  void    test_041_cardinalityViolations()
         expectExecutionError
             ( dboConnection, CARDINALITY_VIOLATION,
               "merge into t1_041\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
               "using table( sr_041() ) sr on ( x = 1 )\n" +
               "when matched and y = 101 then delete\n" +
               "when matched and y = 102 then update set z = -1000\n" +
@@ -5756,6 +5778,7 @@ public  void    test_041_cardinalityViolations()
         //
         // drop schema
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
         goodStatement( dboConnection, "drop function sr_041" );
         goodStatement( dboConnection, "drop table t1_041" );
         goodStatement( dboConnection, "drop table t2_041" );
@@ -9318,6 +9341,7 @@ public  void    test_059_targetIndex()
         Connection  dboConnection = openUserConnection( TEST_DBO );
         File    traceFile = SupportFilesSetup.getReadWrite( TRACE_FILE_NAME );
         SupportFilesSetup.deleteFile( traceFile );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6635
 
         //
         // Schema
@@ -9519,6 +9543,7 @@ public  void    test_060_transitionTableSimpleColumn()
 
     public void test_061_Derby6693() throws SQLException {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6693
 
         try {
             s.execute("create table t2(x int)");
@@ -9535,6 +9560,7 @@ public void test_061_Derby6693() throws SQLException {
     }
 
     public void test_062_Derby6550() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6550
         Statement s = createStatement();
         
         s.execute("create table t(a bigint generated always as identity " +
@@ -9617,6 +9643,7 @@ public static IntegerArrayVTI integerList_023()
     public static IntegerArrayVTI singlerow_028()
     {
         // A
+//IC see: https://issues.apache.org/jira/browse/DERBY-6652
         return new IntegerArrayVTI
             (
              new String[] { "X" },
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java
index 6b644eb2f4..17f2b854f5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NativeAuthenticationServiceTest.java
@@ -245,6 +245,7 @@ private Properties  systemProperties( String physicalDatabaseName )
             if ( _localAuthentication ) { authenticationProvider = authenticationProvider + ":LOCAL"; }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5688
         result.put( UPGRADE_TO_BETA_PROPERTY, "true" );
         result.put( PROVIDER_PROPERTY, authenticationProvider );
 
@@ -326,6 +327,7 @@ private String  nameOfTest()
             "Embedded" :
             "Client/Server";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
         return "[ " + dbLocation + authType + local + authOverrides + embedded + " ]";
     }
 
@@ -345,6 +347,7 @@ private String  nameOfTest()
     public static Test suite() throws Exception
     {
         BaseTestSuite suite = new BaseTestSuite();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         //
         // Special version of the test which uses an encrypted database for credentials.
@@ -357,6 +360,7 @@ public static Test suite() throws Exception
                 (
                  (
                   new NativeAuthenticationServiceTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
                   ( JAR_ENCRYPTED, NATIVE, LOCAL, DONT_DISABLE_AUTH )
                   ).decorate( false )
                  );
@@ -395,6 +399,7 @@ private static boolean enableSubprotocolTests() {
     private static Test allConfigurations(boolean clientServer) throws Exception
     {
         BaseTestSuite suite = new BaseTestSuite();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         //
         // No authentication. 
@@ -403,6 +408,7 @@ private static Test allConfigurations(boolean clientServer) throws Exception
             (
              (
               new NativeAuthenticationServiceTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
               ( NONE, NO_AUTH, SYSTEM_WIDE, DONT_DISABLE_AUTH )
               ).decorate( clientServer )
              );
@@ -414,6 +420,7 @@ private static Test allConfigurations(boolean clientServer) throws Exception
             (
              (
               new NativeAuthenticationServiceTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
               ( FILE, NATIVE, LOCAL, DISABLE_AUTHORIZATION )
               ).decorate( clientServer )
              );
@@ -432,6 +439,7 @@ private static Test allConfigurations(boolean clientServer) throws Exception
             (
              (
               new NativeAuthenticationServiceTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
               ( FILE, NATIVE, SYSTEM_WIDE, DISABLE_AUTHORIZATION )
               ).decorate( clientServer )
              );
@@ -456,6 +464,7 @@ private static Test allConfigurations(boolean clientServer) throws Exception
                 (
                  (
                   new NativeAuthenticationServiceTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
                   ( JAR, NATIVE, SYSTEM_WIDE, DONT_DISABLE_AUTH )
                   ).decorate( clientServer )
                  );
@@ -474,6 +483,7 @@ private static Test allConfigurations(boolean clientServer) throws Exception
                 (
                  (
                   new NativeAuthenticationServiceTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
                   ( CLASSPATH, NATIVE, SYSTEM_WIDE, DONT_DISABLE_AUTH )
                   ).decorate( clientServer )
                  );
@@ -569,6 +579,7 @@ private Test decorate(boolean clientServer) throws Exception
         result = TestConfiguration.additionalDatabaseDecoratorNoShutdown( result, THIRTEENTH_DB );
         result = TestConfiguration.additionalDatabaseDecoratorNoShutdown( result, FOURTEENTH_DB );
         result = _fifteenthDBSetup = TestConfiguration.additionalDatabaseDecoratorNoShutdown( result, FIFTEENTH_DB, true );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5741
 
         result = TestConfiguration.changeUserDecorator( result, DBO, getPassword( DBO ) );
         
@@ -603,6 +614,7 @@ else if ( credentialsViaSubprotocol() )
         else
         {
             vetCoreBehavior();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5762
             vetCasing();
             vetSystemWideOperations();
 
@@ -870,6 +882,7 @@ private void    vetCoreBehavior()   throws Exception
             vetProtocol( jarDBName( _credentialsDBLocation ) );
         
             // database accessed via classpath subprotocol
+//IC see: https://issues.apache.org/jira/browse/DERBY-5615
             vetProtocol( classpathDBName() );
         }
         
@@ -1010,6 +1023,7 @@ private void    vetCasing()   throws Exception
         // only run this if we are using NATIVE authentication and the DBO's creds are already
         // in the credentials DB. this is just to make sure that we are in a database where
         // the DBO's creds already exist.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5762
         if ( !_nativeAuthentication ) { return; }
         if ( _localAuthentication ) { return; }
 
@@ -1324,6 +1338,7 @@ private void    vetProviderChanges()   throws Exception
         // to the missing classname NATIVE. we only check this for the embedded
         // case because the network scrunches exceptions together and we lose
         // the structure which allows us to look for nested SQLStates.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5741
         if ( isEmbedded() )
         {
             Connection  fifteenthConn = openConnection( FIFTEENTH_DB, dbo, true, null );
@@ -1509,6 +1524,7 @@ private String  getHashingScheme( Connection conn, String userName )
 
         // normalize the user name
         userName = userName.toUpperCase();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5762
 
         try {
             while ( rs.next() )
@@ -1579,10 +1595,12 @@ private void    vetSQLAuthorizationOn() throws Exception
         {
             if ( shouldFail && (t instanceof SQLException) )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5741
                 SQLException se = (SQLException) t;
                 StringBuffer    buffer = new StringBuffer();
 
                 ArrayList<String> actualSQLStates = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
                 //  ok if the sqlstate is one of the expected ones
                 for ( int i = 0; i < expectedSQLStates.length; i++ )
@@ -1608,6 +1626,7 @@ private void    vetSQLAuthorizationOn() throws Exception
     }
     // look for a sql state in a SQLException and its chained exceptions. returns true if found
     private boolean    vetSQLState
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
       ( SQLException actual, String expectedSQLState, ArrayList<String> actualSQLStates )
         throws Exception
     {
@@ -1636,6 +1655,7 @@ private Connection  passwordExpiring( boolean expiring, String dbName, String us
         reportConnectionAttempt( dbName, user, getPassword( user ), true );
 
         String  expectedSQLState = DBO.equals( user ) ? DBO_PASSWORD_EXPIRING : PASSWORD_EXPIRING;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5647
 
         conn = openConnection( dbName, user, true, null );
 
@@ -1644,6 +1664,7 @@ private Connection  passwordExpiring( boolean expiring, String dbName, String us
         if ( expiring )
         {
             assertNotNull( tagError( "Should have seen a warning" ), warning );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5647
             assertSQLState( expectedSQLState, warning );
         }
         else
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NestedCommitTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NestedCommitTest.java
index 2159c5defa..5396909dc3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NestedCommitTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NestedCommitTest.java
@@ -88,6 +88,7 @@ public void testNestedCommit() throws Exception
                     + "       DYNAMIC RESULT SETS 0 LANGUAGE JAVA "
                     + "       EXTERNAL NAME "
                     + "'org.apache.derbyTesting.functionTests.util.Triggers"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6516
                     + ".doConnStmt' "
                     + "    CONTAINS SQL"
                     + "       PARAMETER STYLE JAVA");
@@ -101,6 +102,7 @@ public void testNestedCommit() throws Exception
             st.executeUpdate("CREATE FUNCTION doConnStmtInt(TEXT CHAR(50)) "
                     + "       RETURNS INT EXTERNAL NAME "
                     + "'org.apache.derbyTesting.functionTests.util.Triggers"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6516
                     + ".doConnStmtInt' "
                     + "       LANGUAGE JAVA PARAMETER STYLE JAVA");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NestedWhereSubqueryTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NestedWhereSubqueryTest.java
index e6242dbccf..0091e213a8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NestedWhereSubqueryTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NestedWhereSubqueryTest.java
@@ -192,6 +192,7 @@ public void testBasicOperations()
 		JDBC.assertUnorderedResultSet(rs, expectedRows);
 
 		/* A variation of the above WHERE EXISTS but using ANY should return the same rows */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3349
 		sb = new StringBuffer();
 		sb.append("select unbound_e.empid, unbound_p.projid ");
 		sb.append("from departments this, ");
@@ -405,6 +406,7 @@ public void testBasicOperations()
      * here (FIXME).
      */
     public void testDerby5501 () throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5501
         setAutoCommit(false);
         Statement s = createStatement();
 
@@ -473,4 +475,4 @@ public void testDerby5501 () throws SQLException {
     public static Test suite() {
 		return TestConfiguration.defaultSuite(NestedWhereSubqueryTest.class);
 	}
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NewOptimizerOverridesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NewOptimizerOverridesTest.java
index fd6d27ab3e..f03f64aa35 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NewOptimizerOverridesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NewOptimizerOverridesTest.java
@@ -98,6 +98,7 @@ public NewOptimizerOverridesTest(String name)
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("NewOptimizerOverridesTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest( TestConfiguration.embeddedSuite( NewOptimizerOverridesTest.class ) );
 
@@ -184,6 +185,7 @@ public void test_01_basicSyntax() throws Exception
             ( WRONG_ROW_SOURCE_COUNT,
               "select tablename from v, sys.syscolumns\n" +
               "where tablename = columnname\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
               "--derbyplan sys.syscolumns_heap\n"
               );
         expectCompilationError
@@ -317,6 +319,7 @@ public void test_02_simpleSelects() throws Exception
         //
         // Union query with a separate override clause per branch.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         assertPlanShape
             (
              conn,
@@ -365,6 +368,7 @@ public void test_02_simpleSelects() throws Exception
         //
         // EXISTS subquery (flattened into outer query block).
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         expectCompilationError
             ( UNSUPPORTED_PLAN_SHAPE,
               "select tableid\n" +
@@ -428,6 +432,7 @@ public void test_02_simpleSelects() throws Exception
      */
     public void test_03_offsetFetch() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         Connection conn = getConnection();
         
         // with an override the join order is syssequences, syscolumns, sysaliases, systables
@@ -513,6 +518,7 @@ static  void    assertPlanShape( Connection conn, String query, String expectedP
 
         // we need to drain the result set and close it in order to fill in all
         // of the structures needed by the toXML() machinery. i don't know why.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         while ( rs.next() ) {}
         rs.close();
 
@@ -527,6 +533,7 @@ static  void    assertPlanShape( Connection conn, String query, String expectedP
     /** Get an xml-based picture of the plan chosen for the last query. The query is identified by its JDBC ResultSet */
     public  static  Document    getLastQueryPlan( Connection conn, ResultSet rs ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6741
         LanguageConnectionContext   lcc = ConstraintCharacteristicsTest.getLCC( conn );
         org.apache.derby.iapi.sql.ResultSet derbyRS = lcc.getLastActivation().getResultSet();
 
@@ -555,8 +562,11 @@ private static  void    summarize( StringBuilder buffer, Element element ) throw
 
         if ( "HashJoinResultSet".equals( type ) ) { summarizeJoin( buffer, element, "#" ); }
         else if ( "NestedLoopJoinResultSet".equals( type ) ) { summarizeJoin( buffer, element, "*" ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         else if ( "ProjectRestrictResultSet".equals( type ) ) { summarizeProjectRestrict( buffer, element ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         else if ( "RowCountResultSet".equals( type ) ) { summarizeProjectRestrict( buffer, getFirstElement( element, "source" ) ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         else if ( "UnionResultSet".equals( type ) ) { summarizeUnion( buffer, element ); }
         else
         {
@@ -572,6 +582,7 @@ private static  void    summarize( StringBuilder buffer, Element element ) throw
     }
 
     private static  void    summarizeProjectRestrict( StringBuilder buffer, Element projectRestrict )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         throws Exception
     {
         // look for subqueries attached to this ProjectRestrict node
@@ -611,6 +622,7 @@ private static  void    summarizeJoin( StringBuilder buffer, Element element, St
     }
 
     private static  void    summarizeUnion( StringBuilder buffer, Element union )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         throws Exception
     {
         NodeList    list = union.getChildNodes();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NoDBInternalsPermissionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NoDBInternalsPermissionTest.java
index 39779c4e93..d7e0b09f12 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NoDBInternalsPermissionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NoDBInternalsPermissionTest.java
@@ -133,9 +133,11 @@ public  void    test_001_ContextService()
      * </p>
      */
     public  void    test_002_EmbedConnection()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6741
         throws Exception
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6741
             Connection  conn = getConnection();
             ((EmbedConnection) conn).getContextManager();
             fail( "Should have raised an AccessControlException" );
@@ -150,6 +152,7 @@ public  void    test_002_EmbedConnection()
      * </p>
      */
     public  void    test_003_JCECipherFactory()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6630
         throws Exception
     {
         try {
@@ -167,6 +170,7 @@ public  void    test_003_JCECipherFactory()
      * </p>
      */
     public  void    test_004_BaseDataFileFactory()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6636
         throws Exception
     {
         try {
@@ -183,6 +187,7 @@ public  void    test_004_BaseDataFileFactory()
      * </p>
      */
     public  void    test_005_EmbedConnection_getLCC()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         throws Exception
     {
         try {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullIfTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullIfTest.java
index bfd7c10d57..036ffce21c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullIfTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullIfTest.java
@@ -135,8 +135,10 @@ public NullIfTest(String name) {
     public void testAllDatatypesCombinations() throws SQLException {
         Statement s = createStatement();
         for (int firstColumnType = 0; firstColumnType < SQLUtilities.SQLTypes.length; firstColumnType++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
 
             StringBuffer nullIfString = new StringBuffer("SELECT NULLIF("
+//IC see: https://issues.apache.org/jira/browse/DERBY-2463
                     + SQLUtilities.allDataTypesColumnNames[firstColumnType]);
             for (int secondColumnType = 0; secondColumnType < SQLUtilities.SQLTypes.length; secondColumnType++) {
 
@@ -192,8 +194,10 @@ public void testAllDatatypesCombinations() throws SQLException {
      */
     public void testParameterForFirstOperandToNullIf() throws SQLException {
         for (int secondColumnType = 0; secondColumnType < SQLUtilities.SQLTypes.length; secondColumnType++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
 
             String nullIfString = new String("SELECT NULLIF(?,"
+//IC see: https://issues.apache.org/jira/browse/DERBY-2463
                     + SQLUtilities.allDataTypesColumnNames[secondColumnType]
                     + ") from AllDataTypesTable");
             int row = 0;
@@ -382,6 +386,7 @@ public void testNonDeterministicLeftOperand() throws SQLException {
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("NullIfTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(baseSuite("NullIfTest:embedded"));
 
@@ -391,6 +396,7 @@ public static Test suite() {
     }
 
     public static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(NullIfTest.class);
 
@@ -400,6 +406,7 @@ public static Test baseSuite(String name) {
              * 
              */
             protected void decorateSQL(Statement s) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2463
                 SQLUtilities.createAndPopulateAllDataTypesTable(s);
             }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullableUniqueConstraintTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullableUniqueConstraintTest.java
index 2255ae3d51..bef1a46c46 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullableUniqueConstraintTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullableUniqueConstraintTest.java
@@ -55,6 +55,7 @@ public NullableUniqueConstraintTest(String name) {
      *         run.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("NullableUniqueConstraintTest");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullsTest.java
index c311733ab0..4f9af9ffea 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/NullsTest.java
@@ -53,6 +53,7 @@ public void testCreate() throws SQLException{
 
         // A column cannot be declared explicitly nullable.
         assertCompileError("42X01", "create table a(a1 int null)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
         //Trying to define null and not null for a column
         String sql = "create table a(a1 int null not null)";
@@ -122,6 +123,7 @@ public void testAlter() throws SQLException{
 
         // Adding explicitly nullable column should fail.
         assertCompileError("42X01", "alter table a add column a3 int null");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
         //Alter table table level primary key constraint on nullable column
         //doesn't give an error
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
index d3f5335510..a5e4a7a42b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OLAPTest.java
@@ -50,7 +50,10 @@ public OLAPTest(String name) {
 	}
 
 	public static Test makeSuite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
         Test clean = new CleanDatabaseTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new BaseTestSuite(OLAPTest.class)) {
                 protected void decorateSQL(Statement s)
                         throws SQLException
@@ -58,6 +61,7 @@ protected void decorateSQL(Statement s)
                     getConnection().setAutoCommit(false);
                     s.executeUpdate("create table t1 (a int, b int)");
                     s.executeUpdate("create table t2 (x int)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2998
                     s.executeUpdate("create table t3 (y int)");
                     s.executeUpdate("create table t4 (a int, b int)");
                     s.executeUpdate("create table t5 (a int, b int)");
@@ -83,6 +87,7 @@ protected void decorateSQL(Statement s)
 
 	public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("OLAPTest");
 		suite.addTest(makeSuite());
 		suite.addTest(TestConfiguration.clientServerDecorator(makeSuite()));
@@ -146,6 +151,8 @@ public void testBasicOperations()
 		/* Ordering */
 		rs = s.executeQuery("select row_number() over () as r, t1.* from t1 order by b desc");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		expectedRows = new String[][]{{"5", "50", "500"},
 									  {"4", "40", "400"},
 									  {"3", "30", "300"},
@@ -296,6 +303,8 @@ public void testBasicOperations()
 		// Check that flattening does not happen when a window is used in a
 		// subquery
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		rs = s.executeQuery("select * from t5 o where o.a in " +
 							"(select x + row_number() over () from t2)");
 		expectedRows = new String[][]{{"2", "4"},
@@ -303,6 +312,7 @@ public void testBasicOperations()
 		JDBC.assertFullResultSet(rs, expectedRows);
 
         // Subquery in SELECT list. DERBY-5954
+//IC see: https://issues.apache.org/jira/browse/DERBY-5954
         rs = s.executeQuery(
             "SELECT rn_t1, (" +
             "     SELECT rn_t2 FROM (" +
@@ -323,6 +333,7 @@ public void testBasicOperations()
 		/*
 		 * Group by and having
 		 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2998
 		rs = s.executeQuery("select r from (select a, row_number() over() as r, b from t1) x group by r");
 		expectedRows = new String[][]{{"1"}, {"2"}, {"3"}, {"4"}, {"5"}};
 		JDBC.assertFullResultSet(rs, expectedRows);
@@ -383,6 +394,7 @@ public void testBasicOperations()
 		JDBC.assertFullResultSet(rs, expectedRows);
 		
 		/* A couple of distinct queries */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2998
 		rs = s.executeQuery("select distinct row_number() over (), 'ABC' from t1");
 		expectedRows = new String[][]{{"1", "ABC"},
 										{"2", "ABC"},
@@ -391,6 +403,8 @@ public void testBasicOperations()
 										{"5", "ABC"}};
 		JDBC.assertFullResultSet(rs, expectedRows);
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
 		rs = s.executeQuery(
 			"select * from (select distinct row_number() over (), " +
 			"                               'ABC' from t1) tmp");
@@ -589,6 +603,7 @@ public void testBasicOperations()
             "                     t_1.a = row_number() over () + t_2.a");
 
         // DERBY-6565: NPE before
+//IC see: https://issues.apache.org/jira/browse/DERBY-6565
         assertStatementError(
                 LANG_WINDOW_FUNCTION_CONTEXT_ERROR,
                 s,
@@ -597,6 +612,7 @@ public void testBasicOperations()
         // DERBY-6688: subquery using SubqueryNode rather than FromSubquery
         // had problems with presence of window function in order by.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6688
         JDBC.assertFullResultSet(s.executeQuery("select * from t3"),
                 new String[][]{{"4"},{"5"},{"6"},{"7"},{"8"}});
 
@@ -611,6 +627,7 @@ public void testBasicOperations()
         // Used to work before
         JDBC.assertFullResultSet(s.executeQuery(
             "select * from  " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6691
             "    (select y from t3 order by row_number() over () " + 
             "     fetch first 1 row only) tt"),
             new String[][]{{"0"}});
@@ -636,6 +653,7 @@ public void testBasicOperations()
 
         // DERBY-6690: a window function in generated clause was not detected
         // before
+//IC see: https://issues.apache.org/jira/browse/DERBY-6690
         assertStatementError(LANG_WINDOW_FUNCTION_CONTEXT_ERROR,
             s,
             "create table t (x int generated always as " +
@@ -882,6 +900,7 @@ private void dumpIt(Statement s, int cols, String sql)
     public void testGroupByWithAndWithoutRollup()
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2998
         Statement s = createStatement();
         // A very simple set of master-detail ORDER and ORDER_ITEM tables,
         // with some fake customer data:
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OffsetFetchNextTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OffsetFetchNextTest.java
index 95985f5674..5cc2a43086 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OffsetFetchNextTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OffsetFetchNextTest.java
@@ -66,6 +66,7 @@ public OffsetFetchNextTest(String name) {
 
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("OffsetFetchNextTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(
             baseSuite("OffsetFetchNextTest:embedded"));
@@ -78,6 +79,7 @@ public static Test suite() {
 
     public static Test baseSuite(String suiteName) {
         return new CleanDatabaseTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new BaseTestSuite(OffsetFetchNextTest.class,
                           suiteName)) {
             @Override
@@ -153,6 +155,7 @@ public void testErrors() throws SQLException
      */
     public void testNewKeywordNonReserved() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4562
         setAutoCommit(false);
         prepareStatement("select a,b as offset from t1 offset 0 rows");
         prepareStatement("select a,b as limit from t1 offset 0 rows");
@@ -451,6 +454,7 @@ public void testOffsetFetchFirstUpdatableForwardOnlyRS() throws SQLException
          * offset 1 rows, update a row and verify result
          */
         variants = makeVariants( "select * from t1 %", FIRST_ROWS_ONLY, "1", null );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for ( String variant : variants )
         {
             rs = stm.executeQuery( variant );
@@ -489,6 +493,7 @@ public void testOffsetFetchFirstReadOnlyScrollableRS() throws SQLException
          * offset 0 rows (a no-op), update a row and verify result
          */
         variants = makeVariants( "select * from t1 %", FIRST_ROWS_ONLY, "0", null );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for ( String variant : variants )
         {
             rs = stm.executeQuery( variant );
@@ -547,6 +552,8 @@ public void testOffsetFetchFirstUpdatableScrollableRS() throws SQLException
          * also try the "for update" syntax so we see that it still works
          */
         variants = makeVariants( "select * from t1 % for update", FIRST_ROWS_ONLY, "0", null );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (String variant : variants)
         {
             rs = stm.executeQuery( variant );
@@ -569,6 +576,8 @@ public void testOffsetFetchFirstUpdatableScrollableRS() throws SQLException
          * offset 1 rows, fetch 3 row, update some rows and verify result
          */
         variants = makeVariants( "select * from t1 %", NEXT_ROWS_ONLY, "1", "3" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for ( String variant : variants )
         {
             rs = stm.executeQuery( variant );
@@ -619,6 +628,7 @@ public void testOffsetFetchFirstUpdatableScrollableRS() throws SQLException
         
         // Test with projection
         variants = makeVariants( "select * from t1 where a + 1 < b%", NEXT_ROWS_ONLY, "1", null );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (String variant : variants)
         {
             rs = stm.executeQuery( variant );
@@ -672,6 +682,7 @@ public void testMetadata() throws SQLException
         String[]    variants;
 
         variants = makeVariants( "select * from t1%", NEXT_ROWS_ONLY, "1", null );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (String variant : variants)
         {
             rs = stm.executeQuery( variant );
@@ -708,6 +719,7 @@ public void testRunTimeStatistics() throws SQLException
         String[]    variants;
 
         variants = makeVariants( "select a,b from t1%", NEXT_ROWS_ONLY, "2", null );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (String variant : variants)
         {
             stm.executeUpdate( "call syscs_util.syscs_set_runtimestatistics(1)" );
@@ -725,6 +737,7 @@ public void testRunTimeStatistics() throws SQLException
             String plan = rs.getString(1);
 
             // Verify that the plan shows the filtering (2 rows of 3 seen):
+//IC see: https://issues.apache.org/jira/browse/DERBY-4079
             assertTrue(plan.indexOf("Row Count (1):\n" +
                                     "Number of opens = 1\n" +
                                     "Rows seen = 3\n" +
@@ -791,6 +804,7 @@ public void testRepeatedExecution() throws SQLException
         String[]    variants;
 
         variants = makeVariants( "select * from t1 order by b%", NEXT_ROWS_ONLY, "2", "2" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (String variant : variants)
         {
             ps = prepareStatement( variant );
@@ -882,6 +896,7 @@ public void testDynamicArgs() throws SQLException
         
         // Mix of prepared and not
         variants = makeVariants( "select * from t1 order by b%", NEXT_ROWS_ONLY, "?", "3" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (String variant : variants)
         {
             ps = prepareStatement( variant );
@@ -949,11 +964,14 @@ public void testDynamicArgsMetaData() throws SQLException
     	//since there is no getParameterMetaData() call available in JSR169 
     	//implementations, do not run this test if we are running JSR169
     	if (JDBC.vmSupportsJSR169()) return;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4384
 
         PreparedStatement ps;
         String[]    variants;
 
         variants = makeVariants( "select * from t1 where a = ? order by b%", NEXT_ROWS_ONLY, "?", "?" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         for (String variant : variants)
         {
             ps = prepareStatement( variant );
@@ -1022,6 +1040,7 @@ public void testJDBCLimitOffset() throws SQLException
      */
     private void    vetStatement
         ( Statement stmt, String sqlState, String stub, String fetchFormat, String offset, String fetchFirst, String[][] expectedResults )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         throws SQLException
     {
         String[]    variants = makeVariants( stub, fetchFormat, offset, fetchFirst );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OptionalToolsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OptionalToolsTest.java
index f13c14f586..7376ee58d1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OptionalToolsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OptionalToolsTest.java
@@ -240,6 +240,7 @@ public void test_02_foreignDBViews() throws Exception
 
         // create a function to count the number of connections
         // managed by ForeignTableVTI
+//IC see: https://issues.apache.org/jira/browse/DERBY-6440
         goodStatement
             (
              dboConnection,
@@ -292,6 +293,7 @@ public void test_02_foreignDBViews() throws Exception
              starResult,
              false
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6440
         assertResults
             (
              dboConnection,
@@ -314,6 +316,7 @@ public void test_02_foreignDBViews() throws Exception
              dboConnection,
              "call syscs_util.syscs_register_tool( 'foreignViews', false, '" + foreignURL + "' )"
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6440
         assertResults
             (
              dboConnection,
@@ -386,6 +389,7 @@ public void test_02_foreignDBViews() throws Exception
              MISSING_SCHEMA,
              starSelect
              );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6440
         assertResults
             (
              dboConnection,
@@ -425,6 +429,7 @@ public void test_03_customTool() throws Exception
         expectExecutionError
             (
              dboConnection,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
              UNKNOWN_TOOL,
              "call syscs_util.syscs_register_tool( 'customTool', true, 'java.lang.String' )"
              );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java
index 48557be16c..22f4eeb7df 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java
@@ -56,6 +56,7 @@ public OrderByAndOffsetFetchInSubqueries(String name) {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("OrderByAndOffsetFetchInSubqueries");
 
@@ -74,6 +75,7 @@ public static Test suite()
     private static Test makeSuite()
     {
         return new CleanDatabaseTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new BaseTestSuite(OrderByAndOffsetFetchInSubqueries.class)) {
                 @Override
                 protected void decorateSQL(Statement s)
@@ -135,6 +137,7 @@ public void testInsertSelectOrderBy() throws SQLException {
         setAutoCommit(false);
         Statement s = createStatement();
         ResultSet rs;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
 
         s.execute("insert into temp1 values 'x','a','c','b','a'");
         s.execute("insert into temp2(s) select s from temp1 order by s");
@@ -370,6 +373,7 @@ public void testInsertSelectOrderByOffsetFetch() throws SQLException {
             "insert into temp2b(s) select * from temp1 order by s " +
             "    offset 1 rows fetch next 4 rows only");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
         ResultSet rs = s.executeQuery("select * from temp2b");
         JDBC.assertFullResultSet(rs, new String[][]{
                 {"1", "a"},
@@ -1026,6 +1030,7 @@ public void testSelectSubqueriesOrderByNegative() throws SQLException {
      * @throws java.sql.SQLException
      */
     public void testSelectSubqueriesSortAvoidance() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4397
         setAutoCommit(false);
         Statement s = createStatement();
         ResultSet rs;
@@ -1121,6 +1126,7 @@ public void testPushAvoidance() throws SQLException {
      * @throws java.sql.SQLException
      */
     public void testNestingInsideSetOperation() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6008
         setAutoCommit(false);
         Statement s = createStatement();
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndSortAvoidance.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndSortAvoidance.java
index 8cdc152c3d..530ad2a593 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndSortAvoidance.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndSortAvoidance.java
@@ -53,6 +53,7 @@ public OrderByAndSortAvoidance(String name) {
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("OrderByAndSortAvoidance");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(makeSuite());
 
@@ -70,6 +71,7 @@ public static Test suite()
     private static Test makeSuite()
     {
         return new CleanDatabaseTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new BaseTestSuite(OrderByAndSortAvoidance.class)) {
                 protected void decorateSQL(Statement st)
                         throws SQLException {
@@ -98,6 +100,7 @@ protected void decorateSQL(Statement st)
                         "CREATE INDEX key3 ON table2(value)");
 
                     populateTestTables(getConnection());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5695
 
                     //Start of tables creation for DERBY-4240 repro
                     st.executeUpdate(
@@ -124,6 +127,9 @@ protected void decorateSQL(Statement st)
                     //End of tables creation for DERBY-4240 repro
 
                     //Start of tables creation for DERBY-4331 repro
+//IC see: https://issues.apache.org/jira/browse/DERBY-4331
+//IC see: https://issues.apache.org/jira/browse/DERBY-3926
+//IC see: https://issues.apache.org/jira/browse/DERBY-4339
                     st.executeUpdate(
                         "CREATE TABLE REPOSITORIES ( ID INT CONSTRAINT "+
                         "REPOSITORIES_PRIMARY_ID PRIMARY KEY GENERATED ALWAYS "+
@@ -201,6 +207,7 @@ protected void decorateSQL(Statement st)
      * @param id the value of the id column
      */
     private static void insertTable1(PreparedStatement ps, long id)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5695
             throws SQLException {
         ps.setLong(1, id);
         ps.executeUpdate();
@@ -440,6 +447,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483653L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483653L, "DocumentSortingValues", "______21857__1__1");
         insertTable2(it2, 2147483653L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483653L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483653L, "Plex", "S");
         insertTable2(it2, 2147483653L, "SC3", "=");
@@ -487,6 +495,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483654L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483654L, "DocumentSortingValues", "______21857__1__1");
         insertTable2(it2, 2147483654L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483654L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483654L, "Plex", "S");
         insertTable2(it2, 2147483654L, "SC3", "=");
@@ -534,6 +543,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483655L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483655L, "DocumentSortingValues", "______21858__1__1");
         insertTable2(it2, 2147483655L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483655L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483655L, "Plex", "S");
         insertTable2(it2, 2147483655L, "SC3", "=");
@@ -581,6 +591,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483656L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483656L, "DocumentSortingValues", "______21858__1__1");
         insertTable2(it2, 2147483656L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483656L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483656L, "Plex", "S");
         insertTable2(it2, 2147483656L, "SC3", "=");
@@ -1004,6 +1015,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483665L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483665L, "DocumentSortingValues", "______21863__1__1");
         insertTable2(it2, 2147483665L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483665L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483665L, "Plex", "S");
         insertTable2(it2, 2147483665L, "SC3", "=");
@@ -1051,6 +1063,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483666L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483666L, "DocumentSortingValues", "______21863__1__1");
         insertTable2(it2, 2147483666L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483666L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483666L, "Plex", "S");
         insertTable2(it2, 2147483666L, "SC3", "=");
@@ -1098,6 +1111,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483667L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483667L, "DocumentSortingValues", "______21864__1__1");
         insertTable2(it2, 2147483667L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483667L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483667L, "Plex", "S");
         insertTable2(it2, 2147483667L, "SC3", "=");
@@ -1145,6 +1159,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483668L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483668L, "DocumentSortingValues", "______21864__1__1");
         insertTable2(it2, 2147483668L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483668L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483668L, "Plex", "S");
         insertTable2(it2, 2147483668L, "SC3", "=");
@@ -1568,6 +1583,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483677L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483677L, "DocumentSortingValues", "______21869__1__1");
         insertTable2(it2, 2147483677L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483677L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483677L, "Plex", "S");
         insertTable2(it2, 2147483677L, "SC3", "=");
@@ -1615,6 +1631,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483678L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483678L, "DocumentSortingValues", "______21869__1__1");
         insertTable2(it2, 2147483678L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483678L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483678L, "Plex", "S");
         insertTable2(it2, 2147483678L, "SC3", "=");
@@ -1662,6 +1679,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483679L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483679L, "DocumentSortingValues", "______21870__1__1");
         insertTable2(it2, 2147483679L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483679L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483679L, "Plex", "S");
         insertTable2(it2, 2147483679L, "SC3", "=");
@@ -1709,6 +1727,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483680L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483680L, "DocumentSortingValues", "______21870__1__1");
         insertTable2(it2, 2147483680L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483680L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483680L, "Plex", "S");
         insertTable2(it2, 2147483680L, "SC3", "=");
@@ -2132,6 +2151,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483689L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483689L, "DocumentSortingValues", "______21875__1__1");
         insertTable2(it2, 2147483689L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483689L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483689L, "Plex", "S");
         insertTable2(it2, 2147483689L, "SC3", "=");
@@ -2179,6 +2199,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483690L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483690L, "DocumentSortingValues", "______21875__1__1");
         insertTable2(it2, 2147483690L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483690L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483690L, "Plex", "S");
         insertTable2(it2, 2147483690L, "SC3", "=");
@@ -2226,6 +2247,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483691L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483691L, "DocumentSortingValues", "______21876__1__1");
         insertTable2(it2, 2147483691L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483691L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483691L, "Plex", "S");
         insertTable2(it2, 2147483691L, "SC3", "=");
@@ -2273,6 +2295,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 2147483692L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 2147483692L, "DocumentSortingValues", "______21876__1__1");
         insertTable2(it2, 2147483692L, "ItemSeq", "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 2147483692L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 2147483692L, "Plex", "S");
         insertTable2(it2, 2147483692L, "SC3", "=");
@@ -2536,6 +2559,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 4294967297L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 4294967297L, "DocumentSortingValues", "");
         insertTable2(it2, 4294967297L, "ItemSeq", "0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 4294967297L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 4294967297L, "Plex", "S");
         insertTable2(it2, 4294967297L, "SC3", "=");
@@ -2602,6 +2626,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 6442450945L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 6442450945L, "DocumentSortingValues", "");
         insertTable2(it2, 6442450945L, "ItemSeq", "0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 6442450945L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 6442450945L, "Plex", "S");
         insertTable2(it2, 6442450945L, "SC3", "=");
@@ -2675,6 +2700,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 8589934593L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 8589934593L, "DocumentSortingValues", "");
         insertTable2(it2, 8589934593L, "ItemSeq", "0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 8589934593L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 8589934593L, "Plex", "S");
         insertTable2(it2, 8589934593L, "SC3", "=");
@@ -2768,6 +2794,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 10737418241L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 10737418241L, "DocumentSortingValues", "");
         insertTable2(it2, 10737418241L, "ItemSeq", "0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 10737418241L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 10737418241L, "Plex", "S");
         insertTable2(it2, 10737418241L, "SC3", "=");
@@ -2870,6 +2897,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 12884901889L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 12884901889L, "DocumentSortingValues", "");
         insertTable2(it2, 12884901889L, "ItemSeq", "0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 12884901889L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 12884901889L, "Plex", "S");
         insertTable2(it2, 12884901889L, "SC3", "=");
@@ -2956,6 +2984,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 15032385537L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 15032385537L, "DocumentSortingValues", "");
         insertTable2(it2, 15032385537L, "ItemSeq", "0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 15032385537L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 15032385537L, "Plex", "S");
         insertTable2(it2, 15032385537L, "SC3", "=");
@@ -3044,6 +3073,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 17179869185L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 17179869185L, "DocumentSortingValues", "");
         insertTable2(it2, 17179869185L, "ItemSeq", "0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 17179869185L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 17179869185L, "Plex", "S");
         insertTable2(it2, 17179869185L, "SC3", "=");
@@ -3137,6 +3167,7 @@ private static void populateTestTables(Connection conn) throws SQLException {
         insertTable2(it2, 19327352833L, "AddressG3", "1180 Bruxelles");
         insertTable2(it2, 19327352833L, "DocumentSortingValues", "");
         insertTable2(it2, 19327352833L, "ItemSeq", "0");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5733
         insertTable2(it2, 19327352833L, "BatchTypeInstructions", "Ne pas jeter ces documents.  Ils ont \u00e9t\u00e9 faits pour quelque chose.");
         insertTable2(it2, 19327352833L, "Plex", "S");
         insertTable2(it2, 19327352833L, "SC3", "=");
@@ -3264,6 +3295,9 @@ private static void populateTestTables(Connection conn) throws SQLException {
      * for both ascending and descending order by clause.  
      */
     public void testDerby4331() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4331
+//IC see: https://issues.apache.org/jira/browse/DERBY-3926
+//IC see: https://issues.apache.org/jira/browse/DERBY-4339
         Statement s;
         ResultSet rs;
         RuntimeStatisticsParser rtsp;
@@ -3610,6 +3644,7 @@ public void testForcedIndexUseForWrongOrder() throws SQLException {
      */
     public void testDerby6148() throws SQLException {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6148
 
         createTablesForDerby6148(s);
         insertDataForDerby6148();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java
index 0ec3bcc825..9aa86f0874 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java
@@ -49,6 +49,7 @@ public OuterJoinTest(String name)
     public static Test suite()
     {
         //Add the test case into the test suite
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("OuterJoinTest Test");
         return TestConfiguration.defaultSuite(OuterJoinTest.class);
     }
@@ -2407,6 +2408,7 @@ public void testdDerby5164() throws Exception
 
      */
     public void testDerby_4471a() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4471
         setAutoCommit(false);
         Statement s = createStatement();
 
@@ -2925,6 +2927,7 @@ public void testDerby_4471d() throws SQLException {
     * stems from DERBY-4712 (parent issue of DERBY-4736).
     */
     public void testDerby_4736() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4736
         setAutoCommit(false);
         Statement s = createStatement();
 
@@ -3078,6 +3081,7 @@ public void testDerby_4736() throws SQLException {
     public void testDerby_4736_nullability() throws Exception
     {
         setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4736
 
         Statement st = createStatement();
         ResultSet rs = null;
@@ -3386,6 +3390,8 @@ public void testDerby_4712_NPEs() throws Exception
     public void testDerby_4798_NPE() throws Exception
     {
         setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4798
+//IC see: https://issues.apache.org/jira/browse/DERBY-3097
 
         Statement st = createStatement();
         ResultSet rs = null;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PredicatePushdownTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PredicatePushdownTest.java
index 178f212b91..7d04830da4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PredicatePushdownTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PredicatePushdownTest.java
@@ -21,6 +21,7 @@
 /*
 
  Derby - Class org.apache.derbyTesting.functionTests.tests.lang.PredicatePushdownTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
 
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
@@ -48,8 +49,10 @@ public PredicatePushdownTest(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         Properties systemProperties = new Properties();
         systemProperties.setProperty("derby.optimizer.noTimeout","true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("predicatePushdown Test");
         suite.addTest(new SystemPropertyTestSetup(new CleanDatabaseTestSetup(TestConfiguration
                 .embeddedSuite(PredicatePushdownTest.class)),systemProperties));
@@ -158,6 +161,7 @@ public void test_predicatePushdown() throws Exception {
         // by checking the case of small (~20 row) tables. We
         // should see hash joins and table scans in ALL of these
         // cases. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         st.execute("CALL SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS(1)");
        
       
@@ -183,6 +187,7 @@ public void test_predicatePushdown() throws Exception {
         expRS = new String[][] { { "2", "2", "1", "2" }, { "4", "4", "2", "4" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected table scan", p.usedTableScan());
         assertTrue("Expected hash join", p.usedHashJoin());
@@ -268,6 +273,10 @@ public void test_predicatePushdown() throws Exception {
                 { "4", "-8", "4", "16" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected table scan", p.usedTableScan());
         assertTrue("Expected hash join", p.usedHashJoin());
@@ -1133,6 +1142,7 @@ public void test_predicatePushdown() throws Exception {
         expRS = new String[][] { { "1", "2", "2", "2" }, { "2", "4", "4", "4" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);  
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1146,6 +1156,7 @@ public void test_predicatePushdown() throws Exception {
         expRS = new String[][] { { "2", "2", "1", "2" }, { "4", "4", "2", "4" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);  
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1165,6 +1176,7 @@ public void test_predicatePushdown() throws Exception {
 
         JDBC.assertFullResultSet(rs, expRS, true);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);  
         assertTrue("Expected table scan on T3", p.usedTableScan("T3"));
         assertTrue("Expected table scan on T4", p.usedTableScan("T4"));
@@ -1178,6 +1190,7 @@ public void test_predicatePushdown() throws Exception {
 
         JDBC.assertFullResultSet(rs, expRS, true);
      
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);  
         assertTrue("Expected table scan on T3", p.usedTableScan("T3"));
         assertTrue("Expected table scan on T4", p.usedTableScan("T4"));
@@ -1195,6 +1208,7 @@ public void test_predicatePushdown() throws Exception {
         expRS = new String[][] { { "2", "4", "4", "4" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);  
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1220,6 +1234,7 @@ public void test_predicatePushdown() throws Exception {
                 { "4", "8", "4", "4" }, { "4", "8", "4", "16" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1242,6 +1257,7 @@ public void test_predicatePushdown() throws Exception {
                 { "4", "8", "4", "4" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected Table Scan ResultSet for T1", p.usedTableScan("T1"));
         assertTrue("Expected Table Scan ResultSet for T2", p.usedTableScan("T2"));
@@ -1268,6 +1284,7 @@ public void test_predicatePushdown() throws Exception {
         
         
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1289,6 +1306,7 @@ public void test_predicatePushdown() throws Exception {
                 { "4", "-8", "4", "16" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1304,6 +1322,7 @@ public void test_predicatePushdown() throws Exception {
         JDBC.assertColumnNames(rs, expColNames);
  
         JDBC.assertEmpty(rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected Table Scan ResultSet for T1", p.usedTableScan("T1"));
         assertTrue("Expected Table Scan ResultSet for T2", p.usedTableScan("T2"));
@@ -1349,6 +1368,7 @@ public void test_predicatePushdown() throws Exception {
                 { "4", "8", "4", "4" }, { "4", "8", "4", "16" }};
         
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1368,6 +1388,7 @@ public void test_predicatePushdown() throws Exception {
         expRS = new String[][] { { "103" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         // DERBY-3819 - this test case consistently fails for 64 bit
         // temporarily (until 3819 is fixed by changing the queries with optimizer directives)
@@ -1399,6 +1420,8 @@ public void test_predicatePushdown() throws Exception {
         
         
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1420,6 +1443,7 @@ public void test_predicatePushdown() throws Exception {
                 { "3", "6" }, { "4", "-8" }, { "4", "8" }, { "5", "10" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         // Expect to see scalar qualifiers with <= operator for four scans.
         p.findString("Operator: <=", 4);
@@ -1440,6 +1464,7 @@ public void test_predicatePushdown() throws Exception {
 
         JDBC.assertFullResultSet(rs, expRS, true);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected Table Scan ResultSet for T1", p.usedTableScan("T1"));
         assertTrue("Expected Table Scan ResultSet for T2", p.usedTableScan("T2"));
@@ -1461,6 +1486,7 @@ public void test_predicatePushdown() throws Exception {
         expRS = new String[][] { { "1", "2", "2", "2" }, { "2", "4", "4", "4" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1487,6 +1513,7 @@ public void test_predicatePushdown() throws Exception {
 
         JDBC.assertFullResultSet(rs, expRS, true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1511,6 +1538,7 @@ public void test_predicatePushdown() throws Exception {
 
         JDBC.assertFullResultSet(rs, expRS, true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected Hash Join", p.usedHashJoin());
         // Can't
@@ -1542,6 +1570,7 @@ public void test_predicatePushdown() throws Exception {
                 { "4", "8", "4", "4" }, { "4", "8", "4", "5" },
                 { "4", "8", "4", "16" }, { "5", "10", "5", "6" }};
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected table scan on T3", p.usedTableScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1568,6 +1597,7 @@ public void test_predicatePushdown() throws Exception {
 
         JDBC.assertFullResultSet(rs, expRS, true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected hash join", p.usedHashJoin());
 
@@ -1628,6 +1658,7 @@ public void test_predicatePushdown() throws Exception {
         expRS = new String[][] { { "909" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected table scan on T1", p.usedTableScan("T1"));
         assertTrue("Expected table scan on T2", p.usedTableScan("T2"));
@@ -1651,6 +1682,7 @@ public void test_predicatePushdown() throws Exception {
 
         expRS = new String[][] { { "9" }};
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1687,6 +1719,7 @@ public void test_predicatePushdown() throws Exception {
                 { "3", "6", "6", "24" }, { "5", "10", "10", "40" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         // DERBY-3819 - this test case consistently fails for 64 bit
         // temporarily (until 3819 is fixed by changing the queries with optimizer directives)
@@ -1713,6 +1746,7 @@ public void test_predicatePushdown() throws Exception {
                 { "4", "-8", "4", "16" }, { "4", "8", "4", "16" }};
         
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected hash join", p.usedHashJoin());
  
@@ -1733,6 +1767,7 @@ public void test_predicatePushdown() throws Exception {
         expRS = new String[][] { { "1", "2", "2", "4" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         // DERBY-3819 - this test case consistently fails for 64 bit
         // temporarily (until 3819 is fixed by changing the queries with optimizer directives)
@@ -1758,6 +1793,7 @@ public void test_predicatePushdown() throws Exception {
         expRS = new String[][] { { "2" }};
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1773,6 +1809,7 @@ public void test_predicatePushdown() throws Exception {
         expColNames = new String[] { "I", "P" };
         JDBC.assertColumnNames(rs, expColNames);
         JDBC.assertDrainResults(rs, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected hash join", p.usedHashJoin());
         assertTrue("Expected table scan on T1", p.usedTableScan("T1"));
@@ -1793,6 +1830,7 @@ public void test_predicatePushdown() throws Exception {
                 { "8", "4" } };
 
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected distinct scan on T1", p.usedDistinctScan("T1"));
         assertTrue("Expected distinct scan  T3", p.usedDistinctScan("T3"));
@@ -1812,6 +1850,7 @@ public void test_predicatePushdown() throws Exception {
                 { "4", "2" }, { "6", "3" }, { "6", "3" }, { "8", "4" },
                 { "8", "4" }};
         JDBC.assertFullResultSet(rs, expRS, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected distinct scan on T1", p.usedDistinctScan("T1"));
         assertTrue("Expected distinct scan  T2", p.usedDistinctScan("T2"));
@@ -1835,6 +1874,7 @@ public void test_predicatePushdown() throws Exception {
         expColNames = new String[] { "A", "I" };
         JDBC.assertColumnNames(rs, expColNames);
         JDBC.assertDrainResults(rs, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected hash join", p.usedHashJoin());
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
@@ -1855,6 +1895,7 @@ public void test_predicatePushdown() throws Exception {
     
 
         JDBC.assertEmpty(rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected index scan on T3", p.usedIndexScan("T3"));
         assertTrue("Expected index scan on T4", p.usedIndexScan("T4"));
@@ -1872,6 +1913,7 @@ public void test_predicatePushdown() throws Exception {
         JDBC.assertColumnNames(rs, expColNames);
         JDBC.assertDrainResults(rs, 0);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         p = SQLUtilities.getRuntimeStatisticsParser(st);
         assertTrue("Expected table scan on T3", p.usedTableScan("T3"));
         assertTrue("Expected table scan on T4", p.usedTableScan("T4"));
@@ -2774,6 +2816,7 @@ private static boolean is64BitJVM() {
         // Try the direct way first, by looking for 'sun.arch.data.model'
         String dataModel = getSystemProperty("sun.arch.data.model");
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             if (Integer.parseInt(dataModel) == 64)
                 return true;
             else 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PredicateTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PredicateTest.java
index fab0b2aa03..8dcfe5c73f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PredicateTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PredicateTest.java
@@ -147,6 +147,7 @@ private String getStatistics() throws SQLException {
      * @return a list of all operators
      */
     private List<String> extractOperators(String stats) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> ops = new ArrayList<String>();
         BufferedReader r = new BufferedReader(new StringReader(stats));
         String line;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PrepareExecuteDDL.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PrepareExecuteDDL.java
index a28ecc1634..fd4396ff6e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PrepareExecuteDDL.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PrepareExecuteDDL.java
@@ -89,9 +89,11 @@ public class PrepareExecuteDDL extends BaseJDBCTestCase {
      * as well.
 	 */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("PrepareExecuteDDL");
         for (int i = 0; i < DDL.length; i++)
         	suite.addTest(new PrepareExecuteDDL("testPrepareExcute", DDL[i]));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1974
         return TestConfiguration.sqlAuthorizationDecorator(suite);
     }
 	private final String ddl;
@@ -109,6 +111,7 @@ private boolean tableDropped()
 	
 	public void testPrepareExcute() throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection conn = getConnection();
         
 		PreparedStatement[] psa= new PreparedStatement[STMTS.length];
@@ -163,6 +166,7 @@ private void checkSelect(PreparedStatement ps, String sql)
 		if (isSelectStar)
 			;
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-1976
 		JDBC.assertDrainResults(rs);
 	}
 	
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java
index 68bbf21e6b..33d9b54230 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/PrimaryKeyTest.java
@@ -36,6 +36,7 @@ public PrimaryKeyTest(String name)      {
 		super(name);
 	}
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(PrimaryKeyTest.class);
 	}
 
@@ -276,6 +277,7 @@ public void testBug5420() throws SQLException
 	}
 
     public void testDerby5111() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5111
         final Statement s = createStatement();
         s.executeUpdate("create table t1 (t1_id integer not null, " +
                 "t0_id integer not null, value varchar(75) not null)");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java
index 3ee2b82dff..c90fc57fc8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java
@@ -49,6 +49,7 @@ public void testTriggerNoSql() throws SQLException {
         Statement s = createStatement();
         s.execute("create trigger after_stmt_trig_no_sql AFTER insert on t2 for each STATEMENT call proc_no_sql()");
         //insert 2 rows. check that trigger is fired - procedure should be called once
+//IC see: https://issues.apache.org/jira/browse/DERBY-2560
         zeroArgCount = 0;
         s.execute("insert into t2 values (1,2), (2,4)");
         checkAndResetZeroArgCount(1);
@@ -101,6 +102,7 @@ public void testTriggerNoSql() throws SQLException {
      */
     public void testTriggerContainsSql() throws SQLException{
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5103
         s.execute("insert into t2 values (1,2), (2,4)");
         s.execute("create trigger after_row_trig_contains_sql AFTER update on t2 for each ROW call proc_contains_sql()");
         // --- update 2 rows. check that trigger is fired - procedure should be called twice
@@ -131,6 +133,7 @@ public void testTriggerReadsSql() throws SQLException {
         s.execute("insert into t1 values (1, 'one')");
         s.execute("create trigger after_stmt_trig_reads_sql AFTER insert on t2 for each STATEMENT call proc_reads_sql(1)");
         //--- insert 2 rows. check that trigger is fired - procedure should be called once
+//IC see: https://issues.apache.org/jira/browse/DERBY-2560
         selectRowsCount = 0;
         s.execute("insert into t2 values (1,2), (2,4)");
         checkAndResetSelectRowsCount(1);
@@ -218,8 +221,11 @@ public void testModifiesSql() throws SQLException {
         try {
             s.execute("insert into t2 values (1,2), (2,4)");
         } catch (SQLException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
             assertSQLState("38000", se);
             se = se.getNextException();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2692
             assertSQLState("38001", se);
         }
         //--- check trigger is not fired.
@@ -240,6 +246,7 @@ public void testModifiesSql() throws SQLException {
        s.execute("insert into t1 values (4,'four')");
        //--- Check that insert successful and trigger fired. 
        rs = s.executeQuery("select * from t1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2560
        String [][] expectedRows = {{"5","two            "},
                                    {"3","one            "},
                                    {"6","four           "}};
@@ -252,6 +259,7 @@ public void testModifiesSql() throws SQLException {
        rs = s.executeQuery("select * from t1");
        expectedRows = new String [][]
                         {{"5","two            "},{"6","four           "},{"8","eight          "}};
+//IC see: https://issues.apache.org/jira/browse/DERBY-2560
        JDBC.assertFullResultSet(rs, expectedRows);
        s.execute("drop trigger delete_trig");
        //--- Procedures with schema name
@@ -297,9 +305,11 @@ public void testTriggerNegative() throws SQLException {
 
         // Insert some test data.
         s.execute("insert into t1 values (5,'two'), (6,'four'), (8,'eight')");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5103
 
         ResultSet rs;
         assertStatementError("42Y03",s,"create trigger call_non_existent_proc1 AFTER insert on t2 for each ROW call non_existent_proc()");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
           rs = s.executeQuery("select count(*) from SYS.SYSTRIGGERS where CAST(triggername AS VARCHAR(128))='CALL_NON_EXISTENT_PROC1'");
           JDBC.assertFullResultSet(rs, new String[][] {{"0"}});
           assertStatementError("42Y03",s,"create trigger call_proc_with_non_existent_proc2 AFTER insert on t2 for each ROW call new_schema.non_existent_proc()");
@@ -403,9 +413,12 @@ public void testTriggerNegative() throws SQLException {
          //--- check delete failed
          rs = s.executeQuery("select * from t1");
          expectedRows = new String[][] { {"5","two"},{"6","four"},{"8","eight"}};
+//IC see: https://issues.apache.org/jira/browse/DERBY-2560
          JDBC.assertFullResultSet(rs, expectedRows);
          //--- check trigger is not created
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
          rs = s.executeQuery("select count(*) from SYS.SYSTRIGGERS where  CAST(triggername AS VARCHAR(128))='TEST_TRIG'");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2560
          JDBC.assertFullResultSet(rs, new String[][] {{"0"}});
          s.execute("drop trigger create_trigger_trig");
          //--- create a trigger to test we cannot drop it from a procedure called by a trigger
@@ -416,7 +429,9 @@ public void testTriggerNegative() throws SQLException {
          rs = s.executeQuery("select * from t2");
          JDBC.assertFullResultSet(rs,new String[][] {{"1","2"}, {"2","4"}});
          //--- check trigger is not dropped
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
          rs = s.executeQuery("select count(*) from SYS.SYSTRIGGERS where CAST(triggername AS VARCHAR(128))='TEST_TRIG'");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2560
          JDBC.assertFullResultSet(rs, new String[][] {{"1"}});
          s.execute("drop trigger drop_trigger_trig");
          //- use procedures which create/drop index on trigger table and some other table
@@ -428,6 +443,7 @@ public void testTriggerNegative() throws SQLException {
          JDBC.assertFullResultSet(rs,new String[][] {{"1","2"}, {"2","4"}});
          // -- check index is not created
          rs = s.executeQuery("select count(*) from SYS.SYSCONGLOMERATES where CAST(CONGLOMERATENAME AS VARCHAR(128))='IX' and ISINDEX");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2560
          JDBC.assertFullResultSet(rs, new String [][] {{"0"}});
          s.execute("drop trigger create_index_trig");
          //--- create an index to test we cannot drop it from a procedure called by a trigger
@@ -437,16 +453,19 @@ public void testTriggerNegative() throws SQLException {
          // -- check delete failed
          rs = s.executeQuery("select * from t1");
          expectedRows = new String[][] { {"5","two"},{"6","four"},{"8","eight"}};
+//IC see: https://issues.apache.org/jira/browse/DERBY-2560
          JDBC.assertFullResultSet(rs, expectedRows);
          // -- check index is not dropped
          rs = s.executeQuery("select count(*) from SYS.SYSCONGLOMERATES where CAST(CONGLOMERATENAME AS VARCHAR(128))='IX' and ISINDEX");
          JDBC.assertFullResultSet(rs, new String[][] {{"1"}});
 
          // Clean up objects created by the test case.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5103
          s.execute("drop trigger alter_table_trig");
          s.execute("drop trigger test_trig");
          s.execute("drop trigger drop_index_trig");
          s.execute("drop index ix");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5103
 
          s.close();
     }
@@ -454,6 +473,7 @@ public void testTriggerNegative() throws SQLException {
     
     
     private static Test basesuite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test basesuite = new BaseTestSuite(ProcedureInTriggerTest.class);
         Test clean = new CleanDatabaseTestSetup(basesuite) {
         protected void decorateSQL(Statement s) throws SQLException {
@@ -488,7 +508,9 @@ protected void decorateSQL(Statement s) throws SQLException {
         }
                 
         public static Test suite() { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite = new BaseTestSuite();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2560
             if (!JDBC.vmSupportsJSR169()) {
                 suite.addTest(basesuite());
                 suite.addTest(TestConfiguration.clientServerDecorator(basesuite()));
@@ -501,6 +523,7 @@ public static Test suite() {
          */
         protected void tearDown() throws Exception {
             rollback();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5103
 
             // Remove all rows in the test tables, so that each test case
             // sees the same initial state.
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RSMDWrapper.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RSMDWrapper.java
index 8b372b7e78..58e963d9e1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RSMDWrapper.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RSMDWrapper.java
@@ -166,6 +166,7 @@ public boolean next() throws SQLException
         if ( _currentRow >= _rowCount ) { return false; }
 
         _currentRow++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         _currentRowNumber = _currentRow;
         
         return true;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RawDBReaderTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RawDBReaderTest.java
index 53de57fccd..10f0bb9888 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RawDBReaderTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RawDBReaderTest.java
@@ -54,6 +54,7 @@ public class RawDBReaderTest extends GeneratedColumnsHelper
     private static  final   String      BOOT_PASSWORD = "fooBarWibble";
 
     private static  final   String      LIST_USER_SCHEMAS =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
         "select schemaname from sys.sysschemas\n" +
         "where schemaname not like 'SYS%'\n" +
         "and schemaname != 'APP'\n" +
@@ -118,6 +119,7 @@ public RawDBReaderTest( String name )
     public static Test suite()
     {
         Test baseTest = TestConfiguration.embeddedSuite(RawDBReaderTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6864
 
         // We don't expect that users of this tool will run with a security
         // manager. The tool is run standalone behind a firewall.
@@ -150,6 +152,7 @@ protected void tearDown() throws Exception
             // delete the corrupt database so that later tests,
             // which require sql authorization, won't bomb because
             // they can't open the encrypted database
+//IC see: https://issues.apache.org/jira/browse/DERBY-6864
             assertDirectoryDeleted(_dbDir);
             _dbDir = null;
         }
@@ -186,6 +189,7 @@ public  void    test_001_rawDBReader()
         Connection  newDBConn = DriverManager.getConnection( MEMORY_DB + ";create=true" );
 
         // verify that the tool hasn't created any schema objects
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
         vetUnloaded( newDBConn );
         
         // load the tool to recover the corrupt database
@@ -209,6 +213,7 @@ public  void    test_001_rawDBReader()
 
         // verify that the expected schema objects have been created
         vetLoaded( newDBConn );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
 
         runRecoveryScript( newDBConn );
 
@@ -280,6 +285,7 @@ private void  shutdownInMemoryDB() throws Exception
 
     private void    runRecoveryScript( Connection conn ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6864
         try (BufferedReader reader =
                 new BufferedReader(new FileReader(RECOVERY_SCRIPT)))
         {
@@ -352,6 +358,7 @@ private void    vetSiphoning( Connection conn ) throws Exception
 
     private void    vetUnloaded( Connection conn ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
         assertResults( conn, LIST_USER_SCHEMAS, NO_ROWS, false );
         assertResults( conn, LIST_USER_TABLES, NO_ROWS, false );
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ReferentialActionsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ReferentialActionsTest.java
index 1e49169a0d..c57ca51b05 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ReferentialActionsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ReferentialActionsTest.java
@@ -39,6 +39,7 @@ public ReferentialActionsTest(String name) {
 
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("ReferentialActionsTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // DERBY-2353: Need to set derby.language.logQueryPlan to expose the
         // bug (got a NullPointerException when writing the plan to derby.log)
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ReleaseCompileLocksTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ReleaseCompileLocksTest.java
index 2b03fba228..eb6e98b15b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ReleaseCompileLocksTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ReleaseCompileLocksTest.java
@@ -57,6 +57,7 @@ protected void initializeConnection(Connection conn) throws SQLException {
 	protected void setUp() throws SQLException {
 	    Statement stmt = createStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2518
 	    stmt.execute("create function dmlstatic() returns INT " +
 	    	"parameter style java language java external name " +
 	    	"'org.apache.derbyTesting.functionTests.util.StaticInitializers." +
@@ -83,6 +84,7 @@ protected void setUp() throws SQLException {
          * Create a suite of tests.
          **/
         public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite =
                 new BaseTestSuite("ReleasecompileLocksTest");
 
@@ -113,9 +115,11 @@ public void testReleaseCompileLocks() throws Exception {
     		// the procedures use DriverManager to get the default connection.
     		// Of course, this makes this test not fully useful with jsr169,
     		// but at least performing the call to locktable is performed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3056
             if (JDBC.vmSupportsJDBC3()) 
             	JDBC.assertFullResultSet(stmt.executeQuery(
             		"select (dmlstatic()) from sys.systables where " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
         			"CAST(tablename AS VARCHAR(128))= 'SYSCONGLOMERATES'"), new String[][] {{"1"}});
     		else
     			JDBC.assertFullResultSet(stmt.executeQuery(
@@ -134,6 +138,7 @@ public void testReleaseCompileLocks() throws Exception {
 		// the procedures use DriverManager to get the default connection.
 		// Of course, this makes this test not fully useful with jsr169,
 		// but at least performing the call to locktable is performed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3056
 		if (JDBC.vmSupportsJDBC3())
 			JDBC.assertFullResultSet(stmt.executeQuery(
         		"select (insertstatic()) from sys.systables where " +
@@ -141,6 +146,7 @@ public void testReleaseCompileLocks() throws Exception {
 		else
 			JDBC.assertFullResultSet(stmt.executeQuery(
         		"select count(*) from sys.systables where " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
         		"CAST(tablename AS VARCHAR(128)) = 'SYSCONGLOMERATES'"), new String[][] {{"1"}});
 			
         assertNoLocks(stmt);
@@ -169,6 +175,7 @@ public void testReleaseCompileLocks() throws Exception {
 
 		try { 
 		  	stmt.execute("drop table t1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2518
 		  	fail ("expected SQLException; table t should not exist");
 		} catch (SQLException e) {
 			assertSQLState("42Y55", e);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RenameTableTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RenameTableTest.java
index f51e75050a..b6c7e6b946 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RenameTableTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RenameTableTest.java
@@ -251,6 +251,7 @@ public void testRenameInvalidation_derby_4479()
      */
     public  void    test_6672_1() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6672
         Connection  conn = getConnection();
         conn.setAutoCommit( true );
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ResultSetsFromPreparedStatementTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ResultSetsFromPreparedStatementTest.java
index 3596cc9ffe..4ed33538d9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ResultSetsFromPreparedStatementTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ResultSetsFromPreparedStatementTest.java
@@ -419,8 +419,10 @@ private static void dumpObjectArray(ResultSet dumpee,
      * @return whether the table is locked exclusively
      */
     private boolean hasTableXLock(String table) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
         PreparedStatement ps = prepareStatement(
             "select count(*) from syscs_diag.lock_table where tablename=? " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2962
             "and CAST(type AS CHAR(5))='TABLE' and CAST(mode AS CHAR(1))='X'");
         ps.setString(1, table);
         ResultSet rs = ps.executeQuery();
@@ -462,6 +464,7 @@ protected void tearDown() throws Exception {
         try { s.executeUpdate("drop table dept"); } catch (SQLException e) {}
 
         // DERBY-4330 tables:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4330
         try {
             if (c3 != null && !c3.isClosed()) {
                 c3.rollback();
@@ -470,6 +473,7 @@ protected void tearDown() throws Exception {
         } catch (SQLException e) {
         }
         c3 = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5709
 
         try { s.executeUpdate(
                 "drop table APP.FILECHANGES"); } catch (SQLException e) {}
@@ -499,6 +503,7 @@ protected void tearDown() throws Exception {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite
             ("Create ResultSets from PreparedStatements");
         suite.addTestSuite(ResultSetsFromPreparedStatementTest.class);
@@ -598,6 +603,7 @@ public void testCallStatementResultSet() throws Exception {
             ("values SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY"+
              "('some.property.name')");
         for (int i = 0; i < 20; ++i) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             final Integer I = i;
             cs.setObject(2, I);
             cs.execute();
@@ -815,6 +821,7 @@ private void testLastIndexKeyResultSet(PreparedStatement tst,
         };
 
         for (int i = 0; i < expected.length; ++i) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             tst.setString(1, Integer.toString(i) +"_");
             ResultSet rs = tst.executeQuery();
             assertResultSet("?="+i+"_", expected[i], rs);
@@ -893,9 +900,11 @@ private void testDistinctScanResultSet(PreparedStatement tst,
             {{ null }}
         };
         for (int i = 0; i < expected.length; ++i) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             tst.setString(1,Integer.toString(i) +"_");
             ResultSet rs = tst.executeQuery();
             JDBC.assertUnorderedResultSet(rs, expected[i], false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
 
             // Re-execute tst with the same parameters
             rs = tst.executeQuery();
@@ -1028,6 +1037,7 @@ private void testDistinctGroupedAggregateResultSet(PreparedStatement tst,
                                                        PreparedStatement del)
             throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         final Integer i0 = 0;
         Object[][][][] expected = new Object[][][][] {
             {
@@ -1627,6 +1637,7 @@ public void testUpdateResultSet() throws Exception {
      * level between executions.
      */
     public void testUpdateResultSetWithIsolation() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2597
         createTestTable("dept", DS, "dept_data");
         commit();
         PreparedStatement ps = prepareStatement("update dept set c0 = c0");
@@ -2136,6 +2147,7 @@ public void testBigintGeneratedAlwaysAsIdentity() throws Exception {
      * from a table select.
      */
     public void testSetMaxRowsTable()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3397
             throws SQLException {
         createTestTable("emp", ES+","+DNO+")", "emp_data");
         PreparedStatement ps = prepareStatement("select * from emp_data",
@@ -2278,6 +2290,7 @@ public void testRuntimeStatisticsForCall() throws SQLException {
 
 
     public void testDerby4330_JoinResultSet()  throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4330
         setTimeout(1);
         setSchema("APP");
         createDerby4330_join_tables();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java
index 869021fc9e..4faa02c996 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RolesConferredPrivilegesTest.java
@@ -82,6 +82,7 @@ public RolesConferredPrivilegesTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("RolesConferredPrivilegesTest");
 
@@ -105,6 +106,7 @@ private static Test makeSuite()
          * sqlAuthorization.
          */
         Test clean = new CleanDatabaseTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new BaseTestSuite(RolesConferredPrivilegesTest.class)) {
                 protected void decorateSQL(Statement s)
                         throws SQLException {
@@ -156,6 +158,7 @@ protected void decorateSQL(Statement s)
                          "RolesConferredPrivilegesTest.s1f1' " +
                          "no sql called on null input");
                     s.execute
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                         ("create function s1.f2( ) returns int " +
                          "language java parameter style java external name " +
                          "'org.apache.derbyTesting.functionTests.tests.lang." +
@@ -167,6 +170,7 @@ protected void decorateSQL(Statement s)
                          "primary key (c1,c2,c3))");
                     // We made columns all unique so we can test references
                     // privilege for all columns.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
                     s.execute(
                         "create procedure s1.calledNested()" +
                         "  language java parameter style java" +
@@ -382,6 +386,7 @@ public void atestConferredPrivileges() throws SQLException
      * should work).
      */
     public void testViewInvalidation() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         Connection dboConn = getConnection();
         Statement s = dboConn.createStatement();
 
@@ -1243,6 +1248,7 @@ public void testPSInvalidation() throws SQLException {
                     setRole(c, "none");
                     assertPsWorks(false, ps);
                     // set it back:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                     setRole(c, "h");
                     assertPsWorks(true, ps);
 
@@ -1347,6 +1353,7 @@ public void testPSInvalidation() throws SQLException {
      * finish using the result set.
      */
     public void testOpenRs() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         Connection dboConn = getConnection();
         Statement s = dboConn.createStatement();
 
@@ -1479,6 +1486,7 @@ public void testOpenRs() throws SQLException {
      * See DERBY-3897.
      */
     public void testDefaultCurrentRole() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
         Connection dboConn = getConnection();
         Statement s = dboConn.createStatement();
         s.execute("grant h to DonaldDuck");
@@ -1511,6 +1519,7 @@ public void testDefaultCurrentRole() throws SQLException {
 
         s.execute("grant execute on procedure s1.calledNested to DonaldDuck");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3917
         if (!JDBC.vmSupportsJSR169()) {
             // JSR169 cannot run with tests with stored procedures
             // that do database access - for they require a
@@ -1537,6 +1546,7 @@ public void testDefaultCurrentRole() throws SQLException {
      * See DERBY-3897.
      */
     public void testCurrentRoleInWeirdContexts() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3917
         if (JDBC.vmSupportsJSR169()) {
             // JSR169 cannot run with tests with stored procedures
             // that do database access - for they require a
@@ -1640,6 +1650,7 @@ private void assertAllforRole(int hasPrivilege,
 
 
     private void assertEverything(int hasPrivilege,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                                   String user,
                                   String role) throws SQLException {
 
@@ -1671,6 +1682,7 @@ private void assertEverything(int hasPrivilege,
             (hasPrivilege, c, schema, table, columns);
         assertUpdatePrivilege
             (hasPrivilege, c, schema, table, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         assertDeletePrivilege
             (hasPrivilege, c, schema, table);
         assertReferencesPrivilege
@@ -1694,6 +1706,7 @@ private void assertEverything(int hasPrivilege,
      * @throws SQLException throws all exceptions
      */
     private void assertExecutePrivilege(int hasPrivilege,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                                         String user,
                                         String role,
                                         String schema,
@@ -1723,6 +1736,7 @@ private void assertExecutePrivilege(int hasPrivilege,
                                         String schema,
                                         String function) throws SQLException {
         Statement stm = c.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 
         try {
             ResultSet rs =
@@ -1762,6 +1776,7 @@ private void assertExecutePrivilege(int hasPrivilege,
      * @throws SQLException throws all exceptions
      */
     private void assertTriggerPrivilege(int hasPrivilege,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                                         String user,
                                         String role,
                                         String schema,
@@ -1838,6 +1853,7 @@ private void assertTriggerPrivilege(int hasPrivilege,
      * @throws SQLException throws all exceptions
      */
     private void assertReferencesPrivilege(int hasPrivilege,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                                            String user,
                                            String role,
                                            String schema,
@@ -1924,6 +1940,7 @@ private void assertReferencesPrivilege(int hasPrivilege,
      * @throws SQLException throws all exceptions
      */
     private void assertUpdatePrivilege(int hasPrivilege,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                                        String user,
                                        String role,
                                        String schema,
@@ -2033,6 +2050,7 @@ private void assertUpdatePrivilege(int hasPrivilege,
      * @throws SQLException throws all exceptions
      */
     private void assertInsertPrivilege(int hasPrivilege,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                                        String user,
                                        String role,
                                        String schema,
@@ -2105,6 +2123,7 @@ private void assertInsertPrivilege(int hasPrivilege,
      * @throws SQLException throws all exceptions
      */
     private void assertSelectPrivilege(int hasPrivilege,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                                        String user,
                                        String role,
                                        String schema,
@@ -2292,6 +2311,7 @@ private void assertSelectPrivilege(int hasPrivilege,
      * this to work.
      */
     private void assertViewExists(boolean exists,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                                   Connection c,
                                   String table) throws SQLException {
         Statement s = c.createStatement();
@@ -2397,6 +2417,7 @@ private void assertPsWorks(boolean works,
             ResultSet rs = ps.getResultSet();
             if (rs != null) {
                 rs.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                 rs.close();
             }
             ps.getConnection().rollback();
@@ -2507,6 +2528,7 @@ private void assertPrivilegeMetadata(int hasPrivilege,
                                          String table,
                                          String[] columns) throws SQLException {
         ResultSet rs;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         Statement stm = c.createStatement();
         rs = stm.executeQuery("values current_user");
         rs.next();
@@ -2619,6 +2641,7 @@ private void assertPrivilegeMetadata(int hasPrivilege,
 
     private boolean isOwner(String schema, String user) throws SQLException {
         Connection c = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         Statement stm = c.createStatement();
         ResultSet rs = stm.executeQuery
             ("select schemaname, authorizationid from sys.sysschemas " +
@@ -2640,8 +2663,10 @@ private boolean isOwner(String schema, String user) throws SQLException {
     private String[] getAllColumns(String schema, String table)
             throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         Connection c = getConnection();
         DatabaseMetaData dbmd = c.getMetaData();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> columnList = new ArrayList<String>();
         ResultSet rs =
             dbmd.getColumns( (String) null, schema, table, (String) null);
@@ -2651,6 +2676,7 @@ private String[] getAllColumns(String schema, String table)
                 columnList.add(rs.getString(4));
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return columnList.toArray(new String[columnList.size()]);
     }
 
@@ -2698,6 +2724,7 @@ private static String formatArgs(Connection c,
                                      String dbObject)  throws SQLException {
 
         ResultSet rs;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         Statement stm =  c.createStatement();
         rs = stm.executeQuery("values current_user");
         rs.next();
@@ -2708,6 +2735,7 @@ private static String formatArgs(Connection c,
         String role = rs.getString(1);
         rs.close();
         stm.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
 
         return
             "User: " + user +
@@ -2722,6 +2750,7 @@ private static String formatArgs(Connection c,
      */
     private void setRole(Connection c, String role) throws SQLException {
         PreparedStatement ps;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
         if (role.toUpperCase().equals("NONE")) {
             ps = c.prepareStatement("set role none");
@@ -2741,6 +2770,7 @@ private void doGrantRevoke(int action,
                                String grantor,
                                String[] actionStrings,
                                String grantee,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
                                String[] warningExpected)
             throws SQLException {
         Connection c = openUserConnection(grantor);
@@ -2755,6 +2785,7 @@ private void doGrantRevoke(int action,
                 (action == REVOKE && actionStrings[i].startsWith
                  ("execute") ? " restrict" : ""));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
             if (warningExpected[i] != null) {
                 assertSQLState(warningExpected[i], s.getWarnings());
             }
@@ -2773,6 +2804,7 @@ private void doGrantRevoke(int action,
                                String[] actionStrings,
                                String grantee)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         String[] warns = new String[actionStrings.length];
         doGrantRevoke(action, grantor, actionStrings, grantee, warns);
     }
@@ -2837,6 +2869,7 @@ private void assertSQLState(String[] ok_states, SQLException e) {
     }
 
     public static void calledNested()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3897
             throws SQLException
     {
         Connection c = null;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java
index fe37e0bcf9..3272c2b593 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RolesTest.java
@@ -88,6 +88,7 @@ public class RolesTest extends BaseJDBCTestCase
      */
     private final static String[] users =
         {"TEST_DBO", "DonaldDuck", "\"additional\"\"user\""};
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
 
     private final static int
         dboIndex            = 0; // used for connections
@@ -128,10 +129,12 @@ public RolesTest(String name, int authLevel,
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("RolesTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         /* Negative syntax tests */
         suite.addTest(negativeSyntaxSuite("suite: negative syntax, embedded"));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         suite.addTest(
             TestConfiguration.clientServerDecorator(
                 negativeSyntaxSuite("suite: negative syntax, client")));
@@ -146,6 +149,7 @@ public static Test suite()
         /* Semantic tests */
         suite.addTest(
             semanticSuite("suite: semantic, embedded"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
 
         suite.addTest(
             TestConfiguration.clientServerDecorator(
@@ -168,6 +172,7 @@ public static Test suite()
     private static Test negativeSyntaxSuite(String framework)
     {
         BaseTestSuite suite = new BaseTestSuite("roles:"+framework);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         /* Tests running without sql authorization set.
          */
@@ -178,6 +183,7 @@ private static Test negativeSyntaxSuite(String framework)
                                           null,
                                           null));
         suite.addTest(noauthSuite);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
         // Tests running with sql authorization set.
         suite.addTest(wrapInAuthorization("testNegativeSyntax"));
@@ -229,6 +235,8 @@ public void testNegativeSyntax() throws SQLException
         doStmt("create role current_role", // current_role is reserved word
                syntaxError, syntaxError, syntaxError);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3073
+//IC see: https://issues.apache.org/jira/browse/DERBY-2207
         char[] longname = new char[MAX_IDENTIFIER_LENGTH + 1];
         java.util.Arrays.fill(longname, 'a');
         String nameWithMoreThanMaxChars = new String(longname);
@@ -240,6 +248,7 @@ public void testNegativeSyntax() throws SQLException
                sqlAuthorizationRequired, invalidRoleName, invalidRoleName);
         doStmt("create role \"SYSROLE\"",
                sqlAuthorizationRequired, invalidRoleName, invalidRoleName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3333
         doStmt("create role public",
                syntaxError, syntaxError, syntaxError);
         doStmt("create role \"PUBLIC\"",
@@ -248,6 +257,7 @@ public void testNegativeSyntax() throws SQLException
                sqlAuthorizationRequired, invalidPUBLIC, invalidPUBLIC);
         doStmt("revoke \"PUBLIC\" from " + users[1],
                sqlAuthorizationRequired, invalidPUBLIC, invalidPUBLIC);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         _stm.close();
     }
 
@@ -279,6 +289,8 @@ public void testPositiveSyntax() throws SQLException
 
         // Check that role name can be longer than present user name
         // (max 30, cf.  Limits.DB2_MAX_USERID_LENGTH).
+//IC see: https://issues.apache.org/jira/browse/DERBY-3073
+//IC see: https://issues.apache.org/jira/browse/DERBY-2207
         String nameWithMoreThan30Chars = ("r123456789" +
                                           "0123456789" +
                                           "01234567890"); // 31 long
@@ -328,8 +340,10 @@ private static Test semanticSuite(String framework)
          * Tests running without sql authorization set.  The purpose
          * of this is just to make sure the proper errors are given.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite noauthSuite = new BaseTestSuite(
             "suite: security level=noSqlAuthorization");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
         noauthSuite.addTest(new RolesTest("testSemantics",
                                           NO_SQLAUTHORIZATION,
                                           null,
@@ -340,9 +354,12 @@ private static Test semanticSuite(String framework)
          * sqlAuthorization.
          */
         BaseTestSuite suite = new BaseTestSuite("roles:"+framework);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         suite.addTest(noauthSuite);
         suite.addTest(wrapInAuthorization("testSemantics"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
 
         return suite;
     }
@@ -356,11 +373,13 @@ private static Test semanticSuite(String framework)
     private static Test wrapInAuthorization(String testName)
     {
         // add decorator for different users authenticated
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite usersSuite =
             new BaseTestSuite("suite: security level=sqlAuthorization");
 
         // First decorate with users (except "additionaluser"), then
         // with authorization decorator
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
         for (int userNo = 0; userNo <= users.length - 2; userNo++) {
             usersSuite.addTest
                 (TestConfiguration.changeUserDecorator
@@ -386,6 +405,7 @@ private static Test wrapInAuthorization(String testName)
      */
     public void testSemantics() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
         println("testSemantics: auth=" + this._authLevel +
                 " user="+getTestConfiguration().getUserName());
 
@@ -397,9 +417,11 @@ public void testSemantics() throws SQLException
          * CREATE ROLE
          */
         doStmt("create role foo",
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
                sqlAuthorizationRequired, null , roleDboOnly);
         doStmt("create role bar",
                sqlAuthorizationRequired, null , roleDboOnly);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         doStmt("create role notGranted",
                sqlAuthorizationRequired, null , roleDboOnly);
         doStmt("create role role", // role is not reserved word
@@ -410,6 +432,7 @@ public void testSemantics() throws SQLException
                 sqlAuthorizationRequired, null , roleDboOnly);
 
         // Verify that we can't create a role which already exists
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         doStmt("create role foo",
                sqlAuthorizationRequired, objectAlreadyExists, roleDboOnly);
 
@@ -442,6 +465,7 @@ public void testSemantics() throws SQLException
                objectAlreadyExists, roleDboOnly);
 
         testLoginWithUsernameWhichIsARole();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3681
 
         /*
          * GRANT <role>
@@ -469,6 +493,7 @@ public void testSemantics() throws SQLException
         doStmt("grant foo,bar to admin",
                sqlAuthorizationRequired, null , roleDboOnly);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         assertSysRolesRowCount(0, 24,
                                // nonDbo run: foo, bar, notGranted still in
                                // place, used for testing SET ROLE for non-dbo
@@ -477,6 +502,7 @@ public void testSemantics() throws SQLException
                                5);
 
         checkGrantCircularity();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
 
         /*
          * SET ROLE
@@ -491,6 +517,7 @@ public void testSemantics() throws SQLException
 
         doDynamicSetRole(_conn);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         doStmt("set role 'NONE'",
                sqlAuthorizationRequired, idParseError, idParseError);
         doStmt("set role 'none'",
@@ -503,6 +530,7 @@ public void testSemantics() throws SQLException
 
         doStmt("set role bar",
                sqlAuthorizationRequired, null , null /* direct grant */);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         doStmt("set role notGranted",
                sqlAuthorizationRequired, null , invalidRole /* not granted */);
         doStmt("set role role",
@@ -524,7 +552,10 @@ public void testSemantics() throws SQLException
         ResultSet rs = doQuery("values current_role",
                                sqlAuthorizationRequired, null , null);
         assertRoleInRs(rs, "\"ROLE\"", "\"BAR\"");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
         if (rs != null) {
             rs.close();
         }
@@ -590,6 +621,7 @@ public void testSemantics() throws SQLException
         assertSysTablePermsRowCount(0,
                                     // role admin not dropped yet:
                                     // + grant to whoever int setup
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
                                     2,
                                     // role admin has been dropped, so
                                     // this run's grant to admin is de
@@ -614,6 +646,7 @@ public void testSemantics() throws SQLException
 
         doStmt("drop role admin",
                sqlAuthorizationRequired, null , roleDboOnly);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
         assertSysTablePermsRowCount(0,
                                     // grant to whoever in setup:
                                     1,
@@ -650,6 +683,7 @@ public void testSemantics() throws SQLException
                sqlAuthorizationRequired, null , null );
 
         // assert (almost) blank slate
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
         assertSysTablePermsRowCount(0,
                                     // grant to whoever in setup:
                                     1,
@@ -659,10 +693,13 @@ public void testSemantics() throws SQLException
 
         // roles foo and bar survive to nonDbo run and beyond:
         assertSysRolesRowCount(0, 5, 5);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
         _stm.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3865
         if (!JDBC.vmSupportsJSR169()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3859
             testCurrentRoleIsReset();
         }
     }
@@ -677,6 +714,7 @@ public void testSemantics() throws SQLException
      * @exception Exception
      */
     private void testLoginWithUsernameWhichIsARole() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3681
         if (_authLevel == SQLAUTHORIZATION && isDbo()) {
             _stm.execute("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY" +
                          "('derby.user.soonarole', 'whatever')");
@@ -724,6 +762,7 @@ private void testLoginWithUsernameWhichIsARole() throws SQLException {
      */
     private void testCurrentRoleIsReset()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3859
 
         if (_authLevel == SQLAUTHORIZATION && isDbo() /* once is enough */) {
             final String user = "DonaldDuck";
@@ -738,6 +777,7 @@ private void testCurrentRoleIsReset()
             // This is currently only implemented in the client driver.
             if (usingDerbyNetClient()) {
                 J2EEDataSource.setBeanProperty(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     cpDs, "maxStatements",7);
                 doTestCurrentRoleIsReset(cpDs.getPooledConnection(user, passwd),
                                          user);
@@ -765,6 +805,7 @@ private void doTestCurrentRoleIsReset(PooledConnection pc, String user)
         // Change the role.
         stmt.execute("set role bar");
         ResultSet rs = stmt.executeQuery("values current_role");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         assertRoleInRs(rs, "\"BAR\"", n_a);
         rs.close();
         stmt.close();
@@ -783,6 +824,7 @@ private void doTestCurrentRoleIsReset(PooledConnection pc, String user)
 
 
     private void checkGrantCircularity() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
         if (isDbo()) {
             // Test circularity in role grant relation given this a
             // priori graph:
@@ -860,6 +902,7 @@ protected void setUp() throws Exception
             try {
                 _stm.executeUpdate("drop role foo");
                 _stm.executeUpdate("drop role bar");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
                 _stm.executeUpdate("drop role notGranted");
             } catch (SQLException se) {
             }
@@ -871,6 +914,7 @@ protected void setUp() throws Exception
         } catch (SQLException se) {
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
         if (_authLevel == SQLAUTHORIZATION && isDbo()) {
             // create a table grant to an (uknown) user WHOEVER.
             // This is used to test that create role detects the
@@ -919,6 +963,7 @@ protected void tearDown() throws Exception
 
 
     private void doStmt(String stmt,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
                         String noAuthState,
                         String authDboState,
                         String authNotDboState)
@@ -980,6 +1025,7 @@ private ResultSet doStmtWithWarnings(String stmt,
             } else { // SQLAUTHORIZATION
                 if (isDbo()) {
                     if (authDboState[0] != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
                         fail("exception " + authDboState[0] + " expected: (" +
                              stmt);
                     }
@@ -990,6 +1036,7 @@ private ResultSet doStmtWithWarnings(String stmt,
                     }
                 } else {
                     if (authNotDboState[0] != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
                         fail("exception " + authNotDboState[0] +
                              " expected: (" + stmt);
                     }
@@ -1004,6 +1051,7 @@ private ResultSet doStmtWithWarnings(String stmt,
             if (_authLevel == NO_SQLAUTHORIZATION) {
                 if (noAuthState[0] == null) {
                     fail("stmt " + stmt + " failed with exception " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
                          e.getSQLState(), e);
                 } else {
                     assertSQLState("Stmt " + stmt, noAuthState[0], e);
@@ -1013,6 +1061,7 @@ private ResultSet doStmtWithWarnings(String stmt,
                 if (isDbo()) {
                     if (authDboState[0] == null) {
                         fail("stmt " + stmt + " failed with exception " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
                              e.getSQLState(), e);
                     } else {
                         assertSQLState("Stmt " + stmt, authDboState[0], e);
@@ -1047,11 +1096,13 @@ private void doDynamicSetRole(Connection conn)
                  assertSQLState(sqlAuthorizationRequired, e);
                  return;
              } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
                  fail("prepare of set role ? failed:" + e, e);
              }
         }
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
             pstmt.setString(1, "BAR");
             int rowcnt = pstmt.executeUpdate();
             assertEquals("rowcount from set role ? not 0", rowcnt, 0);
@@ -1060,6 +1111,7 @@ private void doDynamicSetRole(Connection conn)
         }
 
         // Test that trimming works:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4475
         try {
             pstmt.setString(1, " BAR ");
             int rowcnt = pstmt.executeUpdate();
@@ -1073,11 +1125,13 @@ private void doDynamicSetRole(Connection conn)
                 "set role ' BAR '");
             assertEquals("rowcount from set role ? not 0", rowcnt, 0);
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
             fail("execute of set role ? failed: [foo]" + e, e);
         }
 
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
             pstmt.setString(1, "");
             int rowcnt = pstmt.executeUpdate();
             fail("Expected syntax error on identifier");
@@ -1086,6 +1140,7 @@ private void doDynamicSetRole(Connection conn)
         }
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
             pstmt.setString(1, " ");
             int rowcnt = pstmt.executeUpdate();
             fail("Expected syntax error on identifier");
@@ -1115,18 +1170,29 @@ private void doDynamicSetRole(Connection conn)
             }
 
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
                 pstmt.setString(1, "none");
                 int rowcnt = pstmt.executeUpdate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
                 fail("NONE should not be allowed as a dynamic parameter");
             } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
                 assertSQLState(idParseError, e);
             }
 
             try {
                 pstmt.setString(1, "\"NONE\"");
                 int rowcnt = pstmt.executeUpdate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
                 assertEquals("rowcount from set role ? not 0", rowcnt, 0);
                 ResultSet rs = doQuery("values current_role", n_a, null , n_a );
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
                 assertRoleInRs(rs, "\"NONE\"", n_a);
                 rs.close();
             } catch (SQLException e) {
@@ -1241,6 +1307,8 @@ private void dumpSysRoles() throws SQLException
         println("SYS.SYSROLES:");
 
         while (rs.next()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
             println("uuid=" + rs.getString(1) +
                     " r=" + rs.getString(2) + " -ee:" + rs.getString(3) +
                     " -or:" + rs.getString(4) + " a:" + rs.getString(5) +
@@ -1326,6 +1394,8 @@ private void assertRoleInRs(ResultSet rs,
             assertNull(rs);
         } else {
             if (isDbo()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3327
+//IC see: https://issues.apache.org/jira/browse/DERBY-1331
                 JDBC.assertSingleValueResultSet(rs, dboRole);
             } else {
                 JDBC.assertSingleValueResultSet(rs, notDboRole);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RoutineTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RoutineTest.java
index 3119a11379..ad68441a44 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RoutineTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RoutineTest.java
@@ -53,6 +53,7 @@ public RoutineTest(String name)
     }
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite(RoutineTest.class, "RoutineTest");
         
@@ -67,6 +68,7 @@ public static Test suite() {
     public void testFunctionResultDataTypeValidation() throws SQLException
     {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3119
 
         // SMALLINT -> short
         s.executeUpdate(
@@ -320,6 +322,7 @@ public void testFunctionReturnsNullOnNullInput() throws SQLException
      */
     public void testFunctionNullHandling() throws SQLException, UnsupportedEncodingException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2213
         Statement s = createStatement();
         
         // Create three simple functions that take an integer and
@@ -371,6 +374,7 @@ public void testFunctionNullHandling() throws SQLException, UnsupportedEncodingE
         ps.close();
         
         // Test that any single argument being null causes NULL to be returned.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2213
         s.executeUpdate(
                 "CREATE FUNCTION CONCAT_NOCALL(VARCHAR(10), VARCHAR(10)) " +
                    "RETURNS VARCHAR(20) " +
@@ -468,6 +472,7 @@ public void testFunctionNullHandling() throws SQLException, UnsupportedEncodingE
         
         // Nested calls with SQL types that do not need casts
         // and map to primitive types. This had issues see DERBY-479
+//IC see: https://issues.apache.org/jira/browse/DERBY-2213
         s.executeUpdate(
                 "CREATE FUNCTION SAME_NOCALL(INTEGER) " +
                    "RETURNS INTEGER " +
@@ -512,6 +517,7 @@ public void testFunctionNullHandling() throws SQLException, UnsupportedEncodingE
         assertStatementError("39004", ps); // Can't pass NULL into primitive type
         ps.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2213
         s.executeUpdate(
                 "CREATE FUNCTION NOON_NOCALL(TIME) " +
                    "RETURNS TIME " +
@@ -599,6 +605,7 @@ public void testFunctionNullHandling() throws SQLException, UnsupportedEncodingE
         JDBC.assertSingleValueResultSet(ps.executeQuery(), "11:30:00");
         ps.close();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2213
         s.close();
     }
     
@@ -648,6 +655,7 @@ public void test_4459() throws Exception
      */
     public void test_5749() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5749
         Statement s = createStatement();
         s.executeUpdate("create table t5749(v varchar(5))");
         s.executeUpdate(
@@ -692,6 +700,7 @@ public void test_5749() throws SQLException
     public void test_6511() throws Exception
     {
         Connection  conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6511
 
         vet_6511( conn, "boolean", "booleanpToBoolean", "booleanToBooleanp", "true" );
         vet_6511( conn, "int", "intToInteger", "integerToInt", "1" );
@@ -822,16 +831,19 @@ public static void p5749 (String s) {
     // functions for converting between primitive and wrapper types
     public  static  Boolean booleanpToBoolean( boolean val )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return val;
     }
     public  static  boolean booleanToBooleanp( Boolean val ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6511
         if ( val == null )  { throw new Exception( "This method does not allow nulls!" ); }
         else { return val.booleanValue(); }
     }
     
     public  static  Integer intToInteger( int val )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return val;
     }
     public  static  int     integerToInt( Integer val ) throws Exception
@@ -842,6 +854,7 @@ public  static  int     integerToInt( Integer val ) throws Exception
     
     public  static  Long    longpToLong( long val )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return val ;
     }
     public  static  long     longToLongp( Long val ) throws Exception
@@ -852,6 +865,7 @@ public  static  long     longToLongp( Long val ) throws Exception
     
     public  static  Integer    shortpToInteger( short val )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
       return (int) val;
     }
     public  static  short     integerToShortp( Integer val ) throws Exception
@@ -862,6 +876,7 @@ public  static  short     integerToShortp( Integer val ) throws Exception
     
     public  static  Float floatpToFloat( float val )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return val;
     }
     public  static  float     floatToFloatp( Float val ) throws Exception
@@ -872,6 +887,7 @@ public  static  float     floatToFloatp( Float val ) throws Exception
     
     public  static  Double doublepToDouble( double val )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return val;
     }
     public  static  double     doubleToDoublep( Double val ) throws Exception
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RoutinesDefinersRightsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RoutinesDefinersRightsTest.java
index f132fea4ff..debd6a1734 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RoutinesDefinersRightsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/RoutinesDefinersRightsTest.java
@@ -80,6 +80,7 @@ public RoutinesDefinersRightsTest(String name)
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("RoutinesDefinersRightsTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         if (!JDBC.vmSupportsJSR169()) {
             // JSR169 cannot run with tests with stored procedures
@@ -88,6 +89,7 @@ public static Test suite()
             // DriverManager is not supported with JSR169.
             suite.addTest(makeSuite());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             suite.addTest(
                 TestConfiguration.clientServerDecorator(makeSuite()));
         }
@@ -108,6 +110,7 @@ private static Test makeSuite()
          * sqlAuthorization.
          */
         Test clean = new CleanDatabaseTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new BaseTestSuite(RoutinesDefinersRightsTest.class)) {
                 protected void decorateSQL(Statement s)
                         throws SQLException {
@@ -140,6 +143,7 @@ protected void decorateSQL(Statement s)
                          "reads sql data called on null input");
 
                     s.execute
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
                         ("create procedure s1.updateWage() " +
                          "language java parameter style java " +
                          "modifies sql data " +
@@ -288,6 +292,7 @@ public void testDefinersRights() throws SQLException
 
         // Try as PHB to update, delete and insert on a result set
         stm.executeUpdate("call s1.updateWage()");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
 
         stm.close();
         c.close();
@@ -464,6 +469,7 @@ public static double lookupWageFootSoldier(int employee)
      * for more detail.
      */
     public static void updateWage()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             throws SQLException
     {
         Connection c = null;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SGVetter.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SGVetter.java
index ca6352179b..5da8fa32df 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SGVetter.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SGVetter.java
@@ -121,6 +121,7 @@ public Long getNextValue()
 
         advance();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return retval.longValue();
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SQLAuthorizationPropTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SQLAuthorizationPropTest.java
index 0f1425f0bd..ae3f92b553 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SQLAuthorizationPropTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SQLAuthorizationPropTest.java
@@ -39,6 +39,7 @@ public SQLAuthorizationPropTest(String name) {
 	}
 
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(
             SQLAuthorizationPropTest.class, "SQLAuthorizationPropTest");
 		
@@ -48,6 +49,7 @@ public static Test suite() {
 		Properties props = new Properties();
 	    props.setProperty("derby.database.sqlAuthorization", "true");
 	    Test test = new SQLAuthorizationPropTest("grantRevokeAfterSettingSQLAuthProperty");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
 	    suite.addTest(new DatabasePropertyTestSetup (test, props, true));
 	    
 	    // This test has to be run after SQL authorization property has been 
@@ -57,6 +59,7 @@ public static Test suite() {
         // This test needs to run in a new single use database as upon entry
         // the test expects SQL authorization to be off and then sets it
         // which cannot be undone.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1975
 	    return TestConfiguration.singleUseDatabaseDecorator(suite);
 	}
 	
@@ -142,6 +145,7 @@ public void resetSQLAuthProperty() throws SQLException {
         // This should work
         testPropertyReset(setDBP, "true");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1975
         setDBP.close();
 	}
 	
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SQLSessionContextTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SQLSessionContextTest.java
index 2e7e85397f..57e6574296 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SQLSessionContextTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SQLSessionContextTest.java
@@ -111,6 +111,7 @@ public SQLSessionContextTest(String name)
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("SQLSessionContextTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         /* Positive tests */
         if (!JDBC.vmSupportsJSR169()) {
@@ -145,6 +146,7 @@ private static Test positiveSuite(String framework)
          */
 
         // add decorator for different users authenticated
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite usersSuite =
             new BaseTestSuite("suite: positiveSuite");
 
@@ -261,6 +263,7 @@ public void testPositive() throws SQLException
         // for dropper.
         _stm.execute("call test_dbo.dropper()");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3667
         String[] expected = new String[]{null, "TEST_DBO"};
         for (int i= 0; i < 1; i++) {
             rs = ps[i].executeQuery();
@@ -375,6 +378,7 @@ private static void assertCurrent(String sessionVar,
         assertTrue("result set empty", rs.next());
         String actualCurrent = rs.getString(1);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
         if (sessionVar.equals("role") && expected != null) {
             // returned current_role is a delimited identifer, which is SQL
             // standard compliant. current_schema returns case normal form,
@@ -382,6 +386,7 @@ private static void assertCurrent(String sessionVar,
             expected = "\"" + expected + "\"";
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3667
         if (expected != null) {
             assertTrue(sessionVar + ": current is " + actualCurrent +
                        ", expected " + expected,
@@ -722,6 +727,7 @@ public static void dropper() throws SQLException
             stm.close();
 
             String[] expected = new String[]{null, "TEST_DBO"};
+//IC see: https://issues.apache.org/jira/browse/DERBY-3667
 
             // check that we revert correctly
             for (int i= 0; i < variableKeywords.length; i++) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors1Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors1Test.java
index d297448b6b..3e4c158e67 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors1Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors1Test.java
@@ -548,6 +548,7 @@ public void testNoHoldScrollableResults() throws SQLException{
         }
         
         public void testSimpleScrollCursors() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2561
             Connection conn = getConnection();
             Statement s = conn.createStatement();
             s.executeUpdate("create table t (a int)");
@@ -678,6 +679,8 @@ public void testScrollCursors3() throws SQLException {
             assertEquals(1, rs.getInt(1));
             assertEquals(2, rs.getInt(2));
             rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3224
+//IC see: https://issues.apache.org/jira/browse/DERBY-3176
             s.executeUpdate("drop table u1.t1");
         }
         
@@ -698,8 +701,10 @@ private void assertNoCurrentRow(ResultSet rs) throws SQLException {
         
         public static Test baseSuite(String name) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(ScrollCursors1Test.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2561
 
         return new CleanDatabaseTestSetup(suite) {
 
@@ -725,6 +730,7 @@ protected void decorateSQL(Statement s) throws SQLException {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ScrollCursors1");
         suite.addTest(baseSuite("ScrollCursors1:embedded"));
         suite.addTest(TestConfiguration.clientServerDecorator(baseSuite("ScrollCursors1:client")));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors2Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors2Test.java
index 8af27e462c..dcc206c419 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors2Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ScrollCursors2Test.java
@@ -197,6 +197,7 @@ public void testForwardOnlyNegative() throws SQLException {
             assertEquals(1, rs.getFetchSize());
 
         rs.setFetchSize(5);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2411
         assertEquals(5,rs.getFetchSize());
       
         assertEquals(ResultSet.FETCH_FORWARD,rs.getFetchDirection());
@@ -215,6 +216,7 @@ public void testForwardOnlyNegative() throws SQLException {
         // Verify that result set from statement is
         // scroll insensitive and read only
         rs = ps_f_r.executeQuery();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2411
         assertEquals(ResultSet.TYPE_FORWARD_ONLY, rs.getType());
         
         assertEquals(ResultSet.CONCUR_READ_ONLY,rs.getConcurrency());
@@ -530,6 +532,7 @@ public void testScrollInsensitiveNegative() throws SQLException {
             assertEquals("XJ062", sqle.getSQLState());
 
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2411
         rs.close();
         s_i_r.close();
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.java
index fdf67e306f..400631d23f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SecurityPolicyReloadingTest.java
@@ -87,6 +87,7 @@ public class SecurityPolicyReloadingTest extends BaseJDBCTestCase {
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("SecurityPolicyReloadingTest");
 
@@ -95,6 +96,7 @@ public static Test suite()
         // jar file but is not easy to do with all of the testing and server
         // classes jumbled together in the same class tree.
         if ( !TestConfiguration.loadingFromJars() ) { return suite; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
 
         suite.addTest( decorateTest() );
 
@@ -122,6 +124,7 @@ public static Test suite()
     private static Test decorateTest()
     {
         Test test = new SecurityPolicyReloadingTest();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
 
         //
         // Install a security manager using the initial policy file.
@@ -145,6 +148,7 @@ private static Test decorateTest()
             (
              test,
              null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
              new String[] { getSourcePolicy() },
              null,
              new String[] { makeTargetPolicyStub() }
@@ -199,6 +203,7 @@ private void dbaTest()
         throws Exception
     {
         Connection  conn = openUserConnection( DerbyConstants.TEST_DBO );
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
 
         assertTrue( "Initially, should be able to read property.", canReadProperty() );
 
@@ -219,6 +224,8 @@ private void dbaTest()
     private void nonDbaTest()
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1828
+//IC see: https://issues.apache.org/jira/browse/DERBY-2633
         String          reservedToDBO = "42504";
         Connection  conn = openUserConnection( NON_DBO_USER );
 
@@ -250,6 +257,7 @@ private void doPolicyReloadingIsNotGranted()
     {
         String          insufficientPrivilege = "XK000";
         Connection  conn = openUserConnection( DerbyConstants.TEST_DBO );
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
 
         // First change to a policy which does not permit policy reloading
         changePolicyFile( conn, UNRELOADABLE_SOURCE_POLICY, true, null );
@@ -289,6 +297,7 @@ private boolean canReadProperty()
         throws Exception
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             getSystemProperty("SecurityPolicyReloadingTest.property");
             return true;
         }
@@ -343,6 +352,7 @@ private static String makeServerPolicyName()
             String  userDir = getSystemProperty( "user.dir" );
             String  fileName = userDir + File.separator + SupportFilesSetup.EXTINOUT + File.separator + makeTargetPolicyStub();
             File      file = new File( fileName );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
             return file.toURI().toURL().toExternalForm();
         }
         catch (Exception e)
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SelectivityTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SelectivityTest.java
index a5187356a3..8bcdbcce1f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SelectivityTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SelectivityTest.java
@@ -43,6 +43,7 @@ public SelectivityTest(String name) {
     
     public static Test suite() {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         Properties props = new Properties();
         // first disable the automatic statistics gathering so we get
         // clean statistics
@@ -52,6 +53,7 @@ public static Test suite() {
         props.setProperty("derby.language.statementCacheSize", "0");
         // set the props, and boot the db
         Test test = new DatabasePropertyTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new BaseTestSuite(SelectivityTest.class), props, true);
         
         return new CleanDatabaseTestSetup(test) {
@@ -89,7 +91,9 @@ protected void decorateSQL(Statement s) throws SQLException
                 s.executeUpdate("create index test_id on test(id)");
                 s.executeUpdate("insert into test select * from template");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
                 s.executeUpdate("create view showstats as "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6977
                                 + "select cast (conglomeratename as varchar(60)) indexname, "
                                 + "cast (statistics as varchar(60)) stats, "
                                 + "creationtimestamp createtime, "
@@ -110,6 +114,7 @@ protected void decorateSQL(Statement s) throws SQLException
                 s
                         .executeUpdate("CALL SYSCS_UTIL.SYSCS_UPDATE_STATISTICS('APP','TEST',null)");
                 statsrs = s
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
                         .executeQuery("select indexname, stats, ncols from showstats order by indexname, stats, createtime, ncols");
                 JDBC.assertFullResultSet(statsrs, new String[][] {
                         {"TEMPLATE_102","numunique= 100 numrows= 4000","1"},
@@ -118,6 +123,7 @@ protected void decorateSQL(Statement s) throws SQLException
                         {"TEMPLATE_22","numunique= 40 numrows= 4000","2"},
                         {"TEMPLATE_TWENTY","numunique= 20 numrows= 4000","1"},
                         {"TEMPLATE_TWO","numunique= 2 numrows= 4000","1"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
                         {"TEST_ID","numunique= 4000 numrows= 4000","1"},
                         });
                 
@@ -159,6 +165,7 @@ protected void decorateSQL(Statement s) throws SQLException
                 statsrs = s.executeQuery(
                         "select indexname, stats, ncols from showstats " +
                         "where indexname like 'T1%' " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6495
                         "order by indexname, stats");
                 JDBC.assertFullResultSet(statsrs, new String[][] {
                         {"T1_HUNDRED","numunique= 100 numrows= 4000","1"},
@@ -233,6 +240,7 @@ public void testSingleColumnSelectivity() throws SQLException {
                 "test, template --DERBY-PROPERTIES joinStrategy=hash \n" +
                 "where test.two = template.two").close();
         checkEstimatedRowCount(conn,8020012.5);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         RuntimeStatisticsParser rtsp = 
               SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedHashJoin());
@@ -245,6 +253,7 @@ public void testSingleColumnSelectivity() throws SQLException {
                 "index=null \n" +
                 "where test.two = template.two").close();
         checkEstimatedRowCount(conn,8020012.5);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertFalse(rtsp.usedHashJoin());
         
@@ -256,6 +265,7 @@ public void testSingleColumnSelectivity() throws SQLException {
                 "index=template_two \n" +
                 "where test.two = template.two").close();
         checkEstimatedRowCount(conn,8020012.5);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_TWO"));
         
@@ -269,6 +279,7 @@ public void testSingleColumnSelectivity() throws SQLException {
                 "where test.twenty = template.twenty").close();
         // Rowcount should be same as testSingleColumnSelectivityHash
         checkEstimatedRowCount(conn,802001.25);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_TWENTY"));
         
@@ -282,6 +293,7 @@ public void testSingleColumnSelectivity() throws SQLException {
                 "index=template_22 \n" +
                 "where test.twenty = template.twenty").close();
         checkEstimatedRowCount(conn,802001.25);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_22"));
         
@@ -309,6 +321,7 @@ public void testSingleColumnSelectivity() throws SQLException {
                 "where test.hundred = template.hundred and test.id <= 100").close();
         // note: original cloudscape result was expecting 3884.85 here.
         checkEstimatedRowCount(conn,3924.9);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEST", "TEST_ID"));
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_102"));
@@ -321,6 +334,7 @@ public void testSingleColumnSelectivity() throws SQLException {
                 "index=null \n" +
                 "where test.hundred = template.hundred and test.id <= 100").close();
         checkEstimatedRowCount(conn,3924.9);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEST", "TEST_ID"));
         
@@ -332,6 +346,7 @@ public void testSingleColumnSelectivity() throws SQLException {
                 "index=null \n" +
                 "where test.hundred = template.hundred and test.id <= 100").close();
         checkEstimatedRowCount(conn,3924.9);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedHashJoin());
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEST", "TEST_ID"));
@@ -351,6 +366,7 @@ public void testMultiPredicate() throws SQLException {
         Statement s = createStatement();
         
         // join on twenty/two. template inner, hash, index=null, all rows.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         s.executeUpdate("CALL SYSCS_UTIL.SYSCS_UPDATE_STATISTICS" +
                 "('APP','TEST',NULL)");
         s.executeUpdate("CALL SYSCS_UTIL.SYSCS_UPDATE_STATISTICS" +
@@ -363,6 +379,7 @@ public void testMultiPredicate() throws SQLException {
                 "where test.twenty = template.twenty " +
                 "and test.two = template.two").close();
         checkEstimatedRowCount(conn,401000.625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         RuntimeStatisticsParser rtsp = 
                 SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedHashJoin());
@@ -375,6 +392,7 @@ public void testMultiPredicate() throws SQLException {
                 "where test.twenty = template.twenty " +
                 "and test.two = template.two").close();
         checkEstimatedRowCount(conn,401000.625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_TWO"));
         
@@ -387,6 +405,7 @@ public void testMultiPredicate() throws SQLException {
                 "where test.twenty = template.twenty " +
                 "and test.two = template.two").close();
         checkEstimatedRowCount(conn,401000.625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_TWENTY"));
         
@@ -398,6 +417,7 @@ public void testMultiPredicate() throws SQLException {
                 "where test.twenty = template.twenty " +
                 "and test.two = template.two").close();
         checkEstimatedRowCount(conn,401000.625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_22"));
         
@@ -416,6 +436,7 @@ public void testMultiPredicate() throws SQLException {
                 "where test.twenty = template.twenty " +
                 "and test.two = template.two").close();
         checkEstimatedRowCount(conn,401000.625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedHashJoin());
         
@@ -428,6 +449,7 @@ public void testMultiPredicate() throws SQLException {
                 "where test.twenty = template.twenty " +
                 "and test.two = template.two").close();
         checkEstimatedRowCount(conn,401000.625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_TWO"));
         
@@ -469,6 +491,7 @@ public void testMultiPredicate() throws SQLException {
                 "where test.twenty = template.twenty " +
                 "and test.two = template.two").close();
         checkEstimatedRowCount(conn,80200.12500000001);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_TWENTY"));
         
@@ -506,6 +529,7 @@ public void testTwoWayJoins() throws SQLException {
         // row count is 16*10^6 * 0.005 = 8*10^4.
         
         // join on hundred. constant pred on two. NL, index=null, all rows.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         s.executeUpdate("CALL SYSCS_UTIL.SYSCS_UPDATE_STATISTICS" +
                 "('APP','TEMPLATE',NULL)");
         s.executeUpdate("CALL SYSCS_UTIL.SYSCS_UPDATE_STATISTICS" +
@@ -531,6 +555,7 @@ public void testTwoWayJoins() throws SQLException {
                 "where test.hundred = template.hundred " +
                 "and 1 = template.two").close();
         checkEstimatedRowCount(conn,80200.125);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         RuntimeStatisticsParser rtsp = 
                 SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_102"));
@@ -558,6 +583,7 @@ public void testTwoWayJoins() throws SQLException {
                 "where test.hundred = template.hundred " +
                 "and 1 = template.twenty").close();
         checkEstimatedRowCount(conn,8020.0125);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("TEMPLATE", "TEMPLATE_102"));
     }
@@ -583,6 +609,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t1.twenty = t2.twenty and " +
                 "t2.two = t3.two").close();
         checkEstimatedRowCount(conn,1.606007503125E7);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         RuntimeStatisticsParser rtsp = 
                 SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.findString("Table Scan ResultSet for T1", 1));
@@ -663,6 +690,11 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t1.hundred = t3.hundred").close();
         checkEstimatedRowCount(conn,3212015.00625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.findString("Table Scan ResultSet for T1", 1));
         assertTrue(rtsp.findString("Bit set of columns fetched={0, 3}", 1));
@@ -681,6 +713,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t1.hundred = t3.hundred").close();
         checkEstimatedRowCount(conn,3212015.00625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.findString("Table Scan ResultSet for T2", 1));
         assertTrue(rtsp.findString("Bit set of columns fetched={1, 3}", 1));
@@ -727,6 +760,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t1.hundred = t3.hundred").close();
         checkEstimatedRowCount(conn,3212015.00625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.findString("Table Scan ResultSet for T2", 1));
         assertTrue(rtsp.findString("Bit set of columns fetched={1, 3}", 1));
@@ -742,6 +776,9 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t1.hundred = t3.hundred").close();
         checkEstimatedRowCount(conn,3212015.00625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.findString("Table Scan ResultSet for T3", 1));
         assertTrue(rtsp.findString("Bit set of columns fetched={1, 3}", 1));
@@ -765,6 +802,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t1.hundred = t3.hundred " +
                 "and t1.hundred='1'").close();
         checkEstimatedRowCount(conn,30458.025);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("T2", "T2_HUNDRED"));
         assertTrue(rtsp.findString("Bit set of columns fetched=All", 1));
@@ -785,6 +823,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t1.hundred = t3.hundred " +
                 "and t2.hundred = t3.hundred").close();
         checkEstimatedRowCount(conn,3212015.00625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.findString("Table Scan ResultSet for T2", 1));
         assertTrue(rtsp.findString("Bit set of columns fetched={1, 3}", 1));
@@ -803,6 +842,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t2.twenty = t3.twenty").close();
         checkEstimatedRowCount(conn,1.606007503125E7);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.findString("Table Scan ResultSet for T2", 1));
         assertTrue(rtsp.findString("Bit set of columns fetched={1, 2, 3}", 1));
@@ -820,6 +860,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t2.twenty = t3.twenty").close();
         checkEstimatedRowCount(conn,1.606007503125E7);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.findString("Table Scan ResultSet for T1", 1));
         assertTrue(rtsp.findString("Bit set of columns fetched={0, 3}", 1));
@@ -836,6 +877,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t2.twenty = t3.twenty").close();
         checkEstimatedRowCount(conn,1.606007503125E7);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.findString("Table Scan ResultSet for T2", 1));
         assertTrue(rtsp.findString("Bit set of columns fetched={1, 2, 3}", 1));
@@ -852,6 +894,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t2.twenty = t3.twenty").close();
         checkEstimatedRowCount(conn,1.606007503125E7);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.findString("Table Scan ResultSet for T1", 1));
         assertTrue(rtsp.findString("Bit set of columns fetched={0, 3}", 1));
@@ -867,6 +910,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t2.twenty = t3.twenty").close();
         checkEstimatedRowCount(conn,1.606007503125E7);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("T3", "T3_TWO_TWENTY"));
         assertTrue(rtsp.findString("Bit set of columns fetched={0, 1}", 1));
@@ -882,6 +926,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t2.twenty = t3.twenty").close();
         checkEstimatedRowCount(conn,1.606007503125E7);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("T3", "T3_TWO_TWENTY"));
         assertTrue(rtsp.findString("Bit set of columns fetched={0, 1}", 1));
@@ -898,6 +943,7 @@ public void testThreeWayJoins() throws SQLException {
                 "and t2.two = t3.two " +
                 "and t2.twenty = t3.twenty").close();
         checkEstimatedRowCount(conn,6.4240300125000015E7);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("T3", "T3_TWO_TWENTY"));
         assertTrue(rtsp.findString("Bit set of columns fetched={0, 1}", 1));
@@ -941,6 +987,7 @@ public void testScratch() throws SQLException {
                 "where t1.two = s.two " +
                 "and s.hundred = CAST(CHAR(t1.hundred) AS INTEGER)").close();
         checkEstimatedRowCount(conn,802001.25);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         RuntimeStatisticsParser rtsp = 
                 SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedHashJoin());
@@ -952,6 +999,7 @@ public void testScratch() throws SQLException {
                 "t1, scratch_table s " +
                 "where t1.twenty = s.twenty").close();
         checkEstimatedRowCount(conn,1604002.5);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("T1", "T1_TWO_TWENTY"));
         assertTrue(rtsp.usedHashJoin());
@@ -964,6 +1012,7 @@ public void testScratch() throws SQLException {
                 "where t1.twenty = s.twenty " +
                 "and s.hundred = CAST(CHAR(t1.hundred) AS INTEGER)").close();
         checkEstimatedRowCount(conn,160400.2500000);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("T1", "T1_TWENTY_HUNDRED"));
         assertTrue(rtsp.usedHashJoin());
@@ -978,6 +1027,7 @@ public void testStatMatcher() throws SQLException {
         Statement s = createStatement();
         
         s.executeUpdate("CALL SYSCS_UTIL.SYSCS_UPDATE_STATISTICS" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
                 "('APP','T1',NULL)");
         s.executeUpdate("CALL SYSCS_UTIL.SYSCS_UPDATE_STATISTICS" +
                 "('APP','T2',NULL)");
@@ -989,6 +1039,7 @@ public void testStatMatcher() throws SQLException {
                 "and t1.twenty = t2.twenty " +
                 "and t1.hundred = t2.hundred").close();
         checkEstimatedRowCount(conn,4010.00625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         RuntimeStatisticsParser rtsp = 
                 SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedHashJoin());
@@ -1000,6 +1051,7 @@ public void testStatMatcher() throws SQLException {
                 "and t1.hundred = t2.hundred " +
                 "and t1.twenty = t2.twenty").close();
         checkEstimatedRowCount(conn,4010.00625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedHashJoin());
         
@@ -1009,6 +1061,7 @@ public void testStatMatcher() throws SQLException {
                 "and t1.twenty = t2.twenty " +
                 "and t1.two = t2.two").close();
         checkEstimatedRowCount(conn,4010.00625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedHashJoin());
         
@@ -1018,6 +1071,7 @@ public void testStatMatcher() throws SQLException {
                 "and t1.two = t2.two " +
                 "and t1.twenty = t2.twenty").close();
         checkEstimatedRowCount(conn,4010.00625);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         rtsp = SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedHashJoin());
         
@@ -1065,6 +1119,7 @@ public void testBeetle4321() throws SQLException {
                 "and t10.a = 2 " +
                 "and t10.b = 2").close();
         checkEstimatedRowCount(conn,7945.920000000);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3955
         RuntimeStatisticsParser rtsp = 
                 SQLUtilities.getRuntimeStatisticsParser(s);
         assertTrue(rtsp.usedSpecificIndexForIndexScan("COMPLEX", "COMPLEXIND"));
@@ -1175,6 +1230,7 @@ public void testBasic() throws SQLException {
         
         statsrs = s.executeQuery(
                 "select indexname, stats, ncols from showstats " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6495
                 "where indexname = 'TBASIC2_CH_DT' order by indexname, stats");
         JDBC.assertFullResultSet(statsrs, new String[][] {
                 {"TBASIC2_CH_DT","numunique= 3 numrows= 7","1"},
@@ -1188,6 +1244,7 @@ public void testBasic() throws SQLException {
         JDBC.assertFullResultSet(statsrs, new String[][] {{"7"}});
         statsrs = s.executeQuery(
                 "select indexname, stats, ncols from showstats " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6495
                 "where indexname = 'TBASIC2_DT_VC' " +
                 "order by indexname, stats, ncols");
         JDBC.assertFullResultSet(statsrs, new String[][] {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java
index d611095d84..41a8fe8672 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java
@@ -97,6 +97,7 @@ public SequenceGeneratorTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             SequenceGeneratorTest.class);
 
@@ -180,6 +181,7 @@ public void test_02_boundary() throws Exception
 
         updater = new T_SequenceUpdater
           ( (long)Integer.MIN_VALUE, true, 1L, (long) Integer.MAX_VALUE, (long) Integer.MIN_VALUE, (long) Integer.MIN_VALUE );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         assertEquals( -2147483648L, updater.getValueOnDisk().longValue() );
 
@@ -292,6 +294,7 @@ public void test_02_boundary() throws Exception
         if ( _fullDebug) { println( "stepSize = " + stepSize + " and firstValue = " + firstValue + " and canCycle = " + canCycle ); }
         
         SGVetter vetter = new SGVetter
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             ( firstValue, canCycle, stepSize, maxValue, minValue, restartValue, ALLOCATION_COUNT );           
         T_SequenceUpdater updater = new T_SequenceUpdater
             ( firstValue, canCycle, stepSize, maxValue, minValue, restartValue );
@@ -393,6 +396,7 @@ public void test_03_nonCycling() throws Exception
         }
 
         SGVetter vetter = new SGVetter
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             ( firstValue, false, stepSize, maxValue, minValue, restartValue, ALLOCATION_COUNT );           
         T_SequenceUpdater updater = new T_SequenceUpdater
             ( firstValue, false, stepSize, maxValue, minValue, restartValue );
@@ -485,6 +489,7 @@ public void test_06_bigStepSize() throws Exception
 
         updater = new T_SequenceUpdater
             ( Long.MIN_VALUE, true, stepSize, (long) Long.MAX_VALUE, (long) Long.MIN_VALUE, (long) Long.MIN_VALUE );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         long nextValue = updater.getCurrentValueAndAdvance();
         long currentValueOnDisk = updater.getValueOnDisk().longValue();
@@ -502,6 +507,7 @@ public void test_06_bigStepSize() throws Exception
     private void vetBigStep( long maxValue, long minValue )
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Long firstValue = minValue;
         long restartValue = minValue;
         long stepSize = maxValue - 1;
@@ -823,6 +829,7 @@ private void    assertNextValue( Connection conn, String schema, String sequence
     public void test_14_6553() throws Exception
     {
         Connection  dboConn = openUserConnection( TEST_DBO );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6553
 
         //
         // The original DERBY-6553 test case.
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequencePermsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequencePermsTest.java
index dac479bfcf..f64857eb3e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequencePermsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequencePermsTest.java
@@ -81,6 +81,7 @@ public SequencePermsTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             SequencePermsTest.class);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java
index 949914261d..1a5d7b7b7a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java
@@ -57,6 +57,7 @@ public SequenceTest(String name) {
      * Construct top level suite in this JUnit test
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite(SequenceTest.class, "Sequence Test");
 
@@ -182,6 +183,7 @@ public void test_09_CreateOtherSchemaSequence() throws SQLException {
         Connection alphaCon = openUserConnection(ALPHA);
         Statement stmtAlpha = alphaCon.createStatement();
         stmtAlpha.executeUpdate("CREATE SEQUENCE alpha_seq");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4393
 
         Connection betaCon = openUserConnection(BETA);
         Statement stmtBeta = betaCon.createStatement();
@@ -289,6 +291,7 @@ public void test_10_NextValue() throws SQLException {
         Statement s = createStatement();
         s.executeUpdate("CREATE SEQUENCE mySeq1");
         s.execute("SELECT NEXT VALUE FOR mySeq1 from sys.systables");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5116
         s.execute("DROP SEQUENCE mySeq1 restrict");
     }
 
@@ -363,6 +366,7 @@ public void test_11_forbiddenContexts() throws Exception
     public void test_12_clauseOrder() throws Exception
     {
         Connection conn = openUserConnection(ALPHA);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4539
 
         goodSequence
             (
@@ -554,6 +558,7 @@ public void test_14_insertSelect() throws Exception
     public void test_15_5254() throws Exception
     {
         Connection conn = openUserConnection(ALPHA);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5254
 
         goodStatement( conn, "create table t_5254( cycle int, minvalue int, maxvalue int )" );
         goodStatement( conn, "drop table t_5254" );
@@ -648,6 +653,7 @@ public void test_16_6137() throws Exception
      */
     public void test_17_6554() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
         Connection alphaConn = openUserConnection( ALPHA );
         Connection betaConn = openUserConnection( BETA );
 
@@ -710,6 +716,7 @@ public void test_17_6554() throws Exception
     public void test_17_6554_cacheEviction() throws Exception
     {
         Connection control = openUserConnection( TEST_DBO );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6554
 
         // set the size of the sequence generator cache to 5 entries.
         // bounce the database so that the value takes effect.
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ShutdownDatabaseTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ShutdownDatabaseTest.java
index c6edf5fdaf..4143e86434 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ShutdownDatabaseTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ShutdownDatabaseTest.java
@@ -54,6 +54,7 @@ public static Test suite() {
         // Only run in embedded as running in client/server
         // hits a problem. See DERBY-2477. To see the bug
         // just use the defaultSuite.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new CleanDatabaseTestSetup(new BaseTestSuite(
             ShutdownDatabaseTest.class, "ShutdownDatabaseTest"));
     }
@@ -79,6 +80,7 @@ protected void tearDown() throws Exception {
         st.execute("DROP TABLE TEST_TABLE");
         st.close();
         commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2709
         super.tearDown();
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SimpleJsonTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SimpleJsonTest.java
index 9a75e18857..b0f69232f3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SimpleJsonTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SimpleJsonTest.java
@@ -57,6 +57,7 @@ public class SimpleJsonTest extends BaseJDBCTestCase
     private static  final   String  OUT_OF_RANGE = "22003";
 
     private static  final   String  THERMOSTAT_READINGS =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         "[\n" +
         " {\n" +
         "   \"id\": 1,\n" +
@@ -93,12 +94,14 @@ public static Test suite()
 
         suite.addTest( TestConfiguration.defaultSuite( SimpleJsonTest.class ) );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         return new SupportFilesSetup
             (
              suite,
              new String[]
              { 
                 "functionTests/tests/lang/thermostatReadings.dat",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
                 "functionTests/tests/lang/json.dat",
              }
             );
@@ -539,6 +542,7 @@ public void testNegative_003() throws Exception
 	public void testVTI_004() throws Exception
     {
         Connection  conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
 
         goodStatement( conn, "call syscs_util.syscs_register_tool( 'simpleJson', true )" );
 
@@ -625,6 +629,7 @@ public void testVTI_004() throws Exception
 	public void testVTIdatatypes005() throws Exception
     {
         Connection  conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
 
         goodStatement( conn, "call syscs_util.syscs_register_tool( 'simpleJson', true )" );
 
@@ -759,6 +764,7 @@ private void dropFunction_005( Connection conn, String datatype )
 	public void testArrayToClob_006() throws Exception
     {
         Connection  conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
 
         goodStatement( conn, "call syscs_util.syscs_register_tool( 'simpleJson', true )" );
         goodStatement( conn, "create table employee( fullName varchar( 100 ) )" );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SpillHashTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SpillHashTest.java
index a442ec396e..936a325c49 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SpillHashTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SpillHashTest.java
@@ -88,6 +88,7 @@ protected void initializeConnection(Connection conn) throws SQLException {
 	public static Test suite() {
         // suite of tests with light load on the tables
         BaseTestSuite light = new BaseTestSuite();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // suite of tests with heavy load on the tables
         BaseTestSuite heavy = new BaseTestSuite();
@@ -141,6 +142,7 @@ protected void setUp() throws Exception {
 			}
 		};
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite mainSuite = new BaseTestSuite();
 		
 		mainSuite.addTest(lightSetup);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StalePlansTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StalePlansTest.java
index 8cec2c9fe4..a82c2294df 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StalePlansTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StalePlansTest.java
@@ -67,7 +67,9 @@ public static Test suite() {
         // recompilation of statements at random times.
         props.setProperty("derby.storage.indexStats.auto", "false");
         Test suite = new DatabasePropertyTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new BaseTestSuite(StalePlansTest.class), props, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2949
         return new CleanDatabaseTestSetup(suite);
     }
 
@@ -104,6 +106,7 @@ protected void tearDown() throws Exception {
      * all row count changes visible.
      */
     private void flushRowCount(Statement stmt) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2949
         stmt.execute("CALL SYSCS_UTIL.SYSCS_CHECKPOINT_DATABASE()");
     }
 
@@ -237,6 +240,7 @@ public void testStalePlansOnLargeTable() throws SQLException {
 
         // Change the row count a little bit. A recompile will only be
         // triggered if the row count changes by 10% or more.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2949
         for (int i = 1025; i <= 1250; i++) {
             insert.setInt(1, i);
             insert.setInt(2, i);
@@ -256,6 +260,7 @@ public void testStalePlansOnLargeTable() throws SQLException {
 
         // Execute 11 more times, the plan should not change
         for (int i = 0; i < 11; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2949
             JDBC.assertSingleValueResultSet(ps.executeQuery(), "1250");
         }
 
@@ -277,6 +282,7 @@ public void testStalePlansOnLargeTable() throws SQLException {
 
         // Execute 11 times, the plan should change
         for (int i = 0; i < 11; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2949
             JDBC.assertSingleValueResultSet(ps.executeQuery(), "2500");
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java
index 05df1bb523..6adcfb22c1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java
@@ -62,6 +62,7 @@ public StatementPlanCacheTest(String name) {
      * Runs in embedded only since it's testing the server side cache.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("StatementPlanCacheTest");
         
         CACHE_SIZE = 100; // default cache size
@@ -75,6 +76,7 @@ public static Test suite() {
                 "derby.language.statementCacheSize", "0", true));
         
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2772
         return new CleanDatabaseTestSetup(suite);
     }
     
@@ -89,6 +91,7 @@ private static Test suiteWithSizeSet(int cacheSize)
     }
     
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(
             "StatementPlanCacheTest:derby.language.statementCacheSize=" + name);
         suite.addTestSuite(StatementPlanCacheTest.class);
@@ -114,6 +117,7 @@ protected void setUp() throws SQLException  {
     
     protected void tearDown() throws Exception {
         cacheInPlanPS_ID.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2709
         cacheInPlanPS_ID = null;
         cacheInPlanPS_TEXT.close();
         cacheInPlanPS_TEXT = null;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StreamsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StreamsTest.java
index e3fde3f210..7da08c942b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StreamsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StreamsTest.java
@@ -67,6 +67,7 @@ public StreamsTest(String name) {
      */
     public static Test suite() {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test test = new BaseTestSuite(StreamsTest.class, "StreamsTest");
         
         test = DatabasePropertyTestSetup.singleProperty(test,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StringArrayVTI.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StringArrayVTI.java
index 3f63265a87..203ee6ad98 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StringArrayVTI.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/StringArrayVTI.java
@@ -47,6 +47,7 @@ public    class   StringArrayVTI  extends StringColumnVTI
 
     private static  final   String[]    EXPECTED_STACK =
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3595
         "deduceGetXXXCaller",
         "getRawColumn",
         "getString",
@@ -182,6 +183,7 @@ protected String  getRawColumn( int columnNumber ) throws SQLException
     //
     private String  deduceGetXXXCaller() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3595
         StackTraceElement[]     stack = null;
         try {
             stack = (new Throwable()).getStackTrace();
@@ -234,6 +236,7 @@ public  void close() throws SQLException
      */
     private String  locateGetXXXCaller( StackTraceElement[] stack ) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3595
         String[]        actualMethodNames = squeezeMethodNames( stack );
         String[]        expectedMethodNames = EXPECTED_STACK;
         int             actualIdx = findIndex( "getString", actualMethodNames );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java
index 367ec92f74..339ca278c1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java
@@ -51,6 +51,7 @@ public static Test suite() {
         return new DatabasePropertyTestSetup(
             new SystemPropertyTestSetup(new CleanDatabaseTestSetup(
                new BaseTestSuite(SubqueryTest.class, "SubqueryTest")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
                     /**
                      * @see org.apache.derbyTesting.junit.CleanDatabaseTestSetup#decorateSQL(java.sql.Statement)
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SynonymTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SynonymTest.java
index 0b90e61e63..f901c0553d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SynonymTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SynonymTest.java
@@ -46,6 +46,7 @@ public SynonymTest(String name) {
      * Create a suite of tests.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite(SynonymTest.class, "SynonymTest");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SysDiagVTIMappingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SysDiagVTIMappingTest.java
index 5c7b7eb9e4..d6b65b3cd3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SysDiagVTIMappingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SysDiagVTIMappingTest.java
@@ -61,6 +61,7 @@ public SysDiagVTIMappingTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("Diagnostic VTI Table Mappings");
 
@@ -90,6 +91,7 @@ public static Test suite()
 
     public void setUp() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2709
         Statement stmt = createStatement();
         stmt.execute("create table app.t1 (i int, c varchar(10))");
         stmt.execute("insert into app.t1 values (1, 'one'), "
@@ -895,6 +897,7 @@ public void testContainedRoles() throws SQLException
         // 2-arg version
         ResultSet rs = st.executeQuery
             ("select * from table(syscs_diag.contained_roles(null, 0))t");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3930
 
         JDBC.assertEmpty(rs);
 
@@ -933,6 +936,7 @@ private void    vetTimestamp( ResultSet rs ) throws Exception
 
         String  timestampString = rs.getString( 1 ).trim();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5414
         SimpleDateFormat sdf =
             new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
         Timestamp   timestamp = new Timestamp( sdf.parse( timestampString ).getTime() );
@@ -1006,6 +1010,8 @@ private void checkIllegalUses(Statement st, String vtiTableName,
         cSt.setString(1, "SYSCS_DIAG");
         cSt.setString(2, vtiTableName.toUpperCase());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
         assertStatementError("42X62", cSt);
         
         cSt = prepareCall(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SystemCatalogTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SystemCatalogTest.java
index cb38fd84d5..58c8bd1a3a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SystemCatalogTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/SystemCatalogTest.java
@@ -40,6 +40,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class SystemCatalogTest extends BaseJDBCTestCase {
 
     public SystemCatalogTest(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2484
 		super(name);
 	}
 	
@@ -55,6 +56,7 @@ public static Test suite() {
 	public void testNoUserDDLOnSystemTables() throws SQLException {
 	    Statement s = createStatement();
 	    
+//IC see: https://issues.apache.org/jira/browse/DERBY-2484
 	    assertStatementError("X0Y56", s, "drop table sys.systables");
 	    assertStatementError("42X62", s, "drop index sys.sysaliases_index2");
 	    assertStatementError("42X62", s, "create index trash on sys.systables(tableid)");
@@ -197,6 +199,11 @@ public void testSystemCatalogColumns() throws SQLException {
 				{"SYSCOLPERMS", "GRANTOR", "3", "VARCHAR(128) NOT NULL"},
 				{"SYSCOLPERMS", "TABLEID", "4", "CHAR(36) NOT NULL"},
 				{"SYSCOLPERMS", "TYPE", "5", "CHAR(1) NOT NULL"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-6903
+//IC see: https://issues.apache.org/jira/browse/DERBY-6904
+//IC see: https://issues.apache.org/jira/browse/DERBY-6905
+//IC see: https://issues.apache.org/jira/browse/DERBY-6906
+//IC see: https://issues.apache.org/jira/browse/DERBY-534
 				{"SYSCOLUMNS", "AUTOINCREMENTCYCLE", "10", "BOOLEAN"},
 				{"SYSCOLUMNS", "AUTOINCREMENTINC", "9", "BIGINT"},
 				{"SYSCOLUMNS", "AUTOINCREMENTSTART", "8", "BIGINT"},
@@ -245,6 +252,7 @@ public void testSystemCatalogColumns() throws SQLException {
                 {"SYSPERMS", "OBJECTTYPE", "2", "VARCHAR(36) NOT NULL"},
                 {"SYSPERMS", "PERMISSION", "4", "CHAR(36) NOT NULL"},
                 {"SYSPERMS", "UUID", "1", "CHAR(36) NOT NULL"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
                 {"SYSROLES", "GRANTEE", "3", "VARCHAR(128) NOT NULL"},
                 {"SYSROLES", "GRANTOR", "4", "VARCHAR(128) NOT NULL"},
 				{"SYSROLES", "ISDEF", "6", "CHAR(1) NOT NULL"},
@@ -380,7 +388,9 @@ public void testSystemCatalogIndexes() throws SQLException{
                 {"SYSPERMS", "SYSPERMS_INDEX3", "true"},
                 {"SYSPERMS", "SYSPERMS_INDEX2", "true"},
                 {"SYSPERMS", "SYSPERMS_INDEX1", "true"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
                 {"SYSROLES", "SYSROLES_HEAP", "false"},
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 				{"SYSROLES", "SYSROLES_INDEX3", "true"},
 				{"SYSROLES", "SYSROLES_INDEX2", "true"},
 				{"SYSROLES", "SYSROLES_INDEX1", "true"},
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java
index 193b0c7c64..c399e8632b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java
@@ -112,6 +112,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
     
     private static  final   String[][]  BOOLEAN_ROWS =
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
         { "tRuE", "true" },
         { "fAlSe", "false" },
     };
@@ -137,6 +138,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
     
     private static  final   String[][]  WARNING_VTI_ROWS =
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6151
         { "1", "red" },
         { "2", "blue" },
     };
@@ -165,6 +167,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             null,   // TIMESTAMP
             null,   // VARCHAR
             null,   // VARCHAR FOR BIT DATA
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
             null,   // BOOLEAN
         },
     };
@@ -190,10 +193,12 @@ public class TableFunctionTest extends BaseJDBCTestCase
         "getTime " +            // TIME
         "getTimestamp " +       // TIMESTAMP
         "getString " +          // VARCHAR
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
         "getBytes " +           // VARCHAR FOR BIT DATA
         "getBoolean ";            // BOOLEAN
 
     private static  final   String  EXPECTED_GET_XXX_CALLS_JSR169 =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3135
         "getLong " +            // BIGINT
         "getBlob " +            // BLOB
         "getString " +          // CHAR
@@ -214,6 +219,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
         "getTime " +            // TIME
         "getTimestamp " +       // TIMESTAMP
         "getString " +          // VARCHAR
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
         "getBytes " +           // VARCHAR FOR BIT DATA
         "getBoolean ";            // BOOLEAN
 
@@ -334,6 +340,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             ALLOWS_NULLS,
             EMPTY_REMARKS,
             UNDEFINED_CHAR_OCTET_LENGTH,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             1 ,           // ORDINAL_POSITION
             IS_NULLABLE,
             GENERIC_NAME,
@@ -348,6 +355,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_VARCHAR,
             "VARCHAR",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              10 ,               // PRECISION
              20 ,              // LENGTH
             SCALE_UNDEFINED,
@@ -399,6 +407,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_COLUMN_IN,
             JDBC_TYPE_VARCHAR,
             "VARCHAR",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              10 ,               // PRECISION
              20 ,              // LENGTH
             SCALE_UNDEFINED,
@@ -428,6 +437,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             ALLOWS_NULLS,
             EMPTY_REMARKS,
             UNDEFINED_CHAR_OCTET_LENGTH,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              1 ,           // ORDINAL_POSITION
             IS_NULLABLE,
             GENERIC_NAME,
@@ -449,6 +459,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             ALLOWS_NULLS,
             EMPTY_REMARKS,
             UNDEFINED_CHAR_OCTET_LENGTH,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              2 ,           // ORDINAL_POSITION
             IS_NULLABLE,
             GENERIC_NAME,
@@ -463,6 +474,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_CHAR,
             "CHAR",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              10  ,     // PRECISION
              20 ,         // LENGTH
             SCALE_UNDEFINED,
@@ -484,6 +496,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_BINARY,
             "CHAR () FOR BIT DATA",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              10  ,     // PRECISION
              10 ,         // LENGTH
             SCALE_UNDEFINED,
@@ -512,6 +525,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             ALLOWS_NULLS,
             EMPTY_REMARKS,
             UNDEFINED_CHAR_OCTET_LENGTH,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              5 ,           // ORDINAL_POSITION
             IS_NULLABLE,
             GENERIC_NAME,
@@ -526,6 +540,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_DATE,
             "DATE",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              10  ,     // PRECISION
              6 ,         // LENGTH
              0 ,       // SCALE
@@ -547,6 +562,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_DECIMAL,
             "DECIMAL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              5  ,     // PRECISION
              14 ,         // LENGTH
              0 ,       // SCALE
@@ -568,6 +584,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_DOUBLE,
             "DOUBLE",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              52  ,     // PRECISION
              8 ,         // LENGTH
             SCALE_UNDEFINED,       // SCALE
@@ -589,6 +606,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_DOUBLE,
             "DOUBLE",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              52  ,     // PRECISION
              8 ,         // LENGTH
             SCALE_UNDEFINED,       // SCALE
@@ -610,6 +628,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_REAL,
             "REAL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              23  ,     // PRECISION
              4 ,         // LENGTH
             SCALE_UNDEFINED,       // SCALE
@@ -631,6 +650,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_DOUBLE,
             "DOUBLE",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              52  ,     // PRECISION
              8 ,         // LENGTH
             SCALE_UNDEFINED,       // SCALE
@@ -659,6 +679,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             ALLOWS_NULLS,
             EMPTY_REMARKS,
             UNDEFINED_CHAR_OCTET_LENGTH,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              12 ,           // ORDINAL_POSITION
             IS_NULLABLE,
             GENERIC_NAME,
@@ -673,6 +694,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_LONGVARCHAR,
             "LONG VARCHAR",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              32700 ,     // PRECISION
              65400 ,         // LENGTH
             SCALE_UNDEFINED,       // SCALE
@@ -694,6 +716,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_LONGVARBINARY,
             "LONG VARCHAR FOR BIT DATA",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              32700 ,     // PRECISION
              32700 ,         // LENGTH
             SCALE_UNDEFINED,       // SCALE
@@ -715,6 +738,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_NUMERIC,
             "NUMERIC",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              5 ,     // PRECISION
              14 ,         // LENGTH
              0 ,       // SCALE
@@ -736,6 +760,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_REAL,
             "REAL",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              23 ,     // PRECISION
              4 ,         // LENGTH
             SCALE_UNDEFINED,       // SCALE
@@ -757,6 +782,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_SMALLINT,
             "SMALLINT",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              5 ,     // PRECISION
              2 ,         // LENGTH
             SCALE_INTEGER,       // SCALE
@@ -778,6 +804,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_TIME,
             "TIME",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              8 ,     // PRECISION
              6 ,         // LENGTH
             SCALE_INTEGER,       // SCALE
@@ -799,6 +826,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_TIMESTAMP,
             "TIMESTAMP",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              29 ,     // PRECISION
              16 ,         // LENGTH
              9 ,       // SCALE
@@ -820,6 +848,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_VARCHAR,
             "VARCHAR",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              10 ,     // PRECISION
              20 ,         // LENGTH
             SCALE_UNDEFINED,       // SCALE
@@ -841,6 +870,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_VARBINARY,
             "VARCHAR () FOR BIT DATA",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              10 ,     // PRECISION
              10 ,         // LENGTH
             SCALE_UNDEFINED,       // SCALE
@@ -855,6 +885,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
              22 
         },
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
             NO_CATALOG,
             "APP",
             "RETURNSALLLEGALDATATYPES",
@@ -862,6 +893,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
             FUNCTION_RESULT_COLUMN,
             JDBC_TYPE_BOOLEAN,
             "BOOLEAN",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
              1 ,     // PRECISION
              1 ,         // LENGTH
             SCALE_UNDEFINED,       // SCALE
@@ -921,6 +953,7 @@ public class TableFunctionTest extends BaseJDBCTestCase
     public static Test suite()
     {
         BaseTestSuite      suite = new BaseTestSuite( "TableFunctionTest" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest( new TableFunctionTest( "noSpecialCollation" ) );
         suite.addTest( collatedSuite( "en", "specialCollation" ) );
@@ -938,6 +971,7 @@ public static Test suite()
      */
     private static Test collatedSuite(String locale, String baseFixture)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite( "TableFunctionTest:territory=" + locale );
 
@@ -962,6 +996,7 @@ protected void    tearDown()
         dropSchema();
 
         _databaseMetaData = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5717
 
         super.tearDown();
     }
@@ -1014,6 +1049,7 @@ public void tableFunctionTest()
         bulkInsert();
         
         miscBugs();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4092
 
 	classpathError();
     }
@@ -1255,6 +1291,7 @@ private void  simpleVTIResults()
          CHAR_ROWS,
          new int[] { Types.CHAR, Types.CHAR }
          );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
 
         // boolean valued columns
         goodStatement
@@ -1521,6 +1558,7 @@ private void  allLegalDatatypesVTIResults()
              "column17 TIME,\n" +
              "column18 TIMESTAMP,\n" +
              "column19 VARCHAR( 10 ),\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
              "column20 VARCHAR( 10 ) FOR BIT DATA,\n" +
              "column21 BOOLEAN\n" +
              "  )\n" +
@@ -1616,6 +1654,8 @@ private void  checkGetXXXCalls()
                     Types.TIMESTAMP,
                     Types.VARCHAR,
                     Types.VARBINARY,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
                     Types.BOOLEAN,
                 }
              );
@@ -1631,6 +1671,7 @@ private void  checkGetXXXCalls()
         ps.close();
         
         println( actualGetXXXCalls );
+//IC see: https://issues.apache.org/jira/browse/DERBY-3135
 
         String  expectedGetXXXCalls;
         if ( JDBC.vmSupportsJSR169() )
@@ -1982,11 +2023,13 @@ private void  coercionTest()
      * </p>
      */
     private void  miscBugs()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4092
         throws Exception
     {
         derby_4092();
         derby_5779();
         derby_6040();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6151
         derby_6151();
     }
     
@@ -2390,6 +2433,7 @@ private void  derby_6040()
     {
         // this test uses varargs routines, which aren't available unless the VM
         // is at least at level 5
+//IC see: https://issues.apache.org/jira/browse/DERBY-6058
         if ( JDBC.vmSupportsJSR169() ) { return; }
         
         goodStatement
@@ -2464,6 +2508,7 @@ private void  derby_6040()
      * </p>
      */
     private void  derby_6151()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6151
         throws Exception
     {
         goodStatement
@@ -2571,6 +2616,7 @@ public  static  int invert( int value )
      */
     public  static  ResultSet returnsBooleans()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4703
         return makeVTI( BOOLEAN_ROWS );
     }
 
@@ -2729,6 +2775,7 @@ private void    verifyReturnType( String functionName, String expectedReturnType
         throws Exception
     {
         println( "\nExpecting correct function metadata from " + functionName );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ResultSet rs =
             _databaseMetaData.getFunctions( null, "APP", functionName );
         JDBC.assertFullResultSet( rs, expectedGetFunctionsResult, false );
@@ -2802,6 +2849,7 @@ private void assertResults( int[] expectedJdbcTypes, String[] columnNames, Resul
                 switch( actualJdbcType )
                 {
                 case Types.BOOLEAN:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     actualValue = Boolean.toString( rs.getBoolean( column ) );
                     actualValueByName = Boolean.toString( rs.getBoolean( columnName ) );
                     if ( rs.wasNull() ) { actualValue = actualValueByName = null; }
@@ -2843,6 +2891,7 @@ private void assertResults( int[] expectedJdbcTypes, String[] columnNames, Resul
                 case Types.DECIMAL:
                 case Types.NUMERIC:
                     // with JSR169, we cannot execute resultSet.getBigDecimal...
+//IC see: https://issues.apache.org/jira/browse/DERBY-3057
                     if (JDBC.vmSupportsJDBC3()) {
                         actualValue = squeezeString(  rs.getBigDecimal( column ) );
                         actualValueByName = squeezeString(  rs.getBigDecimal( columnName ) );
@@ -2867,6 +2916,7 @@ private void assertResults( int[] expectedJdbcTypes, String[] columnNames, Resul
                     break;
 
                 case Types.BLOB:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
                     Blob blob = rs.getBlob(column);
                     actualValue = squeezeString(blob);
                     actualValueByName = squeezeString(blob);
@@ -3141,6 +3191,7 @@ public  static  final   class   WarningVTI  extends StringArrayVTI
         
         public  WarningVTI()
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6151
             super( makeColumnNames( 2, "mycol" ), WARNING_VTI_ROWS );
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TableVTI.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TableVTI.java
index f79e22a8fc..04c70f766d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TableVTI.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TableVTI.java
@@ -1478,6 +1478,7 @@ public void updateArray(String columnName, Array x)
     }
 
     public RowId getRowId(int columnIndex) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         throw new SQLException("getRowId");
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Test_6496.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Test_6496.java
index b52e0f7d76..90dd3fa9c4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Test_6496.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/Test_6496.java
@@ -79,6 +79,7 @@ public Test_6496(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             Test_6496.class);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TimeHandlingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TimeHandlingTest.java
index 48f984f40a..15e606e2a1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TimeHandlingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TimeHandlingTest.java
@@ -43,6 +43,7 @@ public class TimeHandlingTest extends BaseJDBCTestCase {
      * a TIME value with the same value as CURRENT_TIME.
      */
     private static final String[] CURRENT_TIME_FUNCTIONS =
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
     {"CURRENT TIME", "CURRENT_TIME"};
     
     /**
@@ -69,8 +70,10 @@ public class TimeHandlingTest extends BaseJDBCTestCase {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(TimeHandlingTest.class);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
         suite.addTest(TestConfiguration.clientServerSuite(TimeHandlingTest.class));
         
         return new CleanDatabaseTestSetup(suite) {
@@ -85,6 +88,7 @@ protected void decorateSQL(Statement s) throws SQLException {
                 s.execute("CREATE TABLE TIME_ALL (ID INT," +
                         " C_T TIME," +
                         " C_D DATE," +
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
                         " C_TS TIMESTAMP)");
                 
                 for (int f = 0; f < CURRENT_TIME_FUNCTIONS.length; f++)
@@ -126,6 +130,7 @@ public TimeHandlingTest(String name) {
     protected void setUp() throws SQLException
     {
         cal = Calendar.getInstance();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2213
         Statement s  = createStatement();
         s.executeUpdate("DELETE FROM TIME_ALL");
         s.close();
@@ -245,6 +250,7 @@ private Time getCodedTime(int id)
      */
     public void testCurrentTime() throws SQLException, InterruptedException
     {      
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
         currentFunctionTests(Types.TIME, CURRENT_TIME_FUNCTIONS);      
     }
     
@@ -543,6 +549,7 @@ private Time checkCurrentTimeMultiple(long start, long end, ResultSet rs,
         
         assertEquals(expectedCount, count);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
         return base;
     }
     /**
@@ -611,6 +618,7 @@ private Time checkTimeValue(ResultSet rs, int column) throws SQLException
         Time tv = rs.getTime(column);
         assertEquals(tv == null, rs.wasNull());
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
         Object ov = rs.getObject(column);
         assertEquals(ov == null, rs.wasNull());
         
@@ -640,6 +648,7 @@ private Time checkTimeValue(ResultSet rs, int column) throws SQLException
         // Check if the timestamp is as expected. Skip the check if the test
         // runs around midnight, since we don't know which date to expect in
         // that case.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3519
         if (isDateEqual(now, new Timestamp(now2))) {
             // When reading a TIME value with getTimestamp(), the date
             // component of the timestamp will be based on the current date.
@@ -693,6 +702,7 @@ private Time checkTimeValue(ResultSet rs, int column) throws SQLException
      */
     private Timestamp checkTimestampValue(ResultSet rs, int column) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
         assertEquals(java.sql.Types.TIMESTAMP,
                 rs.getMetaData().getColumnType(column));
         
@@ -719,6 +729,7 @@ private Timestamp checkTimestampValue(ResultSet rs, int column) throws SQLExcept
         assertTime1970(tv);
 
         // Check the TIME portion is set to the same as tv
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
         assertTimeEqual(tv, tsv);
                
         String sv = rs.getString(column);
@@ -789,6 +800,7 @@ private Time checkCurrentTimeValue(long start, long end,
      * @throws SQLException
      */
     private Timestamp checkCurrentTimestampValue(long start, long end,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
             ResultSet rs, int column) throws SQLException
     {       
         Timestamp tsv = checkTimestampValue(rs, column);
@@ -836,6 +848,7 @@ private Timestamp checkCurrentTimestampValue(long start, long end,
     private Time getTime19700101(int hour, int min, int sec)
     {
         cal.clear();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3519
         cal.set(1970, Calendar.JANUARY, 1, hour, min, sec);
         cal.set(Calendar.MILLISECOND, 0);
 
@@ -857,11 +870,14 @@ private Time getTime19700101(int hour, int min, int sec)
     private Time getTime19700101(long t, Calendar cal)
     {
         cal.clear();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3519
         cal.setTimeInMillis(t);
         cal.set(1970, Calendar.JANUARY, 1);
         cal.set(Calendar.MILLISECOND, 0);
 
         Time to = new Time(cal.getTimeInMillis());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
         assertTime1970(to);
         return to;
     }
@@ -878,6 +894,7 @@ private Time getTime19700101(long t, Calendar cal)
      */
     private Time getTime19700101(String s, Calendar cal)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3519
         return getTime19700101(Time.valueOf(s).getTime(), cal);
     }
     
@@ -939,6 +956,7 @@ private void assertTimeEqual(java.util.Date tv1, java.util.Date tv2)
     private boolean isDateEqual(long d, Timestamp tsv)
     {
         cal.clear();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3519
         cal.setTimeInMillis(d);
         int day = cal.get(Calendar.DAY_OF_MONTH);
         int month = cal.get(Calendar.MONTH);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TimestampArithTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TimestampArithTest.java
index a6069e422e..612aed0da5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TimestampArithTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TimestampArithTest.java
@@ -74,6 +74,7 @@ void runTest() throws SQLException {
 				}				
 			} catch (SQLException sqle) {
 				if (expectedSQLState == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4665
                     fail("Unexpected exception from statement '" + sql + "'",
                          sqle);
 				}
@@ -92,6 +93,7 @@ void runTest() throws SQLException {
 				}
 			} catch (SQLException sqle) {
 				if (expectedSQLState == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4665
                     fail("Unexpected exception from prepared statement '" +
                          sql + "'", sqle);
 				}
@@ -384,6 +386,7 @@ protected void initializeConnection(Connection conn) throws SQLException {
 	}
 	
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseJDBCTestSetup(
             new BaseTestSuite(
                 TimestampArithTest.class, "TimestampArithTest")) {
@@ -402,6 +405,7 @@ protected void setUp() throws Exception {
 			}
 
             protected void tearDown() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5716
                 closeAll(tsAddPS);
                 tsAddPS = null;
                 closeAll(tsDiffPS);
@@ -481,6 +485,7 @@ public void testNullInputs() throws SQLException {
 
         // TIMESTAMPDIFF with null timestamp in third argument
         expectNullResult(tsDiffPS[HOUR_INTERVAL]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4665
 
         // TIMESTAMPDIFF with null date in third argument
         tsDiffPS[HOUR_INTERVAL].setNull(2, Types.DATE);
@@ -525,6 +530,7 @@ public void testInvalidLengths() throws SQLException {
 	}
 	
 	public void testInvalidArgTypes() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         expectException( tsDiffPS[ HOUR_INTERVAL], ts( "2005-05-21 15:26:00"), 2.0, "XCL12",
                 "TIMESTAMPDIFF with double ts2");
         expectException( tsDiffPS[ HOUR_INTERVAL], 2.0, ts( "2005-05-11 15:26:00"), "XCL12",
@@ -551,6 +557,7 @@ private static void expectException(PreparedStatement ps, Object obj1, Object ob
 	}
 
     private static void expectNullResult(PreparedStatement ps)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4665
             throws SQLException {
         JDBC.assertSingleValueResultSet(ps.executeQuery(), null);
     }
@@ -597,6 +604,7 @@ private static java.sql.Timestamp ts(String s) {
 				sb.append('0');
 			s = sb.toString();
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-4665
         return java.sql.Timestamp.valueOf(s);
 	}
 	
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
index e37dd3ccbf..5023923113 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
@@ -861,6 +861,7 @@ public void testTriggersInGeneral() throws Exception
         // Check the locks, but retry the correctness of the result set for
         // a while since we have seen extraneous locks here on several system
         // tables, which should be released (DERBY-6628)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6628
         long millis = 60000;
         boolean ok = false;
         expColNames = new String [] {"TYPE", "MODE", "TABLENAME"};
@@ -873,6 +874,7 @@ public void testTriggersInGeneral() throws Exception
         };
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6628
         while (millis >= 0) {
             rs = st.executeQuery("select type, mode, tablename from " +
                     "syscs_diag.lock_table " +
@@ -2391,6 +2393,7 @@ private static void printTriggerChanges() throws Throwable
     private static void assertTriggerOutput(String expected) {
         // Windows: get rid of any carriage returns added by println in output 
         // before we compare since our expected output contains only newlines.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6529
         String got = outs.toString().replaceAll("\r", "");
         
         assertEquals(expected, got);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java
index 4f29e64ac2..fe41aa2906 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java
@@ -72,6 +72,7 @@ public class TriggerTest extends BaseJDBCTestCase {
      * allow recording information about the firing.
      */
     private static ThreadLocal<List<String>> TRIGGER_INFO =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             new ThreadLocal<List<String>>();
     StringBuffer listOfCreatedTriggers = new StringBuffer();
 
@@ -302,6 +303,7 @@ public void testDerby6383StatementTriggerBugTst2() throws SQLException
     }
 
     public void testDerby6726()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6726
         throws SQLException
     {
         Statement s = createStatement();
@@ -447,6 +449,7 @@ public void testDerby6726()
      */
     public void testDerby5578InvalidateAllStatementsProc() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5578
         Statement s = createStatement();
         CallableStatement cSt;
 
@@ -544,6 +547,7 @@ private int numberOfInvalidStatementsInSysstatements(Statement st)
     			"SELECT COUNT(*) FROM SYS.SYSSTATEMENTS "+
         		"WHERE VALID = false");
     	rs.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5578
     	num = rs.getInt(1);
     	rs.close();
     	return(num);
@@ -639,6 +643,7 @@ public void testFiringOrder() throws SQLException
         
         int triggerCount = createRandomTriggers()[0];
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<String> info = new ArrayList<String>();
         TRIGGER_INFO.set(info);
         
@@ -794,6 +799,7 @@ public void testFiringConstraintOrder() throws SQLException
         
         int beforeCount = createRandomTriggers()[1];
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<String> info = new ArrayList<String>();
         TRIGGER_INFO.set(info);
         
@@ -917,6 +923,7 @@ private int assertFiringOrder(String iud, int modifiedRowCount,
       */
     public static void logTriggerInfo(String info)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         TRIGGER_INFO.get().add(info);
     }
 
@@ -1106,6 +1113,7 @@ public void testClobInTriggerTable() throws SQLException, IOException
      */
     private void testClobInTriggerTable(int clobSize) throws SQLException, IOException {
         // Alphabet used when inserting a CLOB.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
         CharAlphabet a1 = CharAlphabet.singleChar('a');
         // Alphabet used when updating a CLOB.
         CharAlphabet a2 = CharAlphabet.singleChar('b');
@@ -1187,6 +1195,9 @@ private void testClobInTriggerTable(int clobSize) throws SQLException, IOExcepti
         ps.setString(1, clobSize +"");
 
         // - set the value of the input parameter to the input stream
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
         ps.setCharacterStream(2,
                 new LoopingAlphabetReader(clobSize, a1), clobSize);
         ps.execute();
@@ -1257,6 +1268,7 @@ public void testBlobInTriggerTable() throws SQLException, IOException
      */
     private  void testBlobInTriggerTable(int blobSize) throws SQLException, IOException {
         // Alphabet used when inserting a BLOB.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
         ByteAlphabet a1 = ByteAlphabet.singleByte((byte) 8);
         // Alphabet used when updating a BLOB.
         ByteAlphabet a2 = ByteAlphabet.singleByte((byte) 9);
@@ -1279,6 +1291,7 @@ private  void testBlobInTriggerTable(int blobSize) throws SQLException, IOExcept
 
         // - set the value of the input parameter to the input stream
         // use a couple blobs so we are sure it works with multiple lobs
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
         ps.setBinaryStream(2,
                 new LoopingAlphabetStream(blobSize, a1), blobSize);
         ps.setBinaryStream(3,
@@ -1341,6 +1354,8 @@ private  void testBlobInTriggerTable(int blobSize) throws SQLException, IOExcept
 
 
         // - set the value of the input parameter to the input stream
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
         ps.setBinaryStream(2,
                 new LoopingAlphabetStream(blobSize, a1), blobSize);
         ps.execute();
@@ -1385,6 +1400,7 @@ private  void testBlobInTriggerTable(int blobSize) throws SQLException, IOExcept
     public void testUpdateTriggerOnClobColumn() throws SQLException, IOException
     {
         // Alphabet used when inserting a CLOB.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
         CharAlphabet a1 = CharAlphabet.singleChar('a');
         // Alphabet used when updating a CLOB.
         CharAlphabet a2 = CharAlphabet.singleChar('b');
@@ -1404,6 +1420,7 @@ public void testUpdateTriggerOnClobColumn() throws SQLException, IOException
 
 
         // - set the value of the input parameter to the input stream
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
         ps.setCharacterStream(2,
                 new LoopingAlphabetReader(clobSize, a1), clobSize);
         ps.execute();
@@ -1514,6 +1531,7 @@ private void actionTypesSetup(String type) throws SQLException
         
         s.executeUpdate("CREATE TRIGGER AIS " +
                 "AFTER INSERT ON T_MAIN " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3220
                 "REFERENCING NEW TABLE AS N " +
                 "FOR EACH STATEMENT " +      
                 "INSERT INTO T_ACTION_STATEMENT(A, V1, ID, V2) " +
@@ -1529,6 +1547,7 @@ private void actionTypesSetup(String type) throws SQLException
         
         s.executeUpdate("CREATE TRIGGER AUS " +
                 "AFTER UPDATE OF V ON T_MAIN " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3220
                 "REFERENCING NEW TABLE AS N OLD TABLE AS O " +
                 "FOR EACH STATEMENT " +      
                 "INSERT INTO T_ACTION_STATEMENT(A, V1, ID, V2) " +
@@ -1544,6 +1563,7 @@ private void actionTypesSetup(String type) throws SQLException
         
         s.executeUpdate("CREATE TRIGGER ADS " +
                 "AFTER DELETE ON T_MAIN " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3220
                 "REFERENCING OLD TABLE AS O " +
                 "FOR EACH STATEMENT " +      
                 "INSERT INTO T_ACTION_STATEMENT(A, V1, ID, V2) " +
@@ -1849,6 +1869,7 @@ public static Object getRandomValue(Random r, int jdbcType,
         switch (jdbcType)
         {
         case Types.SMALLINT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
           return (short) r.nextInt();
         case Types.INTEGER:
             return r.nextInt();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerWhenClauseTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerWhenClauseTest.java
index 06b47d308b..1503e5d83b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerWhenClauseTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TriggerWhenClauseTest.java
@@ -622,6 +622,7 @@ public void testCloudscapeBug4821() throws SQLException {
 
     public void testDerby6783() throws SQLException {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
 
         s.execute("CREATE TABLE tabDerby6783(id INTEGER, result VARCHAR(10), status CHAR(1))");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableAndOnlineBackupTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableAndOnlineBackupTest.java
index 0f711d2db8..1be7e39218 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableAndOnlineBackupTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableAndOnlineBackupTest.java
@@ -63,6 +63,7 @@ public TruncateTableAndOnlineBackupTest(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("TruncateTableAndOnlineBackupTest");
 
@@ -76,6 +77,7 @@ public static Test suite() {
     }
     
     protected static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(TruncateTableAndOnlineBackupTest.class);
         return new CleanDatabaseTestSetup(suite); 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableTest.java
index 0e8e523d09..d4a862e6b7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/TruncateTableTest.java
@@ -172,6 +172,8 @@ public void testSelfReferencing() throws SQLException {
         // ALICE schema automatically, but for some reason that doesn't happen
         // when creating a self-referencing table. Create the schema manually
         // for now, if it doesn't already exist.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5101
+//IC see: https://issues.apache.org/jira/browse/DERBY-5139
         try {
             s.execute("CREATE SCHEMA ALICE");
         } catch (SQLException sqle) {
@@ -313,6 +315,7 @@ public void testConcurrentInvalidation() throws Exception {
         // Object used by the main thread to tell the helper thread to stop.
         // The helper thread stops once the value is set to true.
         final AtomicBoolean stop = new AtomicBoolean();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // Holder for anything thrown by the run() method in the helper thread.
         final Throwable[] error = new Throwable[1];
@@ -325,6 +328,7 @@ public void testConcurrentInvalidation() throws Exception {
         Thread t = new Thread() {
             public void run() {
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                     while (!stop.get()) {
                         JDBC.assertEmpty(ps.executeQuery());
                     }
@@ -346,6 +350,7 @@ public void run() {
             }
         } finally {
             // We're done, so tell the helper thread to stop.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             stop.set(true);
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDAPermsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDAPermsTest.java
index 12e2ce9f01..eee6af1236 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDAPermsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDAPermsTest.java
@@ -86,6 +86,7 @@ public UDAPermsTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             UDAPermsTest.class);
 
@@ -452,6 +453,7 @@ public  void    test_004_emptySchema()
      * </p>
      */
     public  void    test_005_builtinAggregators()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
         throws Exception
     {
         Connection  dboConnection = openUserConnection( TEST_DBO );
@@ -545,6 +547,7 @@ private void vetStatsBuiltins_005( Connection conn )
                                 "select sys." + aggName + "( a ) from ruth.doubles" );
 
         // cannot use ALL or DISTINCT with a builtin aggregate
+//IC see: https://issues.apache.org/jira/browse/DERBY-5466
         expectCompilationError( conn, PARSE_ERROR,
                                 "select " + aggName + "( all a ) from ruth.doubles" );
         expectCompilationError( conn, BAD_DISTINCT,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDTPermsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDTPermsTest.java
index 77536f6f4c..95cf06da5b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDTPermsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDTPermsTest.java
@@ -80,6 +80,7 @@ public UDTPermsTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             UDTPermsTest.class);
 
@@ -152,6 +153,7 @@ public  void    test_001_basicGrant()
              );
 
         // should work fine. no USAGE priv required.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6491
         goodStatement
             (
              ruthConnection,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
index 66be8a7843..fb1b8426d6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
@@ -152,6 +152,7 @@ public void test_02_basicColumnRetvalParam() throws Exception
         //
         // DECIMAL datatype used here and the JSR169 support for it is less complete.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4454
         if ( JDBC.vmSupportsJSR169() ) { return; }
         Connection conn = getConnection();
 
@@ -429,6 +430,7 @@ public void test_05_viewDependencies() throws Exception
         dropTypeStatement = "drop type price_05_a restrict\n";
         createObjectStatement = 
              "create view udtView( a, b, c ) as\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
              "select tabletype, cast (null as price_05_a), cast( null as price_05_a)\n" +
             "from sys.systables\n";
         dropObjectStatement = "drop view udtView\n";
@@ -471,6 +473,7 @@ public void test_05_viewDependencies() throws Exception
     public void test_06_casts() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
 
         // cast a NULL as a UDT
         goodStatement
@@ -776,6 +779,7 @@ public void test_11_tableFunctionColumns() throws Exception
         // This test uses DriverManager.
         //
         if ( JDBC.vmSupportsJSR169() ) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4545
 
         Connection conn = getConnection();
 
@@ -911,6 +915,7 @@ public void test_13_sqlData() throws Exception
         // SQLData not defined in JSR 169.
         //
         if ( JDBC.vmSupportsJSR169() ) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4545
 
         Connection conn = getConnection();
 
@@ -938,6 +943,7 @@ public void test_14_systemClasses() throws Exception
         // If a new system type is added, then we need to add it to the following block
         // of compilation errors.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
         assertEquals( 21, vetDatatypeCount( conn ) );
         
         expectCompilationError( ILLEGAL_UDT_CLASS, "create type java_string external name 'byte[]' language java\n" );
@@ -1007,6 +1013,7 @@ public void test_15_ordering() throws Exception
         expectCompilationError( ILLEGAL_AGG, "select min( a ) from t_15\n" );
         expectCompilationError( ILLEGAL_AGG, "select avg( a ) from t_15\n" );
         expectCompilationError( FORBIDDEN_ORDERING_OPERATION, "select * from t_15 union select * from t_15\n" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4545
         expectCompilationError( ILLEGAL_COMPARISON, "select * from t_15 where a = makeIntArray_15( 3 )\n" );
         expectCompilationError( ILLEGAL_COMPARISON, "select * from t_15 where a between makeIntArray_15( 2 ) and makeIntArray_15( 4 )\n" );
         expectCompilationError( ILLEGAL_COMPARISON, "select * from t_15 l, t_15 r where l.a = r.a\n" );
@@ -1029,6 +1036,7 @@ public void test_15_ordering() throws Exception
     public void test_16_casts() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4469
 
         goodStatement( conn, "create type javaSerializable external name 'java.io.Serializable' language java\n" );
         goodStatement( conn, "create type javaNumber external name 'java.lang.Number' language java\n" );
@@ -1063,6 +1071,7 @@ public void test_16_casts() throws Exception
         // If this fails, it means that we need to add another system type to the
         // cast checks below.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
         assertEquals( 21, vetDatatypeCount( conn ) );
         
         // casts to system types not allowed
@@ -1119,6 +1128,7 @@ public void test_16_casts() throws Exception
              "    a17 timestamp,\n" +
              "    a18 varchar(10),\n" +
              "    a19 varchar(10) for bit data,\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
              "    a20 xml,\n" +
              "    a21 boolean\n" +
              ")"
@@ -1146,11 +1156,13 @@ public void test_16_casts() throws Exception
         expectCompilationError( BAD_CAST, "select cast( a20 as javaSerializable ) from t_16_all_types\n" );
         expectCompilationError( BAD_CAST, "select cast( a21 as javaSerializable ) from t_16_all_types\n" );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
 
         //
         // If this fails, it means that we need to add another system type to the
         // implicit casts which follow.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
         assertEquals( 21, vetDatatypeCount( conn ) );
         
         expectCompilationError( ILLEGAL_STORAGE, "insert into t_16_all_types( a01 ) select b from t_16\n" );
@@ -1173,6 +1185,7 @@ public void test_16_casts() throws Exception
         expectCompilationError( ILLEGAL_STORAGE, "insert into t_16_all_types( a18 ) select b from t_16\n" );
         expectCompilationError( ILLEGAL_STORAGE, "insert into t_16_all_types( a19 ) select b from t_16\n" );
         expectCompilationError( ILLEGAL_STORAGE, "insert into t_16_all_types( a20 ) select b from t_16\n" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4730
         expectCompilationError( ILLEGAL_STORAGE, "insert into t_16_all_types( a21 ) select b from t_16\n" );
         
         // test cast from the half-supported boolean type
@@ -1200,6 +1213,7 @@ public void test_16_casts() throws Exception
     public void test_17_outputParameters() throws Exception
     {
         Connection conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4499
 
         goodStatement( conn, "create type intArray_17 external name 'org.apache.derbyTesting.functionTests.tests.lang.IntArray' language java\n" );
         goodStatement
@@ -1251,6 +1265,7 @@ public static void twoArgPriceProc( Price price1, Price price2 ) {}
     public static void changeIntArray( int newSize, IntArray[] array )
     {
         IntArray newArray = new IntArray( new int[ newSize ] );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4499
 
         array[ 0 ] = newArray;
     }
@@ -1265,9 +1280,11 @@ public static HashMap makeHashMap( String key, Integer value )
     }
 
     public static HashMap putValue(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             HashMap<String, String> map, String key, String value)
     {
         map.put( key, value );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
 
         return map;
     }
@@ -1285,6 +1302,7 @@ public static ResultSet hashmapReader() throws Exception
 
     public  static  Integer getIntValue( HashMap<String,Integer> map, String key )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
         return map.get( key );
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UnaryArithmeticParameterTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UnaryArithmeticParameterTest.java
index b6e4a84472..0168f5522f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UnaryArithmeticParameterTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UnaryArithmeticParameterTest.java
@@ -50,6 +50,7 @@ public static Test suite() {
         // ParameterMetaData calls to ensure that the parameter type for
         // dynamic parameter for unary minus and plus get set correctly from
         // the context in which they are used.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         if ( !JDBC.vmSupportsJDBC3()) {
             return new BaseTestSuite(
                 "empty UnaryArithmeticParameterTest - " +
@@ -106,6 +107,7 @@ public void testParametersForUnaryMinusAndPlus() throws Exception {
 			ps.setInt(1,1);
 			expectedTypes=new int[] {Types.INTEGER};
 			JDBC.assertParameterTypes(ps,expectedTypes);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")},
 										{-1,-1,-1.0,new String("def")},
 										{3,3,3.1,new String("ghi")},
@@ -117,6 +119,7 @@ public void testParametersForUnaryMinusAndPlus() throws Exception {
 			ps.setDouble(3,1.1);
 			expectedTypes= new int[]{Types.INTEGER, Types.SMALLINT,Types.DOUBLE};
 			JDBC.assertParameterTypes(ps,expectedTypes);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			expectedRows = new Object[][]{{1,1,1.1,new String("abc")}};
 			JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
 			
@@ -140,6 +143,7 @@ public void testABSWithUnaryMinusAndPlus() throws Exception {
 			ps.setInt(2,1);
 			int[] expectedTypes= new int[]{Types.INTEGER,Types.INTEGER};
 			JDBC.assertParameterTypes(ps,expectedTypes);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")},
 										{-1,-1,-1.0,new String("def")}};
 			JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
@@ -158,6 +162,7 @@ public void testMAXWithUnaryMinusAndPlus() throws Exception{
 			ps.setInt(1,1);
 			int[] expectedTypes= new int[]{Types.INTEGER};
 			JDBC.assertParameterTypes(ps,expectedTypes);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")},
 					{-1,-1,-1.0,new String("def")}};
 			JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
@@ -208,6 +213,7 @@ public void testNOTINWithUnaryMinusAndPlus() throws Exception{
 			ps.setInt(4,4);
 			int[] expectedTypes= new int[]{Types.INTEGER,Types.INTEGER, Types.INTEGER,Types.INTEGER};
 			JDBC.assertParameterTypes(ps,expectedTypes);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")},
 										{-1,-1,-1.0,new String("def")}};
 			JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
@@ -229,6 +235,8 @@ public void testOperatorsWithUnaryMinusAndPlus() throws Exception{
 			ps.setInt(1,0);
 			int[] expectedTypes=new int[]{Types.SMALLINT};
 			JDBC.assertParameterTypes(ps,expectedTypes);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")}};
 			JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
 
@@ -237,6 +245,7 @@ public void testOperatorsWithUnaryMinusAndPlus() throws Exception{
 			ps.setInt(2,-1);
 			expectedTypes = new int[]{Types.INTEGER,Types.INTEGER};
 			JDBC.assertParameterTypes(ps,expectedTypes);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			expectedRows = new Object[][]{{-1,-1,-1.0,new String("def")}};
 			JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
 
@@ -303,6 +312,7 @@ public void testSelectWithUnaryMinusAndPlus() throws Exception{
 			ps.setInt(2,22);
 			int[] expectedTypes = new int[]{Types.INTEGER,Types.SMALLINT};
 			JDBC.assertParameterTypes(ps, expectedTypes);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			Object[][] expectedRows = new Object[][]{{1},{-22}};
 			JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
 			ps.close();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UngroupedAggregatesNegativeTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UngroupedAggregatesNegativeTest.java
index d27089d153..cf3f914fb8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UngroupedAggregatesNegativeTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UngroupedAggregatesNegativeTest.java
@@ -58,6 +58,7 @@ public void setUp() throws SQLException {
     public void tearDown() throws Exception {
         dropTable("t1");
         dropTable("t2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5720
         super.tearDown();
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UniqueConstraintMultiThreadedTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UniqueConstraintMultiThreadedTest.java
index 6944296b2c..3e679248d5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UniqueConstraintMultiThreadedTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UniqueConstraintMultiThreadedTest.java
@@ -47,6 +47,7 @@ public UniqueConstraintMultiThreadedTest() {
      */
     private void executeThreads (int isolation1, int isolation2, 
             boolean commit) throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5719
         Connection con1 = openDefaultConnection();
         con1.setTransactionIsolation(isolation1);
         Connection con2 = openDefaultConnection();
@@ -110,12 +111,14 @@ public void testLockingWithRollback () throws Exception {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("UniqueConstraintTest");
         suite.addTest(TestConfiguration.embeddedSuite(UniqueConstraintMultiThreadedTest.class));
         return suite;
     }
     
     protected void setUp() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5719
         Statement stmt = createStatement();
         stmt.execute("create table tab1 (i integer)");
         stmt.executeUpdate("alter table tab1 add constraint con1 unique (i)");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UniqueConstraintSetNullTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UniqueConstraintSetNullTest.java
index 64f7273d7c..b62706e1cf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UniqueConstraintSetNullTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UniqueConstraintSetNullTest.java
@@ -49,6 +49,7 @@ public UniqueConstraintSetNullTest(String name) {
      *         implemented tests to run.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("UniqueConstraintSetNullTest");
 
@@ -61,6 +62,7 @@ public static Test suite() {
      * Create table for test cases to use.
      */
     protected void setUp() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5718
         Statement stmt = createStatement();
         stmt.executeUpdate("create table constraintest (" +
                 "val1 varchar (20) not null, " +
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
index 005338e7ee..7011eede45 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
@@ -283,6 +283,7 @@ public UpdatableResultSetTest(String name) {
     }
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("UpdatableResultSetTest");
         
         BaseTestSuite embeddedSuite =
@@ -305,8 +306,12 @@ public static Test suite() {
     }
     
     private static BaseTestSuite baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(UpdatableResultSetTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3850
+//IC see: https://issues.apache.org/jira/browse/DERBY-177
+//IC see: https://issues.apache.org/jira/browse/DERBY-3693
         return suite;
     }
     
@@ -1971,6 +1976,7 @@ public void testDeleteRowWithTriggerChangingRS() throws SQLException {
         // this delete row will fire the delete trigger which will delete all
         // the rows from the table and from the resultset
         rs.deleteRow();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
         assertFalse("FAIL - row not found", rs.next());
         try {           
             rs.deleteRow();
@@ -2055,12 +2061,14 @@ public void testDeleteRowSelfReferential() throws SQLException {
         // this delete row will cause the delete cascade constraint to delete
         // all the rows from the table and from the resultset
         rs.deleteRow();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
         assertFalse("FAIL - row not found", rs.next());
         try {      
             rs.deleteRow();
             fail("FAIL - there should have be no more rows in the resultset " +
                     "at this point because of the delete cascade");
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2380
             String sqlState = usingEmbedded() ? "24000" : "42X30";
             assertSQLState(sqlState, e);
         }
@@ -2562,6 +2570,7 @@ public void testUpdateXXXOnReadOnlyRS() throws SQLException {
                 } catch (SQLException e) {
                     // updateArray and updateRef are not implemented on both 
                     // drivers
+//IC see: https://issues.apache.org/jira/browse/DERBY-2443
                     if((updateXXXName == 20) || (updateXXXName == 21)) {
                         assertSQLState("FAIL - unexpected exception on " + 
                                 allUpdateXXXNames[updateXXXName-1], "0A000", e);
@@ -2598,6 +2607,7 @@ public void testUpdateXXXWithAllDatatypes()
                     updateXXXName <= allUpdateXXXNames.length; 
                     updateXXXName++) 
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2158
                 if(JDBC.vmSupportsJSR169() && (updateXXXName == 4))
                     continue;
                 println("Testing " + allUpdateXXXNames[updateXXXName-1] + 
@@ -2883,6 +2893,7 @@ public void testUpdateObjectWithAllDatatypes()
                     updateXXXName <= allUpdateXXXNames.length; 
                     updateXXXName++) 
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2158
                 if(JDBC.vmSupportsJSR169() && (updateXXXName == 4))
                     continue;
                 println("  Testing " + allUpdateXXXNames[updateXXXName-1] + 
@@ -2925,6 +2936,7 @@ private void runTestUpdateObjectWithAllDatatypes(
                     println(displayString + " Short object as parameters");
                     if (indexOrName == 1) //test by passing column position
                         rs.updateObject(sqlType, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                                 rs1.getShort(updateXXXName));
                     else //test by passing column name
                         rs.updateObject(ColumnNames[sqlType-1], 
@@ -2949,6 +2961,8 @@ private void runTestUpdateObjectWithAllDatatypes(
                                 rs1.getLong(updateXXXName));
                 } else if (updateXXXName == 4) { 
                     //updateObject using BigDecimal object
+//IC see: https://issues.apache.org/jira/browse/DERBY-2158
+//IC see: https://issues.apache.org/jira/browse/DERBY-2158
                     if(!JDBC.vmSupportsJSR169()) {
                         println(displayString + 
                                 " BigDecimal object as parameters");
@@ -2964,6 +2978,7 @@ private void runTestUpdateObjectWithAllDatatypes(
                     println(displayString + " Float object as parameters");
                     if (indexOrName == 1) //test by passing column position
                         rs.updateObject(sqlType, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                                 rs1.getFloat(updateXXXName));
                     else //test by passing column name
                         rs.updateObject(ColumnNames[sqlType-1], 
@@ -3068,6 +3083,7 @@ else if (updateXXXName == 11) {
                     //since Derby don't support boolean datatype
                     if (indexOrName == 1) //test by passing column position
                         rs.updateObject(sqlType, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                                 rs1.getBoolean(1));
                     else //test by passing column name
                         rs.updateObject(ColumnNames[sqlType-1], 
@@ -3290,6 +3306,7 @@ public void testUpdateXXXWithCancelRowUpdates() throws SQLException {
         if (usingEmbedded() && JDBC.vmSupportsJDBC3()) {
             println("  updateClob and then cancelRowUpdates");
             String clb1 = rs.getString(13);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5489
             String clb2 = rs1.getString(13);
             rs.updateClob(13, rs1.getClob(13));
             assertEquals("FAIL - wrong value returned by getXXX method",
@@ -4154,6 +4171,7 @@ private void runTestUpdateXXXAllDataTypesInsertRow(
             int sqlType,
             int updateXXXName) throws SQLException, UnsupportedEncodingException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5701
         Statement s = createStatement();
         ResultSet rs, rs1;
         int checkAgainstColumn = updateXXXName;
@@ -4191,6 +4209,7 @@ private void runTestUpdateXXXAllDataTypesInsertRow(
                         rs.updateLong(ColumnNames[sqlType-1], 
                                 rs1.getLong(updateXXXName));
                 } else if (updateXXXName == 4) { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2158
                     if (!JDBC.vmSupportsJSR169())
                     {
                         //update column with updateBigDecimal methods
@@ -4370,6 +4389,7 @@ private void runTestUpdateXXXAllDataTypesInsertRow(
                 }
                 verifyData(sqlType, checkAgainstColumn);
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5701
                 s.executeUpdate("DELETE FROM AllDataTypesForTestingTable");
                 
             } catch (SQLException se) {
@@ -4391,6 +4411,7 @@ private void runTestUpdateXXXAllDataTypesInsertRow(
             rs.close();
             rs1.close();       
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5701
         closeStatement(s);
     }
     
@@ -4561,6 +4582,7 @@ private void verifyData(int sqlType, int updateXXXName)
             assertEquals("FAIL - wrong value on " + allSQLTypes[sqlType - 1] + 
                     " using " + allUpdateXXXNames[updateXXXName - 1], 
                     rs.getBoolean(sqlType), rs1.getBoolean(1));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5701
         } else if (updateXXXName == 19) { //verifying updateNull
             assertNull("FAIL - wrong value on " + allSQLTypes[sqlType - 1] + 
                     " using " + allUpdateXXXNames[updateXXXName - 1], 
@@ -4584,6 +4606,7 @@ private void verifyData(int sqlType, int updateXXXName)
                     " using " + allUpdateXXXNames[updateXXXName - 1],
                     rs1.getLong(updateXXXName), rs.getLong(sqlType));
         } else if (sqlType == 4) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2158
             if (!JDBC.vmSupportsJSR169()) {
                 // verify update made to DECIMAL column with updateXXX methods
                 assertTrue("FAIL - wrong value on " + allSQLTypes[sqlType - 1] + 
@@ -4599,6 +4622,7 @@ private void verifyData(int sqlType, int updateXXXName)
         } else if (sqlType == 6) {
             // verify update made to DOUBLE column with updateXXX methods
             Double d1, d2;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             d1 = rs.getDouble(sqlType);
             d2 = rs1.getDouble(updateXXXName);
             // can have precision problems with updateFloat
@@ -4635,6 +4659,7 @@ private void verifyData(int sqlType, int updateXXXName)
                             rs1.getBytes(updateXXXName)));
         } else if (sqlType == 13 && JDBC.vmSupportsJDBC3()) {
             // verify update made to CLOB column with updateXXX methods
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
             Clob clob = rs.getClob(sqlType);
             int len = (int)clob.length();
             assertEquals("FAIL - wrong value on " + allSQLTypes[sqlType - 1] + 
@@ -4658,6 +4683,7 @@ private void verifyData(int sqlType, int updateXXXName)
                     rs1.getTimestamp(updateXXXName), rs.getTimestamp(sqlType));
         } else if (sqlType == 17 && JDBC.vmSupportsJDBC3()) {
             // verify update made to BLOB column with updateXXX methods
+//IC see: https://issues.apache.org/jira/browse/DERBY-3844
             Blob blob = rs.getBlob(sqlType);
             long len = blob.length();
             assertTrue("FAIL - wrong value on " + allSQLTypes[sqlType - 1] + 
@@ -4668,6 +4694,7 @@ private void verifyData(int sqlType, int updateXXXName)
         
         rs.close();
         rs1.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5701
         closeStatement(pstmt);
         closeStatement(pstmt1);
     }
@@ -4683,6 +4710,7 @@ private void resetData() throws SQLException {
         insertSQL.append("cast("+SQLData[allSQLTypes.length - 1][0]
                 + " as BLOB(1K)))");
         stmt.executeUpdate(insertSQL.toString());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5701
         closeStatement(stmt);
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdateCursorTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdateCursorTest.java
index a6723f52af..5e3027687e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdateCursorTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdateCursorTest.java
@@ -74,6 +74,7 @@ public static Test suite() {
 
 		props.setProperty("derby.language.maxMemoryPerTable", "1");
 		return new DatabasePropertyTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             new SystemPropertyTestSetup(
                 new CleanDatabaseTestSetup(
                     new BaseTestSuite(
@@ -113,6 +114,7 @@ protected void decorateSQL(Statement s) throws SQLException {
 
 					for (int j = 0; j < 5; j++) {
 						pstmt.setInt(1 + k, i + (4 - j));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 						pstmt.setString(2 + k, Integer.toString(i));
 						pstmt.setInt(3 + k, i + j);
 						pstmt.setString(4 + k, Integer.toString(i));
@@ -128,6 +130,7 @@ protected void decorateSQL(Statement s) throws SQLException {
 				pstmt.close();
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2543
 		}, props), props, true);
 	}
 
@@ -146,6 +149,8 @@ public void testVirtualMemoryHeap() throws SQLException {
 		/* drop index and recreate it to be sure that it is ascending
                  * (other subtests may have changed it)
                  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3224
+//IC see: https://issues.apache.org/jira/browse/DERBY-3176
 		assertUpdateCount(update, 0, "drop index I11");
 		assertUpdateCount(update, 0, "create index I11 on T1 (c3, c1, c5)");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdateStatisticsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdateStatisticsTest.java
index 59fede0965..838b396a04 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdateStatisticsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UpdateStatisticsTest.java
@@ -56,6 +56,7 @@ public static Test suite() {
         //       With automatic generation enabled, testUpdateStatistics may
         //       fail intermittently due to timing, mostly when run
         //       with the client driver.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5025
         Test test = TestConfiguration.defaultSuite(UpdateStatisticsTest.class);
         Test statsDisabled = DatabasePropertyTestSetup.singleProperty
             ( test, "derby.storage.indexStats.auto", "false", true );
@@ -69,6 +70,7 @@ public static Test suite() {
      *  SYSCS_DROP_STATISTICS and SYSCS_UPDATE_STATISTICS
      */
     public void testIndexAndColumnNamedStatistics() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5681
         String tbl = "T1";
         // Helper object to obtain information about index statistics.
         IndexStatsUtil stats = new IndexStatsUtil(openDefaultConnection());
@@ -206,13 +208,16 @@ public void testStatisticsProcsWithEmptyParamsDerby5750() throws SQLException {
      * Test for update statistics
      */
     public void testUpdateAndDropStatistics() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5774
         String tbl1 = "T1";
         // Helper object to obtain information about index statistics.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4837
         IndexStatsUtil stats = new IndexStatsUtil(openDefaultConnection());
         Statement s = createStatement();
 
         //Calls to update and drop statistics below should fail because 
         // table APP.T1 does not exist
+//IC see: https://issues.apache.org/jira/browse/DERBY-5681
         dropTable("T1");
         assertStatementError("42Y55", s, 
             "CALL SYSCS_UTIL.SYSCS_DROP_STATISTICS('APP','T1',null)");
@@ -245,6 +250,7 @@ public void testUpdateAndDropStatistics() throws SQLException {
         //So far the table t1 is empty and we have already created index I1 on 
         //it. Since three was no data in the table when index I1 was created,
         //there will be no row in sysstatistics table
+//IC see: https://issues.apache.org/jira/browse/DERBY-5774
         stats.assertNoStatsTable(tbl1);
         //Now insert some data into t1 and then create a new index on the 
         //table. This will cause sysstatistics table to have one row for this
@@ -331,6 +337,7 @@ public void testUpdateAndDropStatistics() throws SQLException {
         //empty
         s.executeUpdate("CREATE INDEX t2i1 ON t2(c21)");
         s.executeUpdate("CREATE INDEX t2i2 ON t2(c22)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5774
         stats.assertNoStatsTable("T2");
         
         PreparedStatement ps = prepareStatement("INSERT INTO T2 VALUES(?,?,?)");
@@ -357,6 +364,7 @@ public void testUpdateAndDropStatistics() throws SQLException {
 		//Running the update statistics below will create statistics for T2I2
 		s.execute("CALL SYSCS_UTIL.SYSCS_UPDATE_STATISTICS('APP','T2','T2I2')");
         stats.assertIndexStats("T2I2", 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4837
 
         //Rerunning the query "SELECT * FROM t2 WHERE c21=? AND c22=?" and
         //looking at it's plan will show that this time it picked up more
@@ -465,6 +473,8 @@ public void testParallelCompilationAndUpdate() throws Exception {
         updateConn.close();
 
         // Clean-up
+//IC see: https://issues.apache.org/jira/browse/DERBY-5174
+//IC see: https://issues.apache.org/jira/browse/DERBY-5153
         dropTable("derby5153");
         commit();
     }
@@ -505,6 +515,7 @@ public void testDERBY5681() throws Exception {
                 "ADD CONSTRAINT TEST_TAB_1_PK_1 "+
         		"PRIMARY KEY (c11)");
         stats.assertNoStatsTable("TEST_TAB_1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
 
         //Test - unique key constraint
         s.executeUpdate("ALTER TABLE TEST_TAB_1 "+
@@ -542,6 +553,7 @@ public void testDERBY5681() throws Exception {
         stats.assertTableStats("TEST_TAB_1",2);
         s.executeUpdate("ALTER TABLE TEST_TAB_1 "+
                 "DROP CONSTRAINT TEST_TAB_1_UNQ_2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         stats.assertNoStatsTable("TEST_TAB_1");
         s.executeUpdate("ALTER TABLE TEST_TAB_1 "+
                 "DROP CONSTRAINT TEST_TAB_1_PK_1");
@@ -568,6 +580,7 @@ public void testDERBY5681() throws Exception {
         s.executeUpdate("ALTER TABLE TEST_TAB_2 "+
                 "ADD CONSTRAINT TEST_TAB_2_PK_1 "+
         		"PRIMARY KEY (c21)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         stats.assertNoStatsTable("TEST_TAB_2");
         // DERBY-5702 Add a foreign key constraint and now we should find one
         // row of statistics for TEST_TAB_2 (for the foreign key constraint).
@@ -604,6 +617,7 @@ public void testDERBY5681() throws Exception {
      * useful statistics intact.
      */
     public void testDisposableStatsEagerness()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
             throws SQLException {
         setAutoCommit(false);
         String tbl = "DISPOSABLE_STATS_EAGERNESS";
@@ -650,12 +664,14 @@ public void testDisposableStatsEagerness()
         IndexStatsUtil stats = new IndexStatsUtil(getConnection());
         // Expected FK table: 0
         // Expected main table: 2xPK, 1 non-unique, 1 FK = 4
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         stats.assertNoStatsTable(tbl_fk);
         stats.assertTableStats(tbl, 4);
         IndexStatsUtil.IdxStats[] tbl_stats_0 = stats.getStatsTable(tbl);
 
         // Run the update statistics procedure.
         // Sleep at least one tick to ensure the timestamps differ.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5797
         sleepAtLeastOneTick();
         ps = prepareStatement(
                 "call syscs_util.syscs_update_statistics('APP', ?, ?)");
@@ -666,6 +682,7 @@ public void testDisposableStatsEagerness()
         ps.execute();
 
         // Check the counts.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         stats.assertNoStatsTable(tbl_fk);
         stats.assertTableStats(tbl, 4);
         // Check the timestamps (i.e. were they actually updated?).
@@ -676,6 +693,7 @@ public void testDisposableStatsEagerness()
         }
 
         // Now make sure updating one index doesn't modify the others' stats.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5797
         sleepAtLeastOneTick();
         ps.setString(1, tbl);
         ps.setString(2, nuIdx);
@@ -684,10 +702,12 @@ public void testDisposableStatsEagerness()
         IndexStatsUtil.IdxStats nonUniqueIdx = stats.getStatsIndex(nuIdx)[0];
         assertTrue(nonUniqueIdx.after(tbl_stats_1[0]));
         // Check the counts again.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         stats.assertNoStatsTable(tbl_fk);
         stats.assertTableStats(tbl, 4);
 
         // Cleanup
+//IC see: https://issues.apache.org/jira/browse/DERBY-5774
         dropTable(tbl);
         dropTable(tbl_fk);
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UserDefinedAggregatesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UserDefinedAggregatesTest.java
index 113f0d3f30..acb90bad87 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UserDefinedAggregatesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UserDefinedAggregatesTest.java
@@ -102,6 +102,7 @@ public UserDefinedAggregatesTest(String name)
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("UserDefinedAggregatesTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest( TestConfiguration.defaultSuite(UserDefinedAggregatesTest.class) );
         suite.addTest( collatedSuite( "en" ) );
@@ -118,6 +119,7 @@ public static Test suite()
      */
     private static Test collatedSuite(String locale)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("UserDefinedAggregatesTest:territory=" + locale);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UserLobTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UserLobTest.java
index 614cba0756..aca2834262 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UserLobTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/UserLobTest.java
@@ -74,6 +74,7 @@ public UserLobTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = (BaseTestSuite)TestConfiguration.embeddedSuite(
             UserLobTest.class);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VTITest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VTITest.java
index 84217515ec..95efc519d4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VTITest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VTITest.java
@@ -38,8 +38,10 @@ public class VTITest extends BaseJDBCTestCase {
 
      public static Test suite()
      {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
          BaseTestSuite suite = new BaseTestSuite("VTITest");
          // requires DriverManager support
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
          if (JDBC.vmSupportsJDBC3()) {
             suite.addTest(new VTITest("bulkInsertVtiTest", "WAREHOUSE"));
             // Run the same test again, but now insert into a table whose name
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VarargsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VarargsTest.java
index d60357d477..c0419bb4ab 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VarargsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VarargsTest.java
@@ -86,6 +86,7 @@ public VarargsTest(String name)
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("UserDefinedAggregatesTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest( TestConfiguration.defaultSuite( VarargsTest.class ) );
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VetJigsawTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VetJigsawTest.java
index 4e0f97d1c1..4946ecf968 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VetJigsawTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/VetJigsawTest.java
@@ -54,6 +54,7 @@ public class VetJigsawTest extends BaseJDBCTestCase
         "derbyrun.jar",
         "derbyshared.jar",
         "derbytools.jar",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         "derbyTesting.jar",
     };
 
@@ -183,6 +184,8 @@ private void loadJarFile(Connection conn, String jarFileDirectory, String jarFil
              "insert into zipClasses\n" +
              "  select directory, '" + fullJarFileName + "', name\n" +
              "  from table(zipFile('" + fullJarFileName + "')) t\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6934
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
              "  where name like '%.class' and name <> 'module-info.class'"
              );
     }
@@ -218,6 +221,7 @@ private void examinePackage(StringBuilder buffer, String packageName) throws Exc
           "from zipClasses\n" +
           "where packageName = '" + packageName + "'\n" +
           "order by zipFileName, className\n";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         StringBuffer localBuffer = new StringBuffer();
         int zipsWithClasses = 0;
           
@@ -243,6 +247,7 @@ private void examinePackage(StringBuilder buffer, String packageName) throws Exc
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (zipsWithClasses > 1)
         {
             buffer
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ViewsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ViewsTest.java
index a3b4ecf1df..a95e65918b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ViewsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/ViewsTest.java
@@ -40,13 +40,16 @@ public final class ViewsTest extends BaseJDBCTestCase {
      */
     public ViewsTest(String name)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3520
         super(name);
     }
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("views Test");
         suite.addTest(TestConfiguration.embeddedSuite(ViewsTest.class));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3270
         return new CleanDatabaseTestSetup(suite);
     }
 
@@ -320,6 +323,7 @@ public void test_views() throws Exception
         assertStatementError("X0X95", st,
             " drop view cv8");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4928
         assertStatementErrorUnordered(
             new String[] {"X0Y23","X0Y23","X0Y23","X0X95"}, st,
             " drop view sv5");
@@ -876,6 +880,7 @@ public void test_views() throws Exception
     * @throws SQLException
     */
     public void testSelectViewFromOtherSchemaWithNoDefaultSchema()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3270
             throws SQLException {
         Connection conn = openDefaultConnection("joe","joepass");
         Statement st = conn.createStatement();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/WarehouseVTI.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/WarehouseVTI.java
index ed77fc73b5..d000d4b99b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/WarehouseVTI.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/WarehouseVTI.java
@@ -58,4 +58,4 @@ public int getInt(int col)
      return 0;
  }
 
-}  
\ No newline at end of file
+}  
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLBindingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLBindingTest.java
index 08e1a68785..ae1ab94c09 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLBindingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLBindingTest.java
@@ -67,6 +67,7 @@ public XMLBindingTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("XML Binding Suite");
         if (XML.classpathMeetsXMLReqs())
         {
@@ -74,6 +75,7 @@ public static Test suite()
              * database before the embedded and client suites.  This ensures
              * that we do not remove the objects created by XBindTestSetup.
              */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6233
             Test test =
                 TestConfiguration.defaultSuite(XMLBindingTest.class, false);
 
@@ -157,6 +159,7 @@ public void testXMLSerializeBinding() throws Exception
             if (!rs.wasNull())
             {
                 int ch = xResult.read();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1758
                 for (charCount = 0; ch != -1; ch = xResult.read())
                 {
                     /* Xalan serialization produces platform-specific line-
@@ -272,6 +275,7 @@ private void existsQuery(String xPath, int expectedRows)
     private static class XBindTestSetup extends BaseJDBCTestSetup
     {
         public XBindTestSetup(Test test) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6233
             super(test);
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLConcurrencyTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLConcurrencyTest.java
index 36d0b92cad..ca47d2bf88 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLConcurrencyTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLConcurrencyTest.java
@@ -55,6 +55,7 @@ protected void decorateSQL(Statement s)
                     }
                 };
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("XMLConcurrencyTest - empty");
         }
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java
index 99834da7e3..1423920f1d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java
@@ -73,7 +73,9 @@ public XMLMissingClassesTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("XML Missing Classes Suite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         if (!XML.classpathMeetsXMLReqs())
         {
             // Run this test in embedded and client modes.
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java
index f61ea0df4c..54a186a067 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java
@@ -84,8 +84,10 @@ public XMLOptimizerTraceTest(String name)
     public static Test suite()
     {
         String[]    testFiles = new String[] { "functionTests/tests/lang/" + SAVED_TRACE_NAME };
+//IC see: https://issues.apache.org/jira/browse/DERBY-6256
 
         BaseTestSuite suite = new BaseTestSuite("XMLOptimizerTraceTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest( TestConfiguration.defaultSuite( XMLOptimizerTraceTest.class ) );
  
@@ -187,6 +189,7 @@ protected void    setUp()
                  );
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         if ( !tableExists( conn, "T1" ) )
         {
             goodStatement
@@ -232,6 +235,7 @@ public void test_01_planCost() throws Exception
         File    traceFile = SupportFilesSetup.getReadWrite( TRACE_FILE_NAME );
 
         SupportFilesSetup.deleteFile( traceFile );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6635
 
         // turn on xml-based optimizer tracing and run some queries
         goodStatement
@@ -323,8 +327,10 @@ public void test_01_planCost() throws Exception
 
         // use planCost to examine an outer join
         vetOuterJoin( conn );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
 
         // verify that you can't overwrite an existing file with xml output (DERBY-6635)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6635
         goodStatement
             (
              conn,
@@ -333,6 +339,7 @@ public void test_01_planCost() throws Exception
         expectExecutionError
             (
              conn,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6857
              FILE_EXISTS,
              "call syscs_util.syscs_register_tool( 'optimizerTracing', false, '" + traceFile.getPath() + "' )"
               );
@@ -351,6 +358,7 @@ public void test_01_planCost() throws Exception
      */
     public void test_02_xmlVTI() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6256
         Connection conn = getConnection();
         File    traceFile = SupportFilesSetup.getReadOnly( SAVED_TRACE_NAME );
         URL     traceURL = SupportFilesSetup.getReadOnlyURL( SAVED_TRACE_NAME );
@@ -599,8 +607,10 @@ public void test_02_xmlVTI() throws Exception
      */
     private void vetOuterJoin( Connection conn ) throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6211
         File    traceFile = SupportFilesSetup.getReadWrite( TRACE_FILE_NAME );
         SupportFilesSetup.deleteFile( traceFile );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6635
 
         // turn on xml-based optimizer tracing
         goodStatement
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java
index 0ac9375592..f7775e4e9e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java
@@ -77,9 +77,11 @@ public XMLTypeAndOpsTest(String name)
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("XML Type and Operators Suite\n");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1758
         if (!XML.classpathMeetsXMLReqs())
             return suite;
 
@@ -87,6 +89,7 @@ public static Test suite()
          * database before the embedded and client suites.  This ensures
          * that we do not remove the objects created by XMLTestSetup.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1758
         suite.addTest(
             TestConfiguration.defaultSuite(XMLTypeAndOpsTest.class, false));
 
@@ -101,6 +104,7 @@ public void testXMLColCreation() throws Exception
         // If the column's definition doesn't make sense for XML,
         // then we should throw the correct error.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42894",
             "create table fail1 (i int, x xml default 'oops')");
 
@@ -155,6 +159,7 @@ public void testIllegalNullInserts() throws Exception
      */
     public void testXMLColsWithNonXMLVals() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42821", "insert into t1 values (3, 'hmm')");
         assertCompileError("42821", "insert into t1 values (1, 2)");
         assertCompileError("42821", "insert into t1 values (1, 123.456)");
@@ -185,6 +190,7 @@ public void testNonXMLColsWithXMLVals() throws Exception
             + "float, d double, vc varchar(20), da date, ti time, "
             + "ts timestamp, cl clob, bl blob)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42821",
             "insert into nonXTable (si) values (cast (null as xml))");
         
@@ -241,6 +247,7 @@ public void testNonXMLColsWithXMLVals() throws Exception
      */
     public void testXMLCasting() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42846",
             "insert into t1 values (1, cast ('hmm' as xml))");
         
@@ -295,6 +302,7 @@ public void testXMLCasting() throws Exception
      */
     public void testXMLInNonXMLOps() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42Y95", "select i + x from t1");
         assertCompileError("42Y95", "select i * x from t1");
         assertCompileError("42Y95", "select i / x from t1");
@@ -314,6 +322,7 @@ public void testXMLInNonXMLOps() throws Exception
      */
     public void testXMLComparisons() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42818", "select i from t1 where x = 'hmm'");
         assertCompileError("42818", "select i from t1 where x > 0");
         assertCompileError("42818", "select i from t1 where x < x");
@@ -328,6 +337,7 @@ public void testIllegalOps() throws Exception
     {
         // Indexing/ordering on XML cols is not allowed.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("X0X67", "create index oops_ix on t1(x)");
         assertCompileError("X0X67",
             "select i from t1 where x is null order by x");
@@ -338,6 +348,8 @@ public void testIllegalOps() throws Exception
             "CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE ("
             + "  null, 'T1', 'extinout/xmlexport.del', null, null, null)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
         assertStatementError("42Z71", cSt);
         
         cSt = prepareCall(
@@ -361,6 +373,7 @@ public void testIllegalOps() throws Exception
         
         // XML cannot be used with procedures/functions.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42962",
             "create procedure hmmproc (in i int, in x xml)"
             + "  parameter style java language java external name "
@@ -374,6 +387,7 @@ public void testIllegalOps() throws Exception
         // XML columns cannot be used for global temporary 
         // tables.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42962",
             "declare global temporary table SESSION.xglobal (myx XML)"
             + "  not logged on commit preserve rows");
@@ -386,6 +400,7 @@ public void testIllegalOps() throws Exception
     public void testTriggerSetXML() throws Exception
     {
         // This should fail.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42821",
             "create trigger tr2 after insert on t1 for each row "
             + "mode db2sql update t1 set x = 'hmm'");
@@ -411,6 +426,7 @@ public void testXMLParse() throws Exception
         // These should fail with various parse errors.
 
         Statement st = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42Z74",
             "insert into t1 values (1, xmlparse(document "
             + "'<hmm/>' strip whitespace))");
@@ -606,6 +622,7 @@ public void testTopLevelSelect() throws Exception
         Statement st = createStatement();
         st.executeUpdate("create table vcTab (vc varchar(100))");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42Z71", "select x from t1");
         assertCompileError("42Z71", "select * from t1");
         assertCompileError("42Z71",
@@ -636,6 +653,7 @@ public void testXMLSerialize() throws Exception
         
         // These should fail with various parse errors.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42Z72", "select xmlserialize(x) from t1");
         assertCompileError("42X01", "select xmlserialize(x as) from t1");
         assertCompileError("42Z73",
@@ -808,6 +826,7 @@ public void testXMLParseSerializeCombos() throws Exception
             "select xmlserialize(xmlparse(document '<hmm>' "
             + "preserve whitespace) as clob) from t1");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42X25",
             " select xmlserialize(xmlparse(document x preserve "
             + "whitespace) as char(100)) from t1");
@@ -892,6 +911,7 @@ public void testXMLExists() throws Exception
     {
         // These should fail with various parse errors.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42X01",
             "select i from t1 where xmlexists(x)");
         
@@ -1484,6 +1504,7 @@ public void testXMLExists() throws Exception
         // If the query returns an atomic value (not a sequence), the XMLEXISTS
         // operator should return TRUE.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6634
         expRS = new String[][] {
             { "true" },
             { "true" },
@@ -1517,6 +1538,7 @@ public void testXMLQuery() throws Exception
     {
         // These should fail w/ syntax errors.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("42X01", "select i, xmlquery('//*') from t1");
         assertCompileError("42X01",
             " select i, xmlquery('//*' passing) from t1");
@@ -1571,6 +1593,7 @@ public void testXMLQuery() throws Exception
         // saying what the problem is; it should *NOT* be a NPE, 
         // which is what we were seeing before DERBY-688 was completed.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         assertCompileError("10000",
             "select i,"
             + "  xmlserialize("
@@ -1583,6 +1606,7 @@ public void testXMLQuery() throws Exception
         // In addition, we have prefixed the function with an unrecognized
         // namespace. Verify that it fails with an SQLException and that there
         // isn't any NPE in the exception chain.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         try {
             prepareStatement(
                     "select i,"
@@ -2230,6 +2254,7 @@ public void testNestedXMLQuery() throws Exception
         // Should fail because result of inner XMLQUERY op
         // isn't a valid document.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         Statement st = createStatement();
         assertStatementError("2200V", st,
             "select i,"
@@ -2481,6 +2506,7 @@ public void testAttrSerialization() throws Exception
             {"3"}
         };
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2502
         JDBC.assertFullResultSet(rs, expRS, true, false);
         
         // The use of MAX in the previous query throws a warning because
@@ -2499,6 +2525,7 @@ public void testAttrSerialization() throws Exception
             assertSQLState("01003", sqlWarn);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2502
         rs.close();
         
         // Then use XPath position syntax to retrieve the 
@@ -2674,6 +2701,7 @@ public void testTriggerSPSWithXML() throws Exception
      */
     public void testNumericReturnValues() throws SQLException {
         // Array of XPath queries and their expected return values
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         String[][] queries = {
             // Long.MAX_VALUE. We lose some precision.
             { "9223372036854775807", "9223372036854776000" },
@@ -2692,10 +2720,12 @@ public void testNumericReturnValues() throws SQLException {
             { "-0.0", "0" },
             { "-0.00", "0" },
             // Division by zero yields Not A Number or +/- Infinity
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
             { "0 div 0", "NaN" },
             { "3.14 div 0", "Infinity" },
             { "-3.14 div 0", "-Infinity" },
             // Not strictly numeric, but let's test boolean too
+//IC see: https://issues.apache.org/jira/browse/DERBY-6634
             { "1=1", "true" },
             { "1=2", "false" },
         };
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLXXETest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLXXETest.java
index 5572634fa6..99856c60ea 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLXXETest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XMLXXETest.java
@@ -69,6 +69,8 @@ public static Test suite()
         if (!XML.classpathMeetsXMLReqs())
             return suite;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6810
+//IC see: https://issues.apache.org/jira/browse/DERBY-6820
 	String[] testFiles = new String[] {
 	    "functionTests/tests/lang/xmlOptimizerXXE1Payload.trace",
 	    "functionTests/tests/lang/xmlOptimizerXXE1.trace",
@@ -108,6 +110,7 @@ public void testDerby6807FileAccess ()
         
         s.execute("CREATE TABLE xml_data(xml_col XML)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6810
         String stmt = "INSERT INTO xml_data(xml_col) VALUES(XMLPARSE(DOCUMENT" 
                 + "'<!DOCTYPE foo [<!ENTITY xxe SYSTEM \"file:"
                 + path +"\" >]><yolo>&xxe;</yolo>'"
@@ -127,6 +130,7 @@ public void testDerby6807FileAccess ()
 
     public void testDerby6807BillionLaughs() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6810
         Statement st = createStatement();
         st.executeUpdate("create table xml_billion_laughs( xml_col xml )");
 
@@ -155,6 +159,8 @@ public void testDerby6807BillionLaughs() throws SQLException
     }
 
     public void testDerby6807FileAccessVTI()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6810
+//IC see: https://issues.apache.org/jira/browse/DERBY-6820
 		throws Exception
     {
 	String VULNERABLE_XML = "xmlOptimizerXXE1.trace";
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XplainStatisticsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XplainStatisticsTest.java
index 35ebe67683..35f71c683b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XplainStatisticsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/XplainStatisticsTest.java
@@ -80,11 +80,14 @@ public XplainStatisticsTest(String name) {
 	}
 	
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         timeSuiteStarted = (new Date()).getTime();
         BaseTestSuite allTests =
             new BaseTestSuite(XplainStatisticsTest.class,
                                "XplainStatisticsTest");
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         Test test = allTests;
         test = new SupportFilesSetup(test); //added by DERBY-4587
             
@@ -481,6 +484,7 @@ private static void createSchemaObjects(Statement st)
 	}
 	
     private static boolean hasTable(Statement s,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4849
                                     String schemaName, String tableName)
         throws SQLException
     {
@@ -505,6 +509,7 @@ private static void enableXplainStyle(Statement s)
     {
         verifyXplainUnset(s);
         for (int i = 0; i < tableNames.length; i++)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4849
             if (hasTable(s, "XPLTEST", tableNames[i]))
                 s.execute("delete from XPLTEST." + tableNames[i]);
         s.execute("call SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS(1)");
@@ -520,6 +525,7 @@ private static void enableXplainStyleWithTiming(Statement s)
     }
     
     private static void enableXplainOnlyMode(Statement s)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
             throws SQLException
     {
         s.execute("call syscs_util.syscs_set_xplain_mode(1)");
@@ -547,6 +553,7 @@ private static void disableXplainStyle(Statement s, boolean exportPlan)
     	 * Added by DERBY-4587 to test the generation of XML files
     	 * from PlanExporter tool.
     	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
         if (exportPlan) {
             String dbUrl = s.getConnection().getMetaData().getURL();
 
@@ -563,6 +570,7 @@ private static void disableXplainStyle(Statement s, boolean exportPlan)
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
         s.execute("call syscs_util.syscs_set_xplain_schema('')");
     }
 
@@ -600,6 +608,7 @@ private void verifyNonNullDRDA_ID(Statement s)
      * on successful execution)
      */
     private static String invokePlanExporterTool(String... args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
         PrintStream out = System.out;
         PrintStream err = System.err;
 
@@ -661,6 +670,7 @@ private void dumpResultSets(Statement s)
     }
     
     private void dumpStatements(Statement s)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
         throws SQLException
     {
         ResultSet rs;
@@ -693,6 +703,8 @@ private void dumpStatements(Statement s)
      * @return stmt_id
      * */
     private String getStmtID(Statement s) throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
     	ResultSet rs;
         String stmt_id;
         rs = s.executeQuery( 
@@ -738,6 +750,7 @@ private Object getADocument(final String file) throws Exception {
     	DocumentBuilder builder = factory.newDocumentBuilder();
 
     	InputSource xml = new InputSource(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     			AccessController.doPrivileged
     			(new java.security.PrivilegedExceptionAction<InputStream>(){
     				public InputStream run()throws Exception{
@@ -763,6 +776,7 @@ private String readStatement(final String file)
     throws Exception
     {
         Document document = (Document) getADocument(file);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4781
 
     	return document.getElementsByTagName("statement").item(0).getChildNodes().item(0).getNodeValue();
 
@@ -777,6 +791,7 @@ private String readStatement(final String file)
      */
     private int countNode(final String file) throws Exception{
         Document document = (Document) getADocument(file);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4781
 
     	return document.getElementsByTagName("node").getLength();
     }
@@ -790,6 +805,7 @@ private int countNode(final String file) throws Exception{
      * @throws Exception
      */
     private String getNodeName(final String file) throws Exception{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4781
         Document document = (Document) getADocument(file);
     	NodeList lst=document.getElementsByTagName("node");
     	String name= "";
@@ -809,6 +825,7 @@ private String getNodeName(final String file) throws Exception{
      * @throws Exception
      */
     private String getNodeAttribute(final String file, String attribute, int node) throws Exception{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4781
     	Document document = (Document) getADocument(file);
     	NodeList lst=document.getElementsByTagName("node");
     	if(lst.item(node).getAttributes().getNamedItem(attribute)==null)
@@ -829,6 +846,7 @@ public void testPlanExporterIllegalFileAccess()
 	throws Exception
     {
         // Make sure there is a statement with recorded statistics.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
         Statement s = createStatement();
         enableXplainStyle(s);
         JDBC.assertDrainResults(s.executeQuery("values 1"));
@@ -895,6 +913,7 @@ public void testPlanExporterSpecialCharactersInSchema() throws Exception {
         rs.close();
 
         // Create the XML file. This used to result in a syntax error.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
         String output = invokePlanExporterTool(
                 getConnection().getMetaData().getURL(),
                 schema,
@@ -924,6 +943,7 @@ public void testPlanExporterSpecialCharactersInSchema() throws Exception {
      * @throws Exception if something goes wrong
      */
     public void testSimpleQueryMultiWithInvalidation()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4849
             throws Exception {
         // Start two threads; one selecting from COUNTRIES with XPLAIN on, and
         // one generating statistics for the same table.
@@ -988,6 +1008,7 @@ public void testSimpleQuery() throws Exception
             new String[][] {  {"Belize"}, {"Costa Rica"}, {"El Salvador"},
                 {"Guatemala"}, {"Honduras"}, {"Nicaragua"} } );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
         disableXplainStyle(s, true);
         
         // The statement should have been executed as a PROJECTION
@@ -1079,6 +1100,8 @@ public void testSimpleQuery() throws Exception
          * of the XML file generated by the new tool, PlanExporter.
          * */
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -1110,6 +1133,7 @@ public void testSimpleQuery() throws Exception
     }
     
     private String getStmtIDByName(Statement s, String sName)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6216
 			throws SQLException
     {
     	ResultSet rs;
@@ -1137,6 +1161,7 @@ public void testSimpleXplainOnly() throws Exception
 	         "WHERE region = 'Central America'" ));
         clearXplainOnlyMode(s);
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
 	// dumpStatements(s);
         // dumpResultSets(s);
@@ -1328,8 +1353,11 @@ public void testXplainOnlyExecutePrepared() throws Exception
         JDBC.assertEmpty(ps.executeQuery());
         clearXplainOnlyMode(s);
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         // Verify that statistics were collected.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6297
         JDBC.assertDrainResults(
                 s.executeQuery("select * from xpltest.sysxplain_statements"),
                 1);
@@ -1357,6 +1385,9 @@ public void testXplainOnlyPrepared() throws Exception
                 {"Europe", "29"}, {"Middle East", "7"},
                 {"North Africa", "5"}, {"North America", "3"},
                 {"Pacific Islands", "3"}, {"South America", "11"} } );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
         disableXplainStyle(s, true);
 	//dumpStatements(s);
         //dumpResultSets(s);
@@ -1599,6 +1630,7 @@ public void testIndexScan() throws Exception
             new String[][] {  {"AA1112"}, {"AA1114"}, {"AA1116"} } );
 
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         // This query should have been executed as a PROJECTION whose child
         // is a ROWIDSCAN whose child is an INDEXSCAN. The INDEXSCAN should
@@ -1648,6 +1680,8 @@ public void testIndexScan() throws Exception
         /* This test is added by DERBY-4587, to verify the content
          * of the XML file generated by the new tool, PlanExporter.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -1693,6 +1727,7 @@ public void testConstraintScan() throws Exception
             "SELECT region from countries where country = 'Cameroon'";
         JDBC.assertSingleValueResultSet(s.executeQuery(selectStatement),
                 "Africa");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
         disableXplainStyle(s, true);
         JDBC.assertUnorderedResultSet(s.executeQuery(
                     "select op_identifier from xpltest.sysxplain_resultsets"),
@@ -1716,6 +1751,8 @@ public void testConstraintScan() throws Exception
          * This test is added by DERBY-4587, to verify the content
          * of the XML file generated by the new tool, PlanExporter.
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -1769,6 +1806,7 @@ public void testGroupBySortProps()
                 {"Pacific Islands", "3"}, {"South America", "11"} } );
 
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         // This statement is executed as a PROJECTION with a child GROUPBY
         // with a child PROJECTION with a child TABLESCAN. The TABLESCAN
@@ -1822,6 +1860,8 @@ public void testGroupBySortProps()
         /* * This test is added by DERBY-4587, to verify the content
          * of the XML file generated by the new tool, PlanExporter.
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -1868,6 +1908,7 @@ public void testDistinctAggregateSortProps()
         // to look at the statistics.
         s.executeQuery(selectStatement).close();
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         JDBC.assertSingleValueResultSet(s.executeQuery(
             "select count(*) from xpltest.sysxplain_sort_props"), "1");
@@ -1891,6 +1932,8 @@ public void testDistinctAggregateSortProps()
          * of the XML file generated by the new tool, PlanExporter.
          *  
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	// This statement is executed as a PROJECTION with a child GROUPBY
         	// with a child PROJECTION with a child TABLESCAN. 
@@ -1932,6 +1975,7 @@ public void testAggregationResultSet()
             "select count(distinct region) from countries";
         JDBC.assertSingleValueResultSet(s.executeQuery(selectStatement), "12");
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         // The above statement results in the query execution:
         // PROJECTION(AGGREGATION(PROJECTION(TABLESCAN)))
@@ -1953,6 +1997,8 @@ public void testAggregationResultSet()
          * of the XML file generated by the new tool, PlanExporter.
          *  
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -2037,6 +2083,8 @@ public void testInsertResultSet()
          * of the XML file generated by the new tool, PlanExporter.
          *  
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -2074,6 +2122,7 @@ public void testUpdateResultSet()
         throws Exception
     {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4188
         s.executeUpdate("delete from AIRLINES");
         String insertStatement = 
             "insert into AIRLINES values " +
@@ -2086,6 +2135,7 @@ public void testUpdateResultSet()
         enableXplainStyle(s);
         numRows = s.executeUpdate(updateStatement);
         assertEquals("Failed to update AIRLINES", 1, numRows);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
         disableXplainStyle(s, true);
         JDBC.assertUnorderedResultSet(s.executeQuery(
                     "select stmt_type, stmt_text " +
@@ -2171,6 +2221,8 @@ public void testUpdateResultSet()
          * of the XML file generated by the new tool, PlanExporter.
          *  
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -2279,6 +2331,8 @@ public void testDeleteResultSet()
          * of the XML file generated by the new tool, PlanExporter.
          *  
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -2316,6 +2370,7 @@ public void testSortResultSet()
             "select region from countries order by country";
         s.executeQuery(selectStatement).close(); // Discard the results
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         // The above statement results in the query execution:
         // PROJECTION(SORT(PROJECTION(TABLESCAN)))
@@ -2355,6 +2410,8 @@ public void testSortResultSet()
          * of the XML file generated by the new tool, PlanExporter.
          *  
          **/ 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -2398,6 +2455,9 @@ public void testUnionQuery()
             "select country from countries where region = 'Africa'";
         s.executeQuery(selectStatement).close(); // Discard the results
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         // The above statement results in the query execution:
         // SORT(UNION(PROJECTION(TABLESCAN),PROJECTION(TABLESCAN)))
@@ -2453,6 +2513,8 @@ public void testUnionQuery()
          * of the XML file generated by the new tool, PlanExporter.
          *  
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -2506,6 +2568,7 @@ public void testDDLCreateTable()
         // result set graph recorded for DDL statements, so the PlanExporter
         // tool will complain.
         disableXplainStyle(s, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         JDBC.assertUnorderedResultSet(s.executeQuery(
                     "select stmt_type, stmt_text " +
@@ -2527,6 +2590,7 @@ public void testMaxFromIndex()
             "select max(country_iso_code) from countries";
         s.executeQuery(selectStatement).close();
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         // The above query is executed as
         // PROJECTION(AGGREGATION(PROJECTION(LASTINDEXKEYSCAN)))
@@ -2577,6 +2641,8 @@ public void testMaxFromIndex()
          * of the XML file generated by the new tool, PlanExporter.
          *  
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -2642,6 +2708,7 @@ public void testOuterJoin()
                     {"AKL",null},{"NRT",null}
         });
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         // We should get a Nested Loop Outer Join which  reads 10 rows
         // from the left (SEEN_ROWS), constructs 10 EMPTY_RIGHT_ROWS,
@@ -2673,6 +2740,8 @@ public void testOuterJoin()
          * of the XML file generated by the new tool, PlanExporter.
          *  
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -2737,6 +2806,7 @@ public void testScanPositions()
         for (int i = 0; i < searches.length; i++)
             s.executeQuery(searches[i]).close();
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         ResultSet rs = s.executeQuery(
                 "select s.stmt_text, sp.start_position, sp.stop_position " +
@@ -2802,6 +2872,12 @@ public void testScanPositions()
       * A simple test of a non-zero value for numDeletedRowsVisited.
       */
     public void testScanDeletedRows()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         throws Exception
     {
         Statement s = createStatement();
@@ -2809,6 +2885,7 @@ public void testScanDeletedRows()
         String selectStatement = "select x from t";
         JDBC.assertUnorderedResultSet(s.executeQuery(selectStatement),
                 new String[][] { {"1"},{"2"},{"4"} });
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
         disableXplainStyle(s, true);
         
         // There should be a CONSTRAINTSCAN result set with a SCAN PROPS
@@ -2834,6 +2911,8 @@ public void testScanDeletedRows()
          * of the XML file generated by the new tool, PlanExporter.
          *  
          * */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
         if(XML.classpathMeetsXMLReqs()){
         	//getting the stmt_id, because files are generated using
         	//stmt_id as their name.
@@ -2883,6 +2962,7 @@ public void testAlwaysEmptyResultSet() throws Exception {
         enableXplainStyle(s);
         JDBC.assertEmpty(s.executeQuery(sql));
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         // Now, see if we find the query among the recorded statements.
         PreparedStatement ps = prepareStatement(
@@ -2899,6 +2979,7 @@ public void testTableNotValid()
     {
         Statement s = createStatement();
         for (int i = 0; i < tableNames.length; i++)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4849
             if (hasTable(s, "XPLTEST", tableNames[i]))
                 s.executeUpdate("drop table xpltest."+tableNames[i]);
         s.executeUpdate("create table xpltest.sysxplain_resultsets(a int)");
@@ -2914,6 +2995,7 @@ public void testTableNotValid()
             if (e.getMessage().indexOf("RS_ID") < 0)
                 fail("Expected message about missing column RS_ID, not " +
                         e.getMessage());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4188
         } finally {
             // Drop the created table if this testcase is not run as the last.
             s.executeUpdate("drop table xpltest.sysxplain_resultsets");
@@ -2970,6 +3052,8 @@ public void testPlanExporterHandlingSpecialCharacters() throws Exception{
         enableXplainStyle(s);
         JDBC.assertEmpty(s.executeQuery(queryText));
         disableXplainStyle(s, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
 
         ResultSet rs = s.executeQuery(
         "SELECT STMT_ID, STMT_TEXT FROM XPLTEST.SYSXPLAIN_STATEMENTS");
@@ -3000,6 +3084,7 @@ public void testPlanExporterHandlingSpecialCharacters() throws Exception{
      */
     private static abstract class AbstractMTThread
             implements Runnable {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4849
 
         protected final Connection con;
         /** Duration of the run. */
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
index f7ea2a736a..dabda3c9db 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
@@ -174,12 +174,14 @@ public static Test suite() throws Exception {
         suite.addTest(LangHarnessJavaTest.suite());
         		
         suite.addTest(ResultSetsFromPreparedStatementTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5412
         if (!isPhoneME())
         { // Disable temporarily until CVM/phoneME is fixed.. See DERBY-4290)
         suite.addTest(OrderByAndSortAvoidance.suite());
         }
 
         // tests that do not run with JSR169
+//IC see: https://issues.apache.org/jira/browse/DERBY-2525
         if (JDBC.vmSupportsJDBC3())  
         {
             // test uses triggers interwoven with other tasks
@@ -190,13 +192,17 @@ public static Test suite() throws Exception {
             suite.addTest(GrantRevokeDDLTest.suite());
 
             // test uses regex classes that are not available in Foundation 1.1
+//IC see: https://issues.apache.org/jira/browse/DERBY-2829
+//IC see: https://issues.apache.org/jira/browse/DERBY-2817
             suite.addTest(ErrorMessageTest.suite());
             // Test uses DriverManager to connect to database in jar.
             suite.addTest(DBInJarTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3754
             suite.addTest(ConnectTest.suite());
             
             // test uses PooledConnections and Savepoints
             suite.addTest(DeclareGlobalTempTableJavaJDBC30Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2895
 
             // requires Java 5 (generics)
             suite.addTest(UserDefinedAggregatesTest.suite());
@@ -208,61 +214,105 @@ public static Test suite() throws Exception {
             suite.addTest(OptionalToolsTest.suite());
         }
        
+//IC see: https://issues.apache.org/jira/browse/DERBY-3724
         suite.addTest(BigDataTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3751
         suite.addTest(MixedCaseExpressionTest.suite());
         suite.addTest(UpdateStatisticsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3760
         suite.addTest(MiscErrorsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3767
         suite.addTest(NullsTest.suite());
         suite.addTest(ArithmeticTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3750
         suite.addTest(ConstantExpressionTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3802
         suite.addTest(OptimizerOverridesTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3758
         suite.addTest(PrecedenceTest.suite());
         suite.addTest(GeneratedColumnsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3932
         suite.addTest(GeneratedColumnsPermsTest.suite());
         suite.addTest(RestrictedVTITest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
         suite.addTest(AwareVTITest.suite());
         suite.addTest(UDTTest.suite());
         suite.addTest(UDTPermsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4663
         suite.addTest(BooleanValuesTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4013
+//IC see: https://issues.apache.org/jira/browse/DERBY-4014
         suite.addTest(AlterColumnTest.suite());
         suite.addTest(UserLobTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4079
         suite.addTest(OffsetFetchNextTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6523
         suite.addTest(TriggerBeforeTrigTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6520
         suite.addTest(TriggerGeneralTest.suite());
         suite.addTest(SequenceTest.suite());
         suite.addTest(SequencePermsTest.suite());
         suite.addTest(SequenceGeneratorTest.suite());
         suite.addTest(DBOAccessTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3634
+//IC see: https://issues.apache.org/jira/browse/DERBY-4069
         suite.addTest(OLAPTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4398
         suite.addTest(OrderByAndOffsetFetchInSubqueries.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5005
         suite.addTest(Derby5005Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4509
         suite.addTest(AutoIncrementTest.suite());
         suite.addTest(HalfCreatedDatabaseTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5601
+//IC see: https://issues.apache.org/jira/browse/DERBY-5607
         suite.addTest(NativeAuthenticationServiceTest.suite());
         suite.addTest(Derby5652.suite());
         suite.addTest(TruncateTableAndOnlineBackupTest.suite()); 
         suite.addTest(QueryPlanTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6519
         suite.addTest(JoinDeadlockTest.suite());
         suite.addTest(Derby6131.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6514
+//IC see: https://issues.apache.org/jira/browse/DERBY-5614
         suite.addTest(AggBuiltinTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6267
         suite.addTest(NewOptimizerOverridesTest.suite());
         suite.addTest(MergeStatementTest.suite());
         suite.addTest(IdentitySequenceTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6516
+//IC see: https://issues.apache.org/jira/browse/DERBY-6515
         suite.addTest(NestedCommitTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6507
+//IC see: https://issues.apache.org/jira/browse/DERBY-6707
         suite.addTest(ForeignKeysNonSpsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6508
         suite.addTest(LOBDB2compatibilityTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6509
         suite.addTest(CurrentSchemaTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6496
         suite.addTest(Test_6496.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         suite.addTest(ConstraintCharacteristicsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         suite.addTest(ForeignKeysDeferrableTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6276
         suite.addTest(DB2IsolationLevelsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         suite.addTest(LuceneSuite.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
         suite.addTest(JsonSuite.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6517
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
         suite.addTest(ConsistencyCheckerTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6136
         suite.addTest(RawDBReaderTest.suite());
         suite.addTest(Derby5866TriggerOrderTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         suite.addTest(NoDBInternalsPermissionTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6654
         suite.addTest(ClassLoadingTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (TestConfiguration.loadingFromJars()) { suite.addTest(VetJigsawTest.suite()); }
         return suite;
 	}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java
index 2b8b9e1d40..983d210d0d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/dbManagerLimits.java
@@ -207,6 +207,7 @@ public static void testMostColumnsInTable( Connection conn) throws Throwable
 			String tempString = new String();
 			int i = 0;
 			sbTableElements.append("create table t1 (");
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_TABLE-2; i++)
 				sbTableElements.append("c" + i +" int, ");
 
@@ -297,6 +298,7 @@ public static void testMostColumnsInView( Connection conn) throws Throwable
 			StringBuffer sbViewColumnNames = new StringBuffer();
 			String tempString = new String();
 			int i = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_VIEW-2; i++) {
 				sbValuesClause.append(1 + ", ");
 				sbViewColumnNames.append("c" + i + ", ");
@@ -356,6 +358,7 @@ public static void testMostElementsInSelectList( Connection conn) throws Throwab
 			String tempString = new String();
 			int i = 0;
 			sb.append("create table t1 (");
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_TABLE-2; i++)
 				sb.append("c" + i +" int, ");
 
@@ -409,6 +412,7 @@ public static void testMostElementsInOrderBy( Connection conn) throws Throwable
 			String tempString = new String();
 			int i = 0;
 			sbOrderBy.append("select * from t1 order by ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			for (i = 0; i < Limits.DB2_MAX_ELEMENTS_IN_ORDER_BY-2; i++)
 				sbOrderBy.append("c1, ");
 
@@ -468,6 +472,7 @@ public static void testMostElementsInGroupBy( Connection conn) throws Throwable
 
 			//first create 7 views with 5000 columns each
 			int i = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_VIEW-1; i++)
 				sbValuesClause.append(1 + ", ");
 
@@ -481,6 +486,7 @@ public static void testMostElementsInGroupBy( Connection conn) throws Throwable
 			}
       
 			for (int j = 1; j < 7; j++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 				for (i = 0; i < Limits.DB2_MAX_COLUMNS_IN_VIEW; i++)
 					sbGroupBy.append("c" + j + "" + i + ", ");
 			}
@@ -580,6 +586,7 @@ public static void testMostIndexesOnTable( Connection conn) throws Throwable
 
 			s.executeUpdate("create table t1 (c1 int not null, c2 int, primary key(c1))");
 			System.out.println("First create one index less than maximum allowed number of indexes");
+//IC see: https://issues.apache.org/jira/browse/DERBY-104
 			for (i = 0; i < Limits.DB2_MAX_INDEXES_ON_TABLE-2; i++) {
 				s.executeUpdate("create index i" + i + " on t1(c1,c2)");
 			System.out.println("   create index" + i);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/dbjarUtil.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/dbjarUtil.java
index eeabc8da96..37e8ba3193 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/dbjarUtil.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/dbjarUtil.java
@@ -122,6 +122,7 @@ public static void setDBContextClassLoader(String jarName) throws MalformedURLEx
 
 		File jar = new File(root, jarName);
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		URLClassLoader cl = new URLClassLoader(new URL[] {jar.toURI().toURL()});
     	java.lang.Thread.currentThread().setContextClassLoader(cl);
    
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/largeCodeGen.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/largeCodeGen.java
index 53bc75364d..924cb02064 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/largeCodeGen.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/largeCodeGen.java
@@ -47,6 +47,7 @@ public largeCodeGen(String name)
     }
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite();
         
         // Code generation test, just invoke on embedded
@@ -60,6 +61,7 @@ public static Test suite() {
        
     protected void setUp() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         getConnection().setAutoCommit(false);
     	Statement stmt = createStatement();
 		
@@ -290,6 +292,7 @@ private boolean largeUnionSelect(String viewName,
 	        commit();
         }
         pstmt.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-176
         return false;
      
 		} catch (SQLException sqle)
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/outparams.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/outparams.java
index 91d0a8a6e8..24cdb5a829 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/outparams.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/outparams.java
@@ -38,6 +38,7 @@ public class outparams
 	//Get the class name to be used for the procedures
 	//outparams - J2ME; outparams30 - non-J2ME
 	static{
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 		if(BigDecimalHandler.representation != BigDecimalHandler.BIGDECIMAL_REPRESENTATION)
 			HAVE_BIG_DECIMAL = false;
 		else
@@ -182,6 +183,7 @@ public class outparams
 	static String returnMethods[];
 	//Get the array to be used based on HAVE_BIG_DECIMAL
 	static{
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 		if(HAVE_BIG_DECIMAL){
 			returnMethods = new String[] 	{
 									"returnsNothing",
@@ -299,6 +301,7 @@ public class outparams
 	static int[] paramJDBCType =
 	{
 		Types.NULL, // "returnsNothing",
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 
 		Types.NULL, // "returnsBytePrimitive",
 		Types.NULL, // "returnsByte",
@@ -336,6 +339,7 @@ public class outparams
 	static final int types[] =
 	{
 		Types.BIT,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 		Types.BOOLEAN,
 		Types.TINYINT,
 		Types.SMALLINT,
@@ -405,6 +409,7 @@ public static void runTests( Connection conn) throws Throwable
 		testOtherOutputType(conn);
 		testManyOut(conn);
 		//Uses a procedure with nested connection - Cannot be tested with JSR169
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 		if(HAVE_DRIVER_CLASS)
 			test5116(conn);
 	}
@@ -418,6 +423,7 @@ private static void testMisc(Connection conn) throws Throwable
 		Statement scp = conn.createStatement();
 
 		scp.execute("CREATE PROCEDURE takesString(OUT P1 VARCHAR(40), IN P2 INT) " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 						"EXTERNAL NAME '" + CLASS_NAME + "takesString'" +
 						" NO SQL LANGUAGE JAVA PARAMETER STYLE JAVA");
 
@@ -519,6 +525,7 @@ private static void testMisc(Connection conn) throws Throwable
 		cs.close();
 		scp.execute("DROP PROCEDURE takesString");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 		scp.execute("CREATE FUNCTION returnsString(P2 INT) RETURNS VARCHAR(40) " +
 						"EXTERNAL NAME '" + CLASS_NAME + "returnsString'" +
 						" NO SQL LANGUAGE JAVA PARAMETER STYLE JAVA");
@@ -564,6 +571,7 @@ private static void testNull(Connection conn) throws Throwable
 		Statement scp = conn.createStatement();
 
 		scp.execute("CREATE PROCEDURE testNullBug4317(IN P1 VARCHAR(10)) " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 						"EXTERNAL NAME '" + CLASS_NAME + "testNullBug4317'" +
 						" NO SQL LANGUAGE JAVA PARAMETER STYLE JAVA");
 
@@ -605,6 +613,7 @@ private static void testUpdate(Connection conn) throws Throwable
 		Statement scp = conn.createStatement();
 
 		scp.execute("CREATE FUNCTION returnsIntegerP(P1 INT) RETURNS INTEGER " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 						"EXTERNAL NAME '" + CLASS_NAME + "returnsIntegerP'" +
 						" NO SQL LANGUAGE JAVA PARAMETER STYLE JAVA");
 
@@ -800,6 +809,8 @@ private static void testOtherOutputType(Connection conn) throws Throwable
 			{
 
 				scp.execute("CREATE PROCEDURE " + methodName + "(INOUT P1 " + outputProcParam[method] + ", IN P2 INT) " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 					"EXTERNAL NAME '" + CLASS_NAME + "" + methodName +
 					"' NO SQL LANGUAGE JAVA PARAMETER STYLE JAVA");
 
@@ -872,6 +883,7 @@ private static void testOtherOutputType(Connection conn) throws Throwable
 					StringBuffer getbuf = new StringBuffer();
 					try
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 						callGetMethod(cs, 1, types[getType], Types.OTHER , getbuf);
 					}
 					catch (SQLException se)
@@ -923,6 +935,8 @@ private static void testReturnTypes(Connection conn) throws Throwable
 			{
 
 				scf.execute("CREATE FUNCTION " + methodName + "(P1 INT) RETURNS " + returnMethodType[method] +
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 					" EXTERNAL NAME '" + CLASS_NAME + "" + methodName +
 					"' NO SQL LANGUAGE JAVA PARAMETER STYLE JAVA");
 				dropRoutine = "DROP FUNCTION " + methodName;
@@ -988,6 +1002,8 @@ private static void testReturnTypes(Connection conn) throws Throwable
 					StringBuffer getbuf = new StringBuffer();
 					try
 					{
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 						callGetMethod(cs, 1, types[getType], paramJDBCType[method], getbuf);
 					}
 					catch (SQLException se)
@@ -1014,8 +1030,10 @@ private static void callSetObject(CallableStatement cs, int arg, int type, Strin
 		switch (type)	
 		{
 			case Types.BIT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.BOOLEAN:
 				strbuf.append("setObject("+arg+", true)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				cs.setObject(arg, true);
 				break;
 
@@ -1053,6 +1071,7 @@ private static void callSetObject(CallableStatement cs, int arg, int type, Strin
 			case Types.DECIMAL:
 			case Types.NUMERIC:
 				strbuf.append("setObject("+arg+", 666.666)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 				BigDecimalHandler.setObjectString(cs,arg,"666.666");
 				break;
 
@@ -1101,6 +1120,7 @@ private static void callSetMethod(CallableStatement cs, int arg, int type, Strin
 		switch (type)	
 		{
 			case Types.BIT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.BOOLEAN:
 				strbuf.append("setBoolean("+arg+", true)");
 				cs.setBoolean(arg, true);
@@ -1140,6 +1160,7 @@ private static void callSetMethod(CallableStatement cs, int arg, int type, Strin
 			case Types.DECIMAL:
 			case Types.NUMERIC:
 				strbuf.append("setBigDecimal("+arg+", 666.666)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 				BigDecimalHandler.setBigDecimalString(cs,arg,"666.666");
 				break;
 
@@ -1189,6 +1210,7 @@ private static void callGetMethod(CallableStatement cs, int arg, int type, int p
 		switch (type)	
 		{
 			case Types.BIT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.BOOLEAN:
 				strbuf.append("getBoolean("+arg+") = ");
 				strbuf.append(cs.getBoolean(arg));
@@ -1228,6 +1250,7 @@ private static void callGetMethod(CallableStatement cs, int arg, int type, int p
 			case Types.DECIMAL:
 			case Types.NUMERIC:
 				strbuf.append("getBigDecimal("+arg+") = ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 				strbuf.append(BigDecimalHandler.getBigDecimalString(cs,arg,paramType));
 				break;
 
@@ -1341,6 +1364,7 @@ private static String getStringOfType(int type) throws Throwable
 				return "00680065006c006c006f";
 
 			case Types.BIT:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.BOOLEAN:
 				return "true";
 
@@ -1364,6 +1388,7 @@ public static void testNull(Boolean passedInNull, Boolean setToNull, Integer[] r
 			}
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		retval[0] = (setToNull.booleanValue()) ? null : 66;
 	}
 
@@ -1380,6 +1405,7 @@ public static void takesBytePrimitive(byte[] outparam, int type)
 	}
 	public static void takesByte(Byte[] outparam, int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		outparam[0] = ((byte)(outparam[0] == null ? 33 : outparam[0].byteValue()*2));
 	}
 
@@ -1389,6 +1415,7 @@ public static void takesShortPrimitive(short[] outparam, int type)
 	}
 	public static void takesShort(Short[] outparam, int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
       outparam[0] = (short) ((byte)(outparam[0] == null ? 33 : outparam[0].shortValue()*2));
 	}
 
@@ -1398,6 +1425,7 @@ public static void takesIntegerPrimitive(int[] outparam, int type)
 	}
 	public static void takesInteger(Integer[] outparam, int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		outparam[0] = outparam[0] == null ? 33 : outparam[0].intValue()*2;
 	}
 
@@ -1407,6 +1435,7 @@ public static void takesLongPrimitive(long[] outparam, int type)
 	}
 	public static void takesLong(Long[] outparam, int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
       outparam[0] = (long)(outparam[0] == null ? 33 : outparam[0].longValue()*2);
 	}
 
@@ -1416,6 +1445,7 @@ public static void takesDoublePrimitive(double[] outparam, int type)
 	}
 	public static void takesDouble(Double[] outparam, int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
       outparam[0] = (double) (outparam[0] == null ? 33 : outparam[0].doubleValue()*2);
 	}
 
@@ -1425,6 +1455,7 @@ public static void takesFloatPrimitive(float[] outparam, int type)
 	}
 	public static void takesFloat(Float[] outparam, int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
       outparam[0] = (float) (outparam[0] == null ? 33 : outparam[0].floatValue()*2);
 	}
 
@@ -1434,6 +1465,7 @@ public static void takesBooleanPrimitive(boolean[] outparam, int type)
 	}
 	public static void takesBoolean(Boolean[] outparam, int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		outparam[0] = true;
 	}
 
@@ -1485,6 +1517,7 @@ public static byte returnsByteP(int type)
 	}
 	public static Byte returnsByte(int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return (byte)66;
 	}
 
@@ -1494,6 +1527,7 @@ public static short returnsShortP(int type)
 	}
 	public static Short returnsShort(int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return (short)666;
 	}
 
@@ -1503,6 +1537,7 @@ public static int returnsIntegerP(int type)
 	}
 	public static Integer returnsInteger(int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return 666;
 	}
 
@@ -1512,6 +1547,7 @@ public static long returnsLongP(int type)
 	}
 	public static Long returnsLong(int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return 666L;
 	}
 
@@ -1521,6 +1557,7 @@ public static float returnsFloatP(int type)
 	}
 	public static Float returnsFloat(int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return 666f;
 	}
 
@@ -1530,6 +1567,7 @@ public static double returnsDoubleP(int type)
 	}
 	public static Double returnsDouble(int type)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return 666.0;
 	}
 
@@ -1579,6 +1617,7 @@ private static void testManyOut(Connection conn) throws SQLException {
 
 			"EXTERNAL NAME '" + CLASS_NAME + "output' NO SQL LANGUAGE JAVA PARAMETER STYLE JAVA");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 
 		scp.execute("CREATE PROCEDURE OP_INOUT " +
 			"(INOUT I1 INT, INOUT I2 INT, INOUT I3 INT, INOUT I4 INT, INOUT I5 INT, " +
@@ -1719,6 +1758,7 @@ private static void test5116(Connection conn) throws Throwable
     "PRIMARY KEY ( AIID ) )");
 
 		stmt.execute("CREATE PROCEDURE doInsertion(IN P1 VARCHAR(2) FOR BIT DATA) " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 						"EXTERNAL NAME '" + CLASS_NAME + "doInsertion'" +
 						" MODIFIES SQL DATA LANGUAGE JAVA PARAMETER STYLE JAVA");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/outparams30.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/outparams30.java
index 44c71bbe41..a19392ac02 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/outparams30.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/outparams30.java
@@ -38,6 +38,7 @@ public class outparams30 extends outparams {
 	public static void takesBigDecimal(BigDecimal[] outparam, int type)
 	{
 		outparam[0] = (outparam[0] == null ? new BigDecimal("33") : outparam[0].add(outparam[0]));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		outparam[0].setScale(4, RoundingMode.DOWN);
 	}
 	
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/simpleThread.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/simpleThread.java
index 919006eb4f..88688fcaf5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/simpleThread.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/simpleThread.java
@@ -47,6 +47,7 @@ public simpleThread( String query, long waitTime) {
                 _wait = waitTime;
                 _myCount = getCount();
                 _query = query;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5708
                 start();
         }
 
@@ -107,6 +108,7 @@ public simpleThread(String argv[]) throws Exception {
 
             String query = "SELECT * from people ORDER by name";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5708
             Thread[] threads = {
                 new simpleThread(query,0),
                 new simpleThread(query,10000),
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java
index 4320ae3f6e..806414f8cd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java
@@ -36,14 +36,17 @@ public static void deleteFromATable() throws SQLException
         PreparedStatement statement = null;
         Statement s = con.createStatement();
         ResultSet rs = s.executeQuery("SELECT c1 from new org.apache.derby.catalog.TriggerOldTransitionRows() AS EQ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Vector<Long> keys = new Vector<Long>();
         while(rs.next()){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             keys.addElement(rs.getLong(1));
         }
         rs.close();
 
         statement = 
         con.prepareStatement("delete from t1  where c1  = ?");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (long key : keys) {
            statement.setLong(1, key);
            statement.executeUpdate();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
index e3d737fa03..38a97d957f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
@@ -47,9 +47,12 @@ public static void main(String[] args) throws Throwable{
         conn.setAutoCommit(false);
         conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1961
+//IC see: https://issues.apache.org/jira/browse/DERBY-2911
         createTables(conn, true);
         
         BufferedInputStream inStream;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1914
         String resource = "org/apache/derbyTesting/functionTests/tests/" +
                 "lang/wisc_setup.sql";  
         // set input stream
@@ -70,10 +73,13 @@ public static void main(String[] args) throws Throwable{
 	
 	public static void createTables(Connection conn, boolean compress)
 			throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4363
                 createTables(conn, compress, 10000);
         }
 	public static void createTables(Connection conn, boolean compress, int numRows)
 			throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1961
+//IC see: https://issues.apache.org/jira/browse/DERBY-2911
 
 		Statement stmt = conn.createStatement();
 		
@@ -95,6 +101,7 @@ public static void createTables(Connection conn, boolean compress, int numRows)
 											 "string4 char(52) )");
 		//--insert numRows rows into TENKTUP1
 		WISCInsert wi = new WISCInsert();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4363
 		wi.doWISCInsert(numRows, "TENKTUP1", conn);
 		
 		stmt.execute("create unique index TK1UNIQUE1 on TENKTUP1(unique1)");
@@ -129,6 +136,7 @@ public static void createTables(Connection conn, boolean compress, int numRows)
 											"string4 char(52) )");
 		//-- insert numRows rows into TENKTUP2
 		wi = new WISCInsert();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4363
 		wi.doWISCInsert(numRows, "TENKTUP2", conn);
 		
 		stmt.execute("create unique index TK2UNIQUE1 on TENKTUP2(unique1)");
@@ -179,10 +187,13 @@ public static void createTables(Connection conn, boolean compress, int numRows)
 
 		conn.commit();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1961
+//IC see: https://issues.apache.org/jira/browse/DERBY-2911
 		if (!compress) {
 			return;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-937
 		PreparedStatement ps2 = conn.prepareStatement
 			("call SYSCS_UTIL.SYSCS_COMPRESS_TABLE(?, ?, ?)");
 		ps2.setString(1, "APP");
@@ -218,8 +229,10 @@ public static void createTables(Connection conn, boolean compress, int numRows)
      * @return An open stream
     */
     protected static InputStream openTestResource(final URL url)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1914
         throws PrivilegedActionException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged
         (new java.security.PrivilegedExceptionAction<InputStream>(){
 
@@ -241,6 +254,7 @@ public InputStream run() throws IOException {
     protected static URL getTestResource(final String name)
     {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     return AccessController.doPrivileged
         (new java.security.PrivilegedAction<URL>(){
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/Derby5624Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/Derby5624Test.java
index adad9902af..4eb630367b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/Derby5624Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/Derby5624Test.java
@@ -1,171 +1,173 @@
-package org.apache.derbyTesting.functionTests.tests.largedata;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-import junit.framework.Test;
-import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.BaseTestSuite;
-import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
-import org.apache.derbyTesting.junit.JDBC;
-
-
-/*
-Class org.apache.derbyTesting.functionTests.tests.store.Derby5624Test
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*/
-
-
-/**
-
-Test to reproduce DERBY-5624, a recursion during DropOnCommit causes out
-of stack space for operations that generate a lot of objects to be dropped
-at commit time. 
-
-This test reproduces the problem by creating a table with 1000 columns, then
-an index on each of those columns, loads some data and then call compress
-will drop and recreate each of those indexes.  At commit time each index
-drop will have registered itself onto the Observer list for processing at
-commit time.  Before fix this would fail with out of disk space in at least
-XP, ibm16 default jvm configuration.
-
-**/
-
-public class Derby5624Test extends BaseJDBCTestCase
-{
-    /**************************************************************************
-     * Fields of the class
-     **************************************************************************
-     */
-
-    /**************************************************************************
-     * Constructors for This class:
-     **************************************************************************
-     */
-
-    /**************************************************************************
-     * Private/Protected methods of This class:
-     **************************************************************************
-     */
-
-    /**************************************************************************
-     * Public Methods of This class:
-     **************************************************************************
-     */
-
-    /**************************************************************************
-     * Public Methods of XXXX class:
-     **************************************************************************
-     */
-
-    public Derby5624Test(String name) 
-    {
-        super(name);
-    }
-
-    
-    /**
-     * DERBY-5624 test case
-     * <p>
-     *
-     **/
-    public void testDERBY_5624()
-        throws SQLException
-    {
-        Statement stmt = createStatement();
-
-        PreparedStatement insert_stmt = 
-            prepareStatement(
-                "INSERT INTO TESTBIGTABLE (col1, col2, col3) VALUES(?, ?, ?)");
-
-        for (int i = 0; i < 3000; i++)
-        {
-            insert_stmt.setInt(1, i);
-            insert_stmt.setInt(2, -(i));
-            insert_stmt.setInt(3, i);
-            insert_stmt.executeUpdate();
-        }
-
-        commit();
-
-        // create index on each column
-        for (int i = 0; i < 1000; i++)
-        {
-            stmt.executeUpdate(
-                "CREATE INDEX INDEXBIG" + i + 
-                " on TESTBIGTABLE (col" + i + ")");
-        }
-        commit();
-
-        // see if compress succeeeds 
-        stmt.executeUpdate(
-            "call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'TESTBIGTABLE', 0)");
-
-        commit();
-
-        // verify access to table after the commit, previous to fix the
-        // commit would fail with an out of memory or out of stack space error.
-        JDBC.assertUnorderedResultSet(
-            prepareStatement(
-                "select col1, col2 from TESTBIGTABLE where col1 = 10").executeQuery(),
-            new String[][] {{"10", "-10"}});
-
-    }
-
-    protected static Test baseSuite(String name) 
-    {
-        BaseTestSuite suite = new BaseTestSuite(name);
-        suite.addTestSuite(Derby5624Test.class);
-        return new CleanDatabaseTestSetup(suite)
-        {
-            /**
-             * Creates the tables used in the test cases.
-             * @exception SQLException if a database error occurs
-             */
-            protected void decorateSQL(Statement stmt) throws SQLException
-            {
-                Connection conn = stmt.getConnection();
-
-                // create table with 1000 columns
-                StringBuffer create_table_qry = new StringBuffer(10000);
-
-                create_table_qry.append("CREATE TABLE TESTBIGTABLE (col0 int");
-
-                for (int colnum = 1; colnum < 1000; colnum++)
-                {
-                    create_table_qry.append(", col" + colnum + " int");
-                }
-                create_table_qry.append(")");
-
-                // CREATE TABLE TESTBIGTABLE (
-                //     col0 int, col1 int, ... , col999 int)
-                stmt.executeUpdate(create_table_qry.toString());
-
-                conn.setAutoCommit(false);
-            }
-        };
-    }
-
-    public static Test suite() 
-    {
-        BaseTestSuite suite = new BaseTestSuite("Derby5624Test");
-        suite.addTest(baseSuite("Derby5624Test:embedded"));
-        return suite;
-    }
-}
+package org.apache.derbyTesting.functionTests.tests.largedata;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import junit.framework.Test;
+import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestSuite;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.JDBC;
+
+
+/*
+Class org.apache.derbyTesting.functionTests.tests.store.Derby5624Test
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/
+
+
+/**
+
+Test to reproduce DERBY-5624, a recursion during DropOnCommit causes out
+of stack space for operations that generate a lot of objects to be dropped
+at commit time. 
+
+This test reproduces the problem by creating a table with 1000 columns, then
+an index on each of those columns, loads some data and then call compress
+will drop and recreate each of those indexes.  At commit time each index
+drop will have registered itself onto the Observer list for processing at
+commit time.  Before fix this would fail with out of disk space in at least
+XP, ibm16 default jvm configuration.
+
+**/
+
+public class Derby5624Test extends BaseJDBCTestCase
+{
+    /**************************************************************************
+     * Fields of the class
+     **************************************************************************
+     */
+
+    /**************************************************************************
+     * Constructors for This class:
+     **************************************************************************
+     */
+
+    /**************************************************************************
+     * Private/Protected methods of This class:
+     **************************************************************************
+     */
+
+    /**************************************************************************
+     * Public Methods of This class:
+     **************************************************************************
+     */
+
+    /**************************************************************************
+     * Public Methods of XXXX class:
+     **************************************************************************
+     */
+
+    public Derby5624Test(String name) 
+    {
+        super(name);
+    }
+
+    
+    /**
+     * DERBY-5624 test case
+     * <p>
+     *
+     **/
+    public void testDERBY_5624()
+        throws SQLException
+    {
+        Statement stmt = createStatement();
+
+        PreparedStatement insert_stmt = 
+            prepareStatement(
+                "INSERT INTO TESTBIGTABLE (col1, col2, col3) VALUES(?, ?, ?)");
+
+        for (int i = 0; i < 3000; i++)
+        {
+            insert_stmt.setInt(1, i);
+            insert_stmt.setInt(2, -(i));
+            insert_stmt.setInt(3, i);
+            insert_stmt.executeUpdate();
+        }
+
+        commit();
+
+        // create index on each column
+        for (int i = 0; i < 1000; i++)
+        {
+            stmt.executeUpdate(
+                "CREATE INDEX INDEXBIG" + i + 
+                " on TESTBIGTABLE (col" + i + ")");
+        }
+        commit();
+
+        // see if compress succeeeds 
+        stmt.executeUpdate(
+            "call SYSCS_UTIL.SYSCS_COMPRESS_TABLE('APP', 'TESTBIGTABLE', 0)");
+
+        commit();
+
+        // verify access to table after the commit, previous to fix the
+        // commit would fail with an out of memory or out of stack space error.
+        JDBC.assertUnorderedResultSet(
+            prepareStatement(
+                "select col1, col2 from TESTBIGTABLE where col1 = 10").executeQuery(),
+            new String[][] {{"10", "-10"}});
+
+    }
+
+    protected static Test baseSuite(String name) 
+    {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
+        BaseTestSuite suite = new BaseTestSuite(name);
+        suite.addTestSuite(Derby5624Test.class);
+        return new CleanDatabaseTestSetup(suite)
+        {
+            /**
+             * Creates the tables used in the test cases.
+             * @exception SQLException if a database error occurs
+             */
+            protected void decorateSQL(Statement stmt) throws SQLException
+            {
+                Connection conn = stmt.getConnection();
+
+                // create table with 1000 columns
+                StringBuffer create_table_qry = new StringBuffer(10000);
+
+                create_table_qry.append("CREATE TABLE TESTBIGTABLE (col0 int");
+
+                for (int colnum = 1; colnum < 1000; colnum++)
+                {
+                    create_table_qry.append(", col" + colnum + " int");
+                }
+                create_table_qry.append(")");
+
+                // CREATE TABLE TESTBIGTABLE (
+                //     col0 int, col1 int, ... , col999 int)
+                stmt.executeUpdate(create_table_qry.toString());
+
+                conn.setAutoCommit(false);
+            }
+        };
+    }
+
+    public static Test suite() 
+    {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
+        BaseTestSuite suite = new BaseTestSuite("Derby5624Test");
+        suite.addTest(baseSuite("Derby5624Test:embedded"));
+        return suite;
+    }
+}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java
index 31ce0b4199..642a2f20c1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java
@@ -277,6 +277,9 @@ close time (milliseconds) = 0
 					Scan type=btree
 					Tree height=3
 					start position:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 						&gt;= on first 1 column(s).
 						Ordered null semantics on the following columns: 
 						0 
@@ -314,6 +317,7 @@ public Derby6317Test(String name)
 
     public static Test suite() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Derby6317Test");
         suite.addTest(baseSuite("Derby6317Test:embedded"));
         return suite;
@@ -434,6 +438,7 @@ public void dontrun_testDERBY_6317()
 
     protected static Test baseSuite(String name) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(Derby6317Test.class);
         return new CleanDatabaseTestSetup(suite)
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java
index 87ecd4c1fb..8679cefb62 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsLiteTest.java
@@ -45,6 +45,7 @@ public LobLimitsLiteTest(String name) {
     
     public static Test suite() {
         Test test = LobLimitsTest.baseSuite(_1MB, _100K);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("LobLimitsLiteTest");
         suite.addTest(test);
         suite.addTest(TestConfiguration.clientServerDecorator(test));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java
index 20afd2748d..21f386e5d5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/LobLimitsTest.java
@@ -140,6 +140,7 @@ static Test baseSuite(final int biggestSize, final int bigSize) {
         sysprops.setProperty("derby.locks.monitor", "true");
         // Some of the test cases depend on certain other test cases to run
         // first, so force the test cases to run in lexicographical order.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test suite =
                 new CleanDatabaseTestSetup(
                         new BaseTestSuite(LobLimitsTest.class)) {
@@ -243,6 +244,11 @@ public void test_02_BlobNegative() throws SQLException {
             insertBlob_SetBlob("BlobTest #7 (setBlob with 4Gb blob",
                     insertBlob, _4GbBlob,
                     _4GB, 0, 1, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1903
+//IC see: https://issues.apache.org/jira/browse/DERBY-5308
+//IC see: https://issues.apache.org/jira/browse/DERBY-5338
+//IC see: https://issues.apache.org/jira/browse/DERBY-5341
+//IC see: https://issues.apache.org/jira/browse/DERBY-5317
             fail("Inserting 4BG blob should have thrown exception");
         } catch (SQLException sqle) {
             // DERBY DOES NOT SUPPORT INSERT OF 4GB BLOB
@@ -357,6 +363,11 @@ public void test_05_ClobNegative() throws Exception {
                 MORE_DATA_THAN_COL_WIDTH));
         // DERBY-5341 : Client allows clob larger than
         // column width to be inserted.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1903
+//IC see: https://issues.apache.org/jira/browse/DERBY-5308
+//IC see: https://issues.apache.org/jira/browse/DERBY-5338
+//IC see: https://issues.apache.org/jira/browse/DERBY-5341
+//IC see: https://issues.apache.org/jira/browse/DERBY-5317
         if (!usingDerbyNetClient()) {
             try {
                 insertClob2("ClobTest #9.1 ", insertClob2,
@@ -386,6 +397,11 @@ public void test_05_ClobNegative() throws Exception {
             insertClob2("ClobTest #11 ", insertClob2,
                     MORE_DATA_THAN_COL_WIDTH, 4, 1,
                        MORE_DATA_THAN_COL_WIDTH - 1, CHARDATAFILE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1903
+//IC see: https://issues.apache.org/jira/browse/DERBY-5308
+//IC see: https://issues.apache.org/jira/browse/DERBY-5338
+//IC see: https://issues.apache.org/jira/browse/DERBY-5341
+//IC see: https://issues.apache.org/jira/browse/DERBY-5317
             fail("ClobTest #11. Should have thrown XSDA4");
         } catch (SQLException sqle) {
             // NEGATIVE TEST - Expected Exception: truncation of non-blanks not
@@ -399,6 +415,11 @@ public void test_05_ClobNegative() throws Exception {
             // give -ve streamlength
             insertClob_SetCharacterStream("ClobTest #12.1", insertClob,
                     BIG_LOB_SZ, 4, 1, -1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1903
+//IC see: https://issues.apache.org/jira/browse/DERBY-5308
+//IC see: https://issues.apache.org/jira/browse/DERBY-5338
+//IC see: https://issues.apache.org/jira/browse/DERBY-5341
+//IC see: https://issues.apache.org/jira/browse/DERBY-5317
             fail("ClobTest #12. Should have thrown XJ025");
         } catch (SQLException sqle) {
             assertSQLState("XJ025", sqle);
@@ -420,6 +441,11 @@ public void test_05_ClobNegative() throws Exception {
             insertClob_SetClob("ClobTest #13 (setClob with 4Gb clob",
                     insertClob, _4GBClob,
                     _4GB, 0, 1, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1903
+//IC see: https://issues.apache.org/jira/browse/DERBY-5308
+//IC see: https://issues.apache.org/jira/browse/DERBY-5338
+//IC see: https://issues.apache.org/jira/browse/DERBY-5341
+//IC see: https://issues.apache.org/jira/browse/DERBY-5317
             fail("ClobTest #13. Should have thrown 22033");
         } catch (SQLException sqle) {
          // DERBY DOES NOT SUPPORT INSERT OF 4GB CLOB
@@ -462,6 +488,11 @@ private void negativeSpaceTruncationTest(String msg)
         try {
             insertClob2(msg, insertClob2, BIG_LOB_SZ, 4, 1,
                     (NUM_TRAILING_SPACES + BIG_LOB_SZ - 1), CHARDATAFILE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1903
+//IC see: https://issues.apache.org/jira/browse/DERBY-5308
+//IC see: https://issues.apache.org/jira/browse/DERBY-5338
+//IC see: https://issues.apache.org/jira/browse/DERBY-5341
+//IC see: https://issues.apache.org/jira/browse/DERBY-5317
             fail(msg +". Should have thrown XSDA4");
         } catch (SQLException sqle) {
             // EXPECTED EXCEPTION - stream has trailing spaces,but stream
@@ -472,6 +503,11 @@ private void negativeSpaceTruncationTest(String msg)
         try {
             insertClob2(msg, insertClob2, BIG_LOB_SZ, 5, 1,
                     (NUM_TRAILING_SPACES + BIG_LOB_SZ + 1), CHARDATAFILE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1903
+//IC see: https://issues.apache.org/jira/browse/DERBY-5308
+//IC see: https://issues.apache.org/jira/browse/DERBY-5338
+//IC see: https://issues.apache.org/jira/browse/DERBY-5341
+//IC see: https://issues.apache.org/jira/browse/DERBY-5317
             fail(msg + ". Should have thrown XSDA4");
         } catch (SQLException sqle) {
             // EXPECTED EXCEPTION - stream has trailing spaces,but stream
@@ -1618,6 +1654,7 @@ public byte[] getBytes(long pos, int length)
     }
 
     public void free() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         throw new SQLException("Not implemented");
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java
index 652819c934..1f63e779d4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/largedata/_Suite.java
@@ -39,6 +39,7 @@ public _Suite(String name) {
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("largedata suite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(Derby6317Test.suite());
         // DERBY-5624, currently this runs out of file descriptors on unix
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.java
index 2c1e2f3c41..794c027b6c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/CacheManagerMBeanTest.java
@@ -45,6 +45,7 @@ public class CacheManagerMBeanTest extends MBeanTest {
     private final static int DEFAULT_STATEMENT_CACHE_SIZE = 100;
 
     private static String[] ALL_ATTRIBUTES = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         "CollectAccessCounts", "HitCount", "MissCount", "EvictionCount",
         "MaxEntries", "AllocatedEntries", "UsedEntries"
     };
@@ -139,6 +140,7 @@ public void testAllMBeansStartedAndStopped() throws Exception {
         names = queryMBeans(pattern);
         assertEquals("Incorrect number of MBeans found in " + names,
                      3, names.size());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
 
         // Shut down the database.
         TestConfiguration.getCurrent().shutdownDatabase();
@@ -167,6 +169,7 @@ public void testPageCache() throws Exception {
         assertLongAttribute(0, name, "HitCount");
         assertLongAttribute(0, name, "MissCount");
         assertLongAttribute(0, name, "EvictionCount");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         assertLongAttribute(DEFAULT_PAGE_CACHE_SIZE, name, "MaxEntries");
         // Cannot reliably tell how many entries to expect.
         // More than 0 for sure.
@@ -216,6 +219,7 @@ public void testContainerCache() throws Exception {
         assertLongAttribute(0, name, "HitCount");
         assertLongAttribute(0, name, "MissCount");
         assertLongAttribute(0, name, "EvictionCount");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         assertLongAttribute(DEFAULT_CONTAINER_CACHE_SIZE, name, "MaxEntries");
         // Cannot reliably tell how many entries to expect.
         // More than 0 for sure.
@@ -229,6 +233,7 @@ public void testContainerCache() throws Exception {
      * Test the {@code CacheManagerMBean} for the statement cache.
      */
     public void testStatementCache() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         getConnection(); // boot the database
         Set<ObjectName> names =
                 queryMBeans(createObjectName("StatementCache", null));
@@ -327,6 +332,7 @@ public void testStatementCache() throws Exception {
      * base lacks SystemPermission("engine", "monitor").
      */
     public void withoutPermsTest() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         getConnection(); // boot the database
         Set<ObjectName> names =
                 queryMBeans(createObjectName("StatementCache", null));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JDBCMBeanTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JDBCMBeanTest.java
index 2ff7b46376..5cd960a7e1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JDBCMBeanTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JDBCMBeanTest.java
@@ -93,6 +93,7 @@ public void testAttributeDriverLevel() throws Exception {
         // get JDBC version from DatabaseMetaData for comparison
         DatabaseMetaData dmd = getConnection().getMetaData();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5521
         String JDBCVersion =
             dmd.getJDBCMajorVersion() + "." +
             dmd.getJDBCMinorVersion();
@@ -105,6 +106,7 @@ public void testAttributeDriverLevel() throws Exception {
         println("MBean driverLevel  = " + driverLevelString);
 
         assertEquals(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5521
             "Unexpected driver level string: " + driverLevelString +
             " JDBCVersion: " + JDBCVersion,
             -1, driverLevelString.indexOf('?'));
@@ -134,6 +136,7 @@ public void testAttributeMajorVersion() throws Exception {
          * this test configuration is client/server.
          * Assuming that the embedded driver is available in the classpath.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         Driver d = new org.apache.derby.jdbc.EmbeddedDriver();
         int expected = d.getMajorVersion();
         assertIntAttribute(expected, getJdbcMBeanObjectName(), "MajorVersion");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXConnectionDecorator.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXConnectionDecorator.java
index e6d4779107..5237572ada 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXConnectionDecorator.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXConnectionDecorator.java
@@ -51,6 +51,7 @@ static Test remoteNoSecurity(Test test)
      */
     static Test platformMBeanServer(Test test)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         return new JMXConnectionDecorator(test, false);
     }
     
@@ -69,6 +70,7 @@ protected void setUp() throws Exception {
         oldGetter =
             JMXConnectionGetter.mbeanServerConnector.get();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         JMXConnectionGetter getter = remote ?
                 new RemoteConnectionGetter(getJmxUrl()) :
                 new PlatformConnectionGetter();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXConnectionGetter.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXConnectionGetter.java
index f4a08865d6..36f798e94c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXConnectionGetter.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXConnectionGetter.java
@@ -40,8 +40,10 @@ interface JMXConnectionGetter {
     /**
      * Get a connection to the platform MBean Server.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
     MBeanServerConnection getMBeanServerConnection(String user,
             String password) throws Exception;
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
     void close(MBeanServerConnection jmxConnection) throws Exception;
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXTest.java
index b9d685c1e4..ef28e9bd5b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/JMXTest.java
@@ -49,6 +49,7 @@ public JMXTest(String name) {
     public static Test suite() {
         
         return MBeanTest.suite(JMXTest.class, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
                                         "JMXTest");
     }
     
@@ -67,9 +68,11 @@ public void testDerbyRegisteredMBeansSimpleInfo() throws Exception
         // We expect Derby to have registered MBeans
         // including a management MBean and the one registered
         // by our setUp method.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3499
         assertTrue("Derby MBEan count:" + derbyMBeans.size(),
                 derbyMBeans.size() >= 2);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
         final MBeanServerConnection jmx = getMBeanServerConnection();
         for (final ObjectName name : derbyMBeans)
         {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java
index 8e11411020..ac646c313e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java
@@ -52,6 +52,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * MBeans, which is why this class extends BaseJDBCTestCase instead of 
  * BaseTestCase.
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
 abstract class MBeanTest extends BaseJDBCTestCase {
      
     /**
@@ -65,6 +66,7 @@ public MBeanTest(String name) {
     
     protected static Test suite(Class<? extends MBeanTest> testClass, String suiteName) {
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite outerSuite = new BaseTestSuite(suiteName);
         
         Test platform = new BaseTestSuite(testClass,  suiteName + ":platform");
@@ -79,6 +81,7 @@ protected static Test suite(Class<? extends MBeanTest> testClass, String suiteNa
         outerSuite.addTest(platform);
         
         // Create a suite of all "test..." methods in the class.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test suite = new BaseTestSuite(testClass,  suiteName + ":client");
         
         // Set up to get JMX connections using remote JMX
@@ -97,11 +100,16 @@ protected static Test suite(Class<? extends MBeanTest> testClass, String suiteNa
          * and specify this using additional command line properties at server 
          * startup.
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1387
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
         NetworkServerTestSetup networkServerTestSetup = 
                 new NetworkServerTestSetup (
                         suite, // run all tests in this class in the same setup
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
                         getCommandLineProperties(false), // need to set up JMX in JVM
                         new String[0], // no server arguments needed
+//IC see: https://issues.apache.org/jira/browse/DERBY-3504
                         true   // wait for the server to start properly
                 );
 
@@ -118,6 +126,7 @@ protected static Test suite(Class<? extends MBeanTest> testClass, String suiteNa
                 SecurityManagerSetup.noSecurityManager(networkServerTestSetup);
         // this decorator makes sure the suite is empty if this configration
         // does not support the network server:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         outerSuite.addTest(TestConfiguration.defaultServerDecorator(testSetup));
        
         return outerSuite;
@@ -139,6 +148,7 @@ protected static String[] getCommandLineProperties(boolean authentication)
         ArrayList<String> list = new ArrayList<String>();
         list.add("com.sun.management.jmxremote.port=" 
                 + TestConfiguration.getCurrent().getJmxPort());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
         list.add("com.sun.management.jmxremote.authenticate=" +
                 Boolean.toString(authentication));
         list.add("com.sun.management.jmxremote.ssl=false");
@@ -170,8 +180,11 @@ protected void setUp() throws Exception {
     
     @Override
     protected void tearDown() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         super.tearDown();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         if (jmxConnection != null) {
            JMXConnectionGetter.mbeanServerConnector.get().close(jmxConnection);
            jmxConnection = null;
@@ -189,8 +202,11 @@ protected void tearDown() throws Exception {
     protected MBeanServerConnection getMBeanServerConnection() 
             throws Exception {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         if (jmxConnection == null)
             jmxConnection = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
             JMXConnectionGetter.mbeanServerConnector.get()
                 .getMBeanServerConnection(null, null);
         return jmxConnection;
@@ -232,13 +248,16 @@ protected void enableManagement() throws Exception {
         // check the status of the management service
         Boolean active = (Boolean) 
                 getAttribute(mgmtObjName, "ManagementActive");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
 
         if (!active.booleanValue()) {
             // JMX management is not active, so activate it by invoking the
             // startManagement operation.
             invokeOperation(mgmtObjName, "startManagement");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
 
             active = (Boolean) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
                     getAttribute(mgmtObjName, "ManagementActive");
         }
         
@@ -253,6 +272,7 @@ protected void enableManagement() throws Exception {
     protected Set<ObjectName> getDerbyDomainMBeans() throws Exception
     {
         final ObjectName derbyDomain = new ObjectName("org.apache.derby:*");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
         return queryMBeans(derbyDomain);
     }
 
@@ -264,6 +284,7 @@ protected Set<ObjectName> getDerbyDomainMBeans() throws Exception
     Set<ObjectName> queryMBeans(final ObjectName name) throws Exception {
         final MBeanServerConnection serverConn = getMBeanServerConnection(); 
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
             new PrivilegedExceptionAction<Set<ObjectName>>() {
                 public Set<ObjectName> run() throws IOException {
@@ -284,6 +305,7 @@ protected ObjectName getApplicationManagementMBean() throws Exception
         /* prepare the Management mbean, which is (so far) the only MBean that
          * can be created/registered from a JMX client, and without knowing the
          * system identifier */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
         final ObjectName mgmtObjName 
                 = new ObjectName("org.apache.derby", "type", "Management");
         // create/register the MBean. If the same MBean has already been
@@ -334,6 +356,7 @@ protected ObjectName getDerbyMBeanName(Hashtable<String,String> keyProperties)
      *         <code>null</code> if there is no return value.
      */
     protected Object invokeOperation(ObjectName objName, String name)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
             throws Exception
     {
         return invokeOperation(objName, name, new Object[0], new String[0]);
@@ -352,6 +375,7 @@ protected Object invokeOperation(ObjectName objName, String name)
      *         <code>null</code> if there is no return value.
      */
     protected Object invokeOperation(final ObjectName objName, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
                                      final String name, 
                                      final Object[] params, 
                                      final String[] sign)
@@ -377,6 +401,7 @@ public Object run() throws InstanceNotFoundException, MBeanException, Reflection
      * @param value the new value of the attribute
      * @throws Exception if an error occurs when changing the attribute
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
     void setAttribute(final ObjectName objName, String name, Object value)
             throws Exception {
         final MBeanServerConnection jmxConn = getMBeanServerConnection();
@@ -401,6 +426,7 @@ public Void run() throws Exception {
     protected Object getAttribute(final ObjectName objName, final String name) 
             throws Exception {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
         final MBeanServerConnection jmxConn = getMBeanServerConnection();
         
         return AccessController.doPrivileged(
@@ -413,6 +439,9 @@ public Object run() throws AttributeNotFoundException, InstanceNotFoundException
     }
     
     protected void assertBooleanAttribute(boolean expected,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1387
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
             ObjectName objName, String name) throws Exception
     {
         Boolean bool = (Boolean) getAttribute(objName, name);
@@ -421,6 +450,7 @@ protected void assertBooleanAttribute(boolean expected,
     }
     
     protected void assertIntAttribute(int expected,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
             ObjectName objName, String name) throws Exception
     {
         Integer integer = (Integer) getAttribute(objName, name);
@@ -429,6 +459,7 @@ protected void assertIntAttribute(int expected,
     }
     
     protected void assertLongAttribute(int expected,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
             ObjectName objName, String name) throws Exception
     {
         Long longNumber = (Long) getAttribute(objName, name);
@@ -485,6 +516,7 @@ protected void checkIntAttributeValue(ObjectName objName, String name)
      * @throws java.lang.Exception if an unexpected error occurs
      */
     protected void checkLongAttributeValue(ObjectName objName, String name) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
             throws Exception {
         
         Object value = getAttribute(objName, name);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/ManagementMBeanTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/ManagementMBeanTest.java
index 5a80733fa7..4db2174b5b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/ManagementMBeanTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/ManagementMBeanTest.java
@@ -53,6 +53,7 @@ public class ManagementMBeanTest extends MBeanTest {
     // MBean names
     private static final String[] MBEAN_TYPES =
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4356
         "NetworkServer",
         MANAGEMENT,
         "JDBC",
@@ -66,6 +67,7 @@ public ManagementMBeanTest(String name) {
     public static Test suite() {
         
         return MBeanTest.suite(ManagementMBeanTest.class, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
                                         "ManagementMBeanTest");
     }
     
@@ -92,6 +94,7 @@ private void startStopManagement(ObjectName mbean) throws Exception
         // may include MBeans left over from other engines which ran
         // in earlier tests
         StatsTuple originalStats = getCurrentStats( "Original" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4356
 
         assertTrue("DerbyMBeanCount:" + originalStats.getBeanCount(), originalStats.getBeanCount() >= EXPECTED_BEAN_COUNT );
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java
index e148818963..242ba0ad3d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/NetworkServerMBeanTest.java
@@ -172,6 +172,7 @@ public void testAttributeDrdaHost() throws Exception {
         // localhost may also be 127.0.0.1
         // serverHost = expected host
         String serverHost = TestConfiguration.getCurrent().getHostName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6294
         if (serverHost.equals("localhost") || serverHost.equals("127.0.0.1") ||
                 serverHost.equals(" 0:0:0:0:0:0:0:1")) {
             String mbeanHost = (String) getAttribute(
@@ -225,6 +226,7 @@ public void testAttributeDrdaSslMode() throws Exception {
     
     public void testAttributeDrdaStreamOutBufferSize() throws Exception {
         // assuming that the buffer size is 0 (default)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3578
         assertIntAttribute(0,
                 getNetworkServerMBeanObjectName(), 
                 "DrdaStreamOutBufferSize");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/PlatformConnectionGetter.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/PlatformConnectionGetter.java
index 6e286de208..3b018b7f3e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/PlatformConnectionGetter.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/PlatformConnectionGetter.java
@@ -39,6 +39,7 @@ class PlatformConnectionGetter implements JMXConnectionGetter {
      * User name ignored, only applicable for remote connections.
      */
     public MBeanServerConnection getMBeanServerConnection(String user,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
             String password) throws Exception {
         
         return AccessController.doPrivileged(new PrivilegedAction<MBeanServerConnection>() {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/RemoteConnectionGetter.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/RemoteConnectionGetter.java
index 6289f42722..a92b700d7c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/RemoteConnectionGetter.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/RemoteConnectionGetter.java
@@ -37,6 +37,7 @@ class RemoteConnectionGetter implements JMXConnectionGetter {
     
     static final ThreadLocal<Map<MBeanServerConnection,JMXConnector>> connections =
         new ThreadLocal<Map<MBeanServerConnection,JMXConnector>>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
 
     private final JMXServiceURL url;
 
@@ -45,6 +46,7 @@ class RemoteConnectionGetter implements JMXConnectionGetter {
     }
 
     public MBeanServerConnection getMBeanServerConnection(String user,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3506
             String password) throws Exception {
         
         HashMap<String,String[]> env = new HashMap<String,String[]>();
@@ -55,6 +57,7 @@ public MBeanServerConnection getMBeanServerConnection(String user,
         }
         
         JMXConnector jmxc = JMXConnectorFactory.connect(url, env);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         MBeanServerConnection jmxConn =  jmxc.getMBeanServerConnection();
         
         Map<MBeanServerConnection,JMXConnector> conns = connections.get();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/VersionMBeanTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/VersionMBeanTest.java
index 1314b16329..20271037b2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/VersionMBeanTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/VersionMBeanTest.java
@@ -53,7 +53,11 @@ public static Test suite() {
          * derbynet.jar. This means that it is assumed that the Network Server
          * is running and that JMX is enabled. This is being handled by the
          * super class. */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1387
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
         return MBeanTest.suite(VersionMBeanTest.class, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
                                         "VersionMBeanTest");
     }
     
@@ -99,6 +103,7 @@ private ObjectName getDerbyJarObjectName()
      * @throws MalformedObjectNameException if the object name is not valid
      */
     private ObjectName getDerbynetJarObjectName() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
             throws Exception {
         
         // get a reference to the VersionMBean instance for derbynet.jar
@@ -121,6 +126,7 @@ public void testDerbyJarAttributeAlpha() throws Exception {
     }
     
     public void testDerbynetJarAttributeAlpha() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         checkBooleanAttributeValue(getDerbynetJarObjectName(), "Alpha");
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/_Suite.java
index 87921e2a3e..ed7def4399 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/management/_Suite.java
@@ -51,15 +51,26 @@ private _Suite(String name) {
     public static Test suite() {
 
         BaseTestSuite suite = new BaseTestSuite("management");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6097
         if (JDBC.vmSupportsJMX()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
             suite.addTest(JMXTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1387
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
             suite.addTest(ManagementMBeanTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3424
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
             suite.addTest(InactiveManagementMBeanTest.suite());
             suite.addTest(VersionMBeanTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
             suite.addTest(JDBCMBeanTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3435
             suite.addTest(NetworkServerMBeanTest.suite());
             suite.addTest(CustomMBeanServerBuilderTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6733
             suite.addTest(CacheManagerMBeanTest.suite());
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/BlobMemTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/BlobMemTest.java
index 4d6878a003..373bd7136c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/BlobMemTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/BlobMemTest.java
@@ -73,6 +73,7 @@ private void testBlobLength(boolean lengthless, int extraLen) throws SQLExceptio
         if (lengthless) {
             Method m = null;
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 Class<?> c = ps.getClass();
                 m = c.getMethod("setBinaryStream",new Class[] {Integer.TYPE,
                             InputStream.class});                
@@ -82,6 +83,7 @@ private void testBlobLength(boolean lengthless, int extraLen) throws SQLExceptio
                 println("Skipping lengthless insert because method is not available");
                 return;                
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             m.invoke(ps, new Object[] {2,stream});
         }
         else
@@ -200,6 +202,7 @@ public void testBlobLengthTooLongDerby961() throws SQLException, IOException, Il
         testBlobLength(false, 10000);  
     }
        public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =  new BaseTestSuite();
         // Just add Derby-6096 embedded as it takes time to run
         suite.addTest(new BlobMemTest("xtestderby6096BlobhashJoin"));
@@ -221,6 +224,9 @@ public static Test suite() {
      */
     public void testDerby4477_3645_3646_Repro_lowmem()
             throws SQLException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 
         setAutoCommit(false);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java
index ade9d91f01..7118a87aaa 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java
@@ -74,6 +74,7 @@ private void testClobLength(boolean lengthless) throws SQLException, IOException
         if (lengthless) {
             Method m = null;
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 Class<?> c = ps.getClass();
                 m = c.getMethod("setCharacterStream",new Class[] {Integer.TYPE,
                             InputStream.class});
@@ -83,6 +84,7 @@ private void testClobLength(boolean lengthless) throws SQLException, IOException
                 println("Skipping lengthless insert because method is not available");
                 return;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             m.invoke(ps, new Object[] {2, reader});
         }
         else
@@ -180,6 +182,7 @@ public void testClobLengthWithLengthlessInsert() throws SQLException, IOExceptio
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =  new BaseTestSuite();
         // Just add Derby-6096 embedded as it takes time to run
         suite.addTest(new ClobMemTest("xtestderby6096ClobHashJoin"));
@@ -201,6 +204,9 @@ public static Test suite() {
      */
     public void testDerby4477_3645_3646_Repro_lowmem_clob()
             throws SQLException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-3650
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 
         setAutoCommit(false);
 
@@ -239,6 +245,8 @@ public void testDerby4477_3645_3646_Repro_lowmem_clob()
 
         is = rs.getCharacterStream(2);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-4531
         stream = new LoopingAlphabetReader(blobLen);
         assertEquals(stream, is);
         rs.close();
@@ -249,6 +257,8 @@ public void testDerby4477_3645_3646_Repro_lowmem_clob()
         rs.next();
 
         is = rs.getCharacterStream(2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4477
+//IC see: https://issues.apache.org/jira/browse/DERBY-4531
         stream = new LoopingAlphabetReader(blobLen);
         assertEquals(stream, is);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ConnectionHandling.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ConnectionHandling.java
index 8321fbf862..8613e1bd08 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ConnectionHandling.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ConnectionHandling.java
@@ -42,14 +42,18 @@ public static void main(String[] args) throws Exception {
         new org.apache.derby.jdbc.EmbeddedDriver();
         
         Connection conn = DriverManager.getConnection("jdbc:derby:wombat;create=true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-444
         conn.close();
         conn = null;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<Connection> list = new ArrayList<Connection>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-444
         list.ensureCapacity(30000);
         
         Properties p = new Properties();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-444
         while (true) {
             Connection c;
             try {
@@ -91,9 +95,11 @@ public static void main(String[] args) throws Exception {
         {
             // Sleep for 10 secs as we know the implementation
             // of the low meory watermark resets after 5 seconds.
+//IC see: https://issues.apache.org/jira/browse/DERBY-444
             if (i == 300)
                 Thread.sleep(10000L);
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-444
                   Connection c = DriverManager.getConnection("jdbc:derby:wombat", p);
                   list.add(c);
                   ok++;
@@ -121,12 +127,14 @@ public static void main(String[] args) throws Exception {
         int alreadyClosed = 0;
         for (int i = 0; i < list.size(); i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Connection c = list.set(i, null);
             if (c.isClosed())
                 alreadyClosed++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-444
             else 
                 c.close();
         }
         System.out.println("already closed      : " + alreadyClosed);        
   }
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ConnectionHandlingJunit.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ConnectionHandlingJunit.java
index f73668c52d..94d748d71d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ConnectionHandlingJunit.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/ConnectionHandlingJunit.java
@@ -45,6 +45,7 @@ public class ConnectionHandlingJunit extends BaseJDBCTestCase {
      */
     public static Writer getLogDiscarder() {
         // Writer discarding all data written to it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4432
         return new Writer() {
             public void write(char[] cbuf, int off, int len) {
                 // Do nothing.
@@ -77,9 +78,11 @@ public ConnectionHandlingJunit(String name) {
      */
     public static Test suite() {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ConnectionHandlingJUnit");
         
         // Only support for java.sql.DriverManager has been implemented.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
         if (JDBC.vmSupportsJDBC3()) {
             /* driverMgrTestConnectionsToNonexistentDb:
              * Only support for DriverManager (JDBC2 and above) for now, for
@@ -94,6 +97,7 @@ public static Test suite() {
 
             TestCase nonExistentDbTest = new ConnectionHandlingJunit(
                     "driverMgrTestConnectionsToNonexistentDb");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4432
             TestCase nonExistentDbTestInMem = new ConnectionHandlingJunit(
                     "driverMgrTestConnectionsToNonexistentDbInMemory");
             
@@ -103,6 +107,7 @@ public static Test suite() {
              * resources are <i>almost</i> exhausted from the embedded test.
              */
             suite.addTest(nonExistentDbTest);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4432
             suite.addTest(nonExistentDbTestInMem);
             // to run the test in client/server mode, comment the above line,
             // uncomment the next and recompile.
@@ -143,6 +148,7 @@ public static Test suite() {
      */
     public void driverMgrTestConnectionsToNonexistentDb() throws SQLException {
         String url = getTestConfiguration().getJDBCUrl("nonexistentDatabase");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4432
         driverMgrConnectionInitiator(url, false);
     }
 
@@ -176,6 +182,7 @@ private void driverMgrConnectionInitiator(String url, boolean appendId)
                 try {
                     // We are expecting an exception here because we are trying to 
                     // connect to a DB that does not exist.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4432
                     myInvalidConn = DriverManager.getConnection(
                             appendId ? url + count : url);
                     // The following may happen because of changes to helper methods
@@ -250,6 +257,7 @@ private void loadDriver(String url) throws SQLException {
         // written for every failed connection attempt.
         // To take effect, the property must be set before the driver is
         // loaded, which means this test should be run separately.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4432
         setSystemProperty("derby.stream.error.method",
                 "org.apache.derbyTesting.functionTests.tests.memory." +
                 "ConnectionHandlingJunit.getLogDiscarder");
@@ -266,6 +274,7 @@ private void loadDriver(String url) throws SQLException {
             println("Loading JDBC driver " + driverClass);
             // load the driver
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Class<?> clazz = Class.forName(driverClass);
                 clazz.getConstructor().newInstance();
             } catch (ClassNotFoundException cnfe) {
@@ -280,6 +289,7 @@ private void loadDriver(String url) throws SQLException {
                 throw new SQLException("Failed to load JDBC driver '" 
                         + driverClass + "', InstantiationException: " 
                         + ie.getMessage());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             } catch (NoSuchMethodException ie) {
                 throw new SQLException("Missing constructor for JDBC driver '" 
                         + driverClass + "', NoSuchMethodException: " 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/Derby5730Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/Derby5730Test.java
index 8bc7c0076b..31ca5a8637 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/Derby5730Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/Derby5730Test.java
@@ -48,6 +48,7 @@ public Derby5730Test(String name) {
     public static Test suite() {
         // The test case uses DriverManager, so require JDBC 3.0 or higher.
         if (JDBC.vmSupportsJDBC3()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(Derby5730Test.class);
         }
         return new BaseTestSuite("Derby5730Test - skipped");
@@ -108,6 +109,7 @@ public void testLeak() throws IOException {
      * Must run with capped memory size (-Xmx16M) to expose the memory leak.
      */
     public static void main(String[] args) throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5753
         Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
         for (int i = 0; i < FUNCTIONS.length; i++) {
             Connection c = DriverManager.getConnection(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/MemoryLeakFixesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/MemoryLeakFixesTest.java
index 60740413db..04c6785f25 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/MemoryLeakFixesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/MemoryLeakFixesTest.java
@@ -175,6 +175,7 @@ public void testResultSetgcD3316() throws Exception {
      * @throws SQLException if something goes wrong
      */
     public void testRepeatedDatabaseCreationWithAutoStats()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5336
             throws SQLException {
         final String DB_NAME = "derby-memory-test";
         final File DB_DIR = new File("system", DB_NAME);
@@ -184,6 +185,7 @@ public void testRepeatedDatabaseCreationWithAutoStats()
         // within 20 iterations;  this program was run on Windows 7 64-bit using
         // jdk1.6.0_26
         int iter = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5472
         while (iter < 20) {
             
             println("-- " + iter++);
@@ -202,6 +204,7 @@ public void testRepeatedDatabaseCreationWithAutoStats()
             JDBCDataSource.clearStringBeanProperty(ds, "createDatabase");
 
             // Disable auto-commit to speed up insert statements.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5472
             conn.setAutoCommit(false);
             
             // we'll use this one statement the whole time this db is open
@@ -216,6 +219,7 @@ public void testRepeatedDatabaseCreationWithAutoStats()
             // table trigger the daemon that updates index cardinality
             // statistics. derby.storage.indexStats.debug.createThreshold is
             // currently 100.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5472
             PreparedStatement ins =
                     conn.prepareStatement("INSERT INTO TEST VALUES ?");
             for (int i = 0; i < 200; i++) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/MultiByteClobTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/MultiByteClobTest.java
index ac4c4af7eb..5bd612ba9a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/MultiByteClobTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/MultiByteClobTest.java
@@ -141,8 +141,13 @@ public void testLargeMultiByteCharLob() throws SQLException, IOException {
      * @return test suite
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("MultiByteClobTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3818
         suite.addTest(baseSuite("MultiByteClobTest:embedded"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3818
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
+//IC see: https://issues.apache.org/jira/browse/DERBY-3769
         suite.addTest(TestConfiguration
             .clientServerDecorator(baseSuite("MultiByteClobTest:client")));
         Properties p = new Properties();
@@ -157,6 +162,7 @@ public static Test suite() {
      * @param name name for the suite.
      */
     private static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(MultiByteClobTest.class);
         return new CleanDatabaseTestSetup(DatabasePropertyTestSetup
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/RolesDependencyTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/RolesDependencyTest.java
index 220ccfa86c..74eed430ea 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/RolesDependencyTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/RolesDependencyTest.java
@@ -44,6 +44,7 @@ public RolesDependencyTest(String name) {
 
     public static Test suite() {
         Test test = new BaseTestSuite(RolesDependencyTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // Populate database with data as DBO
         test = new CleanDatabaseTestSetup(test) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/TriggerTests.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/TriggerTests.java
index a10c7fbb67..0efc34a8e4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/TriggerTests.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/TriggerTests.java
@@ -326,6 +326,7 @@ public void basicSetup() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test1InsertAfterTrigger() throws SQLException{	
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -346,6 +347,7 @@ public void test1InsertAfterTrigger() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test1InsertAfterTriggerStoredProc() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -421,6 +423,7 @@ public void test1DeleteAfterTrigger() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test1DeleteAfterTriggerStoredProc() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -494,6 +497,7 @@ public void test1UpdateAfterTrigger() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test1UpdateAfterTriggerStoredProc() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -557,6 +561,8 @@ public void test1InsertBeforeTrigger() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test1InsertBeforeTriggerStoredProc() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -632,6 +638,7 @@ public void test1DeleteBeforeTrigger() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test1DeleteBeforeTriggerStoredProc() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -708,6 +715,7 @@ public void test1UpdateBeforeTrigger() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test1UpdateBeforeTriggerStoredProc() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -796,6 +804,7 @@ public void test2InsertAfterTriggerAccessLOB() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test2DeleteAfterTriggerAccessLOB() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -927,6 +936,7 @@ public void test2InsertAfterTriggerUpdatedLOB() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test2UpdateAfterTriggerUpdatedLOB() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -988,6 +998,11 @@ public void test2InsertBeforeTriggerAccessLOB() throws SQLException{
 		ps.setInt(1, 1);
         ps.executeUpdate();
 		commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
    		runtest2InsertTriggerTest();
 	}
 	
@@ -1003,6 +1018,7 @@ public void test2InsertBeforeTriggerAccessLOB() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test2DeleteBeforeTriggerAccessLOB() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -1243,6 +1259,7 @@ public static void proc_test3_UpdateBeforeTrigger_select_table(int p1) throws SQ
 	 * @throws SQLException
 	 */
 	public void test4UpdateAfterTriggerAccessLOB() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -1322,6 +1339,21 @@ public void test4UpdateAfterTriggerUpdatedLOB() throws SQLException{
 	 * @throws SQLException
 	 */
 	public void test4UpdateBeforeTrigger() throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         if (isDerby1482Fixed == false)
             return;
 
@@ -1375,6 +1407,8 @@ public void test5InsertBeforeTriggerNoReferencingClause() throws SQLException{
 		s.execute("create trigger trigger1 NO CASCADE BEFORE INSERT on table1 " +
 			"select updates from table2 where table2.id = 1");
 		commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
    		runtest1InsertTriggerTest();		       	
 	}
 	 
@@ -1417,6 +1451,7 @@ public void test5DeleteBeforeTriggerNoReferencingClause() throws SQLException{
 	public void test5UpdateAfterTriggerNoReferencingClause() throws SQLException{
         basicSetup();
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
 		s.execute("create trigger trigger1 AFTER UPDATE of status on table1 " +
 				"update table2 set updates = updates + 1 where table2.id = 1");
 		commit();
@@ -1432,6 +1467,7 @@ public void test5UpdateAfterTriggerNoReferencingClause() throws SQLException{
 	public void test5UpdateBeforeTriggerNoReferencingClause() throws SQLException{
         basicSetup();
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
 		s.execute("create trigger trigger1 NO CASCADE BEFORE UPDATE of status on table1 " +
 				"select updates from table2 where table2.id = 1");
 		commit();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/XAMemTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/XAMemTest.java
index e3f3dcf4ac..49d84b760f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/XAMemTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/XAMemTest.java
@@ -85,10 +85,13 @@ public void testDerby4137_TransactionTimeoutSpecifiedNotExceeded()
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5291
+//IC see: https://issues.apache.org/jira/browse/DERBY-4137
         if (JDBC.vmSupportsJDBC3()) {
             return TestConfiguration.defaultSuite(XAMemTest.class);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(
             "XAMemTest skipped - XADataSource not available");
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
index ddac592a27..b1defd1810 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
@@ -33,15 +33,20 @@ public _Suite(String name) {
     }
 
     public static Test suite() throws Exception{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Memory Suite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4538
         suite.addTest(TriggerTests.suite());
         suite.addTest(BlobMemTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3741
         suite.addTest(ClobMemTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3741
         suite.addTest(MultiByteClobTest.suite());
         suite.addTest(RolesDependencyTest.suite());
         suite.addTest(Derby3009Test.suite());
         suite.addTest(Derby5730Test.suite());
         suite.addTest(MemoryLeakFixesTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4137
         suite.addTest(XAMemTest.suite());
         return suite;
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/BasicInMemoryDbTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/BasicInMemoryDbTest.java
index 3f6ec5eaa3..9e18cd54cf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/BasicInMemoryDbTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/BasicInMemoryDbTest.java
@@ -52,6 +52,8 @@ public class BasicInMemoryDbTest
      */
     private static final MemoryDbManager dbm =
             MemoryDbManager.getSharedInstance();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4436
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
 
     public BasicInMemoryDbTest(String name) {
         super(name);
@@ -66,6 +68,7 @@ public BasicInMemoryDbTest(String name) {
     public void tearDown()
             throws Exception {
         dbm.cleanUp();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5107
         super.tearDown();
     }
 
@@ -114,6 +117,8 @@ public void testFunctionalityPresent() {
     public void testCreateBackupBootRestore()
             throws IOException, SQLException {
         // 1. Create the database with the in-memory protocol.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4436
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
         Connection memCon = dbm.createDatabase("newMemDb");
         // Make sure the database is newly created.
         assertNull(memCon.getWarnings());
@@ -175,6 +180,8 @@ public void testCreateBackupBootRestore()
 
         // 5. Restore modified backup into memory.
         memCon = dbm.getConnection("newMemDb2;createFrom=" + dbPathBackedUp);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4436
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
 
         // 6. Verify the new content, where the original in-memory database was
         //    backed up and the directory protocol was used to add one more row
@@ -197,7 +204,10 @@ public void testCreateBackupBootRestore()
      * @throws SQLException if something goes wrong
      */
     public void testShutdown()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4093
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4436
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
         dbm.createDatabase("/tmp/myDB");
         try {
             DriverManager.getConnection(
@@ -218,6 +228,7 @@ public void testShutdown()
      */
     public void testEnginehutdown()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5107
         dbm.createDatabase("/tmp/myDB");
         try {
             DriverManager.getConnection(
@@ -238,9 +249,12 @@ public void testEnginehutdown()
      * @throws SQLException if something goes wrong
      */
     public void testBootSameDbDifferentSubSubProtocol()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4171
             throws SQLException {
         final String dbName = "BSDDSSP";
         // Connect to the in-memory database and create a table.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4436
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
         Connection con1 = dbm.createDatabase(dbName);
         Statement stmt1 = dbm.createStatement(con1);
         stmt1.execute("create table t (text varchar(255))");
@@ -270,7 +284,10 @@ public void testBootSameDbDifferentSubSubProtocol()
      * @throws SQLException if something else goes wrong
      */
     public void testDelete()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4436
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5107
             loadDriver();
             Connection conCreate = DriverManager.getConnection(
                     "jdbc:derby:memory:deleteDbSimple;create=true");
@@ -303,6 +320,7 @@ public void testDelete()
             // Delete the database.
             try {
                 DriverManager.getConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
                     "jdbc:derby:memory:deleteDbSimple;drop=true");
                 fail("Dropping database should have raised exception.");
             } catch (SQLException sqle) {
@@ -321,6 +339,8 @@ public void testDelete()
      */
     public void testDeleteWhenInUse()
             throws IOException, SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5107
+//IC see: https://issues.apache.org/jira/browse/DERBY-5107
         loadDriver();
         Connection con = DriverManager.getConnection(
                 "jdbc:derby:memory:deleteDb;create=true");
@@ -382,6 +402,7 @@ public void testShutdownWhenInUse()
 
     public static Test suite() {
         // Run only in embedded-mode for now.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new SupportFilesSetup(
             new BaseTestSuite(BasicInMemoryDbTest.class));
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java
index 3d13c23e4f..f1f2934bee 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/Derby6662Test.java
@@ -41,6 +41,7 @@ public static Test suite() {
     protected void tearDown() throws Exception
     {
       super.tearDown();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6662
       dropInMemoryDb();
     }
     
@@ -53,6 +54,7 @@ public void testDatabaseMetaDataCalls() throws SQLException
     
     public void testOptionalToolMetaData() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6662
         Connection conn = obtainConnection();
         // register the database metadata wrapper
         goodStatement( conn, "call syscs_util.syscs_register_tool" +
@@ -129,6 +131,7 @@ private StringBuffer constructUrl() {
             sb.append('/');
             sb.append("memory:");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6662
         sb.append("DBMDTestDb");
         return sb;
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java
index 722fe46991..125347f70e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java
@@ -102,6 +102,7 @@ public void testConcurrentAccessAndDrop()
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
        return new BaseTestSuite(DropWhileConnectingTest.class);
     }
 
@@ -374,6 +375,7 @@ public void run() {
                     }
                 }
             } catch (Throwable t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6824
                 if (t instanceof org.apache.derby.shared.common.error.ShutdownException){
                     // Not sure if this is a good thing yet.
                     System.out.println(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/MemoryDbManager.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/MemoryDbManager.java
index 87289b97f4..294ba8ecd2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/MemoryDbManager.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/MemoryDbManager.java
@@ -242,6 +242,7 @@ public void cleanUp()
             throws SQLException {
         // Close all known statements.
         for (int i=STATEMENTS.size() -1; i >= 0; i--) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             Statement stmt = STATEMENTS.remove(i);
             stmt.close();
         }
@@ -257,6 +258,7 @@ public void cleanUp()
         }
         // Delete all known databases.
         for (int i=DATABASES.size() -1; i >= 0; i--) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             dropDatabase(DATABASES.remove(i));
         }
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/MogTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/MogTest.java
index fb5f046e12..88a6170666 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/MogTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/MogTest.java
@@ -77,6 +77,7 @@ public void testClusMogInMemory()
           } catch (SQLException sqle) {
               // Ignore exceptions during close.
           }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
           dropInMemoryDb();
       }
       println("duration-in-memory: " + (System.currentTimeMillis() - start));
@@ -93,6 +94,7 @@ public void doTestClusMog(Connection conn)
     // NOTE: Due to instability in the test, the seed has been fixed.
     //       See DERBY-4209 (and DERBY-4085).
     //final long _seed = System.currentTimeMillis();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4085
     final long _seed = 1241411544935L;
     java.util.Random rng = new java.util.Random(_seed);
     /** MOG generator being tested */
@@ -128,6 +130,7 @@ public void doTestClusMog(Connection conn)
       // Cluster the samples again, using SQL.
       clusMogSql.clusterSQL(genMog.n, center, ns, sample);
       // Compare the computed MOG configurations.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4085
       assertEquals("MOG configurations differ, seed=" + _seed,
               clusMog.n, clusMogSql.n);
       compare(clusMog.n, clusMog.weight, clusMogSql.weight, _seed);
@@ -141,6 +144,7 @@ public void doTestClusMog(Connection conn)
       // Cluster the samples again, using SQL.
       clusMogSql.clusterSQL(genMog.n, center, ns, sample);
       // Compare the computed MOG configurations.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4085
       assertEquals("MOG configurations differ, seed=" + _seed,
               clusMog.n, clusMogSql.n);
       compare(clusMog.n, clusMog.weight, clusMogSql.weight, _seed);
@@ -160,6 +164,7 @@ private void compare(int n, double ones[], double oths[], final long seed)
       final double err = dif / (1.0 + Math.abs(one));
       // Use if to avoid unnecessary string concatenation.
       if (err >= thresh) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4085
         fail("Error too big;" + err + " >= " + thresh + ", seed=" + seed);
       }
     }
@@ -184,6 +189,8 @@ private Connection obtainConnection()
         sqle.initCause(e);
         throw sqle;
     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4436
+//IC see: https://issues.apache.org/jira/browse/DERBY-4428
     StringBuffer sb = constructUrl().append(";create=true");
     return DriverManager.getConnection(sb.toString());
   }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/_Suite.java
index e52a67318f..68d6bd1bac 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/memorydb/_Suite.java
@@ -42,10 +42,13 @@ private _Suite(String name) {
 
     public static Test suite() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("In-memory db test suite");
         // Tests are not yet compatible with JSR169 / JavaME
+//IC see: https://issues.apache.org/jira/browse/DERBY-4085
         if (!JDBC.vmSupportsJSR169()) {
             suite.addTest(BasicInMemoryDbTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6662
             suite.addTest(Derby6662Test.suite());
             suite.addTest(MogTest.suite());
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMulti10x1.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMulti10x1.java
index 94e48e7a60..a9a5634c4f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMulti10x1.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMulti10x1.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class StressMulti10x1 extends TestCase {
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
         return StressMultiTest.suite(10,1);
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMulti50x59.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMulti50x59.java
index ae6a99c562..885b84aeae 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMulti50x59.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMulti50x59.java
@@ -32,6 +32,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class StressMulti50x59 extends TestCase {
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
         return StressMultiTest.embeddedSuite(50,59);
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMultiTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMultiTest.java
index 91647ae3f7..45e9d89602 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMultiTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/multi/StressMultiTest.java
@@ -109,6 +109,7 @@ public StressMultiTest(String s) {
      * Default run is 10 threads for 10 minutes in each mode
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
         Properties dbprops = new Properties();
         dbprops.put("derby.locks.deadlockTimeout", "2");
         dbprops.put("derby.locks.waitTimeout", "3");
@@ -117,6 +118,7 @@ public static Test suite() {
         sysprops.put("derby.storage.keepTransactionLog", "true");
         sysprops.put("derby.language.logStatementText", "true");
         sysprops.put("derby.infolog.append", "true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test embedded = new BaseTestSuite(StressMultiTest.class);
         embedded = new SystemPropertyTestSetup(embedded,sysprops,true);
         embedded = new DatabasePropertyTestSetup(embedded,dbprops);
@@ -129,6 +131,7 @@ public static Test suite() {
         // with -Dderby.storage.keepTransactionLog=true if
         // you need to save the transaction log for client.
         Test client = TestConfiguration.clientServerDecorator(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                 new BaseTestSuite(StressMultiTest.class));
         client = newCleanDatabase(new DatabasePropertyTestSetup(client,dbprops));
         Test encrypted = new BaseTestSuite(StressMultiTest.class);
@@ -151,6 +154,7 @@ public static Test suite() {
         suite.addTest(newCleanDatabase(unencrypted));
         //Encrypted uses a different database so it needs its own newCleanDatabase
         suite.addTest(Decorator.encryptedDatabase(new DatabasePropertyTestSetup(newCleanDatabase(encrypted),dbprops)));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
 
         return suite;
     }
@@ -181,6 +185,7 @@ public static Test embeddedSuite(int threads, int minutes) {
         THREADS = threads;
         MINUTES = minutes;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
         Properties dbprops = new Properties();
         dbprops.put("derby.locks.deadlockTimeout", "2");
         dbprops.put("derby.locks.waitTimeout", "3");
@@ -190,6 +195,7 @@ public static Test embeddedSuite(int threads, int minutes) {
         sysprops.put("derby.storage.keepTransactionLog", "true");
         sysprops.put("derby.language.logStatementText", "true");
         sysprops.put("derby.infolog.append", "true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test embedded = new BaseTestSuite(StressMultiTest.class);
         embedded = new SystemPropertyTestSetup(embedded,sysprops,true);
         embedded = new DatabasePropertyTestSetup(embedded,dbprops);
@@ -258,6 +264,7 @@ public void setUp() throws Exception{
         this.getTestConfiguration().setVerbosity(DEBUG);
         
         // Let -Dderby.tests.ThreadsMinutes=TTxMM override.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4429
         String optThreadsMinutes = getSystemProperty(THREADSMINUTES);
         if ( optThreadsMinutes != null )
         { // Syntax: '99x22' meaning 99 threads 22 minutes.
@@ -294,6 +301,7 @@ public void tearDown() throws Exception{
      */
     public void testStressMulti() throws Throwable{
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
         thrown = null;
         
         StressMultiRunnable[] tct = new StressMultiRunnable[THREADS];
@@ -304,6 +312,7 @@ public void testStressMulti() throws Throwable{
         runTestCaseRunnables (tct);
         tct = null;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
         if (thrown!=null) throw thrown;
      }
 
@@ -343,6 +352,7 @@ protected void runTestCaseRunnables(final StressMultiRunnable[] runnables) {
      * Handles any exceptions we get in the threads
      */
     private synchronized void handleException(final Throwable t, String message) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
             complete = true; //This stops the threads.
             if (thrown == null) {
                 if(t instanceof AssertionFailedError) {
@@ -375,8 +385,10 @@ public StressMultiRunnable(String name, int minutes) {
             super();
             this.name = name;
             starttime = System.currentTimeMillis();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
             runtime = minutes*60*1000; //convert minutes to ms
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
                 con = openDefaultConnection();
                 con.setAutoCommit(false);
             } catch (SQLException e) {
@@ -444,6 +456,7 @@ public void run() {
             catch(Throwable t) {
                println("Exception in " + name + ": " + t);
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
                    handleException(t, name + " - " +
                        new Date(System.currentTimeMillis()).toString());
             }
@@ -477,6 +490,7 @@ private void create(String table) throws SQLException {
                         || e.equals("42Y55") || e.equals("42000")
                         || e.equals("40001") || e.equals("40XL1")
                         || e.equals("40XL2") || e.equals("42Y07")
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
                         || e.equals("42Y55")
                         ) {
                     //Ignore these
@@ -554,6 +568,8 @@ private void roll(String table) throws SQLException {
         private void select(String table) throws SQLException {
             Statement s = con.createStatement();
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
+//IC see: https://issues.apache.org/jira/browse/DERBY-3789
                 ResultSet rs = s.executeQuery("select * from " + table);
                 JDBC.assertDrainResults(rs);
             } catch (SQLException se) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/nist/NistScripts.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/nist/NistScripts.java
index 4fa9462da2..3ecd086f2b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/nist/NistScripts.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/nist/NistScripts.java
@@ -170,6 +170,7 @@ public final class NistScripts extends ScriptTestCase {
 	 * Return the suite that runs the NIST SQL scripts.
 	 */
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("NIST");
         
         String suiteUser = null;
@@ -189,7 +190,9 @@ public static Test suite() {
             
             // Add the new user suite with the change user decorator to
             // the main suite but continue to add tests to the user suite.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             userSuite = new BaseTestSuite("NIST user="+testUser);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2007
             String password = testUser.concat("ni8s4T");
             suite.addTest(
                     TestConfiguration.changeUserDecorator(userSuite, testUser, password));
@@ -198,6 +201,7 @@ public static Test suite() {
             userSuite.addTest(test);
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2007
         Test test = getIJConfig(suite);
         
         // Setup user authentication
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.java
index 8f9e94b5cf..a91586fbb4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.java
@@ -69,6 +69,7 @@ public static Test suite() {
         // Likely a jvm issue, so don't run on that OS...
         if (BaseTestCase.isJ9Platform())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             Test test = new BaseTestSuite("Derby5937SlaveShutdownTest");
             return test;
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/DestroySlaveDB.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/DestroySlaveDB.java
index 71b3513c8c..b7844b7fdf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/DestroySlaveDB.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/DestroySlaveDB.java
@@ -48,6 +48,7 @@ public static Test suite()
         System.out.println("**** DestroySlaveDB.suite()");
         System.out.println("'DestroySlaveDB' can not be run outside the 'ReplicationRun' framework.");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DestroySlaveDB");
         
         String masterHostName = System.getProperty("test.serverHost", "localhost");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/KillMaster.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/KillMaster.java
index ad8df3c00f..a0a0690d18 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/KillMaster.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/KillMaster.java
@@ -53,6 +53,7 @@ public static Test suite()
     {
         System.out.println("**** KillMaster.suite()");
         System.out.println("'KillMaster' can not be run outside the 'ReplicationRun' framework.");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("KillMaster");
          
         String masterHostName = System.getProperty("test.serverHost", "localhost");
@@ -130,6 +131,7 @@ public void testKillMaster()
                 masterServerHost,
                 ReplicationRun.ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
                 masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 ReplicationRun.masterDbSubPath); // Distinguishing master/slave
                                                   // Will only work if default/initial values are used!
                                                   // MUST BE FULL PATH!!!
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/KillSlave.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/KillSlave.java
index c48243c65f..66822408f7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/KillSlave.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/KillSlave.java
@@ -50,6 +50,7 @@ public static Test suite()
         System.out.println("**** KillSlave.suite()");
         System.out.println("'KillSlave' can not be run outside the 'ReplicationRun' framework.");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("KillSlave");
         
         String masterHostName = System.getProperty("test.serverHost", "localhost");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
index e0bb0a06fa..e8821c6410 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
@@ -58,6 +58,7 @@ public class ReplicationRun extends BaseTestCase
      */
     final static String REPLICATIONTEST_PROPFILE = "replicationtest.properties";
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-4246
     final static String REPLICATION_MASTER_TIMED_OUT           = "XRE06";
     final static String REPLICATION_SLAVE_STARTED_OK           = "XRE08";
     final static String REPLICATION_DB_NOT_BOOTED              = "XRE11";
@@ -125,6 +126,7 @@ public class ReplicationRun extends BaseTestCase
     static String test_jars = null; // Path for derbyTesting.jar:junit_jar
     
     final static String FS = File.separator;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
     final static String PS = File.pathSeparator;
     
     static boolean showSysinfo = false;
@@ -205,16 +207,19 @@ protected void setUp() throws Exception
      */
     protected void tearDown() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         stopServer(jvmVersion, derbyVersion,
                 slaveServerHost, slaveServerPort);
         
         stopServer(jvmVersion, derbyVersion,
                 masterServerHost, masterServerPort);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Thread t : helperThreads) {
             t.join();
         }
         helperThreads = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         close(masterConn);
         close(slaveConn);
 
@@ -243,6 +248,7 @@ private static void close(Connection conn) throws SQLException {
     public void runBare() throws Throwable {
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4270
 
             super.runBare();
 
@@ -303,6 +309,7 @@ public void runBare() throws Throwable {
     }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
     String useEncryption(boolean create)
     {
         String encryptionString = "";
@@ -334,6 +341,7 @@ String useEncryption(boolean create)
     public void testReplication()
     throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG("WARNING: Define in subclass of ReplicationRun. "
                 + "See ReplicationRun_Local for an example.");
     }
@@ -347,6 +355,7 @@ void connectPing(String fullDbPath,
         
         String dbURL = serverURL( fullDbPath, serverHost, serverPort );
         Connection conn = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
         String lastmsg = null;
         long sleeptime = 200L;
         boolean done = false;
@@ -355,10 +364,13 @@ void connectPing(String fullDbPath,
         {
             try
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 Class.forName(DRIVER_CLASS_NAME); // Needed when running from classes!
                 conn = DriverManager.getConnection(dbURL);
                 done = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
                 util.DEBUG("Ping Got connection after " 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
                         + count +" * "+ sleeptime + " ms.");
                 conn.close();
             }
@@ -371,6 +383,7 @@ void connectPing(String fullDbPath,
                 lastmsg = errCode + " " + sState + " " + lastmsg 
                         + ". Expected: "+ expectedState;
                 util.DEBUG("Got SQLException: " + lastmsg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
                 if ( (errCode == 40000)
                 && (sState.equalsIgnoreCase(expectedState) ) )
                 {
@@ -390,6 +403,7 @@ void connectPing(String fullDbPath,
         }
     }
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
     String showCurrentState(String ID, long waitTime,
             String fullDbPath, 
             String serverHost, int serverPort)
@@ -430,9 +444,11 @@ void waitForConnect(long sleepTime, int tries,
         {
             try
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
                 ClientDataSourceInterface ds = configureDataSource(
                     fullDbPath, serverHost, serverPort, useEncryption(false) );
                 Connection conn = ds.getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
                 util.DEBUG("Wait Got connection after " 
                         + (count-1) +" * "+ sleepTime + " ms.");
                 conn.close();
@@ -463,6 +479,8 @@ void waitForSQLState(String expectedState,
         {
             try
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
                 ClientDataSourceInterface ds = configureDataSource(
                         fullDbPath,
                         serverHost,
@@ -502,6 +520,7 @@ else if (count++ > tries)
             }
         }
     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
     void shutdownDb(String jvmVersion, // Not yet used
             String serverHost, int serverPort, 
             String dbPath, String replicatedDb,
@@ -546,6 +565,7 @@ void runTest(String replicationTest,
                 + ") "
                 );
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         if ( replicationTest == null ) 
         {
             util.DEBUG("No replicationTest specified. Exitting.");
@@ -570,6 +590,7 @@ void runTest(String replicationTest,
         
         String clientJvm = ReplicationRun.getClientJavaExecutableName();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         final boolean isRemote = !testClientHost.equals("localhost");
         final boolean isIjTest = (replicationTest.indexOf(".sql") >= 0);
 
@@ -580,6 +601,7 @@ void runTest(String replicationTest,
         // BaseTestCase.execJavaCmd() gives us. Note that this means we cannot
         // vary versions when running locally.
         if (isRemote) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5504
             cmd.add(clientJvm);
             cmd.add("-classpath");
             cmd.add(isIjTest ? ijClassPath : testingClassPath);
@@ -611,6 +633,7 @@ void runTest(String replicationTest,
             cmd.add(replicationTest);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         String[] command = util.toStringArray(cmd);
         
         long startTime = System.currentTimeMillis();
@@ -630,6 +653,7 @@ void runTest(String replicationTest,
                     "cd " + workingDir + ";" + util.splice(command, ' '),
                     testClientHost, testUser, "runTest ");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG("Time: " + (System.currentTimeMillis() - startTime) / 1000.0);
         
     }
@@ -640,6 +664,7 @@ void runTestOnSlave(String replicationTest,
             String dbName)
             throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG("runTestOnSlave(" + replicationTest
                 + ", " + clientVM
                 + ", " + testClientHost
@@ -650,6 +675,7 @@ void runTestOnSlave(String replicationTest,
                 );
         
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         String URL = slaveURL(dbName);
         String ijClassPath = derbyVersion +FS+ "derbyclient.jar"
                 + PS + derbyVersion +FS+ "derbyTesting.jar"
@@ -659,6 +685,7 @@ void runTestOnSlave(String replicationTest,
                 // See TestConfiguration: startNetworkServer and stopNetworkServer
                 + PS + test_jars;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         String clientJvm = ReplicationRun.getSlaveJavaExecutableName();
         
         if ( replicationTest == null ) 
@@ -667,6 +694,7 @@ void runTestOnSlave(String replicationTest,
             return;
         } 
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         final boolean isRemote = !serverHost.equals("localhost");
         final boolean isIjTest = (replicationTest.indexOf(".sql") >= 0);
 
@@ -719,6 +747,7 @@ void runTestOnSlave(String replicationTest,
                 "cd " + userDir + ";" + util.splice(command, ' '),
                 testClientHost, testUser, "runTestOnSlave ");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG("Time: " + (System.currentTimeMillis() - startTime) / 1000.0);
         
     }
@@ -759,12 +788,16 @@ private void runLoad(String load,
         
         String clientJvm = ReplicationRun.getClientJavaExecutableName();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         final boolean isRemote = !masterHost.equals("localhost");
         final boolean isIjTest = (load.indexOf(".sql") >= 0);
         
         util.DEBUG("load: " + load);
 
         ArrayList<String> cmd = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // For remote tests, we need to specify the Java VM to use and the
         // classpath. For local tests, we'll just use the JVM and the classpath
@@ -824,8 +857,12 @@ private void runStateTest(String stateTest,
                 );
         
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         String URL = masterLoadURL(dbSubPath);
         String ijClassPath = derbyVersion +FS+ "derbyclient.jar"
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 + PS + derbyVersion +FS+ "derbyTesting.jar"
                 // Needed for 'run resource 'createTestProcedures.subsql';' cases?
                 // Nope? what is 'resource'?
@@ -835,11 +872,15 @@ private void runStateTest(String stateTest,
                 // See TestConfiguration: startNetworkServer and stopNetworkServer
                 + PS + test_jars;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         String clientJvm = ReplicationRun.getClientJavaExecutableName();
         
         String command = null;
         
         if ( masterHost.equals("localhost") )
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         { // Use full classpath when running locally. Can not vary server versions!
             ijClassPath = classPath;
             testingClassPath = classPath;
@@ -847,6 +888,7 @@ private void runStateTest(String stateTest,
         util.DEBUG("stateTest: " + stateTest);
         if ( stateTest.indexOf(".sql") >= 0 )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
             command = clientJvm 
                     + " -Dij.driver=" + DRIVER_CLASS_NAME
                     + " -Dij.connection.startTestClient=" + URL
@@ -887,6 +929,7 @@ void bootMasterDatabase(String clientVM,
     {
         // Should just do a "connect....;create=true" here, instead of copying in initMaster.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         String URL = masterURL(dbName)
                 +";create=true"
                 +useEncryption(true);
@@ -897,6 +940,7 @@ void bootMasterDatabase(String clientVM,
             // from the module path after the upgrade tests have unloaded
             // the drivers.
             DriverManager.registerDriver(new ClientDriver());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
             Connection conn = DriverManager.getConnection(URL);
             conn.close();
@@ -906,7 +950,9 @@ void bootMasterDatabase(String clientVM,
         util.DEBUG("************************** DERBY-???? Preliminary needs to freeze db before copying to slave and setting replication mode.");
         
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
              URL = masterURL(dbName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
             Class.forName(DRIVER_CLASS_NAME); // Needed when running from classes!
             util.DEBUG("bootMasterDatabase getConnection("+URL+")");
             Connection conn = DriverManager.getConnection(URL);
@@ -923,6 +969,7 @@ void bootMasterDatabase(String clientVM,
                     masterServerHost, masterServerPort,
                     dbSubPath+FS+dbName);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         util.DEBUG("bootMasterDatabase done.");
     }
 
@@ -948,6 +995,7 @@ void startMaster(String clientVM,
         else
         {
             startMaster_ij(dbName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5318
                     masterHost, 
                     slaveReplInterface, slaveReplPort);
         }
@@ -970,6 +1018,9 @@ private void startMaster_ij(String dbName,
             ijClassPath = classPath;
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         String clientJvm = ReplicationRun.getMasterJavaExecutableName();
         
         String command = clientJvm
@@ -984,6 +1035,8 @@ private void startMaster_ij(String dbName,
                 masterHost, // Must be run on the master!
                 testUser,
                 "startMaster_ij ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG(results);
     }
     private void startMaster_direct(String dbName,
@@ -995,6 +1048,8 @@ private void startMaster_direct(String dbName,
             throws Exception
     {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         String URL = masterURL(dbName)
                 +";startMaster=true;slaveHost="+slaveReplInterface
                 +";slavePort="+slaveReplPort;
@@ -1010,6 +1065,7 @@ private void startMaster_direct(String dbName,
                     /* On 1.5 locking of Drivermanager.class prevents
                      * using DriverManager.getConnection() concurrently
                      * in startMaster and startSlave!
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                     Class.forName(DRIVER_CLASS_NAME); // Needed when running from classes!
                     conn = DriverManager.getConnection(URL);
                      */
@@ -1017,12 +1073,14 @@ private void startMaster_direct(String dbName,
                         +";slaveHost="+slaveReplInterface
                         +";slavePort="+slaveReplPort
                         +useEncryption(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
                     ClientDataSourceInterface ds = configureDataSource
                         ( masterDbPath( dbName ), masterHost, masterServerPort, connectionAttributes );
                     conn = ds.getConnection();
                     
                     done = true;
                     conn.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
                     util.DEBUG("startMaster_direct connected in " + count + " * 100ms.");
                 }
                 catch ( SQLException se )
@@ -1030,9 +1088,12 @@ private void startMaster_direct(String dbName,
                     int errCode = se.getErrorCode();
                     String msg = se.getMessage();
                     String sState = se.getSQLState();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3126
                     String expectedState = "XRE04";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                     util.DEBUG("startMaster Got SQLException: " 
                             + errCode + " " + sState + " " + msg + ". Expected " + expectedState);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
                     if ( (errCode == 40000)
                     && (sState.equalsIgnoreCase(expectedState) ) )
                     {
@@ -1049,6 +1110,7 @@ private void startMaster_direct(String dbName,
                     }
                     else
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
                         if (REPLICATION_MASTER_TIMED_OUT.equals(sState)) // FIXME! CANNOT_START_MASTER_ALREADY_BOOTED
                         {
                             util.DEBUG("Master already started?");
@@ -1068,6 +1130,7 @@ private void startMaster_direct(String dbName,
      */
     protected Connection getMasterConnection() throws SQLException {
         if (masterConn == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
             String url = masterURL(replicatedDb);
             masterConn = DriverManager.getConnection(url);
         }
@@ -1106,6 +1169,7 @@ protected void executeOnMaster(String sql) throws SQLException {
      * executing the sql
      */
     protected void executeOnSlave(String sql) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
          Statement s = getSlaveConnection().createStatement();
          s.execute(sql);
          s.close();
@@ -1131,6 +1195,7 @@ void startSlave(String clientVM,
         }
         else
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5318
             startSlave_ij(
                     dbName,
                     slaveClientInterface,
@@ -1146,6 +1211,8 @@ private void startSlave_ij(
             throws Exception
     {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         String URL = slaveURL(dbName)
                 +";startSlave=true;slaveHost="+slaveReplInterface
                 +";slavePort="+slaveReplPort;
@@ -1156,6 +1223,8 @@ private void startSlave_ij(
             ijClassPath = classPath;
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         String clientJvm = ReplicationRun.getSlaveJavaExecutableName();
         
         String command = clientJvm
@@ -1178,6 +1247,7 @@ private void startSlave_direct(String dbName,
             int slaveReplPort)
             throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         final String URL = slaveURL(dbName)
                 +";startSlave=true;slaveHost="+slaveReplInterface
                 +";slavePort="+slaveReplPort;
@@ -1189,6 +1259,7 @@ private void startSlave_direct(String dbName,
             final int fSlaveServerPort = slaveServerPort;
             final String fConnAttrs = "startSlave=true"
                                 +";slaveHost="+slaveReplInterface
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
                                 +";slavePort="+slaveReplPort
                                 +useEncryption(false);
             Thread connThread = new Thread(
@@ -1203,9 +1274,12 @@ public void run()
                         /*On 1.5 locking of Drivermanager.class prevents
                          * using DriverManager.getConnection() concurrently
                          * in startMaster and startSlave!
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                         Class.forName(DRIVER_CLASS_NAME); // Needed when running from classes!
                         conn = DriverManager.getConnection(URL);
                          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
                         ClientDataSourceInterface ds = configureDataSource(
                             fDbPath, fSlaveHost, fSlaveServerPort, fConnAttrs );
                         conn = ds.getConnection();
@@ -1223,6 +1297,7 @@ public void run()
             }
             );
             connThread.start();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5517
             registerThread(connThread);
             util.DEBUG("startSlave_direct exit.");
     }
@@ -1238,6 +1313,7 @@ void failOver(String jvmVersion,
     {
         if ( host.equalsIgnoreCase("localhost") )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5318
             failOver_direct(dbName);
         }
         else
@@ -1262,6 +1338,7 @@ private void failOver_ij(
             ijClassPath = classPath;
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         String clientJvm = ReplicationRun.getClientJavaExecutableName();
         
         String command = clientJvm
@@ -1277,11 +1354,14 @@ private void failOver_ij(
                 testClientHost,
                 testUser,
                 "failOver_ij ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG(results);
     }
     private void failOver_direct(String dbName)
             throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         String URL = masterURL(dbName)
                 +";failover=true";
                
@@ -1290,18 +1370,21 @@ private void failOver_direct(String dbName)
             try
             {
                 Class.forName(DRIVER_CLASS_NAME); // Needed when running from classes!
+//IC see: https://issues.apache.org/jira/browse/DERBY-5318
                 DriverManager.getConnection(URL);
             }
             catch (SQLException se)
             {
                 int errCode = se.getErrorCode();
                 String msg = se.getMessage();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
                 String sState = se.getSQLState();
                 String expectedState = "XRE20";
                 msg = "failOver_direct Got SQLException: " 
                         + errCode + " " + sState + " " + msg 
                         + ". Expected: " + expectedState;
                 util.DEBUG(msg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3709
                 BaseJDBCTestCase.assertSQLState(expectedState, se);
             }
    }
@@ -1321,11 +1404,13 @@ int xFindServerPID(String serverHost, int serverPort)
         String p4 = ""; // | /bin/grep '/trunk_slave/jars/'"; // Also used for master...
         String p5 = " | grep -v grep"; // /bin/grep
         String p6 = " | grep -v ssh"; // /bin/grep
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         String p7 = " | grep -v bash";  // /bin/grep// Assuming always doing remote command (ssh)
         String p8 = " | gawk '{ print $2 }'"; // /bin/gawk
         String p9 = " | head -1"; // For cases where we also get some error...
         
         String command = p1 + p2 + p3 + p4 + p5 + p6 + p7 /* + p8 */ + ";";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5783
         String result = runUserCommandRemotely(
                 command, serverHost, testUser, "ps");
         util.DEBUG("xFindServerPID: '" + result + "'");
@@ -1339,6 +1424,7 @@ int xFindServerPID(String serverHost, int serverPort)
         util.DEBUG("xFindServerPID: " + pid);
         return pid;
     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
     void xStopServer(String serverHost, int serverPID)
     throws InterruptedException
     {
@@ -1357,6 +1443,7 @@ void verifySlave()
         util.DEBUG("BEGIN verifySlave "+slaveServerHost+":"
                    +slaveServerPort+"/"+slaveDbPath( replicatedDb ) );
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         if ( (replicationTest != null) // If 'replicationTest==null' no table was created/filled
                 && simpleLoad )
         {
@@ -1366,6 +1453,7 @@ void verifySlave()
             // return;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         ClientDataSourceInterface ds = configureDataSource
             ( slaveDbPath( replicatedDb ), slaveServerHost, slaveServerPort, useEncryption(false) );
         Connection conn = ds.getConnection();
@@ -1373,6 +1461,7 @@ void verifySlave()
         simpleVerify(conn);
         conn.close();
         /* BEGIN Distributed repl. tests only */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         if ( !slaveServerHost.equalsIgnoreCase("localhost") ){
         runSlaveVerificationCLient(jvmVersion,
                 testClientHost,
@@ -1387,6 +1476,7 @@ void verifyMaster()
         util.DEBUG("BEGIN verifyMaster " + masterServerHost + ":"
                    +masterServerPort+"/"+masterDbPath( replicatedDb ) );
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         if ( (replicationTest != null)  // If 'replicationTest==null' no table was created/filled
                 && simpleLoad )
         {
@@ -1396,6 +1486,7 @@ void verifyMaster()
             // return;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         ClientDataSourceInterface ds = configureDataSource
             ( masterDbPath( replicatedDb ), masterServerHost, masterServerPort, useEncryption(false) );
         Connection conn = ds.getConnection();
@@ -1403,6 +1494,7 @@ void verifyMaster()
         simpleVerify(conn);
         conn.close();
         /* BEGIN Distributed repl. tests only */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         if ( !masterServerHost.equalsIgnoreCase("localhost") ){
         runMasterVerificationCLient(jvmVersion,
                 testClientHost,
@@ -1430,6 +1522,7 @@ private void runSlaveVerificationCLient(String jvmVersion,
             throws Exception
     {
         util.DEBUG("runSlaveVerificationCLient");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         if ( replicationVerify != null){
         runTestOnSlave(replicationVerify,
                 jvmVersion,
@@ -1466,6 +1559,7 @@ private void runMasterVerificationCLient(String jvmVersion,
      *    {@code null} to run in the same directory as the parent process
      */
     private void runUserCommandLocally(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
             String[] command, String ID, File workingDir) {
         util.DEBUG("");
         final String debugId = "runUserCommandLocally " + ID + " ";
@@ -1476,6 +1570,7 @@ private void runUserCommandLocally(
             
             try
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5808
                 Process proc = execJavaCmd(null, null, command, workingDir);
                 processDEBUGOutput(debugId+"pDo ", proc);
             }
@@ -1503,6 +1598,7 @@ private String runUserCommandRemotely(String command,
                 + command
                 ;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         String output = "";
         try {
             Runtime rt = Runtime.getRuntime();
@@ -1542,6 +1638,7 @@ private void runUserCommandInThreadLocally(final String[] command,
 
         // If dbDir is specified, start the process in that directory;
         // otherwise, inherit working dir from the main test process.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         final File workingDir = dbDir == null ?
                 null : new File(workingDirName, dbDir);
         util.DEBUG(ID + "workingDir: " + workingDir);
@@ -1560,6 +1657,7 @@ public void run()
             );
             util.DEBUG(ID+"************** Do .start().");
             cmdThread.start();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5643
             registerThread(cmdThread);
         }
      
@@ -1569,6 +1667,7 @@ public void run()
     
     // FIXME: NB NB Currently only invoked from startSlave_ij (others unused!)
     private void runUserCommandInThreadRemotely(String command,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
             final String host,
             final String testUser,
             String id)
@@ -1583,11 +1682,13 @@ private void runUserCommandInThreadRemotely(String command,
                 + " as " + testUser);
         
         final String[] envElements = {"CLASS_PATH="+""
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
                 , "PATH="+FS+"home"+FS+testUser+FS+"bin:$PATH" // "/../bin" FIXME!!! All such!
                 };
         
         String workingDirName = System.getProperty("user.home");
         util.DEBUG(ID+"user.home: " + workingDirName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         util.DEBUG(ID+"envElements: " + util.splice(envElements, ' '));
         util.DEBUG(ID+"workingDir: " + workingDirName);
         
@@ -1596,7 +1697,9 @@ private void runUserCommandInThreadRemotely(String command,
             
             String[] shEnvElements = {"CLASS_PATH="+""
                     , "PATH="+FS+"home"+FS+testUser+FS+"bin:${PATH}"
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
             };
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
             String shellEnv = util.splice(shEnvElements, ';');
             util.DEBUG(ID+"shellEnv: " + shellEnv);
 
@@ -1621,6 +1724,8 @@ public void run()
             );
             util.DEBUG(ID+"************** Do .start(). ");
             serverThread.start();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5517
+//IC see: https://issues.apache.org/jira/browse/DERBY-5517
             registerThread(serverThread);
             
         }
@@ -1632,10 +1737,12 @@ public void run()
     void initEnvironment()
     throws IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.printDebug = System.getProperty("derby.tests.repltrace", "false")
                                                      .equalsIgnoreCase("true");
         util.DEBUG("printDebug: " + util.printDebug);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG("*** ReplicationRun.initEnvironment -----------------------------------------");
         util.DEBUG("*** Properties -----------------------------------------");
         userDir = System.getProperty("user.dir");
@@ -1682,6 +1789,7 @@ void initEnvironment()
         unFreezeDB = null;
         util.DEBUG("unFreezeDB: " + unFreezeDB);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         simpleLoad = System.getProperty("derby.tests.replSimpleLoad", "true")
                                                      .equalsIgnoreCase("true");
         util.DEBUG("simpleLoad: " + simpleLoad);
@@ -1735,6 +1843,7 @@ void initEnvironment()
         util.DEBUG("junit_jar: " + junit_jar);
         
         test_jars = derbyTestingJar
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 + PS + junit_jar;
         util.DEBUG("test_jars: " + test_jars);
         
@@ -1753,6 +1862,7 @@ void initEnvironment()
                 +"derby.drda.traceAll=true"+LF;
 
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG("--------------------------------------------------------");
         
         masterPreRepl = null; // FIXME!
@@ -1761,8 +1871,10 @@ void initEnvironment()
         masterPostSlave = null; // FIXME!
         slavePostSlave = null; // FIXME!
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG("--------------------------------------------------------");
         // for SimplePerfTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
         tuplesToInsertPerf = 10000;
         commitFreq = 1000; // "0" is autocommit
         
@@ -1778,6 +1890,7 @@ void initMaster(String host, String dbName)
     throws Exception
     {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5318
         File masterHome = new File(masterDatabasePath, masterDbSubPath);
         File slaveHome = new File(slaveDatabasePath, slaveDbSubPath);
         util.DEBUG("initMaster");
@@ -1788,6 +1901,7 @@ void initMaster(String host, String dbName)
         if ( host.equalsIgnoreCase("localhost") || localEnv )
         {
             if (PrivilegedFileOpsForTests.exists(masterHome)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5836
                 BaseTestCase.assertDirectoryDeleted(masterHome);
             }
             util.mkDirs(masterHome.getPath()); // Create the directory
@@ -1802,6 +1916,7 @@ void initMaster(String host, String dbName)
         }
         else
         {            
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
             String command = "mkdir -p "+masterDatabasePath+FS+masterDbSubPath+";"
                 + " cd "+masterDatabasePath+FS+masterDbSubPath+";"
                 + " rm -rf " + dbName + " derby.log;"
@@ -1838,6 +1953,7 @@ private void removeSlaveDBfiles(String host, String dbName)
                 testUser,
                 // dbName, // unneccessary?
                 "removeSlaveDBfiles ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG(results);
         
     }
@@ -1846,6 +1962,7 @@ void initSlave(String host, String clientVM, String dbName)
     {
         
         util.DEBUG("initSlave");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5318
         File slaveHome = new File(slaveDatabasePath, slaveDbSubPath);
         File masterHome = new File(masterDatabasePath, masterDbSubPath);
         File masterDb = new File(masterHome, dbName);
@@ -1878,6 +1995,12 @@ void initSlave(String host, String clientVM, String dbName)
                 testUser,
                 "initSlave ");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG(results);
         
     }
@@ -1887,6 +2010,7 @@ void restartServer(String serverVM, String serverVersion,
             String serverHost,
             String interfacesToListenOn,
             int serverPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
             String dbSubDirPath)
             throws Exception
     {
@@ -1899,10 +2023,12 @@ void restartServer(String serverVM, String serverVersion,
                     serverPort,
                     dbSubDirPath); // Distinguishing master/slave
     }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
     void startServer(String serverVM, String serverVersion,
             String serverHost,
             String interfacesToListenOn,
             int serverPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
             String dbSubDirPath)
             throws Exception
     {
@@ -1912,13 +2038,16 @@ void startServer(String serverVM, String serverVersion,
         util.DEBUG(debugId+"+++ StartServer " + serverVM + " / " + serverVersion);
                 
         String serverClassPath = serverVersion + FS+"derby.jar"
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
                 + PS + serverVersion + FS+"derbynet.jar"
                 + PS + test_jars; // Required if the test (run on the client) 
                                   // defines and uses functions on test classes.
                                   // Example: PADSTRING in StressMultiTest.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         final boolean isRemote = !serverHost.equals("localhost");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4980
         String workingDirName = masterDatabasePath +FS+ dbSubDirPath;
         
         ArrayList<String> ceArray = new ArrayList<String>();
@@ -1948,6 +2077,7 @@ void startServer(String serverVM, String serverVersion,
         ceArray.add( "-noSecurityManager" );
 
         final String[] commandElements = util.toStringArray(ceArray);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
 
         if (!isRemote)
         {
@@ -1964,6 +2094,7 @@ void startServer(String serverVM, String serverVersion,
 
         // Wait for the server to come up in a reasonable time.
         pingServer(serverHost, serverPort);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5643
 
         util.DEBUG(debugId+"--- StartServer ");
         util.DEBUG("");
@@ -1975,6 +2106,7 @@ private NetworkServerControl startServer_direct(String serverHost,
             String fullDbDirPath,
             String securityOption) // FIXME? true/false?
     throws Exception
+//IC see: https://issues.apache.org/jira/browse/DERBY-3126
     { // Wotk in progress. Not currently used! Only partly tested!
         util.DEBUG("startServer_direct " + serverHost 
                 + " " + interfacesToListenOn +  " " + serverPort
@@ -1989,6 +2121,7 @@ private NetworkServerControl startServer_direct(String serverHost,
                 InetAddress.getByName(interfacesToListenOn), serverPort);
         
         server.start(null); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
         pingServer(serverHost, serverPort, 150);
         
         Properties sp = server.getCurrentProperties();
@@ -2004,6 +2137,7 @@ private NetworkServerControl startServer_direct(String serverHost,
     void killMaster(String masterServerHost, int masterServerPort)
     throws InterruptedException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG("killMaster: " + masterServerHost +":" + masterServerPort);
         if ( masterServerHost.equals("localhost") )
         {
@@ -2044,13 +2178,19 @@ void stopServer(String serverVM, String serverVersion,
         util.DEBUG("+++ stopServer " + serverVM + " / " + serverVersion
                 + " " + debugId);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         String serverJvm = ReplicationRun.getServerJavaExecutableName(serverHost,serverVM);
         String serverClassPath = serverVersion + FS+"derby.jar"
                 + PS + serverVersion + FS+"derbynet.jar";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
 
         final boolean isRemote = !serverHost.equals("localhost");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
 
         ArrayList<String> ceArray = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // For remote tests, we need to specify the Java VM to use and the
         // classpath. For local tests, we'll just use the JVM and the classpath
@@ -2063,6 +2203,7 @@ void stopServer(String serverVM, String serverVersion,
         }
         ceArray.add( "-Dderby.infolog.append=true" );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (JVMInfo.isModuleAware())
         {
             ceArray.add("-m");
@@ -2085,11 +2226,14 @@ void stopServer(String serverVM, String serverVersion,
             ceArray.add( db_passwd );
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         final String[] commandElements = util.toStringArray(ceArray);
         
         final String fullCmd = util.splice(commandElements, ' ');
         util.DEBUG(debugId+"commandElements: " + fullCmd);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5504
+//IC see: https://issues.apache.org/jira/browse/DERBY-5504
         final boolean serverOnLocalhost =
                 serverHost.equalsIgnoreCase("localhost");
         if (serverOnLocalhost)
@@ -2164,6 +2308,7 @@ private void processDEBUGOutput(String id, Process proc)
         util.DEBUG(id+"----     ");
 
         int exitCode = proc.waitFor();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5643
         util.DEBUG(id + "process exit status: " + exitCode);
     }
 
@@ -2174,26 +2319,31 @@ private void processDEBUGOutput(String id, Process proc)
      * @param thread a thread that has been started
      */
     private void registerThread(Thread thread) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5517
         helperThreads.add(thread);
     }
 
     private void pingServer( String hostName, int port)
     throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         util.DEBUG("+++ pingServer: " + hostName +":" + port);
         NetworkServerControl controller =
             new NetworkServerControl(InetAddress.getByName(hostName), port);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5643
         assertTrue("Server did not start in time",
                    NetworkServerTestSetup.pingForServerStart(controller));
         util.DEBUG("--- pingServer: " + hostName +":" + port);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3126
     void startOptionalLoad(Load load,
             String dbSubPath,
             String serverHost,
             int serverPort)
             throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         String loadString = load.load;
         String database = load.database;
         boolean existingDB = load.existingDB;
@@ -2205,12 +2355,14 @@ void startOptionalLoad(Load load,
                 );
         if ( loadString == null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
             util.DEBUG("No load supplied!");
             return;
         }
         if ( !existingDB )
         {
             // Create it!
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
             String URL = masterURL(database)
                     +";create=true"; // Creating! No need for encryption here?
             String ijClassPath = derbyVersion +FS+ "derbyclient.jar"
@@ -2220,6 +2372,7 @@ void startOptionalLoad(Load load,
         { // Use full classpath when running locally. Can not vary server versions!
             ijClassPath = classPath;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
             String clientJvm = ReplicationRun.getClientJavaExecutableName();
             String command = "rm -rf /"+masterDbPath( database )+";" // FIXME! for slave load!
                     + clientJvm // "java"
@@ -2237,6 +2390,7 @@ void startOptionalLoad(Load load,
         }
         
         // Must run in separate thread!:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
         runLoad(loadString,
                 jvmVersion,
                 testClientHost,
@@ -2247,6 +2401,7 @@ void startOptionalLoad(Load load,
         
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
     void makeReadyForReplication()
         throws Exception
     {   // Replace the following code in all tests with a call to makeReadyForReplication()!
@@ -2257,6 +2412,7 @@ void makeReadyForReplication()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES,
@@ -2305,6 +2461,7 @@ void makeReadyForReplication()
      */
     void cleanAllTestHosts()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         util.DEBUG("************************** cleanAllTestHosts() Not yet implemented");
     }
 
@@ -2685,10 +2842,12 @@ private void cleanupAndShutdown()
     
     ///////////////////////////////////////////////////////////////////////////
     /* Load started in different states of replication. */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
     class Load
     {
         Load(String id, Properties testRunProperties)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
             util.DEBUG("Load(): " + id);
             
             String pid = "test." + id;
@@ -2702,6 +2861,7 @@ class Load
                 pid = "test." + id + ".load";
                 load = testRunProperties.getProperty(pid,
                         "org.apache.derbyTesting.functionTests.tests.replicationTests.DefaultLoad");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 util.DEBUG(pid+": " + load);
                 
                 pid = "test." + id + ".database";
@@ -2764,6 +2924,7 @@ protected void assertSqlStateSlaveConn(String expected) throws Exception {
         }
     }
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
     void assertException(SQLException se, String expectedSqlState)
     {
         if (se == null ) // Did not get an exception
@@ -2795,6 +2956,7 @@ void _testInsertUpdateDeleteOnMaster(String serverHost,
             String dbPath,
             int _noTuplesToInsert)
         throws SQLException, ClassNotFoundException, IllegalAccessException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                InstantiationException, NoSuchMethodException, InvocationTargetException
     {
         util.DEBUG("_testInsertUpdateDeleteOnMaster: " + serverHost + ":" +
@@ -2825,6 +2987,7 @@ void _verifyDatabase(String serverHost,
             String dbPath,
             int _noTuplesInserted)
         throws SQLException, ClassNotFoundException, IllegalAccessException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                InstantiationException, NoSuchMethodException, InvocationTargetException
     {
         util.DEBUG("_verifyDatabase: "+serverHost+":"+serverPort+"/"+dbPath);
@@ -2867,6 +3030,7 @@ Connection getConnection(String serverHost, int serverPort,
         return DriverManager.getConnection(connectionURL);
     }
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
     String masterDbPath(String dbName)
     {
         return masterDatabasePath+FS+masterDbSubPath+FS+dbName;
@@ -2903,6 +3067,7 @@ String  credentials()
     }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4246
     SQLException stopSlave(
         String slaveServerHost,
         int slaveServerPort,
@@ -2927,6 +3092,7 @@ SQLException stopSlave(
         String subPath,
         String replicatedDb,
         boolean masterServerAlive)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         throws Exception
     {
         util.DEBUG("stopSlave");
@@ -3011,6 +3177,7 @@ SQLException stopSlave(
     }
     private static String getMasterJavaExecutableName()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         if ( masterServerHost.matches("localhost") )
         {
             return BaseTestCase.getJavaExecutableName();
@@ -3054,6 +3221,7 @@ private static String getServerJavaExecutableName(String serverHost,String serve
          int        serverPort,
          String     connectionAttributes
          ) throws ClassNotFoundException, IllegalAccessException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                   InstantiationException, NoSuchMethodException, InvocationTargetException
     {
         ClientDataSourceInterface ds;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_CleanUp.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_CleanUp.java
index 5c58d01200..107b9e61c2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_CleanUp.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_CleanUp.java
@@ -47,6 +47,7 @@ public ReplicationRun_CleanUp(String testcaseName)
         
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ReplicationRun_CleanUp");
         
         suite.addTestSuite( ReplicationRun_CleanUp.class );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Distributed.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Distributed.java
index 1a7c42a119..9fbb3c91c5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Distributed.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Distributed.java
@@ -52,11 +52,13 @@ public ReplicationRun_Distributed(String testcaseName)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Distributed Suite");
         
         suite.addTestSuite( ReplicationRun_Distributed.class );
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         return SecurityManagerSetup.noSecurityManager(suite);
     }
     
@@ -81,10 +83,12 @@ public void testReplication()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
                 masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 masterDbSubPath); // Distinguishing master/slave
         
         startServer(slaveJvmVersion, derbySlaveVersion,
@@ -115,6 +119,7 @@ public void testReplication()
                 testClientHost);
         
         // Allow the slave to reach the required state before attempting to start master:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         util.sleep(sleepTime, "Before startMaster");  // startMaster_ij should retry connection? 
         startMaster(jvmVersion, replicatedDb,
                 masterServerHost, // Where the startMaster command must be given
@@ -168,6 +173,7 @@ void initEnvironment()
     throws IOException
     {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         util.DEBUG("*** Properties -----------------------------------------");
         userDir = System.getProperty("user.dir");
         util.DEBUG("user.dir:          " + userDir);
@@ -189,6 +195,7 @@ void initEnvironment()
         // Now we can get the derby jar path, jvm path etc.
         
         util.printDebug = cp.getProperty("test.printDebug","false").equalsIgnoreCase("true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         util.DEBUG("printDebug: " + util.printDebug);
         
         showSysinfo = cp.getProperty("test.showSysinfo","false").equalsIgnoreCase("true");
@@ -314,6 +321,7 @@ void initEnvironment()
                 +"derby.drda.traceAll=true"+LF;
 
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         util.DEBUG("--------------------------------------------------------");
         
         masterPreRepl = new Load("masterPreRepl", cp);
@@ -322,8 +330,10 @@ void initEnvironment()
         masterPostSlave = new Load("masterPostSlave", cp);
         slavePostSlave = new Load("slavePostSlave", cp);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         util.DEBUG("--------------------------------------------------------");
         // for SimplePerfTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
         tuplesToInsertPerf = Integer.parseInt(cp.getProperty("test.inserts","10000"));
         util.DEBUG("tuplesToInsertPerf: " + tuplesToInsertPerf);
         commitFreq = Integer.parseInt(cp.getProperty("test.commitFreq","0")); // "0" is autocommit
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Full.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Full.java
index 218203a94c..7ef328a784 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Full.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Full.java
@@ -37,10 +37,12 @@ public ReplicationRun_Full(String testcaseName)
     public static Test suite()
     {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Replication_Full Suite");
         
         suite.addTestSuite( ReplicationRun_Full.class );
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         return SecurityManagerSetup.noSecurityManager(suite);
     }
     
@@ -81,6 +83,7 @@ public void testReplication()
                     masterServerHost,
                     ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
                     masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                     masterDbSubPath); // Distinguishing master/slave
             runTest(replicationTest,
                     jvmVersion,
@@ -100,10 +103,12 @@ public void testReplication()
         initMaster(masterServerHost,
                 replicatedDb); // Prototype V2: copy orig (possibly empty) db to db_master.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
                 masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 masterDbSubPath); // Distinguishing master/slave
         ///////////////////////////////////////////////////////
         // State: PostStartedMasterServer, PreStartedSlaveServer
@@ -116,10 +121,12 @@ public void testReplication()
             if (state.testPreStartedSlaveServer()) return; // + stop master server!
         
         // Thread.sleep(5000L); // Just for testing....
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(slaveJvmVersion, derbySlaveVersion,
                 slaveServerHost,
                 ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
                 slaveServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 slaveDbSubPath); // Distinguishing master/slave
         ///////////////////////////////////////////////////////
         // State: PostStartedMasterServer, PostStartedSlaveServer
@@ -282,10 +289,12 @@ public void testReplication()
         if ( slavePid == -1 )
         {
             util.DEBUG("WARNING: slave server not available. Starting.");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
             startServer(jvmVersion, derbyVersion,
                     slaveServerHost,
                     ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
                     slaveServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                     slaveDbSubPath); // Distinguishing master/slave
         }
         /* BEGIN Failover do not yet clean replication mode on slave! Must restart the server!*/
@@ -307,6 +316,7 @@ public void testReplication()
                     slaveServerHost,
                     ALL_INTERFACES,
                     slaveServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                     slaveDbSubPath); // Distinguishing master/slave
             /* */
           }
@@ -321,10 +331,12 @@ public void testReplication()
         if ( masterPid == -1 )
         {
             util.DEBUG("WARNING: master server not available. Starting.");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
             startServer(jvmVersion, derbyVersion,
                     masterServerHost,
                     ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
                     masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                     masterDbSubPath); // Distinguishing master/slave
         }
         verifyMaster(); // NB NB Hangs here with localhost/ReplicationTestRun!
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local.java
index f570564f28..6500a6de1c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local.java
@@ -57,11 +57,13 @@ public ReplicationRun_Local(String testcaseName, String user, String password )
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ReplicationRun_Local Suite");
         
         suite.addTestSuite( ReplicationRun_Local.class );
         
         return SecurityManagerSetup.noSecurityManager(suite);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
 
     }
     
@@ -69,6 +71,7 @@ public static Test localAuthenticationSuite()
     {
         String      user = "KIWI";
         String      password = "KIWI_password";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(
             "ReplicationRun_Local Suite Local Authentication Suite");
 
@@ -105,14 +108,17 @@ public void testReplication_Local_TestStraightReplication()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6179
         NetworkServerTestSetup.waitForAvailablePort(masterServerPort);
         NetworkServerTestSetup.waitForAvailablePort(slaveServerPort);
         NetworkServerTestSetup.waitForAvailablePort(slaveReplPort);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
                 masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 masterDbSubPath); // Distinguishing master/slave
         
         startServer(slaveJvmVersion, derbySlaveVersion,
@@ -203,6 +209,7 @@ public void testReplication_Local_LogFilesSynched() throws Exception {
         initEnvironment();
         initMaster(masterServerHost, replicatedDb);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion,
                                    derbyMasterVersion,
                                    masterServerHost,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1.java
index 16cf786fe0..9d3bafcae7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1.java
@@ -46,6 +46,7 @@ public ReplicationRun_Local_1(String testcaseName)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_1 Suite");
         
@@ -65,6 +66,7 @@ public void testReplication_Local_1_InsertUpdateDeleteOnMaster()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost, ALL_INTERFACES, masterServerPort,
                 masterDbSubPath);
@@ -103,6 +105,7 @@ public void testReplication_Local_1_InsertUpdateDeleteOnMaster()
         
         int tuplesToInsert = 10000;
         _testInsertUpdateDeleteOnMaster(masterServerHost, masterServerPort, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
                 dbPath, tuplesToInsert);
         
         failOver(jvmVersion,
@@ -117,6 +120,7 @@ public void testReplication_Local_1_InsertUpdateDeleteOnMaster()
         // verifySlave();
         dbPath = slaveDatabasePath+FS+slaveDbSubPath+FS+replicatedDb;
         _verifyDatabase(slaveServerHost, slaveServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
             dbPath, tuplesToInsert);
         // We should verify the master as well, 
         // at least to see that we still can connect.
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1Indexing.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1Indexing.java
index 79e9ac1c8b..f3fcf50d8f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1Indexing.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1Indexing.java
@@ -51,6 +51,7 @@ public ReplicationRun_Local_1Indexing(String testcaseName)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_1Indexing Suite");
         
@@ -127,6 +128,7 @@ void _fillTableOnServer(String serverHost,
     {
         ClientDataSourceInterface ds;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
         if (JDBC.vmSupportsJNDI()) {
             clazz = Class.forName("org.apache.derby.jdbc.ClientDataSource");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3.java
index 6c86a19ddf..87d8e99698 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3.java
@@ -63,6 +63,7 @@ SQLException _failOver(String serverHost, int serverPort, String dbPath)
         util.DEBUG("BEGIN _failOver"); 
         ClientDataSourceInterface ds;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
         if (JDBC.vmSupportsJNDI()) {
             clazz = Class.forName("org.apache.derby.jdbc.ClientDataSource");
@@ -75,6 +76,7 @@ SQLException _failOver(String serverHost, int serverPort, String dbPath)
         ds.setDatabaseName(dbPath);
         ds.setServerName(serverHost);
         ds.setPortNumber(serverPort);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         ds.setConnectionAttributes("failover=true"
                 +useEncryption(false));
         try {
@@ -109,6 +111,7 @@ SQLException _startSlaveTrueAndCreateTrue(String serverHost,
         ds.setDatabaseName(dbPath);
         ds.setServerName(serverHost);
         ds.setPortNumber(serverPort);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         ds.setConnectionAttributes("startSlave=true;create=true"
                 +useEncryption(true));
         try {
@@ -126,6 +129,8 @@ SQLException _stopMaster(String masterServerHost, int masterServerPort, String d
         util.DEBUG("_stopMaster");
         ClientDataSourceInterface ds;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
         if (JDBC.vmSupportsJNDI()) {
             clazz = Class.forName("org.apache.derby.jdbc.ClientDataSource");
@@ -138,6 +143,7 @@ SQLException _stopMaster(String masterServerHost, int masterServerPort, String d
         ds.setDatabaseName(dbPath);
         ds.setServerName(masterServerHost);
         ds.setPortNumber(masterServerPort);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         ds.setConnectionAttributes("stopMaster=true"
                 +useEncryption(false));
         try {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p1.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p1.java
index 66ea6df666..5f416c97d8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p1.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p1.java
@@ -52,6 +52,7 @@ public ReplicationRun_Local_3_p1(String testcaseName)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_3_p1 Suite");
         
@@ -82,6 +83,7 @@ public void testReplication_Local_3_p1_StateNegativeTests()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
@@ -131,6 +133,7 @@ public void testReplication_Local_3_p1_StateNegativeTests()
                 slaveServerHost, // for slaveReplInterface
                 slaveReplPort);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         replicationTest = null; // Used as a flag to verifyMaster and verifySlave!
         runTest(replicationTest, // Returns immediatly if replicationTest is null.
                 jvmVersion,
@@ -141,6 +144,7 @@ public void testReplication_Local_3_p1_StateNegativeTests()
         // 1. separate test
         // slave: stopSlave
         assertException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4246
             stopSlave(slaveServerHost,
                       slaveServerPort,
                       slaveDatabasePath,
@@ -153,6 +157,7 @@ public void testReplication_Local_3_p1_StateNegativeTests()
         // master: stopMaster
         // slave: stopSlave
         assertException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4246
             stopSlave(masterServerHost,
                       masterServerPort,
                       masterDatabasePath,
@@ -174,6 +179,7 @@ public void testReplication_Local_3_p1_StateNegativeTests()
                 slaveDatabasePath + FS + slaveDbSubPath + FS + replicatedDb, 
                 slaveServerHost, slaveServerPort);
         assertException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4246
             stopSlave(slaveServerHost,
                       slaveServerPort,
                       slaveDatabasePath,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p2.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p2.java
index 23d2100adb..a8e35d5df4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p2.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p2.java
@@ -56,6 +56,7 @@ protected void tearDown() throws Exception
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_3_p2 Suite");
         
@@ -87,6 +88,7 @@ public void replication_Local_3_p2_StateTests(boolean bigInsert,
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java
index c9a49952ca..e2b04fe6a5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class ReplicationRun_Local_3_p3 extends ReplicationRun_Local_3
 {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4186
     final static String CANNOT_CONNECT_TO_DB_IN_SLAVE_MODE = "08004";
     final static String REPLICATION_NOT_IN_MASTER_MODE     = "XRE07";
     final static int MAX_TRIES = 20;
@@ -54,6 +55,7 @@ public ReplicationRun_Local_3_p3(String testcaseName)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_3_p3 Suite");
         
@@ -88,6 +90,7 @@ public void testReplication_Local_3_p3_StateNegativeTests()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
@@ -135,6 +138,7 @@ public void testReplication_Local_3_p3_StateNegativeTests()
                 slaveServerHost, // for slaveReplInterface
                 slaveReplPort);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         replicationTest = null; // Used as a flag to verifyMaster and verifySlave!
         runTest(replicationTest, // Returns immediatly if replicationTest is null.
                 jvmVersion,
@@ -158,6 +162,7 @@ public void testReplication_Local_3_p3_StateNegativeTests()
         assertException(
             _stopMaster(masterServerHost, masterServerPort,
                 masterDatabasePath + FS + masterDbSubPath + FS + replicatedDb),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4186
             null); // Implies slave should shut down. // OK to continue.
         /* showCurrentState("Post stopMaster +1s", 1000L,
             masterDatabasePath + FS + masterDbSubPath + FS + replicatedDb, 
@@ -185,6 +190,7 @@ public void testReplication_Local_3_p3_StateNegativeTests()
         // The final end state is successful connect (i.e. a reboot) after
         // stopped slave and db shutdown.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4186
         SQLException gotEx = null;
         int tries = MAX_TRIES;
 
@@ -196,6 +202,7 @@ public void testReplication_Local_3_p3_StateNegativeTests()
                     slaveDatabasePath + FS + slaveDbSubPath + FS + replicatedDb;
                 ClientDataSourceInterface ds;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Class<?> clazz;
                 if (JDBC.vmSupportsJNDI()) {
                     clazz = Class.forName("org.apache.derby.jdbc.ClientDataSource");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java
index 9214cffc01..34959b7c9c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java
@@ -50,6 +50,7 @@ public ReplicationRun_Local_3_p4(String testcaseName)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_3_p4 Suite");
         
@@ -86,6 +87,7 @@ public void testReplication_Local_3_p4_StateNegativeTests()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
@@ -127,6 +129,7 @@ public void testReplication_Local_3_p4_StateNegativeTests()
                 slaveServerHost, // for slaveReplInterface
                 slaveReplPort);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         replicationTest = null; // Used as a flag to verifyMaster and verifySlave!
         runTest(replicationTest, // Returns immediatly if replicationTest is null.
                 jvmVersion,
@@ -191,6 +194,7 @@ private SQLException _connectToSlave(String slaveServerHost,
         ds.setDatabaseName(dbPath);
         ds.setServerName(slaveServerHost);
         ds.setPortNumber(slaveServerPort);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         ds.setConnectionAttributes(useEncryption(false));
         try {
             Connection conn = ds.getConnection(); // 
@@ -208,6 +212,8 @@ private SQLException _internal_stopSlave(String slaveServerHost,
         util.DEBUG("_internal_stopSlave");
         ClientDataSourceInterface ds;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
         if (JDBC.vmSupportsJNDI()) {
             clazz = Class.forName("org.apache.derby.jdbc.ClientDataSource");
@@ -220,6 +226,7 @@ private SQLException _internal_stopSlave(String slaveServerHost,
         ds.setDatabaseName(dbPath);
         ds.setServerName(slaveServerHost);
         ds.setPortNumber(slaveServerPort);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
         ds.setConnectionAttributes("internal_stopslave=true"
                 +useEncryption(false));
         try {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p5.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p5.java
index 862966526b..f17d1b01c5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p5.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p5.java
@@ -54,6 +54,7 @@ public ReplicationRun_Local_3_p5(String testcaseName)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_3_p5 Suite");
         
@@ -90,6 +91,7 @@ public void testReplication_Local_3_p5_DERBY_3878()
                 
         _killMasterServer(); // "Crash" master.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4246
         stopSlave(slaveServerHost,
                   slaveServerPort,
                   slaveDatabasePath,
@@ -97,6 +99,7 @@ public void testReplication_Local_3_p5_DERBY_3878()
                   false); // master server dead
 
         // Try to re-establish replication mode:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES,
@@ -143,6 +146,7 @@ public void testReplication_Local_3_p5_DERBY_3878()
                 slaveReplPort);
         // Should now be back in "normal" replication mode state.
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4246
         assertSqlStateSlaveConn(REPLICATION_SLAVE_STARTED_OK);
         
         failOver(jvmVersion,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java
index e48d5df75e..0a42e74284 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java
@@ -58,6 +58,7 @@ public ReplicationRun_Local_3_p6(String testcaseName)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_3_p6 Suite");
         
@@ -100,6 +101,7 @@ private void derby_3896(boolean autocommit)
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES,
@@ -226,6 +228,7 @@ private Connection _getConnection(String databasePath, String dbSubPath,
     {
         ClientDataSourceInterface ds;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
         if (JDBC.vmSupportsJNDI()) {
             clazz = Class.forName("org.apache.derby.jdbc.ClientDataSource");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java
index e8348004e1..9a8a32bfaa 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java
@@ -45,6 +45,7 @@ public ReplicationRun_Local_Derby4910(String testcaseName)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("Replication test - DERBY-4910");
         
@@ -68,6 +69,7 @@ public void testSlaveWaitsForMaster() throws Exception
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost, ALL_INTERFACES, masterServerPort,
                 masterDbSubPath);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Encrypted_1.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Encrypted_1.java
index ac78c3ca10..76c27f7dff 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Encrypted_1.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Encrypted_1.java
@@ -59,6 +59,7 @@ protected void tearDown() throws Exception
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_Encrypted_1 Suite");
         
@@ -225,6 +226,7 @@ SQLException _connectToSlave(String slaveServerHost, int slaveServerPort,
         util.DEBUG("_connectToSlave");
         ClientDataSourceInterface ds;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
         if (JDBC.vmSupportsJNDI()) {
             clazz = Class.forName("org.apache.derby.jdbc.ClientDataSource");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1.java
index 177b6c4c2d..de30d88648 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1.java
@@ -38,6 +38,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public class ReplicationRun_Local_StateTest_part1 extends ReplicationRun
 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
     final static String CANNOT_CONNECT_TO_DB_IN_SLAVE_MODE = "08004";
     final static String LOGIN_FAILED = "08004";
     final static String REPLICATION_DB_NOT_BOOTED = "XRE11";
@@ -59,6 +60,7 @@ public ReplicationRun_Local_StateTest_part1(String testcaseName)
         
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_StateTest_part1 Suite");
         
@@ -91,19 +93,23 @@ public void testReplication_Local_StateTest_part1()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
                 masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 masterDbSubPath); // Distinguishing master/slave
         
         // State test. 
         _testPreStartedSlaveServer(); 
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(slaveJvmVersion, derbySlaveVersion,
                 slaveServerHost,
                 ALL_INTERFACES, // slaveServerHost, // "0.0.0.0", // All. or use slaveServerHost for interfacesToListenOn,
                 slaveServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 slaveDbSubPath); // Distinguishing master/slave
         
         startServerMonitor(slaveServerHost);
@@ -252,6 +258,7 @@ private void _testPreInitSlave()
         Connection conn = null;
         
         // 1.  stopMaster on master: fail
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         db = masterDatabasePath +FS+ReplicationRun.masterDbSubPath +FS+ replicatedDb;
         connectionURL = "jdbc:derby:"
                 + "//" + masterServerHost + ":" + masterServerPort + "/"
@@ -271,6 +278,7 @@ private void _testPreInitSlave()
             String msg = ec + " " + ss + " " + se.getMessage();
             // SQLState.REPLICATION_NOT_IN_MASTER_MODE
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             BaseJDBCTestCase.assertSQLState(
                 "stopMaster on master failed: " + msg,
                 REPLICATION_NOT_IN_MASTER_MODE,
@@ -296,6 +304,7 @@ private void _testPreInitSlave()
             int ec = se.getErrorCode();
             String ss = se.getSQLState();
             String msg = ec + " " + ss + " " + se.getMessage();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             BaseJDBCTestCase.assertSQLState(
                 "stopSlave on slave failed: " + msg,
                 REPLICATION_DB_NOT_BOOTED,
@@ -307,6 +316,8 @@ private void _testPreInitSlave()
     private void _testPreStartedSlave()
     {
         Connection conn = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         String db = slaveDatabasePath +FS+ReplicationRun.slaveDbSubPath +FS+ replicatedDb;
         String connectionURL = "jdbc:derby:"  
                 + "//" + slaveServerHost + ":" + slaveServerPort + "/"
@@ -330,6 +341,7 @@ private void _testPreStartedSlave()
             String ss = se.getSQLState();
             String msg = ec + " " + ss + " " + se.getMessage();
             util.DEBUG(msg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             BaseJDBCTestCase.assertSQLState(
                 "2. Unexpected SQLException: " + msg,
                 REPLICATION_SLAVE_STARTED_OK,
@@ -349,6 +361,7 @@ private void _testPreStartedSlave()
             String ss = se.getSQLState();
             String msg = ec + " " + ss + " " + se.getMessage();
             util.DEBUG(msg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             BaseJDBCTestCase.assertSQLState(
                 "2. Unexpected SQLException: " + msg,
                 LOGIN_FAILED,
@@ -361,6 +374,8 @@ private void _testPreStartedMaster()
     throws Exception
     {
         Connection conn = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         String db = masterDatabasePath +FS+ReplicationRun.masterDbSubPath +FS+ replicatedDb;
         String connectionURL = "jdbc:derby:"  
                 + "//" + masterServerHost + ":" + masterServerPort + "/"
@@ -394,6 +409,7 @@ private void _testPreStartedMaster()
             String msg = ec + " " + ss + " " + se.getMessage();
             util.DEBUG(msg);
             util.DEBUG("1. startMaster: No connection as expected: " + msg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             BaseJDBCTestCase.assertSQLState(
                 "1. Unexpected SQLException: " + msg,
                 REPLICATION_CONNECTION_EXCEPTION,
@@ -418,6 +434,7 @@ private void _testPreStartedMaster()
             String ss = se.getSQLState();
             String msg = ec + " " + ss + " " + se.getMessage();
             util.DEBUG("2. startMaster No connection as expected: " + msg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             BaseJDBCTestCase.assertSQLState(
                 "2. Unexpected SQLException: " + msg,
                 REPLICATION_MASTER_ALREADY_BOOTED,
@@ -427,6 +444,8 @@ private void _testPreStartedMaster()
         
         // A 2. StartSlave connect should fail:
         util.DEBUG("startSlave attempt should fail on: " + connectionURL);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         db = slaveDatabasePath +FS+ReplicationRun.slaveDbSubPath +FS+ replicatedDb;
         connectionURL = "jdbc:derby:"  
                 + "//" + slaveServerHost + ":" + slaveServerPort + "/"
@@ -447,6 +466,7 @@ private void _testPreStartedMaster()
             String ss = se.getSQLState();
             String msg = ec + " " + ss + " " + se.getMessage();
             util.DEBUG("3. startSlave No connection as expected: " + msg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             BaseJDBCTestCase.assertSQLState(
                 "3. Unexpected SQLException: " + msg,
                 CANNOT_CONNECT_TO_DB_IN_SLAVE_MODE,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java
index df543c991e..546f3eda4c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_1.java
@@ -34,10 +34,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public class ReplicationRun_Local_StateTest_part1_1 extends ReplicationRun
 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
     final static String REPLICATION_DB_NOT_BOOTED              = "XRE11";
     final static String REPLICATION_NOT_IN_SLAVE_MODE          = "XRE40";
     final static String SLAVE_OPERATION_DENIED_WHILE_CONNECTED = "XRE41";
     final static String REPLICATION_SLAVE_SHUTDOWN_OK          = "XRE42";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4175
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
 
     /**
      * Creates a new instance of ReplicationRun_Local_StateTest_part1
@@ -51,6 +54,7 @@ public ReplicationRun_Local_StateTest_part1_1(String testcaseName)
         
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_StateTest_part1_1 Suite");
         
@@ -80,10 +84,12 @@ public void testReplication_Local_StateTest_part1_1()
        initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
                 masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 masterDbSubPath); // Distinguishing master/slave
                 
         startServer(slaveJvmVersion, derbySlaveVersion,
@@ -197,6 +203,7 @@ private void _testPostStartedMasterAndSlave_StopSlave()
         util.DEBUG("4. testPostStartedMasterAndSlave_StopSlave: " +
                    connectionURL);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4277
         waitForConnect(100L, 10, db, slaveServerHost, slaveServerPort);
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_2.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_2.java
index 94f807d80b..ee81f7818a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_2.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_2.java
@@ -39,7 +39,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class ReplicationRun_Local_StateTest_part1_2 extends ReplicationRun
 {
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-4175
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
     final static String CANNOT_CONNECT_TO_DB_IN_SLAVE_MODE     = "08004";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
     final static String LOGIN_FAILED = "08004";
     final static String REPLICATION_DB_NOT_BOOTED = "XRE11";
     final static String REPLICATION_MASTER_ALREADY_BOOTED = "XRE22";
@@ -58,6 +61,7 @@ public ReplicationRun_Local_StateTest_part1_2(String testcaseName)
         
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_StateTest_part1_2 Suite");
         
@@ -87,10 +91,12 @@ public void testReplication_Local_StateTest_part1_2()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
                 masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 masterDbSubPath); // Distinguishing master/slave
         
         
@@ -147,6 +153,8 @@ public void testReplication_Local_StateTest_part1_2()
 
 
     private void _testPostStartedMasterAndSlave_StopMaster()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4175
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             throws InterruptedException, SQLException
     {
         Connection conn = null;
@@ -154,6 +162,7 @@ private void _testPostStartedMasterAndSlave_StopMaster()
         String connectionURL = null;
         
         // 1. Attempt to perform stopMaster on slave. Should fail.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         db = slaveDatabasePath +FS+ReplicationRun.slaveDbSubPath 
                 +FS+ replicatedDb;
         connectionURL = "jdbc:derby:"  
@@ -174,6 +183,7 @@ private void _testPostStartedMasterAndSlave_StopMaster()
             String ss = se.getSQLState();
             String msg = ec + " " + ss + " " + se.getMessage();
             //  SQLCODE: -1, SQLSTATE: 08004
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             BaseJDBCTestCase.assertSQLState(
                 "connectionURL +  failed: " + msg,
                 LOGIN_FAILED,
@@ -218,6 +228,8 @@ private void _testPostStartedMasterAndSlave_StopMaster()
         // If we get here quick enough, we see this error state:
         //     CANNOT_CONNECT_TO_DB_IN_SLAVE_MODE
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-4175
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
         SQLException gotEx = null;
         int tries = 20;
 
@@ -254,6 +266,8 @@ private void _testPostStartedMasterAndSlave_StopMaster()
 
 
         // 4. stopMaster on slave which now is not in replication mode should fail.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         db = slaveDatabasePath +FS+ReplicationRun.slaveDbSubPath +FS+ replicatedDb;
         connectionURL = "jdbc:derby:"  
                 + "//" + slaveServerHost + ":" + slaveServerPort + "/"
@@ -271,6 +285,7 @@ private void _testPostStartedMasterAndSlave_StopMaster()
             int ec = se.getErrorCode();
             String ss = se.getSQLState();
             String msg = ec + " " + ss + " " + se.getMessage();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             BaseJDBCTestCase.assertSQLState(
                 "4. stopMaster on slave failed with: " 
                     + connectionURL + " " + msg,
@@ -281,6 +296,7 @@ private void _testPostStartedMasterAndSlave_StopMaster()
         }
         
         // 5. Connect master which now is now in non-replication mode should succeed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         db = masterDatabasePath +FS+ReplicationRun.masterDbSubPath +FS+ replicatedDb;
         connectionURL = "jdbc:derby:"  
                 + "//" + masterServerHost + ":" + masterServerPort + "/"
@@ -303,6 +319,8 @@ private void _testPostStartedMasterAndSlave_StopMaster()
         }
 
         // 6. Attempt to do stopmaster on master which now is now in non-replication mode should fail.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         db = masterDatabasePath +FS+ReplicationRun.masterDbSubPath 
                 +FS+ replicatedDb;
         connectionURL = "jdbc:derby:"  
@@ -321,6 +339,7 @@ private void _testPostStartedMasterAndSlave_StopMaster()
             int ec = se.getErrorCode();
             String ss = se.getSQLState();
             String msg = ec + " " + ss + " " + se.getMessage();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3417
             BaseJDBCTestCase.assertSQLState(
                 "6. stopMaster on server not in master mode failed with: " 
                     + connectionURL + " " + msg,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_3.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_3.java
index 1a65726d62..b92173adcc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_3.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part1_3.java
@@ -50,6 +50,7 @@ public ReplicationRun_Local_StateTest_part1_3(String testcaseName)
         
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_StateTest_part1_3 Suite");
         
@@ -79,10 +80,12 @@ public void testReplication_Local_StateTest_part1_3()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES, // masterServerHost, // "0.0.0.0", // All. or use masterServerHost for interfacesToListenOn,
                 masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 masterDbSubPath); // Distinguishing master/slave
         
         startServer(slaveJvmVersion, derbySlaveVersion,
@@ -133,6 +136,7 @@ public void testReplication_Local_StateTest_part1_3()
     private void _testPostStartedMasterAndSlave_Failover()
     {
         Connection conn = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         String db = slaveDatabasePath +FS+ReplicationRun.slaveDbSubPath +FS+ replicatedDb;
         String connectionURL = "jdbc:derby:"  
                 + "//" + slaveServerHost + ":" + slaveServerPort + "/"
@@ -155,6 +159,7 @@ private void _testPostStartedMasterAndSlave_Failover()
         // Default replication test sequence still OK.
         
         // Failover on master should succeed:
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         db = masterDatabasePath +FS+ReplicationRun.masterDbSubPath +FS+ replicatedDb;
         connectionURL = "jdbc:derby:"  
                 + "//" + masterServerHost + ":" + masterServerPort + "/"
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part2.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part2.java
index 31ce65c5a4..a7f5e96e75 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part2.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_StateTest_part2.java
@@ -51,6 +51,7 @@ public ReplicationRun_Local_StateTest_part2(String testcaseName)
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_StateTest_part2 Suite");
         
@@ -81,10 +82,12 @@ public void testReplication_Local_StateTest_part2()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost,
                 ALL_INTERFACES,
                 masterServerPort,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
                 masterDbSubPath);
         
         startServer(slaveJvmVersion, derbySlaveVersion,
@@ -192,6 +195,7 @@ public void testReplication_Local_StateTest_part2()
     }
 
     private void _testPreStoppedSlave(Connection mConn)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4246
         throws Exception
     {
         util.DEBUG("_testPreStoppedSlave");
@@ -206,12 +210,14 @@ private void _testPreStoppedSlave(Connection mConn)
         
         // Tests against slave:
         assertException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
                 _startSlave(slaveServerHost,slaveServerPort,
                     slaveDatabasePath, replicatedDb,
                     slaveReplPort),
                 "XRE09");
 
         assertException(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4246
                 stopSlave(slaveServerHost,slaveServerPort,
                           slaveDatabasePath, replicatedDb,
                           true),
@@ -257,6 +263,7 @@ private void _testPostStoppedSlave()
         /* No value-adding suggestions here exept that calling startSlave 
          * should hang now. 
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
         util.DEBUG("_testPostStoppedSlave Not yet implemented."
                 + " No value-adding suggestions here"
                 + " exept that calling startSlave should hang now.");
@@ -274,6 +281,7 @@ private void _testPostStoppedMaster()
         /* No value-adding suggestions here since the stopMaster method will 
          * not do anything when called after failover
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
         util.DEBUG("_testPostStoppedMaster Not yet implemented."
                 + "No value-adding suggestions here since the stopMaster method"
                 + " will not do anything when called after failover");
@@ -286,10 +294,13 @@ private void _testPostStoppedServer()
                 + " No value-adding suggestions here.");
     }
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
     SQLException _startSlave(String slaveServerHost, int slaveServerPort,
             String slaveDatabasePath, String replicatedDb,
             int slaveReplPort)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         String db = slaveDatabasePath +FS+ReplicationRun.slaveDbSubPath +FS+ replicatedDb;
         String connectionURL = "jdbc:derby:"  
                 + "//" + slaveServerHost + ":" + slaveServerPort + "/"
@@ -311,9 +322,11 @@ SQLException _startSlave(String slaveServerHost, int slaveServerPort,
     }
 
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
     SQLException _failOver(String serverHost, int serverPort, 
             String databasePath, String dbSubPath, String replicatedDb)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         String db = databasePath +FS+dbSubPath +FS+ replicatedDb;
         String connectionURL = "jdbc:derby:"  
                 + "//" + serverHost + ":" + serverPort + "/"
@@ -332,11 +345,13 @@ SQLException _failOver(String serverHost, int serverPort,
         }
     }
     
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
     SQLException _startMaster(String masterServerHost, int masterServerPort,
             String databasePath, String replicatedDb,
             String slaveServerHost,
             int slaveReplPort)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         String db = databasePath +FS+ReplicationRun.masterDbSubPath +FS+ replicatedDb;
         String connectionURL = "jdbc:derby:"  
                 + "//" + masterServerHost + ":" + masterServerPort + "/"
@@ -360,6 +375,8 @@ SQLException _startMaster(String masterServerHost, int masterServerPort,
     SQLException connectTo(String serverHost, int serverPort,
             String databasePath, String dbSubPath, String replicatedDb)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         String db = databasePath +FS+dbSubPath +FS+ replicatedDb;
         String connectionURL = "jdbc:derby:"  
                 + "//" + serverHost + ":" + serverPort + "/"
@@ -377,6 +394,7 @@ SQLException connectTo(String serverHost, int serverPort,
         }
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
     SQLException _executeQuery(Connection conn, String query)
     {
         util.DEBUG("executeQuery: " + query);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_showStateChange.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_showStateChange.java
index c8811522b8..c33abdb642 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_showStateChange.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_showStateChange.java
@@ -57,6 +57,7 @@ protected void tearDown() throws Exception
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ReplicationRun_Local_showStateChange Suite");
         
@@ -78,6 +79,7 @@ public void testReplication_Local_showStateChange_showReplState()
         initMaster(masterServerHost,
                 replicatedDb);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5729
         startServer(masterJvmVersion, derbyMasterVersion,
                 masterServerHost, ALL_INTERFACES, masterServerPort,
                 masterDbSubPath);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java
index b7fef05fc2..a48d31f647 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java
@@ -45,6 +45,7 @@ private ReplicationSuite(String name) {
 	public static Test suite() throws SQLException {
 
         BaseTestSuite suite = new BaseTestSuite("ReplicationSuite");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // DERBY-5998: The replication code uses javax.net.ServerSocketFactory
         // to set up communication channels between the master and the slave.
@@ -63,13 +64,17 @@ public static Test suite() throws SQLException {
         // on platforms that support JDBC3 and higher. The tests also require
         // a network server.
         if (JDBC.vmSupportsJDBC3() && Derby.hasServer()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5677
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4638
             suite.addTest(ReplicationRun_Local.suite());
             suite.addTest(ReplicationRun_Local.localAuthenticationSuite());
 
             suite.addTest(ReplicationRun_Local_1.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
 
             suite.addTest(ReplicationRun_Local_1Indexing.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
 
             suite.addTest(ReplicationRun_Local_StateTest_part1.suite());
             suite.addTest(ReplicationRun_Local_StateTest_part1_1.suite());
@@ -81,6 +86,7 @@ public static Test suite() throws SQLException {
             // Run this separatly as it produces extra output:
             // suite.addTest(ReplicationRun_Local_showStateChange.suite());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3738
             suite.addTest(ReplicationRun_Local_3_p1.suite());
             suite.addTest(ReplicationRun_Local_3_p2.suite());
             suite.addTest(ReplicationRun_Local_3_p3.suite());
@@ -90,10 +96,13 @@ public static Test suite() throws SQLException {
             suite.addTest(ReplicationRun_Local_3_p5.suite());
 
             suite.addTest(ReplicationRun_Local_Encrypted_1.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3921
 
             suite.addTest(ReplicationRun_Local_3_p6.suite());
 
             suite.addTest(ReplicationRun_Local_Derby4910.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4910
+//IC see: https://issues.apache.org/jira/browse/DERBY-4812
 
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationTestRun.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationTestRun.java
index 25d289c523..1a30c3e265 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationTestRun.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationTestRun.java
@@ -39,6 +39,7 @@ public static Test suite()
     {
         System.out.println("*** ReplicationTestRun.suite()");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ReplicationTestRun");
         System.out.println("*** Done new BaseTestSuite()");
         
@@ -58,6 +59,7 @@ public static Test suite()
         System.out.println("*** Done suite.addTest(StandardTests.createTableFromQueryTest())");
         
         /* Need decoration?
+//IC see: https://issues.apache.org/jira/browse/DERBY-3126
         suite.addTest(StandardTests.databaseClassLoadingTest(masterHostName, masterPortNo));
         System.out.println("*** Done suite.addTest(StandardTests.databaseClassLoadingTest())"); */
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationTestRun_Verify.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationTestRun_Verify.java
index 9dc17f368c..5a7c412718 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationTestRun_Verify.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationTestRun_Verify.java
@@ -43,6 +43,7 @@ public static Test suite()
     {
         System.out.println("*** ReplicationTestRun_Verify.suite()");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ReplicationTestRun_Verify");
         System.out.println("*** Done new BaseTestSuite()");
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMaster.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMaster.java
index 74cdaaf521..12cc48a02b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMaster.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMaster.java
@@ -143,6 +143,7 @@ else if ( url == null )
                         String expectedState = (dbOnly)? "08006": "XJ015";
                         int expectedCode = dbOnly ? 45000 : 50000;
                         System.out.println("shutdown Got SQLException: " + errCode + " " + state + " " + msg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
                         if ( (errCode == expectedCode)
                         && (state.equalsIgnoreCase(expectedState) ) )
                         {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterDb.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterDb.java
index 445eacfced..237b55bed4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterDb.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterDb.java
@@ -44,6 +44,7 @@ public static Test suite()
         
         setEnv();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ShutdownMasterDb");
         suite.addTest(ShutdownMasterDb.suite(masterServerHost,masterServerPort)); // (masterHostName, masterPortNo));
         return (Test)suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServer.java
index 045dde1518..401f429bc3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServer.java
@@ -43,6 +43,7 @@ public static Test suite()
         
         setEnv();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ShutdownMasterServer");
         suite.addTest(ShutdownMasterServer.suite(masterServerHost,masterServerPort)); // (masterHostName, masterPortNo));
         return (Test)suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServerByOsKill.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServerByOsKill.java
index 95c70759da..3a25bbd2ab 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServerByOsKill.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServerByOsKill.java
@@ -46,6 +46,7 @@ public static Test suite()
         
         setEnv();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ShutdownMasterServerByOsKillCtrl");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServerViaNwSrvCtrl.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServerViaNwSrvCtrl.java
index 76588ded90..bdaa96decc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServerViaNwSrvCtrl.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownMasterServerViaNwSrvCtrl.java
@@ -47,6 +47,7 @@ public static Test suite()
         
         setEnv();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ShutdownMasterServerViaNwSrvCtrl");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlave.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlave.java
index efcd4b483c..e5ccbe9a7a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlave.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlave.java
@@ -73,6 +73,7 @@ public static Test suite()
         
         setEnv();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ShutdownSlave");
         suite.addTest(ShutdownSlave.suite(masterServerHost, masterServerPort));
         return (Test)suite;
@@ -167,6 +168,7 @@ else if (url == null )
                         String expectedState = (dbOnly)? "08004": "XJ015";
                         int expectedCode = dbOnly ? 45000 : 50000;
                         System.out.println("shutdown Got SQLException: " + errCode + " " + state + " " + msg);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
                         if ( (errCode == expectedCode)
                         && (state.equalsIgnoreCase(expectedState) ) )
                         {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveDb.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveDb.java
index afc07bd551..93796a05e4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveDb.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveDb.java
@@ -47,6 +47,7 @@ public static Test suite()
         
         setEnv();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ShutdownSlaveDb");
         suite.addTest(ShutdownSlaveDb.suite(masterServerHost, masterServerPort));
         return (Test)suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServer.java
index 38000b8d06..4d70982f8e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServer.java
@@ -47,6 +47,7 @@ public static Test suite()
         
         setEnv();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ShutdownSlaveServer");
         suite.addTest(ShutdownSlaveServer.suite(masterServerHost, masterServerPort));
         return (Test)suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServerByOsKill.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServerByOsKill.java
index af1f493e4f..bf37dd8964 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServerByOsKill.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServerByOsKill.java
@@ -47,6 +47,7 @@ public static Test suite()
         
         setEnv();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ShutdownSlaveServerByOsKill");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServerViaNwSrvCtrl.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServerViaNwSrvCtrl.java
index e01bea1742..6b4295e535 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServerViaNwSrvCtrl.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/ShutdownSlaveServerViaNwSrvCtrl.java
@@ -48,6 +48,7 @@ public static Test suite()
         
         setEnv();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("ShutdownSlaveServerViaNwSrvCtrl");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest.java
index 4241496bf3..6cb79745d3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest.java
@@ -52,10 +52,12 @@ public SimplePerfTest(String testcaseName)
     public static Test suite()
         throws Exception
     {        
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         masterHostName = System.getProperty("test.serverHost", "localhost");
         masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         dbPath = System.getProperty("test.dbPath", "wombat");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("SimplePerfTest");
         
         tuplesToInsert = Integer.parseInt(System.getProperty("test.inserts", "1000"));
@@ -73,6 +75,7 @@ public static Test suite()
      */
     public static Test suite(String serverHost, int serverPort, String dbPath)
     {     
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         Test t = TestConfiguration.existingServerSuite(SimplePerfTest.class,false,serverHost,serverPort,dbPath);
         return SecurityManagerSetup.noSecurityManager(t);
    }
@@ -84,9 +87,11 @@ public static Test suite(String serverHost, int serverPort, String dbPath)
      */
     public void testInserts()
     throws SQLException, IOException, InterruptedException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
            ClassNotFoundException, IllegalAccessException, InstantiationException,
            NoSuchMethodException, InvocationTargetException
     {        
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         String vc = "";
         for ( int i=0;i<20000;i++ )
         {
@@ -130,8 +135,10 @@ public void testInserts()
     public void verifyTestInserts()
         throws SQLException, IOException, InterruptedException,
             ClassNotFoundException, IllegalAccessException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                InstantiationException, NoSuchMethodException, InvocationTargetException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         Connection conn = clientConnection(masterHostName, masterPortNo, dbPath);
         
         Statement s = conn.createStatement();
@@ -143,6 +150,7 @@ public void verifyTestInserts()
     }
     private Connection clientConnection(String hostName, int portNo, String dbPath)
             throws SQLException, ClassNotFoundException, IllegalAccessException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                    InstantiationException, NoSuchMethodException, InvocationTargetException
     {
         ClientDataSourceInterface ds;
@@ -152,6 +160,7 @@ private Connection clientConnection(String hostName, int portNo, String dbPath)
             clazz = Class.forName("org.apache.derby.jdbc.ClientDataSource");
             ds = (ClientDataSourceInterface) clazz.getConstructor().newInstance();
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             ds = new BasicClientDataSource40();
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest_Verify.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest_Verify.java
index 7b9f76f65f..c9c5a96173 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest_Verify.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest_Verify.java
@@ -57,6 +57,7 @@ public static Test suite()
         dbPath = System.getProperty("test.dbPath", "wombat");
         tuplesToInsert= Integer.parseInt(System.getProperty("test.inserts", "0"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("SimplePerfTest_Verify");
         
         suite.addTest(SimplePerfTest_Verify.suite(masterHostName, masterPortNo, dbPath));
@@ -79,6 +80,7 @@ public static Test suite(String serverHost, int serverPort, String dbPath)
      */
     public void testVerify()
         throws SQLException, IOException, InterruptedException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                ClassNotFoundException, IllegalAccessException, InstantiationException,
                NoSuchMethodException, InvocationTargetException
     {
@@ -100,6 +102,7 @@ private void verifyTestInserts()
     }
     private Connection clientConnection(String hostName, int portNo, String dbPath)
             throws SQLException, ClassNotFoundException, IllegalAccessException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                    InstantiationException, NoSuchMethodException,
                    InvocationTargetException
     {
@@ -109,6 +112,7 @@ private Connection clientConnection(String hostName, int portNo, String dbPath)
             Class<?> clazz = Class.forName("org.apache.derby.jdbc.ClientDataSource");
             ds = (ClientDataSourceInterface) clazz.getConstructor().newInstance();
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             ds = new BasicClientDataSource40();
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_Failover.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_Failover.java
index eef7f38ea8..456edc0af6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_Failover.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_Failover.java
@@ -51,6 +51,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("TestPostStartedMasterAndSlave_Failover");
                 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_StopMaster.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_StopMaster.java
index 9870e85fe8..233e1d4b61 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_StopMaster.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_StopMaster.java
@@ -51,6 +51,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("TestPostStartedMasterAndSlave_StopMaster");
                 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_StopSlave.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_StopSlave.java
index 0a578db319..46d5df3580 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_StopSlave.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStartedMasterAndSlave_StopSlave.java
@@ -53,6 +53,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("TestPostStartedMasterAndSlave_StopSlave");
                 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStoppedSlaveServer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStoppedSlaveServer.java
index 01f1ad2d3b..269a45bcf4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStoppedSlaveServer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPostStoppedSlaveServer.java
@@ -48,6 +48,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestPostStoppedSlaveServer");
                 
         suite.addTest(TestPostStoppedSlaveServer.suite(slaveServerHost, slaveServerPort));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreInitSlave.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreInitSlave.java
index 7678b57167..016d06a00d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreInitSlave.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreInitSlave.java
@@ -51,6 +51,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestPreInitSlave");
                 
         suite.addTest(TestPreInitSlave.suite(slaveServerHost, slaveServerPort));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedMaster.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedMaster.java
index ff1177d450..8fc0b43ce4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedMaster.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedMaster.java
@@ -50,6 +50,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestPreStartedMaster");
                 
         suite.addTest(TestPreStartedMaster.suite(masterServerHost, masterServerPort));
@@ -111,6 +112,7 @@ public void testStartMasterConnect_OK()
         System.out.println("2. startMaster attempt should fail on: " + connectionURL);
         System.out.println("********************'' 2. CURRENTLY HANGS!!!! Skipping.");
         // if (false)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
         { // FIXME! PRELIM Hangs!!
         // A 2. StartMaster connect should fail:
         try
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedMasterServer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedMasterServer.java
index 2614cbe589..a461684d73 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedMasterServer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedMasterServer.java
@@ -47,6 +47,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestPreStartedMasterServer");
                 
         suite.addTest(TestPreStartedMasterServer.suite(masterServerHost, masterServerPort));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlave.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlave.java
index 4f36c00b7f..2b71c52c49 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlave.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlave.java
@@ -50,6 +50,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestPreStartedSlave");
                 
         suite.addTest(TestPreStartedSlave.suite(slaveServerHost, slaveServerPort));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlaveServer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlaveServer.java
index 134a52ae75..a43e6191be 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlaveServer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStartedSlaveServer.java
@@ -47,6 +47,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestPreStartedSlaveServer");
                 
         suite.addTest(TestPreStartedSlaveServer.suite(slaveServerHost, slaveServerPort));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMaster.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMaster.java
index 5aad0f97a8..b5fc884b26 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMaster.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMaster.java
@@ -45,6 +45,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestPreStoppedMaster");
                 
         suite.addTest(TestPreStoppedMaster.suite(slaveServerHost, slaveServerPort));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMasterServer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMasterServer.java
index a34cf29d9b..06f1c47b28 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMasterServer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedMasterServer.java
@@ -45,6 +45,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestPreStoppedMasterServer");
                 
         suite.addTest(TestPreStoppedMasterServer.suite(slaveServerHost, slaveServerPort));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlave.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlave.java
index c37bbf05ee..0b0570414a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlave.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlave.java
@@ -54,6 +54,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestPreStoppedSlave");
                 
         suite.addTest(TestPreStoppedSlave.suite(slaveServerHost, slaveServerPort));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlaveServer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlaveServer.java
index ab1649b2e9..c834a0fe52 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlaveServer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/TestPreStoppedSlaveServer.java
@@ -54,6 +54,7 @@ public static Test suite()
         // String masterHostName = System.getProperty("test.serverHost", "localhost");
         // int masterPortNo = Integer.parseInt(System.getProperty("test.serverPort", "1527"));
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("TestPreStoppedSlaveServer");
                 
         suite.addTest(TestPreStoppedSlaveServer.suite(slaveServerHost, slaveServerPort));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Utils.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Utils.java
index a90bf22a87..db8fe7be74 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Utils.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/replicationTests/Utils.java
@@ -57,6 +57,7 @@ void copyDir(String sourcePath, String destPath)
     * @param destPath Directory or file to copy to
     * @throws IOException If copying failed.
     */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3126
     void copyFiles(String srcPath, String destPath) 
     throws IOException
     {
@@ -78,6 +79,7 @@ void copyFiles(String srcPath, String destPath)
         }
         else
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3162
             copy(src,dest);  // Also works w/ JVM 1.4
             // NIOcopy(src,dest); // Requires JVM 1.5 or 1.6
         }
@@ -104,6 +106,7 @@ void writeToFile(String text, String outFile)
         out.close();
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3126
     void mkDirs(String dirPath)
     {
         File dir = new File(dirPath);
@@ -135,6 +138,7 @@ void sleep(long sleepTime, String ID)
     /**
      * Convert a list of strings to an array of strings.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     String[] toStringArray(List<String> list) {
         return list.toArray(new String[list.size()]);
     }
@@ -143,6 +147,7 @@ String[] toStringArray(List<String> list) {
      * Splice together strings. Separate the sub-strings by the specified
      * separator character.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5791
     String splice(String[] strings, char sep) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < strings.length; i++) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AccessTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AccessTest.java
index 0506dddf65..423bde6ed2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AccessTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AccessTest.java
@@ -403,6 +403,7 @@ else if (expectedScan.equals("Constraint"))
 
 
             if (expPages != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4540
                 assertTrue(
                         "RuntimeStatisticsParser.findstring(Number of pages visited= "
                         + expPages + ") returned false" +
@@ -1041,6 +1042,7 @@ public void testCS1346b() throws Exception
         expRS = new String [][]{{"20"}};
         JDBC.assertFullResultSet(rs, expRS, true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4523
         st.executeUpdate("drop table long1");
         st.executeUpdate("drop table long2");
     }
@@ -1572,6 +1574,7 @@ public void testCS3368_3370() throws Exception
 
         checkSpaceTable(st, "5");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4523
         st.executeUpdate("drop table a");
     }
     
@@ -1859,6 +1862,7 @@ public void testCaseCS4595B_NonUniqueIndex() throws Exception
     public void testQualifiers() throws Exception
     {
         setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4523
 
         ResultSet rs = null;
         Statement st = createStatement();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsMultiTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsMultiTest.java
index d04a594b94..5862b3f866 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsMultiTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsMultiTest.java
@@ -79,6 +79,7 @@ public void testMTSelect()
         int totalError = 0;
         List<SQLException> errors = new ArrayList<SQLException>();
         for (int i=0; i < threadCount; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5468
             MTCompileThread ct = compileThreads[i];
             int count = ct.getCount();
             int errorCount = ct.getErrorCount();
@@ -138,8 +139,11 @@ public void testMTSelectWithDDL()
 
         int total = 0;
         int totalError = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<SQLException> errors = new ArrayList<SQLException>();
         for (int i=0; i < threadCount; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5468
             MTCompileThread ct = compileThreads[i];
             int count = ct.getCount();
             int errorCount = ct.getErrorCount();
@@ -161,6 +165,8 @@ public void testMTSelectWithDDL()
                 createThread.getError().printStackTrace(out);
             }
             out.println("select/compile errors:");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             for (SQLException sqle : errors) {
                 out.println("------");
                 sqle.printStackTrace(out);
@@ -180,6 +186,7 @@ private void verifyStatistics()
         // by the test threads may cause the index statistics daemon worker
         // thread to be "starved". Add a timeout to give it a chance to do
         // what it has been told to do.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5097
         IndexStatsUtil stats = new IndexStatsUtil(getConnection(), 5000);
         IdxStats[] myStats = stats.getStatsTable(TAB, 2);
         for (int i=0; i < myStats.length; i++) {
@@ -241,6 +248,7 @@ private void prepareTable(boolean dropIfExists)
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(AutomaticIndexStatisticsMultiTest.class);
     }
 
@@ -251,6 +259,7 @@ private static class MTCompileThread
         private final Connection con;
         private final long runTime;
         private final ArrayList<SQLException> errors =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 new ArrayList<SQLException>();
         private volatile int count;
 
@@ -269,6 +278,7 @@ public void run() {
                                 (++counter) + " = " + counter + " AND val2 = " +
                                 (1 + rand.nextInt(10)));
                 } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5468
                     synchronized (this) {
                         errors.add(sqle);
                     }
@@ -286,6 +296,7 @@ public synchronized int getErrorCount() {
         }
 
         public synchronized List<SQLException> getErrors() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return new ArrayList<SQLException>(errors);
         }
     }
@@ -325,6 +336,7 @@ public void run() {
                     lastWasCreate = !lastWasCreate;
                 }
             } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5468
                 error = sqle;
                 println("create/drop thread failed: " + sqle.getMessage());
             }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java
index 0d1b1ad940..6192f557d2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/AutomaticIndexStatisticsTest.java
@@ -73,7 +73,9 @@ public AutomaticIndexStatisticsTest(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test test = new BaseTestSuite(AutomaticIndexStatisticsTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6193
         test = new CleanDatabaseTestSetup(test);
         test = TestConfiguration.additionalDatabaseDecorator(test, MASTERDB);
 
@@ -112,6 +114,7 @@ public void tearDown()
      */
     public void testStatsCreatedOnGrowthThenDeleteDb()
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5040
         String db = "singleUse/newCleanDb";
         DataSource ds = JDBCDataSource.getDataSource();
         JDBCDataSource.setBeanProperty(ds, "databaseName", db);
@@ -273,11 +276,14 @@ public void testCompressWhileScanning()
         // Trigger stats update on secondary table, make sure the daemon can
         // still process work.
         myStats.assertNoStatsTable(TAB2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         con.prepareStatement("select * from " + TAB2 + " where id = ?");
         myStats.assertTableStats(TAB2, 1);
         myStats.release();
 
         // Shutdown database and try to delete it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6193
         JDBCDataSource.shutdownDatabase(ds);
         assertDirectoryDeleted(constructDbPath(db));
     }
@@ -335,6 +341,8 @@ public void testStatisticsCorrectness()
             
             // DERBY-6144 
             // Stats cannot have been created after the current time (future).
+//IC see: https://issues.apache.org/jira/browse/DERBY-6144
+//IC see: https://issues.apache.org/jira/browse/DERBY-5046
             assertFalse(
                 "expected stat created in past:now = " + now + 
                 ";s.created = " + s.created,
@@ -368,6 +376,8 @@ public void testStatisticsCorrectness()
                     ", previous stats created " + earlier,
                     s.created.after(earlier));
             // Stats cannot have been created after the current time (future).
+//IC see: https://issues.apache.org/jira/browse/DERBY-6144
+//IC see: https://issues.apache.org/jira/browse/DERBY-5046
             assertFalse(
                 "expected stat created in past:now = " + now + 
                 ";s.created = " + s.created,
@@ -445,6 +455,7 @@ public void testSelectFromSimpleView()
 
         // Select from the view, using index.
         stats.assertNoStatsTable(table);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         prepareStatement("select * from " + view + " where vcol2 = 7");
         stats.assertNoStatsTable(table);
         // Trigger update of the base table.
@@ -534,6 +545,7 @@ private void copyDb(String newDbName)
         // where we aren't supposed to.
         if (!PrivilegedFileOpsForTests.exists(dest.getParentFile())) {
             AccessController.doPrivileged(new PrivilegedAction<Void>() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
                 public Void run() {
                     assertTrue(dest.getParentFile().mkdirs());
@@ -664,6 +676,7 @@ private void createAndInsertSimple(Connection con, String table, int rows)
         // See if the table exists, and if so, drop it.
         dropIfExists(con, table);
         // Create table.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         s.executeUpdate(
                 "create table " + table + "(id int primary key, val int)");
         s.executeUpdate("create index NON_UNIQUE_INDEX_" + table + " on " +
@@ -676,6 +689,7 @@ private void createAndInsertSimple(Connection con, String table, int rows)
         println("created " + table + ", inserting " + rows + " rows");
         insertSimple(con, table, rows, 0);
         println("completed in " + (System.currentTimeMillis() - start) + " ms");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         myStats.assertNoStatsTable(table);
     }
 
@@ -708,6 +722,7 @@ private void insertSimple(String table, int rows, int start)
     private void insertSimple(Connection con, String table, int rows, int start)
             throws SQLException {
         PreparedStatement ps = con.prepareStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
                                     "insert into " + table + " values (?,?)");
         boolean autoCommit = con.getAutoCommit();
         con.setAutoCommit(false);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BTreeMaxScanTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BTreeMaxScanTest.java
index e372891212..3faec42ba0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BTreeMaxScanTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BTreeMaxScanTest.java
@@ -58,6 +58,7 @@ public static Test suite() {
     protected void tearDown() throws Exception {
         super.tearDown();
         if (SanityManager.DEBUG) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             for (String flag : traceFlags) {
                 SanityManager.DEBUG_PRINT(
                         flag, "Disable tracing for " + getName());
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BackupRestoreTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BackupRestoreTest.java
index d7c2e70acd..9109634df1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BackupRestoreTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BackupRestoreTest.java
@@ -113,6 +113,7 @@ public void testDerby3875()
      * @return A test suite.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(BackupRestoreTest.class);
         return new SupportFilesSetup(
                 TestConfiguration.singleUseDatabaseDecorator(suite));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java
index 9b9f84eeb2..77f0cf276b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java
@@ -112,6 +112,7 @@ protected void logError(String   str)
      * Simple wrapper to execute a sql string.
      **/
     public void executeQuery(
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
     Connection  conn,
     String      stmt_str,
     boolean     commit_query)
@@ -231,6 +232,7 @@ protected void createDebugSystemProcedures(
     String dump_table(
     Connection  conn,
     String      schemaName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
     String      tableName,
     boolean     commit_transaction)
 		throws SQLException
@@ -270,6 +272,7 @@ String dump_table(
 
         rs.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
         if (commit_transaction)
             conn.commit();
 
@@ -318,6 +321,7 @@ protected String get_lock_info(
         // order by
         //     tabname, type desc, mode, cnt, lockname;
         String lock_query = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-571
             "select cast(l.xid as char(8)) as xid, cast(username as char(8)) as username, cast(t.type as char(8)) as trantype, cast(l.type as char(8)) as type, cast(lockcount as char(3)) as cnt, cast(mode as char(4)) as mode, cast(tablename as char(12)) as tabname, cast(lockname as char(10)) as lockname, state, status from SYSCS_DIAG.LOCK_TABLE l right outer join SYSCS_DIAG.LOCK_TABLE t on l.xid = t.xid where l.tableType <> 'S' ";
         if (!include_system_locks)
             lock_query += "and t.type='UserTransaction' ";
@@ -422,6 +426,8 @@ protected int[] getSpaceInfo(
 		throws SQLException
     {
         String stmt_str = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1187
+//IC see: https://issues.apache.org/jira/browse/DERBY-1188
             "select conglomeratename, isindex, numallocatedpages, numfreepages, numunfilledpages, pagesize, estimspacesaving from new org.apache.derby.diag.SpaceTable('" +
             tableName + "') t where isindex = 0";
         PreparedStatement space_stmt = conn.prepareStatement(stmt_str);
@@ -439,6 +445,8 @@ protected int[] getSpaceInfo(
 
         int[] ret_info = new int[SPACE_INFO_NUMCOLS];
         String conglomerate_name        = rs.getString(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1187
+//IC see: https://issues.apache.org/jira/browse/DERBY-1188
         for (int i = 0; i < SPACE_INFO_NUMCOLS; i++)
         {
             ret_info[i] = rs.getInt(i + 2);
@@ -459,6 +467,8 @@ protected int[] getSpaceInfo(
             System.out.println(
                 "Space information for " + schemaName + "." + tableName + ":");
             System.out.println(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1187
+//IC see: https://issues.apache.org/jira/browse/DERBY-1188
                 "isindex = " + ret_info[SPACE_INFO_IS_INDEX]);
             System.out.println(
                 "num_alloc = " + ret_info[SPACE_INFO_NUM_ALLOC]);
@@ -488,6 +498,8 @@ protected int[] getSpaceInfo(
      **/
     protected int total_pages(int[] space_info)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1187
+//IC see: https://issues.apache.org/jira/browse/DERBY-1188
         return(space_info[SPACE_INFO_NUM_FREE] + 
                space_info[SPACE_INFO_NUM_ALLOC]);
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Beetle6038.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Beetle6038.java
index f8eb924f1f..d78ae8efdb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Beetle6038.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Beetle6038.java
@@ -37,9 +37,11 @@ public static void main(String[] args)
 		throws Exception
 	{
 		String driver = "org.apache.derby.jdbc.EmbeddedDriver";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(driver);
         clazz.getConstructor().newInstance();
 		String dburl = "jdbc:derby:Beetle6038Db;create=true;dataEncryption=true;bootPassword=Thursday;encryptionAlgorithm=DES/CBC/NoPadding";
+//IC see: https://issues.apache.org/jira/browse/DERBY-417
 
 		Connection conn = DriverManager.getConnection(dburl);
 		conn.close();
@@ -48,6 +50,7 @@ public static void main(String[] args)
 
 		// read in the properties in the service.properties file of the db
 		Properties serviceProperties = new Properties();
+//IC see: https://issues.apache.org/jira/browse/DERBY-577
 		String systemhome =  System.getProperty("derby.system.home");
 		File f = new File(systemhome + File.separatorChar + "Beetle6038Db" + File.separatorChar + "service.properties");
 		serviceProperties.load(new FileInputStream(f.getCanonicalPath()));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java
index 87a1426525..e8395df484 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java
@@ -54,9 +54,11 @@ public class BootAllTest  extends BaseJDBCTestCase {
     
     public static Test suite() {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("BootAllTest");
         
         // Test uses driver manager so JDBC 2 required.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
         if (JDBC.vmSupportsJDBC3())
         {           
             // Suite to create the third (inner) database and
@@ -74,6 +76,7 @@ public static Test suite() {
             
             // Suite to create the second database (middle) and
             // embed in it the third database suite.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite db2 = new BaseTestSuite("db2");
             db2.addTest(new BootAllTest("createShutdownDatabase"));
             db2.addTest(TestConfiguration.singleUseDatabaseDecorator(db3));
@@ -106,6 +109,8 @@ public BootAllTest(String name) {
     
     public void createShutdownDatabase() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         getConnection().close();
         getTestConfiguration().shutdownDatabase();
     }
@@ -131,6 +136,8 @@ public void testSettingBootAllPropertyWithHomePropertySet()
             throws Exception 
     {
         JDBCClient embedded = getTestConfiguration().getJDBCClient();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
 
         String driverName = embedded.getJDBCDriverName();
         String url = embedded.getUrlBase();
@@ -142,6 +149,7 @@ public void testSettingBootAllPropertyWithHomePropertySet()
         } catch (SQLException e) {
        }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(driverName);
         clazz.getConstructor().newInstance();
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
index 65b783bf6c..c706b13360 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootLockMinion.java
@@ -47,6 +47,7 @@ public static void main(String[] args) {
                            "BootLockMinion.log");
         try
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6651
             DataSource ds = JDBCDataSource.getDataSource(dbName);
             JDBCDataSource.setBeanProperty(ds, "createDatabase", "create");
 
@@ -57,10 +58,12 @@ public static void main(String[] args) {
             // Once we are finished creating the database and making the
             // connection, create the file minionComplete that BootLockTest
             //can check in order to proceed with its work.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4985
             File checkFile = new File(BootLockTest.minionCompleteFileName);
             checkFile.createNewFile();
             //infinite loop until we get killed by BootLockTest.java
             int wait = WAIT_FOR_DESTROY_MAX_MILLIS;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4987
             while(wait > 0)
             {
                 Thread.sleep(10000);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java
index ccb9b41fa6..9d9ddaca26 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/BootLockTest.java
@@ -51,8 +51,10 @@ public class BootLockTest extends BaseJDBCTestCase {
     private final static String dbName = "BootLockTestDB";
     private final static String dbDir = DEFAULT_DB_DIR + File.separator + dbName;
     public static String minionCompleteFileName = BootLockTest.dbDir + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4985
         File.separator + "minionComplete";
     private final static String dbLockFile = dbDir + File.separator +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4667
     DataFactory.DB_LOCKFILE_NAME;
     private final static String dbExLockFile = dbDir + File.separator +
     DataFactory.DB_EX_LOCKFILE_NAME;
@@ -60,6 +62,7 @@ public class BootLockTest extends BaseJDBCTestCase {
     
     private static String[] cmd = new String[]{
         "org.apache.derbyTesting.functionTests.tests.store.BootLockMinion",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6651
         dbName,
     };
 
@@ -83,6 +86,7 @@ public BootLockTest(String name) {
      * @return The test suite
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("BootLockTest");
         suite.addTest(decorateTest());
         return suite;
@@ -97,9 +101,11 @@ public static Test suite() {
     private static Test decorateTest() {
 
         Test test = new BaseTestSuite(BootLockTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         if (JDBC.vmSupportsJSR169() && !isJ9Platform()) {
             // PhoneME requires forceDatabaseLock
+//IC see: https://issues.apache.org/jira/browse/DERBY-4179
             Properties props = new Properties();
             props.setProperty("derby.database.forceDatabaseLock", "true");
             test = new SystemPropertyTestSetup(test, props, true);
@@ -117,8 +123,10 @@ public void testBootLock() throws Exception {
 
         Process p = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4667
         p = execJavaCmd(cmd);
         waitForMinionBoot(p,MINION_WAIT_MAX_MILLIS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4987
 
         // We now know minion has booted
 
@@ -146,6 +154,7 @@ public void testBootLock() throws Exception {
             }
         }
         // Since all went OK, no need to keep the minion log file.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6651
         File minionLog = new File(DEFAULT_DB_DIR, "BootLockMinion.log");
         assertTrue(minionLog.delete());
 
@@ -174,6 +183,7 @@ private void waitForMinionBoot(Process p, int waitmillis) throws InterruptedExce
         BufferedReader minionSysErr = new BufferedReader(
             new InputStreamReader(p.getErrorStream()));
         String minionErrLine= null ;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4985
         File checkFile = new File(minionCompleteFileName);
         do {
             if (checkFile.exists()) { 
@@ -193,6 +203,7 @@ private void waitForMinionBoot(Process p, int waitmillis) throws InterruptedExce
         
         // If we got here, the database did not boot. Try to print the error.
         failmsg.append(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4987
                 "Minion did not start or boot db in " +
                 (MINION_WAIT_MAX_MILLIS/1000) +
                 " seconds.\n");                
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ClassLoaderBootTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ClassLoaderBootTest.java
index a8794a27e4..c1c35f0bac 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ClassLoaderBootTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ClassLoaderBootTest.java
@@ -53,6 +53,7 @@ public class ClassLoaderBootTest extends BaseJDBCTestCase {
     private static URL embeddedDataSourceClassLocation; 
 	static {
         // find the location of derby jar file and derbytools jar file
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         derbyClassLocation = getClassLocation("org.apache.derby.database.Database");
         embeddedDataSourceClassLocation = getClassLocation("org.apache.derby.jdbc.EmbeddedDataSource");
 	}
@@ -86,6 +87,7 @@ public ClassLoaderBootTest(String name ) {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(ClassLoaderBootTest.class);
         Test test = suite;
         TestSetup setup = 
@@ -114,6 +116,7 @@ protected void setUp() throws Exception {
      */
     protected void setUp() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         URL[] urls = new URL[]{derbyClassLocation, embeddedDataSourceClassLocation};
         mainLoader = getThreadLoader();
 
@@ -138,6 +141,7 @@ protected void    tearDown()
     private DerbyURLClassLoader createDerbyClassLoader(final URL[] urls) 
         throws Exception 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
             new PrivilegedAction<DerbyURLClassLoader>(){
                  public DerbyURLClassLoader run()
@@ -176,6 +180,7 @@ public void testBootingAnAlreadyBootedDatabase() throws SQLException
         Connection conn1 = ds_1.getConnection();
         // now attemp to boot using another class loader.
         setThreadLoader(loader_2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4361
         DataSource ds_2 = JDBCDataSource.getDataSource();
         assertEquals(loader_2, getThreadLoader());
         assertEquals(loader_2, ds_2.getClass().getClassLoader());
@@ -215,11 +220,13 @@ public void testBootingDatabaseShutdownByAnotherCLR() throws SQLException
         assertEquals(loader_2, ds_2.getClass().getClassLoader());
         ds_2.getConnection();
         // shutdown the engine for both the class loaders.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4361
         JDBCDataSource.shutEngine(ds_2);
         JDBCDataSource.shutEngine(ds_1);
 }
 
     private void setThreadLoader(final ClassLoader which) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         AccessController.doPrivileged(new PrivilegedAction<Void>(){
             public Void run()  {
                 java.lang.Thread.currentThread().setContextClassLoader(which);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
index 2ded24a0e5..a7350c697a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
@@ -436,6 +436,7 @@ public void testBlobLinkedListReclamationOnRollback() throws SQLException {
     
     public static Test suite() {
         Test suite = TestConfiguration.embeddedSuite(ClobReclamationTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6215
         return new CleanDatabaseTestSetup(suite) {
             /**
              * Creates the table used in the test cases.
@@ -463,6 +464,7 @@ protected void decorateSQL(Statement s) throws SQLException {
             }
 
             protected void tearDown() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6215
                 if (SanityManager.DEBUG) {
                     SanityManager.DEBUG_CLEAR("DaemonTrace");
                 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/CryptoCrashRecoveryTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/CryptoCrashRecoveryTest.java
index 65e3c6c87a..2ce4c456c8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/CryptoCrashRecoveryTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/CryptoCrashRecoveryTest.java
@@ -82,7 +82,9 @@ public static Test suite() {
             suite = TestConfiguration.embeddedSuite(
                     CryptoCrashRecoveryTest.class);
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             suite = new BaseTestSuite(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
                     "CryptoCrashRecovery disabled due to non-debug build");
             println("CryptoCrashRecoveryTest disabled due to non-debug build");
         }
@@ -155,6 +157,7 @@ public void testReEncryptionWithEncryptionKey()
     private void runCrashRecoveryTestCases(DataSource ds, int operation,
                                            boolean useEncPwd)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         Connection con = null; // silence the compiler
         switch (operation) {
             case OP_DECRYPT:
@@ -227,6 +230,7 @@ private void runCrashRecoveryTestCases(DataSource ds, int operation,
         crash(ds, operation, useEncPwd, TEST_REENCRYPT_CRASH_AFTER_CHECKPOINT);
         crashInRecovery(ds, useEncPwd, useNewCredential,
                      TEST_REENCRYPT_CRASH_BEFORE_RECOVERY_FINAL_CLEANUP);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         if (operation == OP_DECRYPT) {
             useNewCredential = null;
         }
@@ -250,6 +254,7 @@ private void crash(DataSource ds, int operation, boolean useEncPwd,
         setDebugFlag(debugFlag);
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             switch (operation) {
                 case OP_REENCRYPT:
                     reEncryptDatabase(ds, useEncPwd);
@@ -588,6 +593,7 @@ private Connection encryptDatabase(DataSource ds, boolean useEncPwd)
      * @throws SQLException if any database exception occurs
      */
     private Connection decryptDatabase(DataSource ds, boolean useEncPwd)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
         throws SQLException {
         String connAttrs = "decryptDatabase=true;";
         if (useEncPwd) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/DecryptDatabaseTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/DecryptDatabaseTest.java
index e28e3f56b4..6ffc873ca4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/DecryptDatabaseTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/DecryptDatabaseTest.java
@@ -149,6 +149,7 @@ public void testDecryptDatabaseNegative()
         }
         
         // Bad setting for decryptDatabase
+//IC see: https://issues.apache.org/jira/browse/DERBY-5970
         try {
             connect( false, BOOTPW, "decryptDatabase=fred" );
             fail( "bad decryptDatabase setting not detected" );
@@ -376,6 +377,7 @@ private void populateDatabase(boolean init, int rows)
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("DecryptDatabaseTest suite");
         suite.addTest(wrapTest());
         suite.addTest(wrapTest("AES/OFB/NoPadding"));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby3625Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby3625Test.java
index 63be660d36..296eb03386 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby3625Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby3625Test.java
@@ -226,6 +226,7 @@ public void testTwoToOneByteCase()
     
     protected static Test baseSuite(String name) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(Derby3625Test.class);
         return new CleanDatabaseTestSetup(
@@ -262,6 +263,7 @@ protected void decorateSQL(Statement stmt) throws SQLException
 
     public static Test suite() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Derby3625Test");
         suite.addTest(baseSuite("Derby36625Test:embedded"));
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby3980DeadlockTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby3980DeadlockTest.java
index 0589f9551d..128089f679 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby3980DeadlockTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby3980DeadlockTest.java
@@ -47,11 +47,13 @@
 public class Derby3980DeadlockTest extends BaseJDBCTestCase {
     private final int THREAD_COUNT = 2;
     private final LinkedList<Throwable> listExceptions =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             new LinkedList<Throwable>();
     private final Object syncObject = new Object();
     private int startedCount = 0;
     private static final String fprefix = "javacore";
     private static final String POLICY_FILE_NAME =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         "org/apache/derbyTesting/functionTests/tests/store/Derby3980DeadlockTest.policy";
     
     public Derby3980DeadlockTest(String name) {
@@ -73,6 +75,7 @@ public void test3980Deadlock() {
     private void checkExceptions() {        
         //Due to timing, you might see ERROR 40XL1: A lock could not be obtained
         //instead of ERROR 40001 (DERBY-3980)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Throwable t : listExceptions) {
             if (t instanceof SQLException) {
                 assertSQLState("40001", (SQLException) t);
@@ -97,6 +100,7 @@ private static Test decorateTest() {
         test = new SystemPropertyTestSetup(test, diagProperties, true);
      
         // Install a security manager using the initial policy file.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6162
         return new SecurityManagerSetup(test, POLICY_FILE_NAME);
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java
index 58d8280dcc..ed27c3d360 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java
@@ -14,6 +14,7 @@
 
 /*
 Class org.apache.derbyTesting.functionTests.tests.store.Derby4577Test
+//IC see: https://issues.apache.org/jira/browse/DERBY-4770
 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -304,6 +305,7 @@ public void testSmallRow1()
     
     protected static Test baseSuite(String name) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(Derby4577Test.class);
         return new CleanDatabaseTestSetup(
@@ -337,6 +339,7 @@ protected void decorateSQL(Statement stmt) throws SQLException
 
     public static Test suite() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Derby4577Test");
         suite.addTest(baseSuite("Derby4577Test:embedded"));
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4676Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4676Test.java
index f98708c640..2581a7495c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4676Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4676Test.java
@@ -47,6 +47,7 @@ public static Test suite() {
 
     /** Set up the test environment. */
     protected void setUp() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         threads = new ArrayList<HelperThread>();
     }
 
@@ -70,6 +71,7 @@ protected void tearDown() throws Exception {
 
         // Then check if any of the helper threads failed.
         for (int i = 0; i < localThreads.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             HelperThread t = localThreads.get(i);
             if (t.exception != null) {
                 fail("Helper thread failed", t.exception);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4923Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4923Test.java
index b92b6b924e..79ff48b35b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4923Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/Derby4923Test.java
@@ -278,6 +278,7 @@ private void callCompress(
     
     protected static Test baseSuite(String name) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(Derby4923Test.class);
         return new CleanDatabaseTestSetup(
@@ -309,6 +310,7 @@ protected void decorateSQL(Statement stmt) throws SQLException
 
     public static Test suite() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Derby4923Test");
         suite.addTest(baseSuite("Derby4923Test:embedded"));
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptDatabaseTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptDatabaseTest.java
index 86ae686695..cb7bb8fa83 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptDatabaseTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptDatabaseTest.java
@@ -63,6 +63,7 @@ public EncryptDatabaseTest(String name) {
      * @return A suite containing embedded suites
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("EncryptDatabase");
         suite.addTest(wrapTest());
         suite.addTest(wrapTest("DESede/CBC/NoPadding")); // from encryption
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java
index 62941e6b9d..f06044735e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionAESTest.java
@@ -96,6 +96,7 @@ public EncryptionAESTest(String name) {
 */
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Encryption AES suite");
         // we're using SupportFilesSetup so the created databases will get 
         // removed. Databases get created in subdirectory EXTINOUT.
@@ -201,6 +202,7 @@ protected void runTestEncryptionKeyLengths(
         // Pop a message to the console and only test encryptionKeyLength 128.
         if (con == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3711
             if (TestConfiguration.getCurrent().doTrace())
                 System.out.println("no unrestricted policy jars; cannot test AES " +
                     "encryption with encryptionKeyLengths 192 nor 256");
@@ -298,6 +300,7 @@ public void runMismatchKeyLength(String dbName, String encryptionAlgorithm,
      */
     private String obtainDbName(String dbName) {
         File tmp = new File(dbName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return PrivilegedFileOpsForTests.getAbsolutePath(
                 new File(SupportFilesSetup.EXTINOUT, tmp.getPath()));
     }
@@ -429,6 +432,7 @@ private Connection getDriverManagerConnection(String dbName,
         String driver =
             getTestConfiguration().getJDBCClient().getJDBCDriverName();
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(driver);
             clazz.getConstructor().newInstance();
         } catch (ClassNotFoundException cnfe) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyAESTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyAESTest.java
index 48947feb34..9a0575beca 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyAESTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyAESTest.java
@@ -42,6 +42,7 @@ public EncryptionKeyAESTest(String name) {
 
     public static Test suite() {
         // This test runs only in embedded due to the use of external files.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(EncryptionKeyAESTest.class,
                                         "EncryptionKey AES suite");
         return new SupportFilesSetup(suite);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyTest.java
index 0ffeb5a05d..873928a208 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/EncryptionKeyTest.java
@@ -127,6 +127,7 @@ protected void tearDown()
             con.rollback();
             con.close();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5724
         con = null;
         super.tearDown();
     }
@@ -264,6 +265,7 @@ public void testCreateDbFromBackup()
         validateDBContents(con);
         CallableStatement cs = con.prepareCall(
                 "CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE(?)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1001
         cs.setString(1, 
                      new File(SupportFilesSetup.EXTINOUT, "backups").getPath());
         // Perform backup.
@@ -281,6 +283,8 @@ public void testCreateDbFromBackup()
         // Try to create a new database from backup with the wrong key.
         dbNameRestored = dbName + "RestoreAttemptedWrongKey";
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
             con = getConnection(dbNameRestored, WRONG_KEY,
                     "createFrom=" + backupDbLocation);
             fail("Created database from encrypted backup with wrong key.");
@@ -292,6 +296,8 @@ public void testCreateDbFromBackup()
         // Try to create a new database from backup with an invalid key.
         dbNameRestored = dbName + "RestoreAttemptedInvalidKey";
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
             con = getConnection(dbNameRestored, INVALID_CHAR_KEY,
                     "createFrom=" + backupDbLocation);
             fail("Created database from encrypted backup with an invalid key.");
@@ -303,6 +309,8 @@ public void testCreateDbFromBackup()
         // Try to create a new database from backup with an odd length key.
         dbNameRestored = dbName + "RestoreAttemptedOddLengthKey";
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
             con = getConnection(dbNameRestored, ODD_LENGTH_KEY,
                     "createFrom=" + backupDbLocation);
             fail("Created db from encrypted backup with an odd length key.");
@@ -329,6 +337,10 @@ public void testCreateDbFromBackup()
         assertTrue(con.isClosed());
         // Create a new database from backup again.
         dbNameRestored = dbName + "RestoredOnceMore";
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
         con = getConnection(dbNameRestored, CORRECT_KEY,
                 "createFrom=" + backupDbLocation);
         validateDBContents(con);
@@ -373,6 +385,8 @@ public void testInvalidRestoreFrom()
         // the existing database we are trying to restore to/into. This is
         // expected behavior currently, but should maybe change?
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
             con = getConnection(dbNameRestored, INVALID_CHAR_KEY,
                     ";restoreFrom=" + obtainDbName(dbName, null));
             fail("Restored database with an invalid key.");
@@ -443,6 +457,7 @@ public void testCreateWithInvalidEncryptionKey() {
      * @return A string with the absolute path to the database.
      * @see SupportFilesSetup
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     String obtainDbName(String dbName, String subdirectory) {
         File tmp = new File(dbName);
         if (subdirectory != null) {
@@ -476,6 +491,8 @@ private void createBackupRestore(String sourceDb, String targetDb)
         shutdown(sourceDb);
         confirmNonBootedDB(sourceDb);
         // Use the restoreFrom attribute.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
         con = getConnection(targetDb, CORRECT_KEY,
                 ";restoreFrom=" + obtainDbName(sourceDb, "backups"));
         validateDBContents(con);
@@ -567,6 +584,7 @@ private Connection getConnection(String dbName,
         str.append(";");
         JDBCDataSource.setBeanProperty(
                 ds, "connectionAttributes", str.toString());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2555
         return ds.getConnection();
     }
 
@@ -606,6 +624,7 @@ protected void shutdown(String databaseName, String dir)
      */
     protected Connection createAndPopulateDB(String dbName)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1001
         Connection newCon = getConnection(dbName, CORRECT_KEY);
         SQLWarning warning = newCon.getWarnings();
         // If the database already exists, fail the test.
@@ -615,6 +634,7 @@ protected Connection createAndPopulateDB(String dbName)
                         warning.getMessage() + ">");
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1001
         Statement stmt = newCon.createStatement();
         stmt.executeUpdate("CREATE TABLE " + TABLE + " (id int NOT NULL, " +
                 "val int NOT NULL, PRIMARY KEY(id))");
@@ -627,6 +647,7 @@ protected Connection createAndPopulateDB(String dbName)
             ps.executeUpdate();
         }
         ps.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-1001
         return newCon;
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/HoldCursorJDBC30Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/HoldCursorJDBC30Test.java
index 939609edd2..2dc4ae314d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/HoldCursorJDBC30Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/HoldCursorJDBC30Test.java
@@ -102,6 +102,7 @@ protected void decorateSQL(Statement s)
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("HoldCursorJDBC30Test");
         suite.addTest(decorateTest(TestConfiguration.embeddedSuite(HoldCursorJDBC30Test.class)));
         suite.addTest(decorateTest(TestConfiguration.clientServerSuite(HoldCursorJDBC30Test.class)));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java
index 2e159c069f..2442a6ca36 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/IndexSplitDeadlockTest.java
@@ -70,6 +70,7 @@ protected void tearDown() throws Exception {
         // Rollback all uncommitted operations so that we don't hold any
         // locks that may block the other threads.
         rollback();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (AsyncThread thread : threads) {
             thread.waitFor();
         }
@@ -78,6 +79,7 @@ protected void tearDown() throws Exception {
         // All the other threads have finished. Now, remove everything from
         // the APP schema so that we don't leave anything around for subsequent
         // tests.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4218
         setAutoCommit(false); // required by JDBC.dropSchema()
         JDBC.dropSchema(getConnection().getMetaData(), "APP");
 
@@ -362,6 +364,7 @@ public void testBTreeForwardScan_fetchRows_resumeAfterWait_unique_split()
         // insert more values. Both threads should wait until the other thread
         // has reached the barrier before continuing.
         final Barrier barrier = new Barrier(2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5440
 
         // Lock a row on the first page in a different thread to stop the
         // index scan. Then split the first leaf by inserting many values
@@ -377,6 +380,7 @@ public void doWork(Connection conn) throws Exception {
                 // it can go ahead with the index scan. Wait here until the
                 // main thread has started the scan.
                 barrier.await();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5440
 
                 // The main thread has started the index scan. Give it a
                 // second to get to the row we have locked.
@@ -395,6 +399,7 @@ public void doWork(Connection conn) throws Exception {
         });
 
         // Prepare the index scan.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5440
         ResultSet rs = s.executeQuery(
                 "select * from t --DERBY-PROPERTIES constraint=C");
 
@@ -480,6 +485,7 @@ public void testBTreeForwardScan_fetchRows_resumeAfterWait_nonUnique_split()
         // thread. They should both wait for the other thread to reach the
         // barrier point before continuing.
         final Barrier barrier = new Barrier(2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5440
 
         // Hold a lock in a different thread to stop the index scan, then
         // split the first leaf (on which the scan is positioned) before the
@@ -493,6 +499,7 @@ public void doWork(Connection conn) throws Exception {
                 // Tell the main thread we have locked the row, and wait for
                 // it to start the index scan.
                 barrier.await();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5440
 
                 // Give the index scan time to get to the row we have locked.
                 Thread.sleep(1000);
@@ -648,6 +655,7 @@ public void doWork(Connection conn) throws Exception {
         // when the other thread is ready. Don't wait more than a minute
         // as something must have gone wrong.
         int totalWait = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6146
         do {
             totalWait += 500;
             Thread.sleep(500);
@@ -667,6 +675,7 @@ public void doWork(Connection conn) throws Exception {
      * @throws SQLException
      */
     private int numlocks() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6146
         Statement s = createStatement();
         ResultSet rs = s.executeQuery("SELECT count(*) from syscs_diag.lock_table");
         rs.next();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java
index 1b67e99444..f3d88165b7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java
@@ -58,7 +58,9 @@ public InterruptResilienceTest(String name)
     protected static Test makeSuite(String name)
     {
         BaseTestSuite suite = new BaseTestSuite(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         Test est = TestConfiguration.embeddedSuite(
             InterruptResilienceTest.class);
         Test cst = TestConfiguration.clientServerSuite(
@@ -75,6 +77,8 @@ protected static Test makeSuite(String name)
         // interest if the test passes. Setting the stream error level 
         // so we don't get those javacores.
         p.put("derby.stream.error.extendedDiagSeverityLevel", "50000");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4463
+//IC see: https://issues.apache.org/jira/browse/DERBY-5028
 
         suite.addTest(
                 new SystemPropertyTestSetup(est, p, true));
@@ -88,10 +92,12 @@ public static Test suite()
     {
         String testName = "InterruptResilienceTest";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4463
         if (isIBMJVM()) {
             if (getSystemProperty("java.version").startsWith("1.4.2"))
             {
                 println("InterruptResilienceTest skipped for this VM, cf. DERBY-5074/5109");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
                 return new BaseTestSuite(testName);
             }
         }
@@ -102,6 +108,7 @@ public static Test suite()
             return new BaseTestSuite(testName);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4974
         if (hasInterruptibleIO()) {
             println("Test skipped due to interruptible IO.");
             println("This is default on Solaris/Sun Java <= 1.6, use " +
@@ -115,6 +122,7 @@ public static Test suite()
     protected void setUp()
             throws java.lang.Exception {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
             clazz.getConstructor().newInstance();
         } catch (Exception e) {
@@ -158,9 +166,11 @@ protected void tearDown()
             throws java.lang.Exception {
 
         DriverManager.setLoginTimeout( 0 );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
 
         // Forget about uncommitted changes
         rollback();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5104
 
         // Drop the tables created in setUp() if they still exist
         dropTable("t1");
@@ -181,6 +191,7 @@ public static void tstRAFwriteInterrupted() throws SQLException {
         long lost = 0;
         try {
             insert = c.prepareStatement("insert into t1 values (?)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
 
             // About 75000 iterations is needed to see any concurrency
             // wait on RawDaemonThread during recovery, cf.
@@ -194,6 +205,7 @@ public static void tstRAFwriteInterrupted() throws SQLException {
                 // safe for interrupts (on Solaris only) yet.
                 Thread.currentThread().interrupt();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 insert.setLong(1, i);
                 insert.executeUpdate();
 
@@ -202,6 +214,7 @@ public static void tstRAFwriteInterrupted() throws SQLException {
         } finally {
             // always clear flag
             Thread.interrupted();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4814
 
             if (insert != null) {
                 try {
@@ -217,6 +230,7 @@ public static void tstRAFwriteInterrupted() throws SQLException {
     public void testRAFWriteInterrupted () throws SQLException {
         Statement s = createStatement();
         s.executeUpdate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
             "create procedure tstRAFWriteInterrupted () modifies sql data " +
             "external name 'org.apache.derbyTesting.functionTests" +
             ".tests.store.InterruptResilienceTest.tstRAFwriteInterrupted' " +
@@ -238,6 +252,7 @@ public static void tstRAFReadWriteMultipleThreads() throws Exception {
         Connection c = DriverManager.getConnection("jdbc:default:connection");
 
         ArrayList<WorkerThread> workers = new ArrayList<WorkerThread>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         ArrayList<InterruptorThread> interruptors =
                 new ArrayList<InterruptorThread>();
@@ -321,10 +336,12 @@ public static void tstRAFReadWriteMultipleThreads() throws Exception {
         // Wait till here to start works, so interruptors don't get too late to
         // the game
         for (int i = 0; i < workers.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             workers.get(i).start();
         }
 
         for (int i = 0; i < workers.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             WorkerThread w = workers.get(i);
             w.join();
 
@@ -398,6 +415,7 @@ public void run() {
             try {
                 c.setAutoCommit(false);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                 String pStmtText =
                     readertest ?
                     "select * from mtTab where i=?" :
@@ -421,6 +439,7 @@ public void run() {
                         // checkCancellationFlag, we must be prepared to
                         // reestablish connection.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
                         try {
                             ResultSet rs = s.executeQuery();
                             rs.next();
@@ -468,6 +487,8 @@ public void run() {
                                 retries++;
                                 continue;
                             } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5223
+//IC see: https://issues.apache.org/jira/browse/DERBY-5223
                                 fail("expected 08000", e);
                             }
                         }
@@ -479,12 +500,14 @@ public void run() {
 
                         c.commit();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5152
                         if (interrupted()) {
                             interruptsSeen++;
                         }
                     }
                 }
                 s.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5223
             } catch (Throwable e) {
                 this.e = e;
             } finally {
@@ -545,6 +568,7 @@ public void testRAFReadWriteMultipleThreads () throws SQLException {
     // client/server as well, otherwise we would just interrupt the client
     // thread. This SP correponds to #testLongQueryInterrupt
     public static void tstInterruptLongQuery() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         Connection c = DriverManager.getConnection("jdbc:default:connection");
         Statement s = c.createStatement();
 
@@ -588,6 +612,7 @@ public void testLongQueryInterrupt() throws SQLException {
     // client/server as well, otherwise we would just interrupt the client
     // thread. This SP correponds to #testInterruptBatch
     public static void tstInterruptBatch() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         Connection c = DriverManager.getConnection("jdbc:default:connection");
         Statement s = c.createStatement();
         s.executeUpdate("create table tmp(i int)");
@@ -649,6 +674,7 @@ public void testInterruptBatch() throws SQLException {
 
 
     public void testInterruptShutdown() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5152
         if (!usingEmbedded()) {
             // Only meaningful for embedded.
             return;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/KeepDisposableStatsPropertyTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/KeepDisposableStatsPropertyTest.java
index 3cc5ffc514..58eda51dcc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/KeepDisposableStatsPropertyTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/KeepDisposableStatsPropertyTest.java
@@ -63,6 +63,7 @@ public void testPropertyDefault()
     /** Runs the real test case. */
     private void assertOnSCUI(boolean keepDisposable)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         IndexStatsUtil stats = new IndexStatsUtil(
                 openDefaultConnection(), 20*1000); // 20 seconds timeout
         // Create table.
@@ -125,6 +126,7 @@ private void assertOnSCUI(boolean keepDisposable)
         setAutoCommit(true);
         // Trigger the scheduling logic to get the istat daemon going
         prepareStatement("select * from " + TAB + " where id = ?"); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         IndexStatsUtil.IdxStats[] newStats =
                 stats.getNewStatsTable(TAB, oldStats);
         assertEquals(oldStats.length, newStats.length);
@@ -143,7 +145,9 @@ private void assertOnSCUI(boolean keepDisposable)
      * explicitly setting it to {@code false}.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
         String property = "derby.storage.indexStats.debug.keepDisposableStats";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("KeepDisposableStatsPropertyTestSuite");
 
@@ -154,6 +158,7 @@ public static Test suite() {
         // Test setting the property explicitly to true.
         Properties propsOn = new Properties();
         propsOn.setProperty(property, "true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suiteOn = new BaseTestSuite("Do KeepDisposableStats");
         suiteOn.addTest(
                 new KeepDisposableStatsPropertyTest("testPropertyTrue"));
@@ -162,6 +167,7 @@ public static Test suite() {
         // Test setting the property explicitly to false.
         Properties propsOff = new Properties();
         propsOff.setProperty(property, "false");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suiteOff =
             new BaseTestSuite("Don't KeepDisposableStats");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LiveLockTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LiveLockTest.java
index d40d63901b..1523d70d50 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LiveLockTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LiveLockTest.java
@@ -67,6 +67,7 @@ public void testLiveLock() throws Exception {
      *             if any occurred
      */
     private void checkExceptions() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (Exception e : listExceptions) {
             throw e;
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LockTableVtiTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LockTableVtiTest.java
index 7071dc274b..963639d021 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LockTableVtiTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LockTableVtiTest.java
@@ -69,6 +69,7 @@ public static Test suite() {
         // setting to 60, which is the default, for starters
         properties.setProperty("derby.locks.waitTimeout", "60");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1040
         Test suite = TestConfiguration.defaultSuite (LockTableVtiTest.class);
         suite = new DatabasePropertyTestSetup(suite, properties, true);
         return new CleanDatabaseTestSetup(suite) ;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LongColumnTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LongColumnTest.java
index 5bcec7daa7..c441932e84 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LongColumnTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/LongColumnTest.java
@@ -36,6 +36,7 @@ public LongColumnTest(String name) {
     }
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("LongColumnTest");
         suite.addTest(TestConfiguration.defaultSuite(LongColumnTest.class));
 
@@ -70,6 +71,7 @@ public void tearDown() throws Exception {
         st.executeUpdate("DROP FUNCTION PADSTRING");
         st.close();
         dropTable("testing");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5723
         super.tearDown();
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/MadhareTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/MadhareTest.java
index 299ed8ba26..1a263ad128 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/MadhareTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/MadhareTest.java
@@ -47,6 +47,7 @@ public MadhareTest( String name )
       public static Test suite()
       {
         //Add the test case into the test suite
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("MadhareTest Test");
         return TestConfiguration.defaultSuite(MadhareTest.class);
       }
@@ -57,6 +58,7 @@ public void testBasicMadhare() throws SQLException
 
         Statement st = createStatement();
         st.executeUpdate("create table t( i int )");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5127
 
         st.executeUpdate("insert into t(i) values (1956)");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumberRecovery.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumberRecovery.java
index 82c9194a0f..b21a204abc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumberRecovery.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/MaxLogNumberRecovery.java
@@ -97,6 +97,7 @@ private static void setSystemProperty(final String name,
     {
     
     AccessController.doPrivileged
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         (new java.security.PrivilegedAction<Void>(){
             
             public Void run(){
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OCRecoveryTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OCRecoveryTest.java
index d8532246bd..16034afded 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OCRecoveryTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OCRecoveryTest.java
@@ -40,6 +40,7 @@ public OCRecoveryTest(String name) {
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("OCRecoveryTest");
         //DERBY-4647 exec does not work on weme
         if (BaseTestCase.isJ9Platform())
@@ -54,6 +55,7 @@ private static Test decorateTest()
                         OCRecoveryTest.class);
         // using a singleUseDatabaseDecorator which should not create
         // the database until the first connection is made
+//IC see: https://issues.apache.org/jira/browse/DERBY-5382
         return TestConfiguration.singleUseDatabaseDecorator(test,
             "OCRecoveryDB");
     }
@@ -68,6 +70,7 @@ public void testOCRecovery() throws Exception
         assertLaunchedJUnitTestMethod("org.apache.derbyTesting." +
                 "functionTests.tests.store.OCRecoveryTest.launchOCRecovery_1",
                 "OCRecoveryDB");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5382
         assertLaunchedJUnitTestMethod("org.apache.derbyTesting." +
                 "functionTests.tests.store.OCRecoveryTest.launchOCRecovery_2",
                 "OCRecoveryDB");
@@ -85,8 +88,10 @@ public void launchOCRecovery_1() throws Exception
         // is done in next method launchOCRecovery_2 which will run restart
         // recovery on the work done in this step.
         // open a connection to the database, this should create the db
+//IC see: https://issues.apache.org/jira/browse/DERBY-5382
         getConnection();
         setAutoCommit(false);        
+//IC see: https://issues.apache.org/jira/browse/DERBY-5382
         createAndLoadTable(tableName, true, 5000, 0);
         Statement st = createStatement();
         st.executeUpdate("DELETE FROM " + tableName);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OSReadOnlyTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OSReadOnlyTest.java
index 67c6fe389d..fed1c0b1a8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OSReadOnlyTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OSReadOnlyTest.java
@@ -82,6 +82,7 @@ protected void decorateSQL(Statement stmt) throws SQLException
 
     protected static Test baseSuite(String name) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite readonly = new BaseTestSuite("OSReadOnly");
         BaseTestSuite suite = new BaseTestSuite(name);
         readonly.addTestSuite(OSReadOnlyTest.class);
@@ -92,6 +93,7 @@ protected static Test baseSuite(String name)
 
     public static Test suite() 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("OSReadOnlyTest");
         suite.addTest(baseSuite("OSReadOnlyTest:embedded"));
         suite.addTest(TestConfiguration
@@ -104,6 +106,7 @@ public static Test suite()
      * on OS level, the database reacts as if it's in 'ReadOnly' mode
      */
     public void testOSReadOnly() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5824
         if (!supportsSetReadOnly()) {
             // If we can modify files after File.setReadOnly() has been
             // called on them, the test database will not actually be
@@ -141,9 +144,11 @@ public void testOSReadOnly() throws Exception {
         // so far, we were just playing. Now for the test.
         String phDbName = getPhysicalDbName();
         // copy the database to one called 'readOnly'
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
         moveDatabaseOnOS(phDbName, "readOnly");
         // change filePermissions on readOnly, to readonly.
         changeFilePermissions("readOnly");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
         createDummyLockFile("readOnly");
         
         DataSource ds = JDBCDataSource.getDataSource();
@@ -156,6 +161,7 @@ public void testOSReadOnly() throws Exception {
         // copy the database to one called 'readWrite' 
         // this will have the default read/write permissions upon
         // copying
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
         moveDatabaseOnOS("readOnly", "readWrite");
         ds = JDBCDataSource.getDataSource();
         JDBCDataSource.setBeanProperty(ds, "databaseName", "singleUse/readWrite");
@@ -164,9 +170,11 @@ public void testOSReadOnly() throws Exception {
         shutdownDB(ds);
         
         // do it again...
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
         moveDatabaseOnOS("readWrite", "readOnly2");
         // change filePermissions on readOnly, to readonly.
         changeFilePermissions("readOnly2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
         createDummyLockFile("readOnly2");
         
         ds = JDBCDataSource.getDataSource();
@@ -177,6 +185,7 @@ public void testOSReadOnly() throws Exception {
         shutdownDB(ds);
         
         // testharness will try to remove the original db; put it back
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
         moveDatabaseOnOS("readOnly2", phDbName);
     }
 
@@ -191,6 +200,7 @@ public void testOSReadOnly() throws Exception {
      * @throws IOException if an unexpected error happens
      */
     private boolean supportsSetReadOnly() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5824
         File tmp = PrivilegedFileOpsForTests.createTempFile(
                 "tmp", null, currentDirectory());
         PrivilegedFileOpsForTests.setReadOnly(tmp);
@@ -218,6 +228,7 @@ private boolean supportsSetReadOnly() throws IOException {
      */
     private String getPhysicalDbName() {
         String pdbName =TestConfiguration.getCurrent().getJDBCUrl();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return pdbName.substring(pdbName.lastIndexOf("oneuse"));
     }
     
@@ -269,6 +280,7 @@ private void assertExpectedInsertBehaviour(
                     insertIntValue + ", '" + insertStringValue + "')");
                 fail("expected an error indicating the db is readonly");
             } catch (SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
                 if (!(sqle.getSQLState().equals("25502") || 
                         // on iseries / OS400 machines, when file/os 
                         // permissions are off, we may get error 40XD1 instead
@@ -288,7 +300,9 @@ private void assertExpectedInsertBehaviour(
      * @throws IOException if the copy fails
      */
     private void moveDatabaseOnOS(String fromwhere, String todir)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
         File from_dir = constructDbPath(fromwhere);
         File to_dir = constructDbPath(todir);
 
@@ -308,6 +322,7 @@ private void moveDatabaseOnOS(String fromwhere, String todir)
     private void createDummyLockFile(String dbDir) {
         final File f = new File(constructDbPath(dbDir), "db.lck");
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
             public Void run() {
                 if (!f.exists()) {
@@ -357,6 +372,7 @@ public static boolean changeDirectoryToReadOnly( File directory )
             return false;
         final File sdirectory = directory;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
             new java.security.PrivilegedAction<Boolean>() {
                 public Boolean run() {
@@ -387,6 +403,7 @@ public Boolean run() {
                     // again, which means we cannot delete the directory and
                     // its content...
                     //success &= sdirectory.setReadOnly();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                     return success;
                 }
             });        
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OfflineBackupTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OfflineBackupTest.java
index c0d78fe14a..19ae205018 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OfflineBackupTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OfflineBackupTest.java
@@ -74,6 +74,7 @@ public void testCreateFromRestoreFrom() throws SQLException, IOException {
 
     public static Test suite() {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         if (JDBC.vmSupportsJSR169()) {
             return new BaseTestSuite(
                 "Empty OfflineBackupTest (uses DriverManager)");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackup.java
index 9783cd4205..28746bfc9d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackup.java
@@ -42,6 +42,7 @@ public class OnlineBackup implements Runnable{
     private Throwable backupError = null;
     private String backupPath;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
 	OnlineBackup(String dbName, String backupPath) {
 		this.dbName = dbName;
         this.backupPath = backupPath;
@@ -55,6 +56,7 @@ public class OnlineBackup implements Runnable{
 	 * 
 	 */
 	public void run()	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
         backupFailed = false;
 		try {
 			performBackup();
@@ -75,6 +77,7 @@ public void run()	{
 	 * Backup the database
 	 */
 	void performBackup() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
 		Connection conn = TestUtil.getConnection(dbName , "");
 		CallableStatement backupStmt = 	
 			conn.prepareCall("CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE(?)");
@@ -104,6 +107,7 @@ void performBackup() throws SQLException {
 	public void waitForBackupToBegin() throws Exception{
 		synchronized(this) {
 			//wait for backup to begin
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
 			while (!beginBackup) {
                 // if the backup failed for some reason throw error, don't go
                 // into wait state.
@@ -128,6 +132,7 @@ public void waitForBackupToEnd() throws Exception{
 				} else {
 
 					//wait for backup to finish
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
 					while (!endBackup) 
                     {
                         // if the backup failed for some reason throw error, don't go
@@ -159,6 +164,7 @@ public synchronized boolean isRunning() {
 	 */
 	public void createFromBackup(String newDbName) throws SQLException {
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
         Connection conn = TestUtil.getConnection(newDbName,  
                                         "createFrom=" +
                                         backupPath + "/" + 
@@ -173,6 +179,7 @@ public void createFromBackup(String newDbName) throws SQLException {
      */
     public void restoreFromBackup() throws SQLException {
        
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
         Connection conn = TestUtil.getConnection(dbName,  
                                         "restoreFrom=" +
                                         backupPath + "/" + 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1.java
index 6b48d5555b..ecf9e9bdaf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest1.java
@@ -70,6 +70,7 @@ private void runTest() throws Exception {
 		DatabaseActions dbActions = new DatabaseActions(conn);
 		//create the test  tables. 
 		dbActions.createTable(TEST_TABLE_NAME);
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         dbActions.createTable(TEST_TABLE_NAME_1);
         dbActions.createTable(TEST_TABLE_NAME_2);
         conn.commit();
@@ -91,6 +92,7 @@ private void runTest() throws Exception {
 		Thread backupThread = new Thread(backup, "BACKUP");
         
         // run some dml actions in another thread
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
         Connection dmlConn = TestUtil.getConnection(TEST_DATABASE_NAME, null);
         DatabaseActions dmlActions = 
             new DatabaseActions(DatabaseActions.DMLACTIONS, dmlConn);
@@ -127,6 +129,7 @@ private void runTest() throws Exception {
                 logMessage("Backup is not waiting for unlogged actions to commit");
 
             // end the unlogged work transaction.
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
             dbActions.endUnloggedAction(TEST_TABLE_NAME_1);
             // end the unlogged work transaction.
             dbActions1.endUnloggedAction(TEST_TABLE_NAME_2);
@@ -142,7 +145,9 @@ private void runTest() throws Exception {
             ddlThread.join(); 
         }        
         // close the connections.
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         conn.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         conn1.close();
         dmlConn.close();
         ddlConn.close() ;
@@ -167,10 +172,12 @@ private void runTest() throws Exception {
 	 * @param  dbName  consistency checks are performed on this database.
 	 */
 	void runConsistencyChecker(String dbName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
         Connection conn = TestUtil.getConnection(dbName, null);
 		Statement stmt = conn.createStatement();
 		stmt.execute("values SYSCS_UTIL.SYSCS_CHECK_TABLE('APP',  'EMP')");
         //check the data in the EMP table.
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         DatabaseActions dbActions = new DatabaseActions(conn);
         dbActions.select(TEST_TABLE_NAME);
         dbActions.select(TEST_TABLE_NAME_1);
@@ -189,6 +196,7 @@ void shutdown(String dbName) {
 
 		try{
 			//shutdown
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
 			TestUtil.getConnection(dbName, "shutdown=true");
 		}catch(SQLException se){
 			if (se.getSQLState() != null && se.getSQLState().equals("08006"))
@@ -280,6 +288,7 @@ public void run() {
 		 */
 		void performDmlActions() throws SQLException {
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 			while(!stopActivity) {
 				insert(TEST_TABLE_NAME, 100, COMMIT, 10);
 				insert(TEST_TABLE_NAME, 100, ROLLBACK, 10);
@@ -302,6 +311,7 @@ void startUnloggedAction(String tableName) throws SQLException {
 			Statement s = conn.createStatement();
 			
             // index creation does not log the index entries 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
             s.executeUpdate("create index " + tableName + "_name_idx on " + 
                             tableName + "(name) ");
 			s.close();
@@ -420,6 +430,7 @@ void update(String tableName, int rowCount,
 		{
 
 			PreparedStatement ps = conn.prepareStatement("update " + tableName + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 								 " SET name = ?  where id=?");
 		
 			for (int i = 0; i < rowCount; i++) {
@@ -452,6 +463,7 @@ void select(String tableName) throws SQLException {
 			{
 				int tid = rs.getInt(1);
 				String name = rs.getString(2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
  				if(name.equals("skywalker" + id) && tid!= id)
 				{
 					logMessage("DATA IN THE TABLE IS NOT AS EXPECTED");
@@ -465,6 +477,7 @@ void select(String tableName) throws SQLException {
             
 			rs.close();
 			s.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
             conn.commit();
 		}
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3.java
index 5989c3279a..3efa2c38d8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineBackupTest3.java
@@ -44,6 +44,7 @@ public static void main(String[] argv) throws Throwable {
 
         OnlineBackupTest3 test = new OnlineBackupTest3();
         ij.getPropertyArg(argv); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 
         try {
             test.runTest();
@@ -105,6 +106,7 @@ void shutdown(String dbName) {
 
         try{
             //shutdown
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
             TestUtil.getConnection(dbName, "shutdown=true");
         }catch(SQLException se){
             if (se.getSQLState() != null && se.getSQLState().equals("08006"))
@@ -147,6 +149,7 @@ private int countRows(Connection conn,
     /*
      * Test install jar running in parallel to backup and vice versa. 
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
     void installJarTest() throws Exception{
         logMessage("Begin Install Jar Test");
         Connection conn1 = TestUtil.getConnection(TEST_DATABASE_NAME, null);
@@ -163,6 +166,7 @@ void installJarTest() throws Exception{
         try {
             // followng backup call should fail because jar operation is pending 
            conn2_stmt.execute(
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
             "call SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT('extinout/mybackup')");
         } catch (SQLException sqle) {
             //above statement should have failed. 
@@ -173,6 +177,7 @@ void installJarTest() throws Exception{
         // operation to install  'brtestjar.jar to commit.
         
         // start a  thread to perform online backup
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
         OnlineBackup backup = new OnlineBackup(TEST_DATABASE_NAME, BACKUP_PATH);
         Thread backupThread = new Thread(backup, "BACKUP1");
         backupThread.start();
@@ -215,8 +220,10 @@ void installJarTest() throws Exception{
         conn1_stmt.execute("insert into t1 values(6)");
         
         // start a  thread to perform online backup
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
         backup = new OnlineBackup(TEST_DATABASE_NAME, BACKUP_PATH);
         backupThread = new Thread(backup, "BACKUP2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         backupThread.start();
         // wait for the backup to start
         backup.waitForBackupToBegin();
@@ -254,6 +261,7 @@ void installJarTest() throws Exception{
 
         // wait for backup to finish. 
         backup.waitForBackupToEnd();
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         backupThread.join();
         logMessage("Backup-2 Completed");
         
@@ -313,6 +321,7 @@ void installJarTest() throws Exception{
         conn.close();
 
         //shutdown the test db 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         shutdown(TEST_DATABASE_NAME);
         logMessage("End Of Install Jar Test.");
 
@@ -322,8 +331,11 @@ void installJarTest() throws Exception{
     /*
      * Test remove jar running in parallel to backup and vice versa. 
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
     void removeJarTest() throws Exception{
         logMessage("Begin Remove Jar Test");
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
         Connection conn1 = TestUtil.getConnection(TEST_DATABASE_NAME, null);
         conn1.setAutoCommit(false);
         Statement conn1_stmt = conn1.createStatement();
@@ -354,6 +366,7 @@ void removeJarTest() throws Exception{
             // followng backup call should fail because remove 
             // jar operation is pending 
            conn2_stmt.execute(
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
             "call SYSCS_UTIL.SYSCS_BACKUP_DATABASE_NOWAIT('extinout/mybackup')");
         } catch (SQLException sqle) {
             //above statement should have failed. 
@@ -369,6 +382,7 @@ void removeJarTest() throws Exception{
         // the above remove jar  to commit.
         
         // start a  thread to perform online backup
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
         OnlineBackup backup = new OnlineBackup(TEST_DATABASE_NAME, BACKUP_PATH);
         Thread backupThread = new Thread(backup, "BACKUP3");
         backupThread.start();
@@ -397,6 +411,7 @@ void removeJarTest() throws Exception{
         // wait for backup to finish. 
         backup.waitForBackupToEnd();
         backupThread.join();
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
 
         logMessage("Backup-3 Completed");
         
@@ -406,8 +421,10 @@ void removeJarTest() throws Exception{
         conn1_stmt.execute("insert into t1 values(12)");
         
         // start a  thread to perform online backup
+//IC see: https://issues.apache.org/jira/browse/DERBY-1042
         backup = new OnlineBackup(TEST_DATABASE_NAME, BACKUP_PATH);
         backupThread = new Thread(backup, "BACKUP4");
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         backupThread.start();
         // wait for the backup to start
         backup.waitForBackupToBegin();
@@ -444,6 +461,7 @@ void removeJarTest() throws Exception{
         logMessage("The transaction that was blocking the backup has ended");
         // wait for backup to finish. 
         backup.waitForBackupToEnd();
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         backupThread.join();
         logMessage("Backup-4 Completed");
 
@@ -465,10 +483,14 @@ void removeJarTest() throws Exception{
         conn2.close();
         
         //shutdown the test db 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
         shutdown(TEST_DATABASE_NAME);
         // restore the database from the backup and run some checks 
         backup.restoreFromBackup();
         logMessage("Restored From the Backup");
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
         Connection conn = TestUtil.getConnection(TEST_DATABASE_NAME, null);
         Statement stmt = conn.createStatement();
         logMessage("No of rows in table t1: " + countRows(conn, "T1"));
@@ -485,6 +507,7 @@ void removeJarTest() throws Exception{
                            "'APP.math_routines') " ) ;
         }catch (SQLException sqle) {
             //above statement should have failed. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
             org.apache.derby.tools.JDBCDisplayUtil.ShowSQLException(System.out, sqle);
         }
         
@@ -523,6 +546,7 @@ public void run() {
                 conn.commit();
             } catch (SQLException sqle) {
                 org.apache.derby.tools.JDBCDisplayUtil.ShowSQLException(System.out, sqle);
+//IC see: https://issues.apache.org/jira/browse/DERBY-239
                 sqle.printStackTrace(System.out);
             }
             aStatement = null;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineCompressTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineCompressTest.java
index a3c5225066..d98c68dd73 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineCompressTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/OnlineCompressTest.java
@@ -68,6 +68,7 @@ protected void callCompress(
 
         cstmt.execute();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
         if (commit_operation)
             conn.commit();
     }
@@ -126,6 +127,7 @@ protected void createAndLoadTable(
         int row_count = 0;
         try
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
             for (int i = start_value; row_count < num_rows; row_count++, i++)
             {
                 insert_stmt.setInt(1, i);               // keycol
@@ -455,9 +457,12 @@ private void log_wrong_count(
         System.out.println("ERROR: for " + num_rows + " row  test. Expected " + expected_val + ", but got " + actual_val );
         System.out.println("before_info:");
         System.out.println(
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
         "    IS_INDEX         =" + before_info[SPACE_INFO_IS_INDEX]     + 
         "\n    NUM_ALLOC        =" + before_info[SPACE_INFO_NUM_ALLOC]    +
         "\n    NUM_FREE         =" + before_info[SPACE_INFO_NUM_FREE]     +
+//IC see: https://issues.apache.org/jira/browse/DERBY-1187
+//IC see: https://issues.apache.org/jira/browse/DERBY-1188
         "\n    NUM_UNFILLED     =" + before_info[SPACE_INFO_NUM_UNFILLED] +
         "\n    PAGE_SIZE        =" + before_info[SPACE_INFO_PAGE_SIZE]    +
         "\n    ESTIMSPACESAVING =" + before_info[SPACE_INFO_ESTIMSPACESAVING]);
@@ -554,6 +559,7 @@ private void deleteAllRows(
 
         conn.commit();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
         testProgress("end deleteAllRows," + num_rows + " row test.");
     }
 
@@ -653,6 +659,7 @@ private void checkPurgePhase(
             createAndLoadLongTable(conn, create_table, table_name, num_rows);
         else
             createAndLoadTable(conn, create_table, table_name, num_rows, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
 
         // dump_table(conn, schemaName, table_name, false);
 
@@ -773,6 +780,7 @@ private void checkPurgePhase(
         executeQuery(conn, "delete from " + table_name, true);
 
         callWaitForPostCommit(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
 
         // compress all space and commit.
         callCompress(conn, "APP", table_name, true, true, true, true);
@@ -781,6 +789,9 @@ private void checkPurgePhase(
         if (long_table)
             createAndLoadLongTable(conn, create_table, table_name, num_rows);
         else
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
+//IC see: https://issues.apache.org/jira/browse/DERBY-361
             createAndLoadTable(conn, create_table, table_name, num_rows, 0);
         conn.commit();
 
@@ -834,6 +845,7 @@ private void checkPurgePhase(
         conn.commit();
 
         callWaitForPostCommit(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
 
         // check the table.  Note that this will accumulate locks and
         // will commit the transaction.
@@ -1078,6 +1090,8 @@ private void test4(
 	 * @exception  StandardException  Standard exception policy.
      **/
     private void test5_load(
+//IC see: https://issues.apache.org/jira/browse/DERBY-1187
+//IC see: https://issues.apache.org/jira/browse/DERBY-1188
     Connection  conn,
     String      schemaName,
     String      table_name,
@@ -1170,6 +1184,7 @@ private void test5_run(
             conn, "delete from " + table_name + " where onehalf = 0", true);
 
         callWaitForPostCommit(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
 
         if (verbose)
             testProgress("deleted every other row, now calling compress.");
@@ -1206,6 +1221,7 @@ private void test5_run(
             conn, "delete from " + table_name + " where onethird = 0", true);
 
         callWaitForPostCommit(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
 
         if (verbose)
             testProgress("deleted every third row, now calling compress.");
@@ -1242,6 +1258,7 @@ private void test5_run(
             (num_rows / 2), true);
 
         callWaitForPostCommit(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
 
         if (verbose)
             testProgress("deleted top half of the rows, now calling compress.");
@@ -1288,6 +1305,7 @@ private void test5_run(
             conn, "delete from " + table_name + " where keycol < 500 ", true);
 
         callWaitForPostCommit(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
 
         if (verbose)
             testProgress("deleted keys < 500, now calling compress.");
@@ -1403,6 +1421,7 @@ private void test6(
 
         // compress with no deletes should not affect size
         int[] ret_before = getSpaceInfo(conn, "APP", table_name, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
         callCompress(conn, "APP", table_name, true, true, true, true);
         int[] ret_after  = getSpaceInfo(conn, "APP", table_name, true);
 
@@ -1419,12 +1438,16 @@ private void test6(
         testProgress("no delete case complete.");
 
         // delete all the rows.
+//IC see: https://issues.apache.org/jira/browse/DERBY-132
         ret_before = getSpaceInfo(conn, "APP", table_name, true);
         executeQuery(conn, "delete from " + table_name, true);
 
         callWaitForPostCommit(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
 
         conn.commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2549
 
         if (verbose)
             testProgress("deleted all rows, now calling compress.");
@@ -1462,6 +1485,7 @@ private void test6(
      * <p>
      **/
     private void test7(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2549
     Connection  conn,
     String      test_name,
     String      table_name)
@@ -1498,6 +1522,8 @@ private void test7(
             conn, "delete from " + table_name + " where keycol < 1000", true);
 
         callWaitForPostCommit(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
 
         conn.commit();
 
@@ -1520,12 +1546,16 @@ public void testList(Connection conn)
         // test2(conn, "test2", "TEST2");
         test3(conn, "test3", "TEST3");
         // test4(conn, "test4", "TEST4");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1187
+//IC see: https://issues.apache.org/jira/browse/DERBY-1188
         test5(conn, "test5", "TEST5");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2549
         test6(conn, "test6", "TEST6");
         test7(conn, "test7", "TEST7");
     }
 
     public static void callWaitForPostCommit(Connection conn) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
             throws SQLException {
         CallableStatement cstmt = 
                 conn.prepareCall(
@@ -1542,6 +1572,7 @@ public static void main(String[] argv)
    		ij.getPropertyArg(argv); 
         Connection conn = ij.startJBMS();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6502
         Statement stmt = conn.createStatement();
         // Create a procedure to be called before checking on contents
         // to ensure that the background worker thread has completed 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/PositionedStoreStreamTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/PositionedStoreStreamTest.java
index 6f942fe1e4..f742e8cf8f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/PositionedStoreStreamTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/PositionedStoreStreamTest.java
@@ -210,6 +210,7 @@ public void testDerby3735()
      * @throws StandardException will never happen
      */
     public void testDerby3781()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3781
             throws IOException, StandardException {
         final long size = 10;
         InputStream in = new LoopingAlphabetStream(size);
@@ -239,6 +240,7 @@ public void testDerby3781()
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(
                 PositionedStoreStreamTest.class, "PositionedStoreStreamTest");
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RecoveryAfterBackup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RecoveryAfterBackup.java
index ca506c2a1c..a5bec22eb6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RecoveryAfterBackup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RecoveryAfterBackup.java
@@ -79,7 +79,9 @@ public static void main(String[] argv) throws Throwable
             // Shut down database
             System.out.println("Shutting down database ...");
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-907
             	TestUtil.getConnection("", "shutdown=true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-810
             } catch(SQLException sqle) {
                 if (sqle.getSQLState() != null 
                     && sqle.getSQLState().equals("XJ015")) {
@@ -91,6 +93,7 @@ public static void main(String[] argv) throws Throwable
 
             // Start up with rollforward-recovery
             System.out.println("Starting restore with roll-forward recovery..");
+//IC see: https://issues.apache.org/jira/browse/DERBY-907
             String dbName = "hairynosedwombat";
             String connAttrs = 
             	"rollForwardRecoveryFrom=extinout/mybackup/hairynosedwombat";
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RecoveryTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RecoveryTest.java
index f038e599c6..881fe85334 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RecoveryTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RecoveryTest.java
@@ -46,6 +46,7 @@ public RecoveryTest(String name)
     public static Test suite()
     {
         // Add the test case into the test suite
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("RecoveryTest");
         suite.addTest(decorateTest());
         return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RowLockBasicTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RowLockBasicTest.java
index a961e13085..478a5b85ee 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RowLockBasicTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/RowLockBasicTest.java
@@ -43,6 +43,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class RowLockBasicTest extends BaseJDBCTestCase {
     public RowLockBasicTest(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5282
         super(name);
     }
     
@@ -138,6 +139,7 @@ public void tearDown() throws Exception {
         dropTable("a");
         commit();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5282
         super.tearDown();
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java
index ab0171309a..513570afec 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/ServicePropertiesFileTest.java
@@ -202,12 +202,14 @@ public void testSevicePropertiesFileCorruptedWithBackup()
         String db = "spfTestSPFCWB";
         copyDbAs(db);
         createSPFBackup(true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5424
         removeEOFToken(spf, SPF_ENCODING);
         assertPresence(true, true);
 
         // Recover and assert
         connectThenShutdown(db);
         assertNormalPresence();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5424
         assertEOFToken(spf,SPF_ENCODING);
     }
 
@@ -269,6 +271,7 @@ private void assertPresence(boolean spfPresence, boolean spfOldPresence) {
      */
     private void assertEOFToken(File file, String encoding)
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5424
         BufferedReader in = new BufferedReader(new InputStreamReader(
                 PrivilegedFileOpsForTests.getFileInputStream(file), encoding));
         String prev = null;
@@ -278,6 +281,7 @@ private void assertEOFToken(File file, String encoding)
         }
         in.close();
         assertNotNull("last line is null - empty file?", prev);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5424
         assertTrue("prev:" + prev +": does not equal " + END_TOKEN, 
                 prev.startsWith(END_TOKEN));
     }
@@ -324,6 +328,7 @@ private void removeEOFToken(File original, String encoding)
     private int grepForToken(String token, File file)
             throws IOException {
         int matchingLines = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5424
         BufferedReader in = new BufferedReader(new InputStreamReader(
                 PrivilegedFileOpsForTests.getFileInputStream(file),
                 SPF_ENCODING));    
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
index 6cb046d51d..8cb85d07f7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
@@ -41,6 +41,7 @@ public class StoreScriptsTest extends ScriptTestCase {
         /* in comments reasons why scripts from the storemore suite can/cannot be run like this*/
         "cisco",        
         "connectDisconnect", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5977
         "databaseProperties", // causes failures in AccessTest in EncryptionSuite
         "longRow",
         //"logDevice", // cannot run like this; test tries to set up 
@@ -95,6 +96,7 @@ public class StoreScriptsTest extends ScriptTestCase {
         //"onlineBackupTest2", // runs into lock time out 
         //"onlineBackupTest4" // runs into security exception
         // Following scripts were part of the 'storetests' suite
+//IC see: https://issues.apache.org/jira/browse/DERBY-5977
         "st_derby1189",
         // "st_1",// this one can just be removed - was the
         // first initial test for the SYSCS_UTIL schema. All functionality
@@ -110,6 +112,7 @@ public StoreScriptsTest(String script) {
     
     private static Test getSuite(String[] list)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("SQL scripts");
         for (int i = 0; i < list.length; i++)
             suite.addTest(
@@ -132,6 +135,7 @@ public static Test suite() {
         // Lock timeout settings that were set for the old harness store tests
         test = DatabasePropertyTestSetup.setLockTimeouts(test, 1, 4);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("StoreScripts");
         suite.addTest(test);
 
@@ -143,6 +147,7 @@ protected void tearDown() throws Exception {
         Statement s = createStatement();
         // Clear the database properties set by this test so that they
         // don't affect other tests.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5977
         s.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY" +
                 "('derby.storage.pageSize', NULL)");
         s.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY" +
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java
index 9099dc84dc..660e9bcccc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java
@@ -1488,6 +1488,8 @@ public void testDerby500() throws Exception {
             	// Also client inserts bad data.
             	// Remove special case when DERBY-4315
             	// is fixed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4312
+//IC see: https://issues.apache.org/jira/browse/DERBY-4224
                 assertSQLState("XN017", sqle);                
             } else {
                 assertSQLState("XJ001", sqle);
@@ -1556,6 +1558,7 @@ public void testDerby500_verifyVarcharStreams() throws Exception {
             // a different implementation). With the client driver the source
             // stream is read twice, whereas the embedded driver will "cache"
             // the stream content and can thus use it for a second insert.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4531
             if (usingDerbyNetClient()) {
                 fail("Expected second executeUpdate with client driver to fail");
             }
@@ -1572,6 +1575,7 @@ public void testDerby500_verifyVarcharStreams() throws Exception {
                 // DERBY-4531: Depending on whether the finalizer has been run
                 //             or not, the SQLState will differ.
                 //             Don't care about this here, accept both.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4531
                 String expectedState = "XN017";
                 if (sqle.getSQLState().equals("XN014")) {
                     expectedState = "XN014";
@@ -2075,6 +2079,7 @@ public static Test suite() {
         Properties strColProperties = new Properties();
         strColProperties.setProperty("derby.storage.sortBufferMax", "5");
         strColProperties.setProperty("derby.debug.true", "testSort");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("StreamingColumnTest");
         suite.addTest(baseSuite("StreamingColumnTest:embedded"));
         suite
@@ -2084,6 +2089,7 @@ public static Test suite() {
     }
 
     protected static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         suite.addTestSuite(StreamingColumnTest.class);
         Test test = new SupportFilesSetup(suite, new String[] {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TableLockBasicTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TableLockBasicTest.java
index c780124135..efb2073eb3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TableLockBasicTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TableLockBasicTest.java
@@ -536,6 +536,7 @@ public void testRTSOutput() throws SQLException {
                     + "		null\n"
                     + "	qualifiers:\n"
                     + "		None\n"
+//IC see: https://issues.apache.org/jira/browse/DERBY-5420
                     + "	optimizer estimated row count: 6.00\n"
                     + "	optimizer estimated cost: 100.40"
                 },
@@ -843,6 +844,12 @@ public void testDDLTableLockMode() throws SQLException {
                     + "		null\n"
                     + "	qualifiers:\n"
                     + "		None\n"
+//IC see: https://issues.apache.org/jira/browse/DERBY-5420
+//IC see: https://issues.apache.org/jira/browse/DERBY-5420
+//IC see: https://issues.apache.org/jira/browse/DERBY-5420
+//IC see: https://issues.apache.org/jira/browse/DERBY-5420
+//IC see: https://issues.apache.org/jira/browse/DERBY-5420
+//IC see: https://issues.apache.org/jira/browse/DERBY-5420
                     + "	optimizer estimated row count: 6.00\n"
                     + "	optimizer estimated cost: 100.40"
                 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TestDiskHashtable.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TestDiskHashtable.java
index 980c4b6453..881b085f46 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TestDiskHashtable.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TestDiskHashtable.java
@@ -171,6 +171,7 @@ private void testOneVariant( TransactionController tc,
                                  DataValueDescriptor[][] rows)
         throws StandardException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         DiskHashtable dht = 
             new DiskHashtable(
                     tc, 
@@ -182,6 +183,7 @@ private void testOneVariant( TransactionController tc,
 
         boolean[] isDuplicate = new boolean[ rows.length];
         boolean[] found = new boolean[ rows.length];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<Object, Vector<DataValueDescriptor[]>> simpleHash =
             new HashMap<Object, Vector<DataValueDescriptor[]>>(rows.length);
 
@@ -210,6 +212,7 @@ private void testOneVariant( TransactionController tc,
                     REPORT_FAILURE( "  get returned wrong value on key " + j);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             testElements( removeDups, dht, i+1, rows, isDuplicate, found);
         }
         // Remove them
@@ -223,6 +226,7 @@ private void testOneVariant( TransactionController tc,
                 REPORT_FAILURE( "  remove did not delete key " + i);
         }
         testElements( removeDups, dht, 0, rows, isDuplicate, found);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         testLargeTable( dht, keyCols, rows[0]);
         dht.close();
@@ -242,6 +246,7 @@ private void testLargeTable( DiskHashtable dht,
 
         DataValueDescriptor[] row = new DataValueDescriptor[ aRow.length];
         for( int i = 0; i < row.length; i++)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
             row[i] = aRow[i].cloneValue(false);
         
         for( int key0Idx = 0; key0Idx < key0Count; key0Idx++)
@@ -335,6 +340,7 @@ private void testElements( boolean removeDups,
             }
             if( el instanceof DataValueDescriptor[])
                 checkElement( (DataValueDescriptor[]) el, rowCount, rows, found);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             else if (el instanceof List)
             {
                 List v = (List) el;
@@ -398,6 +404,7 @@ private boolean rowsEqual( Object r1, Object r2)
             DataValueDescriptor[] row1 = (DataValueDescriptor[]) r1;
             DataValueDescriptor[] row2;
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             if (r2 instanceof List)
             {
                 List v2 = (List) r2;
@@ -419,6 +426,7 @@ else if( r2 instanceof DataValueDescriptor[])
             }
             return true;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         if (r1 instanceof List)
         {
             if (!(r2 instanceof List))
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TestDurabilityProperty.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TestDurabilityProperty.java
index d1c6d22040..4c675b2cbb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TestDurabilityProperty.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/TestDurabilityProperty.java
@@ -124,6 +124,7 @@ public static long timeTakenToInsert(String mode, boolean create,
 
         try {
             conn.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
             TestUtil.getConnection("","shutdown=true");
         } catch (SQLException sqle) {
             if ("XJ015".equals(sqle.getSQLState())) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
index f9757b0d4f..62af99e49e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
@@ -59,6 +59,7 @@ public UpdateLocksTest(String name) {
 
     public void setUp() throws Exception {
         super.setUp();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
         Statement s = createStatement();
         try {
             s.executeUpdate(
@@ -92,6 +93,7 @@ public void setUp() throws Exception {
             // Create a procedure to be called before checking on contents
             // to ensure that the background worker thread has completed 
             // all the post-commit work.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
             s.execute(
                 "CREATE PROCEDURE WAIT_FOR_POST_COMMIT() " +
                 "LANGUAGE JAVA EXTERNAL NAME " +
@@ -112,6 +114,7 @@ public void tearDown() throws Exception {
         try {
             dropTable("a");
             // commit to prevent message 'table/view a already exists'
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
             commit();
         } catch (SQLException e) {
             assertSQLState("42Y55", e);
@@ -124,6 +127,7 @@ public void tearDown() throws Exception {
     public static Test suite() {
 
         Test suite = TestConfiguration.defaultSuite(UpdateLocksTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
 
         Properties p = new Properties();
         p.put("derby.storage.pageSize", "4096");
@@ -154,6 +158,7 @@ public static Test suite() {
      * Should be the same as SERIALIZABLE results except no previous key locks.
      */
     public void testRepeatableRead () throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
         doRunTests(Connection.TRANSACTION_REPEATABLE_READ, false);
     }
 
@@ -196,6 +201,7 @@ private void insertValuesUnpaddedVarchar(Statement s) throws SQLException {
     }
 
     private void doRunTests (int isolation, boolean withhold) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
             throws Exception {
         setAutoCommit(false);
         getConnection().setTransactionIsolation(
@@ -215,6 +221,7 @@ private void doRunTests (int isolation, boolean withhold)
         insertValuesUnpaddedVarchar(s);
         commit();
         updatecursorlocks(getConnection(), isolation, 0, NO_IDX_1, withhold);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
 
         // non cursor, no index run
         // to create tables of page size 4k and still keep the following tbl
@@ -237,6 +244,7 @@ private void doRunTests (int isolation, boolean withhold)
         updateBtreeCursorLocks1(getConnection(),
                                 isolation,
                                 UNIQUE_INDEX,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
                                 true, 0, 0, withhold);
         updateBtreeCursorLocks2(getConnection(),
                                 isolation,
@@ -253,6 +261,7 @@ private void doRunTests (int isolation, boolean withhold)
         commit();
         updateBtreeCursorLocks1(getConnection(), isolation,
                                 NON_UNIQUE_INDEX,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
                                 true, 0, 0, withhold);
         updateBtreeCursorLocks2(getConnection(), isolation,
                                 NON_UNIQUE_INDEX,
@@ -303,6 +312,7 @@ private void doRunTests (int isolation, boolean withhold)
         s.executeUpdate("insert into a values (7, 70, " +
                         "    PADSTRING('seven',1900))");
         commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
         updatecursorlocks(getConnection(), isolation, 1900, NO_IDX_2,
                 withhold);
 
@@ -352,6 +362,7 @@ private void doRunTests (int isolation, boolean withhold)
         s.executeUpdate("create unique index a_idx on a (a, index_pad)");
         commit();
         updateBtreeCursorLocks1(getConnection(), isolation,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
                                 UNIQUE_INDEX, false, 1900, 600, withhold);
         updateBtreeCursorLocks2(getConnection(), isolation,
                                 UNIQUE_INDEX, false, 1900, 600, withhold);
@@ -383,6 +394,7 @@ private void doRunTests (int isolation, boolean withhold)
         s.executeUpdate("create index a_idx on a (a, index_pad)");
         commit();
         updateBtreeCursorLocks1(getConnection(), isolation,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
                                 NON_UNIQUE_INDEX, false, 1900, 700, withhold);
         updateBtreeCursorLocks2(getConnection(), isolation,
                                 NON_UNIQUE_INDEX, false, 1900, 700, withhold);
@@ -450,6 +462,7 @@ private void doRunTests (int isolation, boolean withhold)
 
 
     private void updatecursorlocks(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
         Connection c, int isolation, int pad, int mode, boolean withhold)
                 throws SQLException {
 
@@ -2409,6 +2422,7 @@ private void updatecursorlocks(
             ));
         commit();
         // wait for post-commit tasks before going on
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
         s.execute("call wait_for_post_commit()");
         ltrs = getLocks();
         JDBC.assertEmpty(ltrs);
@@ -3066,6 +3080,7 @@ private void updateBtreeCursorLocks1(
         boolean withhold) throws SQLException {
 
         c.setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
         Statement s;
         if (withhold)
             s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
@@ -4840,6 +4855,7 @@ private void updateBtreeCursorLocks2(
         int idxPad, 
         boolean withhold) throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
         Statement s;
         if (withhold)
             s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
@@ -4988,6 +5004,7 @@ private void updateBtreeCursorLocks2(
         // With network server/client, locks for the first chunk of 
         // pre-fetched rows are acquired on execute/executeQuery 
         // instead of on the first call to next().
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
         String[][] expectedValues;
         if (!usingDerbyNetClient())
             expectedValues = new String[][]{
@@ -5954,6 +5971,7 @@ private void updateBtreeCursorLocks2(
         // With network server/client, locks for the first chunk of 
         // pre-fetched rows are acquired on execute/executeQuery 
         // instead of on the first call to next().
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
         if (usingDerbyNetClient() && (isolation != Connection.TRANSACTION_SERIALIZABLE))
             expectedValues = new String[][]{
                 {_app, _ut, _t, "3", _IX, _A, _tl, _g, _a},
@@ -6000,6 +6018,8 @@ private void updateBtreeCursorLocks2(
                  (
                      unPadded ?
                      (mode == UNIQUE_INDEX ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
+//IC see: https://issues.apache.org/jira/browse/DERBY-6247
                       expectedValues
                       :
                       new String[][]{
@@ -6861,6 +6881,7 @@ private void updateBtreeSetLocks (
 
         c.commit();
         // wait for post-commit tasks before going on
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
         s.execute("call wait_for_post_commit()");
         /* ------------------------------------------------------------
          * Test full cursor scan which deletes "even" rows.
@@ -7284,6 +7305,7 @@ private void updateBtreeSetLocks (
             ));
         c.commit();
         // wait for post-commit tasks before going on
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
         s.execute("call wait_for_post_commit()");
         s.executeUpdate(
             "update a  set b = -b where a = 2");
@@ -7573,6 +7595,9 @@ private void updateBtreeSetLocks (
             ));
         c.commit();
         // wait for post-commit tasks before going on
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
         s.execute("call wait_for_post_commit()");
         ltrs = getLocks();
         JDBC.assertEmpty(ltrs);
@@ -7657,6 +7682,35 @@ private void updateBtreeSetLocks (
             ));
         c.commit();
         // wait for post-commit tasks before going on
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
         s.execute("call wait_for_post_commit()");
         ltrs = getLocks();
         JDBC.assertEmpty(ltrs);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
index 5251a98378..9943041aa1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
@@ -50,17 +50,26 @@ private _Suite(String name) {
     public static Test suite() {
 
         BaseTestSuite suite = new BaseTestSuite("store");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(BootAllTest.suite());
         suite.addTest(ClassLoaderBootTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3663
         suite.addTest(StreamingColumnTest.suite());
         suite.addTest(Derby3625Test.suite());
         suite.addTest(Derby4577Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         suite.addTest(InterruptResilienceTest.suite());
         suite.addTest(Derby4676Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4179
+//IC see: https://issues.apache.org/jira/browse/DERBY-4646
+//IC see: https://issues.apache.org/jira/browse/DERBY-4647
         suite.addTest(BootLockTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5305
         suite.addTest(UpdateLocksTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3735
         suite.addTest(PositionedStoreStreamTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3837
         suite.addTest(OSReadOnlyTest.suite());
         suite.addTest(BackupRestoreTest.suite());
         suite.addTest(OfflineBackupTest.suite());
@@ -68,40 +77,60 @@ public static Test suite() {
         suite.addTest(ClobReclamationTest.suite());
         suite.addTest(IndexSplitDeadlockTest.suite());
         suite.addTest(HoldCursorJDBC30Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4038
         suite.addTest(AccessTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4939
+//IC see: https://issues.apache.org/jira/browse/DERBY-5131
         suite.addTest(AutomaticIndexStatisticsTest.suite());
         suite.addTest(Derby5582AutomaticIndexStatisticsTest.suite());
         suite.addTest(AutomaticIndexStatisticsMultiTest.suite());
         suite.addTest(BTreeMaxScanTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5127
         suite.addTest(MadhareTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5156
         suite.addTest(LongColumnTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5282
         suite.addTest(RowLockBasicTest.suite());
         suite.addTest(RecoveryTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5382
         suite.addTest(OCRecoveryTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5301
         suite.addTest(TableLockBasicTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5283
         suite.addTest(ServicePropertiesFileTest.suite());
         suite.addTest(Derby5234Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         suite.addTest(KeepDisposableStatsPropertyTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5630
         suite.addTest(LockTableVtiTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5977
         suite.addTest(StoreScriptsTest.suite());
         suite.addTest(Derby4923Test.suite());
         suite.addTest(SpaceTableTest.suite());
         
         /* Tests that only run in sane builds */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3842
         if (SanityManager.DEBUG) {
             suite.addTest(HoldCursorExternalSortJDBC30Test.suite());
         }
 
         // Encryption only supported for Derby in J2SE/J2EE environments.
         // J2ME (JSR169) does not support encryption.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1001
         if (JDBC.vmSupportsJDBC3()) {
             // Add tests of basic functionality on encrypted databases.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2644
             suite.addTest(EncryptionKeyAESTest.suite());
             suite.addTest(EncryptionKeyBlowfishTest.suite());
             suite.addTest(EncryptionKeyDESTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3711
             suite.addTest(EncryptionAESTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2687
+//IC see: https://issues.apache.org/jira/browse/DERBY-5622
             suite.addTest(EncryptDatabaseTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5934
             suite.addTest(CryptoCrashRecoveryTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5792
             suite.addTest(DecryptDatabaseTest.suite());
         }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/backupRestore1.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/backupRestore1.java
index b70fb1a253..88b946d47d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/backupRestore1.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/store/backupRestore1.java
@@ -134,6 +134,7 @@ public static void main( String args[])
 		System.out.println("testing rollforward recovery");
 		try{
 			//perform rollforward recovery and do some inserts again
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
 			Connection conn = TestUtil.getConnection("wombat", "rollForwardRecoveryFrom=extinout/mybackup/wombat");
 			//run consistenct checker
 			Statement stmt = conn.createStatement();
@@ -148,6 +149,7 @@ public static void main( String args[])
 
             conn.commit();
 			conn.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
 			TestUtil.getConnection("wombat", "shutdown=true");
 		}
         catch( SQLException se)
@@ -166,6 +168,7 @@ public static void main( String args[])
 		RandomAccessFile rfs = null;
 		boolean alreadyShutdown = false;
 		try{
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
 			Connection conn = TestUtil.getConnection("wombat", null);
 								
 			//just open to a file in existing backup, so that rename will fail on
@@ -180,6 +183,7 @@ public static void main( String args[])
             backupStmt.execute();
             backupStmt.close();
 			conn.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
 			TestUtil.getConnection("wombat", "shutdown=true");
 		}catch(SQLException se)
 		{
@@ -205,6 +209,8 @@ public static void main( String args[])
 		{
 			try{
 				//shutdown 
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
 				TestUtil.getConnection("wombat", "shutdown=true");
 			}catch(SQLException se){
 				if (se.getSQLState() != null && se.getSQLState().equals("08006"))
@@ -222,6 +228,7 @@ public static void main( String args[])
 			if(rfs != null )
 				rfs.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
 			Connection conn = TestUtil.getConnection("wombat", "restoreFrom=extinout/mybackup/wombat");
 			
 			//run consistenct checker
@@ -242,6 +249,7 @@ public static void main( String args[])
 
 		//now take a backup again , just to make all is well in the system.
 		try{
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
 			Connection conn = TestUtil.getConnection("wombat", null);
 			
             CallableStatement backupStmt = conn.prepareCall(
@@ -253,6 +261,7 @@ public static void main( String args[])
 			Statement stmt = conn.createStatement();
 			stmt.execute("VALUES (ConsistencyChecker())");
 			conn.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
 			TestUtil.getConnection("wombat", "shutdown=true");
 		}catch(SQLException se)
 		{
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_derby1939.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_derby1939.java
index a9d2484209..1afc059b48 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_derby1939.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_derby1939.java
@@ -62,6 +62,7 @@ public class st_derby1939 extends BaseJDBCTestCase {
 	private final int VC_SIZE = 1024;
 
     public st_derby1939(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         super(name);
     }
 
@@ -111,6 +112,7 @@ private void doLoad() throws SQLException
 			 */
 			for (int j = 0; j < 10; j++)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
                 String str = buildString(i + ":" + j);
 				pSt.setInt(1, i % 10);
 				pSt.setString(2, str);
@@ -134,6 +136,7 @@ private void doLoad() throws SQLException
 		pSt2.setNull(1, Types.INTEGER);
 		pSt2.setDouble(2, 48.0d);
 		pSt.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         commit();
 	}
 
@@ -145,6 +148,7 @@ private void doQuery() throws SQLException
 		 * to "spill" to disk.
 		 */
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         PreparedStatement pSt = prepareStatement(
 			"select * from d1939_t2 " +
 			"  left outer join " +
@@ -155,6 +159,7 @@ private void doQuery() throws SQLException
 			"    ) x1 " + 
 			"  on d1939_t2.j = x1.i");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         println("Done preparing, about to execute...");
 		pSt.setShort(1, (short)8);
 		int count = 0;
@@ -168,6 +173,7 @@ private void doQuery() throws SQLException
 			for (count = 0; rs.next() && count < 10; count++);
 			rs.close();
             println("Ran without error, retrieved first " + count + " rows.");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
 
 		} catch (SQLException se) {
 
@@ -181,6 +187,7 @@ private void doQuery() throws SQLException
 		}
 
 		pSt.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         rollback();
 	}
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_derby715.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_derby715.java
index 3655ea1683..27b9da3122 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_derby715.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_derby715.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 The purpose of this test is to reproduce JIRA DERBY-715:
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3624
 Sometimes a deadlock would be incorrectly reported as a timeout.  The
 bug seemed to always reproduce at least once if the following test
 was run (at least one of the iterations in the loop would get an
@@ -51,6 +52,7 @@ public class st_derby715 extends BaseJDBCTestCase {
     private List<Throwable> errors;
 
     public st_derby715(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         super(name);
     }
 
@@ -160,6 +162,7 @@ private void _run() throws SQLException, InterruptedException {
             // Wait till the other thread has completed reading and is ready
             // to insert a row.
             barrier.await();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3624
 
             println(id + " before inserting into " + writeTable);
             stmt.execute("insert into " + writeTable + " values (1)");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java
index 993474c5f5..34195ea600 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java
@@ -49,6 +49,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 unexpectedly quite large before the default space reclamation kicks in.  The
 change queues space reclamation in the case of long columns (blob/clob),
 immediately post commit of the single delete.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
 
 The testing strategy is to loop doing insert, delete, commit of a blob for
 a number of iterations and check that the actual size of the table is 
@@ -63,6 +64,7 @@ public class st_reclaim_longcol extends BaseJDBCTestCase
     static boolean verbose = false;
 
     public st_reclaim_longcol(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         super(name);
     }
 
@@ -84,6 +86,7 @@ private void test1(int blob_size, int num_rows) throws SQLException
         byte[]  long_byteVal    = new byte[blob_size];
         byte[]  short_byteVal   = new byte[10];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         println(
             "test1:insert/delete of " + num_rows + 
                 " rows with blob(" + blob_size + ")"); 
@@ -148,6 +151,7 @@ private void test1(int blob_size, int num_rows) throws SQLException
             // commit the xact, post commit should kick in to reclaim the
             // blob space sometime after the commit.
             commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
 
             // after each commit give the background thread a chance to 
             // reclaim the deleted rows.
@@ -184,6 +188,7 @@ private void test1(int blob_size, int num_rows) throws SQLException
             //         marked "half-filled" and can be used in future for
             //         short rows that don't fit on the last page inserted.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
             fail(
                 "Test 1 failed, expected less than " + 
                 total_expected_page_max + " pages - count is:\n" +
@@ -213,6 +218,7 @@ private void test2(
         byte[]  long_byteVal    = new byte[blob_size];
         byte[]  short_byteVal   = new byte[10];
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         println(
             "test2:queue of " + work_size + 
                 " rows with blob(" + blob_size + "), total_work = " + 
@@ -221,6 +227,7 @@ private void test2(
         Arrays.fill(long_byteVal,  (byte)'L');
         Arrays.fill(short_byteVal, (byte)'S');
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         Statement s = createStatement();
         dropTable("LONGCOL");
         s.execute(
@@ -243,6 +250,7 @@ private void test2(
         }
         commit();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
 
         // for each subsequent work item, queue it to the end and delete
         // the oldest existing work item.
@@ -282,6 +290,7 @@ private void test2(
         // an expected max of allocated pages.  Expect 10 allocated pages per
         // item in work size and add 5 pages for misc overhead.
         wait_for_max_allocated("test2", (10 * work_size) + 5);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
 
         ResultSet rs = getSpaceTable("LONGCOL");
         assertTrue("Space table was empty", rs.next());
@@ -310,6 +319,7 @@ private void test2(
 
             // commit the xact, post commit should kick in to reclaim the
             // blob space sometime after the commit.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
             commit();
         }
 
@@ -319,6 +329,7 @@ private void test2(
         // an expected max of allocated pages.  Expect 10 allocated pages per
         // item in work size and add 5 pages for misc overhead.
         wait_for_max_allocated("test2_2", (10 * work_size) + 5);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
 
         rs = getSpaceTable("LONGCOL");
         assertTrue("Space table was empty", rs.next());
@@ -331,6 +342,7 @@ private void test2(
         JDBC.assertEmpty(rs);
 
         commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
 
         // This could fail due to machine variability, leaving it for now
         // as I have not seen this failure reported.
@@ -389,6 +401,7 @@ private void wait_for_max_allocated(
     {
         // an initial 1/10 of second which should work for most environments.
         sleep(100);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
 
         Integer save_total_alloc = null;
 
@@ -398,6 +411,7 @@ private void wait_for_max_allocated(
         int max_wait_for_bg_thread = 10000;
         int ms_waited              = 100;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
         while (true)
         {
             ResultSet rs = getSpaceTable("LONGCOL");
@@ -448,6 +462,7 @@ else if (total_alloc < save_total_alloc)
                 //         marked "half-filled" and can be used in future for
                 //         short rows that don't fit on the last page inserted.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6709
                 fail(
                     "Test " + test_name + 
                     " failed in wait_for_max_allocated(), expected less than " + 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java
index bd1ad9ef91..6b37f91bb6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ConnectWrongSubprotocolTest.java
@@ -39,11 +39,13 @@ Licensed to the Apache Software Foundation (ASF) under one
 public class ConnectWrongSubprotocolTest extends BaseJDBCTestCase {
 
     public ConnectWrongSubprotocolTest(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5084
         super(name);
     }
     
     public static Test suite() {
         // Test does not run on J2ME
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         if (JDBC.vmSupportsJSR169()) {
             return new BaseTestSuite(
                 "empty: no support for Driver.sql.Manager with jsr 169");
@@ -86,6 +88,7 @@ private void checkConnectWrongSubprotocol(String ijScript, boolean useSystemProp
     private String runIjScript(String ijScript, boolean useSystemProperties) 
             throws UnsupportedEncodingException, SQLException {
         ByteArrayInputStream bais = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5424
         		new ByteArrayInputStream(ijScript.getBytes("US-ASCII"));
         ByteArrayOutputStream baos = new ByteArrayOutputStream(10 * 1024);
         Connection conn = getConnection();
@@ -101,6 +104,7 @@ private String runIjScript(String ijScript, boolean useSystemProperties)
         if (!conn.isClosed() && !conn.getAutoCommit())
             conn.commit();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5424
         return new String(baos.toByteArray(), "US-ASCII");
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IJRunScriptTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IJRunScriptTest.java
index e5ad6ed748..c345465cc4 100755
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IJRunScriptTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IJRunScriptTest.java
@@ -40,6 +40,7 @@ public class IJRunScriptTest extends BaseJDBCTestCase {
     public static Test suite()
     {
         if (Derby.hasTools()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite = new BaseTestSuite("IJRunScriptTest");
             suite.addTestSuite(IJRunScriptTest.class);
             return new CleanDatabaseTestSetup(suite);
@@ -85,6 +86,7 @@ public void testScriptExecution()
      * @throws UnsupportedEncodingException
      */
     public void testBracketedComment()
+//IC see: https://issues.apache.org/jira/browse/DERBY-3242
         throws SQLException, UnsupportedEncodingException
     {
         runTestingScript("VALUES /* comment /* nested comment */ 5; */ 1;", 0);
@@ -111,6 +113,7 @@ public void testEmptyScript()
     public void testAutoCommitCommand()
         throws SQLException, UnsupportedEncodingException
     {      
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection conn = getConnection();
         assertTrue(conn.getAutoCommit());
         runTestingScript("AUTOCOMMIT OFF;", 0);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java
index 8b900ebb0c..02e1b1dffd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IjConnNameTest.java
@@ -46,6 +46,7 @@ public IjConnNameTest(String name) {
     }    
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("IjConnNameTest");
         
         // Test does not run on J2ME
@@ -71,6 +72,7 @@ public void tearDown() throws Exception {
         // attempt to get rid of the extra database.
         // this also will get done if there are failures, and the database will
         // not be saved in the 'fail' directory.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         removeDirectory(
             TestConfiguration.getCurrent().getDatabasePath("lemming"));
         super.tearDown();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IjSecurityManagerTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IjSecurityManagerTest.java
index dea4e5e3bd..30f27bb133 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IjSecurityManagerTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/IjSecurityManagerTest.java
@@ -43,6 +43,7 @@ public void testRunIJ() throws Exception {
 	    
 	    /* Mute the test */
         setSystemOut(new PrintStream(new TestNullOutputStream()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 	    try {
 	        /* Run ij */
@@ -51,6 +52,7 @@ public void testRunIJ() throws Exception {
 	        fail("Failed to run ij under security manager.",e);
 	    } finally {
 	        /* Restore the original out stream */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             setSystemOut(out);
 	    }
 	}
@@ -68,6 +70,7 @@ private static Test decorateTest() {
         return test;
 	}
 	public static Test suite() {		
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("IjSecurityManagerTest");
 		suite.addTest(decorateTest());
 		return suite;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBaseTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBaseTest.java
index 35913ba914..d7350fca2b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBaseTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBaseTest.java
@@ -156,6 +156,7 @@ protected void doExportTableLobsToExtFile(String schemaName,
         throws SQLException 
     {
         String expsql = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
             "call SYSCS_UTIL.SYSCS_EXPORT_TABLE_LOBS_TO_EXTFILE" +  
             "(? , ? , ? , ?, ?, ?, ?)";
         PreparedStatement ps = prepareStatement(expsql);
@@ -185,6 +186,7 @@ protected void doExportQueryLobsToExtFile(String query,
         throws SQLException 
     {
         String expsql = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
             "call SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE" + 
             "(? , ? , ? , ?, ?, ?)";
         PreparedStatement ps = prepareStatement(expsql);
@@ -212,6 +214,7 @@ protected void doImportTableLobsFromExtFile(String schemaName,
         throws SQLException 
     {
         String impsql = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
             "call SYSCS_UTIL.SYSCS_IMPORT_TABLE_LOBS_FROM_EXTFILE" +
             "(?, ?, ?, ?, ?, ?, ?)";
         PreparedStatement ps = prepareStatement(impsql);
@@ -232,6 +235,7 @@ protected void doImportTableLobsFromExtFile(String schemaName,
      *  SYSCS_UTIL.SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE procedure.
      */
     protected void doImportDataLobsFromExtFile(String schemaName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                                                String tableName, 
                                                String insertCols,
                                                String colIndexes, 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java
index 2df9bee435..358e5d2515 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportBinaryDataTest.java
@@ -54,6 +54,7 @@ public ImportExportBinaryDataTest(String name) {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite(ImportExportBinaryDataTest.class);
 
@@ -76,6 +77,7 @@ protected void decorateSQL(Statement s) throws SQLException {
                               "C_VBD VARCHAR(10) FOR BIT DATA, " +
                               "C_LVBD LONG VARCHAR FOR BIT DATA)");
                     // Create a table that holds some invalid hex strings. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                     s.execute("CREATE TABLE hex_tab(id int," +
                               "C1 varchar(20)," + 
                               "C2 varchar(20)," +
@@ -273,6 +275,7 @@ public void testImportExportInvalideDelimiters()
         try {
             doExportQuery("select * from BIN_TAB", fileName,
                           "|", "f", null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
             fail();
         } catch (SQLException e) {
             assertSQLState("XIE0J", e);
@@ -291,12 +294,17 @@ public void testImportExportInvalideDelimiters()
             doImportTable("APP", "BIN_TAB_IMP", fileName, "2", null, null, 0);
             fail();
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
              assertSQLState("XIE0J", e);
         }
 
         try {
             doImportData(null, "BIN_TAB_IMP", null, 
                          null,  fileName, null, "c", null, 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
             fail();
         } catch (SQLException e) {
             assertSQLState("XIE0J", e);
@@ -309,6 +317,7 @@ public void testImportExportInvalideDelimiters()
      * the import file. 
      */
     public void testImportWitgInvalidHexStrings() 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         throws SQLException   
     {
         Statement s = createStatement();
@@ -364,6 +373,12 @@ public void testImportWitgInvalidHexStrings()
                          fileName, null, null, null, 1);
             fail("import did not fail on data with invalid hex strings");
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
             assertSQLState("XIE0N", e);
         }
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportIJTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportIJTest.java
index 75b01e1cac..c6dd535445 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportIJTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportIJTest.java
@@ -41,6 +41,7 @@ public final class ImportExportIJTest extends ScriptTestCase {
 	 * @param script - the name of the script
 	 */
 	private ImportExportIJTest(String script) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5217
 		super(script, true);
 	}
 
@@ -49,6 +50,7 @@ private ImportExportIJTest(String script) {
 	 * Return the suite that runs the script.
 	 */
 	public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("importExportIJ");
 		
         // only run with embedded
@@ -59,6 +61,7 @@ public static Test suite() {
         // server side, and import would be looking on the client.
         // Also, running client & embedded would require some cleanup magic to
         // remove the exported files (see e.g. ImportExportTest).
+//IC see: https://issues.apache.org/jira/browse/DERBY-5368
 		Test test = new ImportExportIJTest("importExportIJ");
 		
         // This test should run in English locale since it compares error
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java
index ca6f9e6bf9..b1ec9de3f6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportLobTest.java
@@ -49,6 +49,8 @@ public class ImportExportLobTest extends ImportExportBaseTest
     String fileName; // main file used to perform import/export.
     String lobsFileName; // file name used to store lobs.
     String lobsFileName2; // file name used to store lobs.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2980
+//IC see: https://issues.apache.org/jira/browse/DERBY-2925
 
     public ImportExportLobTest(String name) throws SQLException {
         super(name);
@@ -57,6 +59,8 @@ public ImportExportLobTest(String name) throws SQLException {
             (SupportFilesSetup.getReadWrite("books.del")).getPath();
         lobsFileName = 
             (SupportFilesSetup.getReadWrite("books_lobs.dat")).getPath();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2980
+//IC see: https://issues.apache.org/jira/browse/DERBY-2925
 	lobsFileName2 =
             (SupportFilesSetup.getReadWrite("unql_books_lobs.dat")).getPath();
     }
@@ -67,6 +71,7 @@ public ImportExportLobTest(String name) throws SQLException {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(ImportExportLobTest.class);
         suite.addTest(TestConfiguration.clientServerSuite(
                              ImportExportLobTest.class));
@@ -264,6 +269,12 @@ public void testImportWithInvalidHexStrings()
                          fileName, null, null, null, 1);
             fail("import did not fail on data with invalid hex strings");
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
             assertSQLState("XIE0N", e);
         }
     }
@@ -277,6 +288,7 @@ public void testImportWithInvalidHexStrings()
     public void testImportTableExportTableLobsInExtFile()  
         throws SQLException, IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         doExportTableLobsToExtFile("APP", "BOOKS", fileName, 
                                    null, null , null, lobsFileName);
 	    doImportTableLobsFromExtFile("APP", "BOOKS_IMP", fileName, 
@@ -292,6 +304,7 @@ public void testImportTableExportTableLobsInExtFile()
      * for the export procedure.
      */
     public void testImportTableExportTableLobsInUnqalifiedExtFile()  
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         throws SQLException, IOException
     {
         // test export procedure with unqulified lob data  file name
@@ -300,6 +313,8 @@ public void testImportTableExportTableLobsInUnqalifiedExtFile()
         // using "UTF-16" code set.
        
 	// delete the export files.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2980
+//IC see: https://issues.apache.org/jira/browse/DERBY-2925
         SupportFilesSetup.deleteFile(lobsFileName2);
  
         doExportTableLobsToExtFile("APP", "BOOKS", fileName, 
@@ -326,6 +341,7 @@ public void testImportDataExportQueryLobsInExtFile()
         throws SQLException, IOException
     {
         doExportQueryLobsToExtFile("select * from BOOKS", fileName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                                   null, null, "8859_1", lobsFileName);
 	    doImportDataLobsFromExtFile(null, "BOOKS_IMP", null, null, fileName, 
                                    null, null , "8859_1", 0);
@@ -333,6 +349,7 @@ public void testImportDataExportQueryLobsInExtFile()
 
         // perform import with column names specified in random order.
         doImportDataLobsFromExtFile(null, "BOOKS_IMP", "PIC, CONTENT, NAME, ID", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3773
                                   "4, 3, 2, 1", fileName, null, null, "8859_1", 1);
         verifyData("PIC, CONTENT, NAME, ID");
 
@@ -357,6 +374,7 @@ public void testImportDataExportQueryLobsInExtFile()
     public void testImportDataExportQueryWithFewColsLobsInExtFile() 
         throws SQLException, IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         doExportQueryLobsToExtFile("select id, name, content, pic from BOOKS",
                                    fileName,  null, null, null, lobsFileName);
         doImportDataLobsFromExtFile(null, "BOOKS_IMP", "ID,PIC", "1 , 4",
@@ -389,6 +407,7 @@ public void testImportExportInvalideDelimiters()
          throws SQLException, IOException   
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
             doExportTableLobsToExtFile("APP", "BOOKS", fileName, 
                                        null, "9" , null, lobsFileName);
             fail();
@@ -416,16 +435,23 @@ public void testImportExportInvalideDelimiters()
                                    fileName, null, null, null, lobsFileName);
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
             doImportTableLobsFromExtFile("APP", "BOOKS_IMP", fileName, "2", 
                                          null, null, 0);
             fail();
         } catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
              assertSQLState("XIE0J", e);
         }
 
         try {
             doImportDataLobsFromExtFile(null, "BOOKS_IMP", null, 
                                       null,  fileName, null, "c", null, 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
             fail();
         } catch (SQLException e) {
             assertSQLState("XIE0J", e);
@@ -441,6 +467,7 @@ public void testImportExportInvalideDelimiters()
      * lobs file name as an argument value.
      */
     public void testImportTableExportWithInvalidLobFileName()  
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         throws SQLException, IOException
     {
         // test export of lob data with lob file name parameter 
@@ -449,6 +476,7 @@ public void testImportTableExportWithInvalidLobFileName()
             doExportTableLobsToExtFile("APP", "BOOKS", fileName, 
                                        null, null , null, 
                                        null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
             fail();
         }catch (SQLException e) {
             assertSQLState("XIE0Q", e);
@@ -468,8 +496,11 @@ public void testImportTableExportWithInvalidLobFileName()
             // missing lob file, refered by the main import file.
             doImportTableLobsFromExtFile("APP", "BOOKS_IMP", fileName, 
                                          null, null, null, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
             fail();
         }catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
             assertSQLState("XIE0P", e);
         }
     }
@@ -491,6 +522,7 @@ public void testDerby2955ExportQueryLobs()
         }
 
 	//DERBY-2925: need to delete export files first
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         SupportFilesSetup.deleteFile(fileName);
         SupportFilesSetup.deleteFile(lobsFileName);
 
@@ -583,6 +615,7 @@ private static void loadData(Statement s) throws SQLException {
         // insert some clob data with default char delimiter inside 
         // the data. It should get exported in double-delimiter format
         // when exporting to the main export file. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         s.executeUpdate("insert into books values" +
                         "(12, 'Transaction Processing' , " +
                         "'This books covers \"Transaction\" \"processing\" concepts'"+
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java
index 010ec16ffa..ada1902705 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportProcedureTest.java
@@ -52,6 +52,7 @@ public ImportExportProcedureTest(String name)
 
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ImportExportProcedureTest");
         suite.addTest(TestConfiguration.defaultSuite(ImportExportProcedureTest.class));
         return new SupportFilesSetup(suite, new String[] { 
@@ -1892,6 +1893,8 @@ public void testImportExportProcedures() throws Exception
     */
     public void test4555ColumnIndexesParsing() throws Exception{	
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
   	CallableStatement cSt;
         Statement st = createStatement();
 
@@ -2067,6 +2070,8 @@ public void test4555ColumnIndexesParsing() throws Exception{
             + "'PET1' , null , '\"Pet Name\",\"Kind of\",\"Age\"' ,   'extinout/pet.dat' "
             + "  , null , null , null, 0, 2) ");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
         try {
             cSt.execute();
         }
@@ -2259,6 +2264,8 @@ public void test4555ColumnIndexesParsing() throws Exception{
 	cSt = prepareCall(
             " call SYSCS_UTIL.SYSCS_IMPORT_TABLE_BULK(null, 'PET', 'extinout/pet.dat', null, null, null, 0, 7) ");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6894
         try {
             cSt.execute();
         }
@@ -2519,6 +2526,7 @@ public void testImportExportProcedureNegative() throws Exception
         assertStatementError("38000", cSt);
        
 	//DERBY-2925: need to delete existing files first.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3068
         SupportFilesSetup.deleteFile("extinout/t1.dat");
  
         //export query is invalid (syntax error)
@@ -2622,6 +2630,7 @@ public void testImportExportProcedureNegative() throws Exception
         
         cSt = prepareCall(
             "call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , "
+//IC see: https://issues.apache.org/jira/browse/DERBY-5749
             + "'extinout/t1.dat' , '\\', '\\', null) ");
         assertStatementError("XIE0J", cSt);
                 
@@ -2647,6 +2656,7 @@ public void testImportExportProcedureNegative() throws Exception
         assertUpdateCount(cSt, 0);
         
         //  DERBY-2925: need to delete existing files 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3068
         SupportFilesSetup.deleteFile("extinout/t1.dat");
         rs = st.executeQuery(
             " select * from t1");
@@ -2703,6 +2713,7 @@ public void testImportExportProcedureNegative() throws Exception
         cSt = prepareCall(
             "call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('IEP', 'T1' , "
             + "'extinout/t1.dat' , '', ';', null, 0) ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6493
         assertStatementError(INVALID_DELIMITER, cSt);
         
         cSt = prepareCall(
@@ -2716,6 +2727,7 @@ public void testImportExportProcedureNegative() throws Exception
         cSt = prepareCall(
             "call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('IEP', 'T1' , "
             + "'extinout/t1.dat' , ';', ';', null, 1) ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6493
         assertStatementError(INVALID_DELIMITER, cSt);
         
         Connection conn = getConnection();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
index 0c8ebb3f43..ba785de92e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
@@ -44,9 +44,11 @@ public ImportExportTest(String name) {
 	
 	public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("ImportExportTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // disabled on weme6.1 due at the moment due 
         // to problems with security exceptions.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2342
         if (JDBC.vmSupportsJSR169())
         {
             return new BaseTestSuite();
@@ -60,11 +62,14 @@ public static Test suite() {
 	}
 	
 	public static Test baseSuite(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(ImportExportTest.class, name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3863
 		Test test = new SupportFilesSetup(suite, new String[] {"functionTests/testData/ImportExport/TwoLineBadEOF.dat"} );
 		return new CleanDatabaseTestSetup(test) {
             protected void decorateSQL(Statement s) throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
                 s.execute( "create type Price external name 'org.apache.derbyTesting.functionTests.tests.lang.Price' language java" );
                 s.execute( "create type hashmap external name 'java.util.HashMap' language java" );
 
@@ -86,6 +91,7 @@ protected void decorateSQL(Statement s) throws SQLException {
 						   "COLUMN7 DOUBLE PRECISION , COLUMN8 INT , COLUMN9 BIGINT , COLUMN10 NUMERIC , " +
 						   "COLUMN11 REAL , COLUMN12 SMALLINT , COLUMN13 TIME , COLUMN14 TIMESTAMP , "+
 						   "COLUMN15 SMALLINT , COLUMN16 VARCHAR(1), COLUMN17 PRICE)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3863
                 s.execute("create table T4 (   Account int,    Name   char(30), Jobdesc char(40), " +
                            "Company varchar(35), Address1 varchar(40), Address2 varchar(40), " +
                            "City    varchar(20), State   char(5), Zip char(10), Country char(10), " +
@@ -103,14 +109,18 @@ protected void decorateSQL(Statement s) throws SQLException {
      * Set up the test environment.
      */
     protected void setUp() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5112
         resetTables();
     }
 	
 	public void testImportFromNonExistantFile() {
 		try {
             doImport("Z", null, "T1", null, null, null, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
             fail();
 		} catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 			assertSQLState("XIE04", e);
 		}
 	}
@@ -118,8 +128,11 @@ public void testImportFromNonExistantFile() {
 	public void testNullDataFile() {
 		try {
             doImport(null, null, "T1", null, null, null, 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
             fail();
 		} catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 			assertSQLState("XIE05", e);
 		}
 	}
@@ -159,6 +172,7 @@ public void testSpecialDelimitersAndUTF16() throws Exception {
 	public void testInvalidEncoding() throws Exception {
 		try {
             doImportAndExport(null, "T1", "^", "#", "INAVALID ENCODING");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
             fail();
 		} catch (SQLException e) {
 			assertSQLState("XIE0I", e);
@@ -169,8 +183,11 @@ public void testEarlyEndOfFile() throws Exception {
 		try {
             doImportFromFile("extin/TwoLineBadEOF.dat", null, "T4",
                              null, null, "US-ASCII", 0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3784
             fail();
 		} catch (SQLException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1440
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 			assertSQLState("XIE0E", e);
 		}
 	}
@@ -280,6 +297,7 @@ public void testQuotesInColumnNames() throws Exception {
      */
     public void testCastingProblem() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
         final String fileName = SupportFilesSetup.
                 getReadWrite("castCheck.dat").getPath();
 
@@ -411,6 +429,7 @@ private void doImportAndVerify(
 	private void resetTables() throws Exception {
 		runSQLCommands("delete from t1");
 		runSQLCommands("delete from t2");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4484
 		runSQLCommands("delete from t5");
 		runSQLCommands("delete from t6");
 		runSQLCommands("INSERT INTO T1 VALUES (null,'aa',1,'a',DATE('1998-06-30'),"+
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java
index 391acdcfb7..33909dad18 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/RollBackWrappingWhenFailOnImportTest.java
@@ -42,6 +42,7 @@
  */
 public class RollBackWrappingWhenFailOnImportTest extends BaseJDBCTestCase {
     class MockInternalDriver extends InternalDriver {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1984
 
         public class MockConnectionFailWhenRollBack extends EmbedConnection {
 
@@ -57,6 +58,7 @@ public void rollback() throws SQLException {
         public Connection connect( String url, Properties info, int loginTimeout ) {
             Connection conn = null;
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
                 conn = super.connect( url, info, loginTimeout );
             } catch (Exception e) {
                 //this exception is ignored for mocking
@@ -72,6 +74,7 @@ public RollBackWrappingWhenFailOnImportTest(String name) {
     }
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("RollBackWrappingWhenFailOnImportTest");
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java
index a52ce318cb..eaa4339aeb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoAPITest.java
@@ -51,6 +51,7 @@ public SysinfoAPITest(String name) {
     }
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test suite = new BaseTestSuite(SysinfoAPITest.class, "Sysinfo API");
     	
     	return suite;
@@ -166,6 +167,7 @@ public void testGetInfo() throws IOException {
      *          database information with what is reported by sysinfo
      */
     public void setUp() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         dm = getConnection().getMetaData();
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
index afdc934e69..22f4386b13 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
@@ -48,6 +48,7 @@ public SysinfoCPCheckTest(String name) {
     public static Test suite() {
 
         if (!Derby.hasTools())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("empty: no tools support");
         
         // check to see if we have derbynet.jar or derbyclient.jar
@@ -57,9 +58,11 @@ public static Test suite() {
         if (!Derby.hasClient())
             isClient=false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         Test suite = new BaseTestSuite(
             SysinfoCPCheckTest.class, "Sysinfo ClassPath Checker");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5211
         return new LocaleTestSetup(suite, Locale.ENGLISH);
     }
 
@@ -74,6 +77,7 @@ public static Test suite() {
      *  Test Classpath Checker output for 3 supported variations
      */
     public void testClassPathChecker() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
         String Success = "Success: All Derby related classes found in class path.";
         // for testing the -cp with valid class
         String thisclass = "org.apache.derbyTesting.functionTests.tests.tools." +
@@ -92,8 +96,11 @@ public void testClassPathChecker() throws IOException {
                     "libraries; typically, only some are needed.", null},
                 // incorrect syntax, or 'args' - should return usage
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4806
+//IC see: https://issues.apache.org/jira/browse/DERBY-4597
                         "a",
                         "0",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
                         "Usage: java org.apache.derby.tools.sysinfo -cp ["
                                 + " [ embedded ][ server ][ client] [ tools ]"
                                 + " [ anyClass.class ] ]", null },
@@ -114,8 +121,10 @@ public void testClassPathChecker() throws IOException {
         for (tst=0; tst<tstargs.length ; tst++)
         {
             ByteArrayOutputStream rawBytes = getOutputStream();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2903
 
             // First obtain the output for the sysinfo command
+//IC see: https://issues.apache.org/jira/browse/DERBY-3771
             PrintStream testOut = new PrintStream(rawBytes,
                     false);
             setSystemOut(testOut);
@@ -145,6 +154,7 @@ public void testClassPathChecker() throws IOException {
                 BufferedReader sysinfoOutput = new BufferedReader(
                     new InputStreamReader(
                         new ByteArrayInputStream(testRawBytes)));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3771
 
                 // evaluate the output
                 // compare the sentence picked
@@ -183,6 +193,7 @@ public void testClassPathChecker() throws IOException {
                 if (tstargs[tst][3] != null && !found)
                     fail ("did not find the string searched for: " + 
                          tstargs[tst][3] + " for command -cp: " + tstargs[tst][0]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2903
 
                 // read the line to be compared
                 s = sysinfoOutput.readLine();
@@ -197,6 +208,7 @@ public void testClassPathChecker() throws IOException {
                 // read one more line - should be the next command's sequence number
                 s = sysinfoOutput.readLine();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2903
                 sysinfoOutput.close();
             } catch (Exception e) {
                 e.printStackTrace();
@@ -211,6 +223,7 @@ public boolean checkClientOrServer(String kind)
         // if there is no derbynet.jar, the syntax should still
         // work, but the comparisons will fail. So never mind.
         // JSR169 / J2ME does not support client or server
+//IC see: https://issues.apache.org/jira/browse/DERBY-2903
         if ((kind.equals("server") || kind.equals("client")) 
                 && JDBC.vmSupportsJSR169())
             return false;
@@ -223,11 +236,13 @@ public boolean checkClientOrServer(String kind)
         return true;
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2903
     ByteArrayOutputStream getOutputStream() {
         return new ByteArrayOutputStream(20 * 1024);
     }
     
     public void testjavaVersion(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6857
         assertEquals(JVMInfo.J2SE_18, JVMInfo.JDK_ID);
     }
      
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoLocaleTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoLocaleTest.java
index 7604782c6e..5b5c39524a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoLocaleTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/SysinfoLocaleTest.java
@@ -76,11 +76,13 @@ public class SysinfoLocaleTest extends BaseTestCase {
      * @param props Properties to use if starting with a module path
      */
     private SysinfoLocaleTest(Locale defaultLocale, boolean german,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                               String info, Properties props) {
         super("testSysinfoLocale");
         this.defaultLocale = defaultLocale;
         this.localizedToGerman = german;
         this._props = props;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3229
         this.name = super.getName() + ":" + info;
     }
 
@@ -119,6 +121,7 @@ protected void tearDown() throws Exception {
      */
     public static Test suite() {
         if (!Derby.hasTools()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("empty: no tools support");
         }
 
@@ -157,6 +160,7 @@ private static Test createTest(Locale loc, String ui, boolean german) {
         prop.setProperty("derby.ui.codeset", ENCODING);
 
         String info = "defaultLocale=" + loc + ",uiLocale=" + ui;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         Test test = new SysinfoLocaleTest(loc, german, info, prop);
         return new SystemPropertyTestSetup(test, prop);
     }
@@ -167,6 +171,7 @@ private static Test createTest(Locale loc, String ui, boolean german) {
      * <code>derby.ui.locale</code> (happens when the class is loaded).
      */
     private static void runSysinfo() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         URL sysinfoURL = SecurityManagerSetup.getURL(SYSINFO_CLASS_NAME);
         URL emmaURL = getEmmaJar();
         URL[] urls = null;
@@ -180,9 +185,11 @@ private static void runSysinfo() throws Exception {
         // Its parent (platformLoader) is a class loader that is able to
         // load the JDBC classes and other core classes needed by the Derby
         // classes.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6854
         ClassLoader platformLoader = java.sql.Connection.class.getClassLoader();
         URLClassLoader loader = new URLClassLoader(urls, platformLoader);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         Class<?> copy = Class.forName(SYSINFO_CLASS_NAME, true, loader);
         Method main = copy.getMethod("main", new Class[] { String[].class });
         main.invoke(null, new Object[] { new String[0] });
@@ -215,6 +222,7 @@ private static String getSysinfoOutput() throws Exception {
      */
     private String getSysinfoOutputWithModules() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         String modulePath = JVMInfo.getSystemModulePath();
         ArrayList<String> args = new ArrayList<String>();
 
@@ -258,6 +266,7 @@ private String getSysinfoOutputWithModules() throws Exception
      * localized to German.
      */
     private static final String[] GERMAN_STRINGS = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5832
         "BS-Name",
         "Java-Benutzername",
         "Derby-Informationen",
@@ -272,6 +281,7 @@ private String getSysinfoOutputWithModules() throws Exception
         "Nome SO",
         "Home utente Java",
         "Informazioni su Derby",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5832
         "Informazioni sulle impostazioni nazionali",
     };
 
@@ -283,6 +293,7 @@ private String getSysinfoOutputWithModules() throws Exception
      * @param output the output from sysinfo
      */
     private void assertContains(String[] expectedSubstrings, String output) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3229
         for (int i = 0; i < expectedSubstrings.length; i++) {
             String s = expectedSubstrings[i];
             if (output.indexOf(s) == -1) {
@@ -296,6 +307,7 @@ private void assertContains(String[] expectedSubstrings, String output) {
      * localized.
      */
     public void testSysinfoLocale() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         String output = JVMInfo.isModuleAware() ?
             getSysinfoOutputWithModules() : getSysinfoOutput();
         String[] expectedSubstrings =
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/Test_6661.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/Test_6661.java
index df9f659a5a..5f83c9752d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/Test_6661.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/Test_6661.java
@@ -89,6 +89,8 @@ public Test_6661(String name)
 	public static Test suite()
     {
         BaseTestSuite baseTest = new BaseTestSuite( Test_6661.class, "Test_6661" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6667
+//IC see: https://issues.apache.org/jira/browse/DERBY-6676
         Test        singleUseWrapper = TestConfiguration.singleUseDatabaseDecorator( baseTest );
         Test        cleanDatabaseWrapper = new CleanDatabaseTestSetup( singleUseWrapper );
         Test        supportFileWrapper = new SupportFilesSetup( cleanDatabaseWrapper );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java
index 3d41edc2ff..ac71d311cc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java
@@ -51,6 +51,7 @@ public final class ToolScripts extends ScriptTestCase {
      *
      */
     private static final String[] CLIENT_AND_EMBEDDED_TESTS = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6585
         "ij4", "ij6", "ij7", "setholdij",
     };
 
@@ -73,6 +74,7 @@ public final class ToolScripts extends ScriptTestCase {
      * (ie. can not run on JSR169).
      */
     private static final String[] JDBC3_TESTS = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5345
     	"qualifiedIdentifiers", "URLCheck",
     };
 
@@ -81,6 +83,7 @@ public final class ToolScripts extends ScriptTestCase {
      * Tests that run with authentication and SQL authorization on.
      */
     private static final String[][][] SQLAUTHORIZATION_TESTS = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3886
         {{"ij_show_roles_dbo"}, {"test_dbo", "donald"}, {"test_dbo"}},
         {{"ij_show_roles_usr"}, {"test_dbo", "donald"}, {"donald"}}
     };
@@ -104,14 +107,17 @@ public static void main(String[] args)
      */
     public static Test suite() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ToolScripts");
         suite.addTest(getSuite(CLIENT_AND_EMBEDDED_TESTS));
         suite.addTest(getSuite(EMBEDDED_TESTS));
         if (JDBC.vmSupportsJDBC3())
             suite.addTest(getSuite(JDBC3_TESTS));
         suite.addTest(getAuthorizationSuite(SQLAUTHORIZATION_TESTS));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 
         // Set up the scripts run with the network client
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite clientTests = new BaseTestSuite("ToolScripts:client");
         clientTests.addTest(getSuite(CLIENT_AND_EMBEDDED_TESTS));
         clientTests.addTest(getAuthorizationSuite(SQLAUTHORIZATION_TESTS));
@@ -132,6 +138,7 @@ private ToolScripts(String toolTest){
     }
 
     private ToolScripts(String toolTest, String user){
+//IC see: https://issues.apache.org/jira/browse/DERBY-1726
         super(toolTest,
               null /* default input encoding */,
               null /* default output encoding */,
@@ -144,6 +151,7 @@ private ToolScripts(String toolTest, String user){
      * that cleans the database.
      */
     private static Test getSuite(String[] list) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Tool scripts");
         for (int i = 0; i < list.length; i++)
             suite.addTest(
@@ -163,6 +171,7 @@ private static Test getSuite(String[] list) {
      *             </ul>
      */
     private static Test getAuthorizationSuite(String[][][] list) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("Tool scripts w/authorization");
 
@@ -170,6 +179,7 @@ private static Test getAuthorizationSuite(String[][][] list) {
 
         for (int i = 0; i < list.length; i++) {
             Test clean;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3886
 
             if (list[i][0][0].startsWith("ij_show_roles")) {
                 clean = new CleanDatabaseTestSetup(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
index 28cf1223d6..2ed2eeb792 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
@@ -44,29 +44,43 @@ private _Suite(String name) {
     public static Test suite() {
 
         BaseTestSuite suite = new BaseTestSuite("tools");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(IJRunScriptTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2342
         suite.addTest(ImportExportTest.suite());
         suite.addTest(ImportExportBinaryDataTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         suite.addTest(ImportExportLobTest.suite());
         suite.addTest(ImportExportProcedureTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3863
         suite.addTest(ImportExportIJTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5368
         suite.addTest(ij2Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2609
         suite.addTest(ToolScripts.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2903
         suite.addTest(SysinfoCPCheckTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3142
         suite.addTest(SysinfoLocaleTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4292
         suite.addTest(IjSecurityManagerTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5084
         suite.addTest(IjConnNameTest.suite());
         suite.addTest(RollBackWrappingWhenFailOnImportTest.suite());
         suite.addTest(ConnectWrongSubprotocolTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5084
 
         // running a jar file implies not using a module path
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (!JVMInfo.isModuleAware())
         {
             suite.addTest(derbyrunjartest.suite());
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5332
         suite.addTest(ij3Test.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
         suite.addTest(Test_6661.suite());
         
         // SysinfoAPITest currently fails when run against jars, so is
@@ -77,6 +91,7 @@ public static Test suite() {
         //suite.addTest(SysinfoAPITest.suite());
 
         // tests that do not run with JSR169
+//IC see: https://issues.apache.org/jira/browse/DERBY-5374
         if (JDBC.vmSupportsJDBC3())  
         {
             suite.addTest(ij5Test.suite());            
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java
index 96e7f0037e..87ecb7cd25 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java
@@ -73,6 +73,7 @@ public static void main (String[] args) {
 		new dblook_test().doTest();
 		System.out.println("\n[ Done. ]\n");
 		renameDbLookLog("dblook_test");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3458
 
 	}
 
@@ -87,6 +88,7 @@ protected void doTest() {
 
 			// Test full dblook functionality.
 			System.out.println("\n-= Start dblook Functional Tests. =-");
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 			createTestDatabase(dbCreationScript_1);
 			runDBLook(testDBName);
 
@@ -136,6 +138,7 @@ protected void createTestDatabase(String scriptName)
 	{
 
 		// Delete existing database, if it exists.
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 		try {
 			deleteDB(testDBName);
 		} catch (Exception e) {
@@ -143,12 +146,14 @@ protected void createTestDatabase(String scriptName)
 				"old test db before creating a new one...");
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
         clazz.getConstructor().newInstance();
 		jdbcProtocol = "jdbc:derby:";
 		createDBFromDDL(testDBName, scriptName);
 
 		// Figure out where our database directory is (abs path).
+//IC see: https://issues.apache.org/jira/browse/DERBY-577
 		String systemhome = System.getProperty("derby.system.home");
 		dbPath = systemhome + File.separatorChar;
 		return;
@@ -292,6 +297,7 @@ protected void runTest(int whichTest, String dbName,
 		} catch (SQLException e) {
 
 			System.out.println("FAILED: Test # : " + whichTest);
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 			e.printStackTrace(System.out);
 			for (e = e.getNextException(); e != null;
 				e = e.getNextException())
@@ -386,12 +392,15 @@ private void lookThree(String dbName)
 
 		printAsHeader("\nDumping DDL for all objects, " +
 			"using\nNetwork Server:\n");
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 		String hostName = TestUtil.getHostName();
 		jdbcProtocol = TestUtil.getJdbcUrlPrefix(hostName,SERVER_PORT);
 
 		String sourceDBUrl;
 		if (TestUtil.isJCCFramework())
 			sourceDBUrl = jdbcProtocol + "\"" + dbPath +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 				separator + dbName + "\":user=app;password=apppw;";
 		else
 			sourceDBUrl = jdbcProtocol + dbPath +
@@ -409,6 +418,7 @@ private void lookThree(String dbName)
 		// Run the test.
 		try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 			new dblook(new String[] {
 				"-d", sourceDBUrl,
 				"-o", dbName + ".sql",
@@ -507,6 +517,7 @@ private void lookSix(String dbName)
 			"writing\nerror to the log:\n");
  
 		// Url is intentionally incorrect; it will cause an error.
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 		new dblook(new String[] {
 			"-o", dbName + ".sql",
 			"-d", dbName }
@@ -558,7 +569,10 @@ private void go(String dbName, String [] args) {
 		jdbcProtocol = "jdbc:derby:";
 		String sourceDBUrl = jdbcProtocol + dbPath +
 			separator + dbName + ";user=app;password=apppw";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 		String [] fullArgs = new String[args.length+2];
 		fullArgs[0] = "-d";
 		fullArgs[1] = sourceDBUrl;
@@ -660,6 +674,8 @@ private void runMessageCheckTest(String dbName)
 		try {
 			Connection conn =
 				DriverManager.getConnection("jdbc:derby:" + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 					jarPath + ";shutdown=true,user=app;password=apppw");
 			conn.close();
 		} catch (SQLException se) {
@@ -717,12 +733,15 @@ private void dumpSysCatalogs(String dbName)
 
 		// Connect to the database.
 		Connection conn = DriverManager.getConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 				"jdbc:derby:" + dbName + ";user=app;password=apppw");
 		conn.setAutoCommit(false);
 
 		// Set the system schema to ensure that UCS_BASIC collation is used.
 		Statement stmt = conn.createStatement();
 		stmt.executeUpdate("SET SCHEMA SYS");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3458
 
 		// Ensure that the database has the expected collation type. 
 		ResultSet rs = null;
@@ -746,12 +765,14 @@ private void dumpSysCatalogs(String dbName)
 		// Load any id-to-name mappings that will be useful
 		// when dumping the catalogs.
 		HashMap<String, String> idToNameMap = loadIdMappings(stmt);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 		// Go through and dump all system catalog information,
 		// filtering out database-dependent id's so that they
 		// won't cause diffs.
 
 		writeOut("\n========== SYSALIASES ==========\n");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3458
 		rs =
 			stmt.executeQuery("select schemaid, sys.sysaliases.* from sys.sysaliases");
 		dumpResultSet(rs, idToNameMap, null);
@@ -824,6 +845,8 @@ private void dumpSysCatalogs(String dbName)
 		rs = stmt.executeQuery("select compilationschemaid, sys.sysviews.* from sys.sysviews");
 		dumpResultSet(rs, idToNameMap, null);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 		writeOut("\n========== SYSROLES ==========\n");
 		rs = stmt.executeQuery
 			("select 'dummyFirstCol', " +
@@ -897,6 +920,7 @@ private boolean isIgnorableSchema(String schemaName) {
 	 ****/
 
 	private void dumpResultSet (ResultSet rs,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		HashMap<String, String> idToNameMap, Connection conn)
 		throws Exception
 	{
@@ -916,6 +940,7 @@ private void dumpResultSet (ResultSet rs,
 		// which is why we use object names.
 		StringBuffer uniqueName = new StringBuffer();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		TreeMap<String, ArrayList<String>> orderedRows =
                 new TreeMap<String, ArrayList<String>>();
 		ArrayList<String> rowValues = new ArrayList<String>();
@@ -929,6 +954,7 @@ private void dumpResultSet (ResultSet rs,
 				String colName = rsmd.getColumnName(i);
 				String value = rs.getString(i);
 				String mappedName = idToNameMap.get(value);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 				if ((colName.indexOf("SCHEMAID") != -1) &&
 					(mappedName != null) &&
@@ -944,6 +970,7 @@ private void dumpResultSet (ResultSet rs,
 					rowValues = null;
 					break;
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-335
 				else if (colName.equals("JAVACLASSNAME") && (value != null) &&
 					(value.indexOf("org.apache.derby") != -1) &&
 					(value.indexOf(".util.") == -1)) {
@@ -963,6 +990,8 @@ else if (colName.equals("JAVACLASSNAME") && (value != null) &&
 
 
 				String uniquePiece;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 
 				if (colName.equals("RGD")) {
 					// Role Grant Descriptor: synthetic unique column, see query
@@ -1018,6 +1047,7 @@ else if (colName.equals("JAVACLASSNAME") && (value != null) &&
 				// id.
 					handleDuplicateRow(rowValues, null, orderedRows);
 				else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 					ArrayList<String> oldRow = orderedRows.put(
 						uniqueName.toString(), rowValues);
 					if (oldRow != null) {
@@ -1032,6 +1062,7 @@ else if (colName.equals("JAVACLASSNAME") && (value != null) &&
 
 			uniqueName = new StringBuffer();
 			rowValues = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 		}
 
@@ -1074,6 +1105,7 @@ else if (colName.equals("JAVACLASSNAME") && (value != null) &&
 	 ****/
 
 	private String dumpColumnData(String colName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		String value, String mappedName, ArrayList<String> rowVals)
 	{
 
@@ -1166,6 +1198,7 @@ else if (looksLikeSysGenId(value))
 	 ****/
 
 	private void handleDuplicateRow(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		ArrayList<String> newRow, ArrayList<String> oldRow,
 		TreeMap<String, ArrayList<String>> orderedRows)
 	{
@@ -1177,6 +1210,7 @@ private void handleDuplicateRow(
 		for (int i = 0; i < newRow.size(); i++)
 			newRowId.append((String)newRow.get(i));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		ArrayList<String> obj = orderedRows.put(newRowId.toString(), newRow);
 		if (obj != null)
 		// entire row is a duplicate.
@@ -1189,6 +1223,7 @@ private void handleDuplicateRow(
 			for (int i = 0; i < oldRow.size(); i++)
 				oldRowId.append((String)oldRow.get(i));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 			obj = orderedRows.put(oldRowId.toString(), oldRow);
 			if (obj != null)
 			// entire row is a duplicate.
@@ -1220,10 +1255,13 @@ private void createDBFromDDL(String newDBName,
 			"' from ddl script '" + scriptName + "'");
 
 		Connection conn = DriverManager.getConnection(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 				"jdbc:derby:" + newDBName +
 				";create=true;user=app;password=apppw" + territoryBased);
 
         runDDL( conn, scriptName );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
 
 		conn.close();
 
@@ -1303,6 +1341,7 @@ private static void writeOut(String str) {
 
     private HashMap<String, String> loadIdMappings(Statement stmt)
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 		HashMap<String, String> idToNameMap = new HashMap<String, String>();
 
@@ -1479,6 +1518,8 @@ private void deleteDB(String dbName)
 		try {
 			Connection conn =
 				DriverManager.getConnection("jdbc:derby:" + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 					deletePath + ";shutdown=true;user=app;password=apppw");
 			conn.close();
 		} catch (SQLException se) {
@@ -1567,6 +1608,7 @@ private void deleteFile(File aFile)
 
 	protected static void renameDbLookLog(String nameOfTest)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3458
 		File dbLookTestLog = new File("dblook.log");
 		if (dbLookTestLog.exists()) {
 			int i = 0;
@@ -1597,6 +1639,7 @@ private void dumpFileToSysOut(String fName) {
 
 		try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 			BufferedReader dumpFile =
 				new BufferedReader(new FileReader(fName));
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
index a02c11c3b7..fa34b2d504 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
@@ -44,9 +44,11 @@ public static Test suite() {
         Class cl = derbyrunjartest.class;
 
         BaseTestSuite suite = new BaseTestSuite(cl);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // The server command can only be used on platforms that support
         // the network server.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         if (Derby.hasServer()) {
             suite.addTest(new derbyrunjartest("xtestServer"));
         }
@@ -66,10 +68,12 @@ public static Test suite() {
      */
     private void runtool(String[] toolArgs, String[] output, int exitCode)
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         String runClassName = org.apache.derby.run.run.class.getName();
         URL result = SecurityManagerSetup.getURL(runClassName);
         String derbyrunloc = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1063
         if (result.toString().endsWith(".jar")) {
             derbyrunloc = result.toString().substring(5);
             if (System.getProperty("os.name").startsWith("Windows"))
@@ -77,6 +81,7 @@ private void runtool(String[] toolArgs, String[] output, int exitCode)
         }
 
         ArrayList<String> cmdArgs = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // Invoke java -jar derbyrun.jar if we are running from jars, or
         // with fully qualified class name if we are running from classes.
@@ -89,6 +94,7 @@ private void runtool(String[] toolArgs, String[] output, int exitCode)
 
         cmdArgs.addAll(Arrays.asList(toolArgs));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         String[] cmd = cmdArgs.toArray(new String[cmdArgs.size()]);
         assertExecJavaCmdAsExpected(output, cmd, exitCode);
     }
@@ -104,6 +110,7 @@ public void testIJ() throws Exception {
     public void testSysinfo() throws Exception {
         String[] cmd = { "sysinfo", "-cp", "help" };
         String[] output = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
             "Usage: java org.apache.derby.tools.sysinfo -cp [ [ embedded ][ server ][ client] [ tools ] [ anyClass.class ] ]"
         };
         runtool(cmd, output, 0);
@@ -112,6 +119,7 @@ public void testSysinfo() throws Exception {
     public void testDblook() throws Exception {
         String[] cmd = { "dblook" };
         String[] output = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
             " Usage:",
             " java org.apache.derby.tools.dblook -d <source database url> [options]",
             " 	where the source URL is the full URL, including the connection protocol",
@@ -142,11 +150,13 @@ public void xtestServer() throws Exception {
         String[] output = {
             "Usage: NetworkServerControl <commands> ",
             "Commands:",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
             "start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]",
             "shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]",
             "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
             "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
             "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5832
             "logconnections { on|off } [-h <host>][-p <port number>] [-ssl <ssl mode>]",
             "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
             "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java
index 3bdd43a4eb..20c67eb195 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ij2Test.java
@@ -41,6 +41,7 @@ public ij2Test(String script) {
     public static Test suite() {        
         Properties props = new Properties();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5368
         props.setProperty("derby.infolog.append", "true");  
         props.setProperty("ij.protocol", "jdbc:derby:");
         props.setProperty("ij.database", "wombat;create=true");
@@ -50,6 +51,7 @@ public static Test suite() {
         test = TestConfiguration.singleUseDatabaseDecorator(test, "wombat1");
         test = new CleanDatabaseTestSetup(test);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ij2Scripts");
         suite.addTest(test);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ij5Test.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ij5Test.java
index 10b977be47..ee2efe7d9d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ij5Test.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/tools/ij5Test.java
@@ -43,6 +43,7 @@ public static Test suite() {
         // And as we're trying to test ij.showNoConnectionsAtStart=false, 
         // we cannot get the same output with non-JSR-169 platforms. So,
         // return an empty suite (i.e. don't run with JSR 169).
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         if (JDBC.vmSupportsJSR169()) {
             return new BaseTestSuite(
                 "empty: cannot obtain expected output with JSR169");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
index 1c5fecea33..1416d78449 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
@@ -49,6 +49,7 @@ public class BasicSetup extends UpgradeChange {
     
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("Upgrade basic setup");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(new BaseTestSuite(BasicSetup.class));
 
@@ -116,8 +117,10 @@ public void testOldVersion() throws SQLException
             // old version is running in a server and the driver
             // is a client driver corresponding to the current version.
             //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             if (!JVMInfo.isModuleAware())
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
               assertEquals("Old major (driver): ",
                     getOldMajor(), dmd.getDriverMajorVersion());
               assertEquals("Old minor (driver): ",
@@ -198,6 +201,7 @@ public void testDML() throws SQLException {
      */
     public void testCreateTable() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
       Connection conn = getConnection();
         Statement stmt = createStatement();
         try {
@@ -209,6 +213,7 @@ public void testCreateTable() throws SQLException
         }
         stmt.executeUpdate("CREATE TABLE T (I INT)");
         TestConfiguration.getCurrent().shutdownDatabase();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         conn.close();
         stmt = createStatement();
         ResultSet rs = stmt.executeQuery("SELECT * from t");
@@ -224,6 +229,7 @@ public void testCreateTable() throws SQLException
      */
     public void testIndex() throws SQLException 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         Connection conn = getConnection();
         Statement stmt = createStatement();
         try {
@@ -238,6 +244,7 @@ public void testIndex() throws SQLException
         stmt.executeUpdate("INSERT INTO  TI values(2)");
         stmt.executeUpdate("INSERT INTO  TI values(3)");
         TestConfiguration.getCurrent().shutdownDatabase();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         conn.close();
         stmt = createStatement();
         ResultSet rs = stmt.executeQuery("SELECT * from TI ORDER BY I");
@@ -252,6 +259,7 @@ public void testIndex() throws SQLException
      */
     public void noConnectionAfterHardUpgrade()
     {              
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         switch (getPhase())
         {
         case PH_POST_HARD_UPGRADE:
@@ -261,6 +269,7 @@ public void noConnectionAfterHardUpgrade()
                     // Check the innermost of the nested exceptions
                     SQLException sqle = getLastSQLException(e);
                     String sqlState = sqle.getSQLState();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                     String message = sqle.getMessage();
                 	// while beta, XSLAP is expected, if not beta, XSLAN
                     String INCOMPATIBLE_VERSION = "XSLAN";
@@ -298,6 +307,11 @@ public void noConnectionAfterHardUpgrade()
      * Otherwise, the database may fail to boot again with the old version.
      */
     public void dropAllTriggerPlans() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
+//IC see: https://issues.apache.org/jira/browse/DERBY-4835
+//IC see: https://issues.apache.org/jira/browse/DERBY-5289
+//IC see: https://issues.apache.org/jira/browse/DERBY-5105
+//IC see: https://issues.apache.org/jira/browse/DERBY-5263
         Statement s = createStatement();
         s.execute("create procedure clear_sps_plans() language java "
                 + "parameter style java external name '"
@@ -540,10 +554,20 @@ public void testDERBY5120NumRowsInSydependsForTrigger() throws Exception
             assertStatementError("42802", s, " update ATDC_TAB1 set c11=2");
 
         	preapreFortDERBY5120();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6547
+//IC see: https://issues.apache.org/jira/browse/DERBY-6383
             s.execute("update ATDC_TAB1 set c11=11");
             s.executeUpdate("alter table ATDC_TAB1 add column c113 int");
             //DERBY-5120 has been fixed in 10.8.2.2 and higher and hence we 
             // will not see the buggy behavior on those codelines
+//IC see: https://issues.apache.org/jira/browse/DERBY-5379
+//IC see: https://issues.apache.org/jira/browse/DERBY-5484
+//IC see: https://issues.apache.org/jira/browse/DERBY-5120
+//IC see: https://issues.apache.org/jira/browse/DERBY-5044
+//IC see: https://issues.apache.org/jira/browse/DERBY-5379
+//IC see: https://issues.apache.org/jira/browse/DERBY-5484
+//IC see: https://issues.apache.org/jira/browse/DERBY-5120
+//IC see: https://issues.apache.org/jira/browse/DERBY-5044
             if (oldLessThan(10,8,2,2)) 
                 s.execute("update ATDC_TAB1 set c11=11");
             else
@@ -662,6 +686,10 @@ private void dropColumn_triggersql_DERBY5044_And_DERBY5120(
         	// in 10.8.2.2 and higher releases where DERBY-5044 and
         	// DERBY-5120 have already been fixed.
         	s.executeUpdate("alter table BKUP1_5044_5120 drop column c112");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5379
+//IC see: https://issues.apache.org/jira/browse/DERBY-5484
+//IC see: https://issues.apache.org/jira/browse/DERBY-5120
+//IC see: https://issues.apache.org/jira/browse/DERBY-5044
             if (oldLessThan(10,8,2,2)) {
                 //Since in releases prior to 10.8.2.2, ALTER TABLE DROP COLUMN 
                 // did not drop dependent trigger, following UPDATE sql will fail 
@@ -812,6 +840,10 @@ public void testDERBY5044AlterTableDropColumn() throws Exception {
             s.execute("insert into ATDC_13_TAB1_BACKUP values (1,11)");
             s.execute("insert into ATDC_13_TAB2 values (1,11)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5379
+//IC see: https://issues.apache.org/jira/browse/DERBY-5484
+//IC see: https://issues.apache.org/jira/browse/DERBY-5120
+//IC see: https://issues.apache.org/jira/browse/DERBY-5044
             if (oldLessThan(10,8,2,2)) {
                 //In releases prior to 10.8.2.2, following does not detect 
             	// that column c22 is getting used by trigger 
@@ -1472,6 +1504,7 @@ public void testExhuastivePermutationOfTriggerColumns() throws Exception
 
     private int[][] constructPowerSet( int count )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     	ArrayList<int[]> list = new ArrayList<int[]>();
         boolean[]           inclusions = new boolean[ count ];
 
@@ -1530,6 +1563,7 @@ private void include(ArrayList<int[]> list, int idx, boolean[] inclusions,
     private int[][] permute( int[][] original )
     {
         ArrayList<int[]> list = new ArrayList<int[]>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         for ( int i = 0; i < original.length; i++ )
         {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_1.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_1.java
index 17e845ecf7..54be80a25c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_1.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_1.java
@@ -31,6 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * will not be run.
  * <BR>
     10.1 Upgrade issues
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
 
     <UL>
     <LI> testProcedureSignature - Routines with explicit Java signatures.
@@ -40,6 +41,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class Changes10_1 extends UpgradeChange {
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Upgrade changes for 10.1");
         
         suite.addTestSuite(Changes10_1.class);
@@ -68,6 +70,7 @@ public Changes10_1(String name) {
      */
     public void testProcedureSignature() throws SQLException
     {      
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
        Statement s = createStatement();
         switch (getPhase())
         {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_10.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_10.java
index b4a1deab2c..8f8895e5e0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_10.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_10.java
@@ -86,6 +86,7 @@ public Changes10_10(String name)
      */
     public static Test suite(int phase) {
         BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.9");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTestSuite(Changes10_10.class);
         
@@ -308,6 +309,7 @@ private void lookForReadmeFile(String path, boolean fileShouldExist) throws IOEx
     // static final double DB2_LARGEST_NEGATIVE_DOUBLE  = -2.225E-307d;
 
     static final float[] beyondDB2Real = new float[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3398
         Float.MIN_VALUE,
         Float.MAX_VALUE,
         +1.174E-37f,
@@ -336,6 +338,7 @@ public  void    testFloatLimits()  throws Exception
         // engine in a remote server. The client driver, however,
         // corresponds to the trunk version, so these tests do
         // not stress the engine behavior.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (JVMInfo.isModuleAware()) { return; }
       
         Statement st = createStatement();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_11.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_11.java
index 2a9b3e0e41..d0371bc23a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_11.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_11.java
@@ -78,6 +78,7 @@ public Changes10_11(String name) {
      * @return the test suite created.
      */
     public static Test suite(int phase) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(Changes10_11.class, "Upgrade test for 10.11");
     }
 
@@ -304,6 +305,7 @@ public void testDeferrableConstraints() throws SQLException {
             "create table t532(i int not null primary key deferrable)",
             "create table t532(i int unique deferrable)",
             "create table t532(i int not null unique deferrable)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             "create table t532(i int check (i > 0) deferrable)",
             "create table t532(i int references referenced(i) deferrable)"};
 
@@ -312,6 +314,7 @@ public void testDeferrableConstraints() throws SQLException {
             "create table t532(i int, constraint c unique(i) deferrable)",
             "create table t532(i int not null, constraint c unique(i) " + 
                 "deferrable)",
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             "create table t532(i int, constraint c check (i > 0) deferrable)",
             "create table t532(i int, constraint c foreign key(i) " + 
                 "references referenced(i) deferrable)"};
@@ -388,6 +391,7 @@ public void testMerge() throws Exception
     /** Test that identity columns handle self-deadlock in soft-upgrade mode */
     public void test_derby6692() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6692
         Connection  conn = getConnection();
         
         switch (getPhase())
@@ -418,9 +422,11 @@ public void test_derby6692() throws Exception
     /** Test the Lucene plugin */
     public void testLuceneSupport() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         Properties  properties = TestConfiguration.getSystemProperties();
         if ( getBooleanProperty( properties, TestConfiguration.KEY_OMIT_LUCENE ) )  { return; }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         Version initialVersion = new Version( getOldMajor(), getOldMinor(), 0, 0 );
         Version firstVersionHavingBooleanType = new Version( 10, 7, 0, 0 );
         Version firstVersionHavingOptionalTools = new Version( 10, 10, 0, 0 );
@@ -445,6 +451,7 @@ public void testLuceneSupport() throws Exception
         {
             case PH_CREATE:
             case PH_POST_SOFT_UPGRADE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
                 assertStatementError( originalSQLState, statement, loadTool );
                 break;
             case PH_SOFT_UPGRADE:
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_13.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_13.java
index af5870a298..253dbc6db2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_13.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_13.java
@@ -234,6 +234,8 @@ public void testAlterTableSetGenerated() throws SQLException {
 	 */
      public void testDerby6892SkipHeaderLines() throws SQLException {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6892
 
         switch (getPhase()) {
 		case PH_CREATE:
@@ -310,6 +312,8 @@ public void testDerby6892SkipHeaderLines() throws SQLException {
 	 * DERBY-6893. 
 	 */
      public void testDerby6893SkipHeaderLines() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4555
+//IC see: https://issues.apache.org/jira/browse/DERBY-6893
         Statement s = createStatement();
        switch (getPhase()) {
 		case PH_CREATE:
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java
index ddee580eeb..1ac56d51a6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_2.java
@@ -49,11 +49,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class Changes10_2 extends UpgradeChange {
     
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Upgrade changes for 10.2");
         
         suite.addTestSuite(Changes10_2.class);
         
         // Encryption only support on J2SE or higher.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         if (JDBC.vmSupportsJDBC3())
         {
             suite.addTest(new Changes10_2("changeEncryptionFromNone"));
@@ -228,6 +230,7 @@ public void testReusableRecordIdSequenceNumber()
      */
     public void testGrantRevokeStatements() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         Statement s = createStatement();
         switch(getPhase()) {
         // 
@@ -356,8 +359,10 @@ public void testSystemRoutinePermissions() throws SQLException
 
     public void changeEncryptionFromNone() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         DataSource ds = JDBCDataSource.getDataSourceLogical("NO_ENCRYPT_10_2");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         switch (getPhase())
         {
         case PH_CREATE:
@@ -387,6 +392,7 @@ public void changeEncryptionFromNone() throws SQLException
             ds.getConnection().close();
             break;
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         case PH_HARD_UPGRADE:
             // On hard upgrade should be able to connect to it
             // changing the encryption.
@@ -428,6 +434,7 @@ public void changeEncryptionFromNone() throws SQLException
 
     public void changeEncryptionFromEncryptedDatabase() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         DataSource ds = JDBCDataSource.getDataSourceLogical("ENCRYPT_10_2");
         
         switch (getPhase())
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java
index c7baae2789..9a54c4aa6b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_3.java
@@ -52,6 +52,7 @@ public class Changes10_3 extends UpgradeChange {
      * @return the test suite created.
      */   
     public static Test suite(int phase) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Upgrade changes for 10.3");
         
         suite.addTestSuite(Changes10_3.class);
@@ -59,7 +60,9 @@ public static Test suite(int phase) {
         //Add the tests for the Stored procedures related to the locator
         //implementation of the LOB related JDBC methods. This needs to be done
         //only during the hard(full) upgrade phase.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2385
         if(phase == PH_HARD_UPGRADE) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2632
             if (JDBC.vmSupportsJDBC3())
             {
                 //Tests for the Blob related locator StoredProcedures
@@ -69,6 +72,7 @@ public static Test suite(int phase) {
             }
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         return new SupportFilesSetup((Test) suite);
     }
 
@@ -114,10 +118,12 @@ public void testCompilationSchema() throws SQLException
      * 10.2 Databases will work with the old LogRecord format.
      */
     public void testNegValueSupportedLogRecord()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         throws SQLException
     {
         switch(getPhase()) {
             case PH_CREATE: {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2611
 
                 // This case is derived from OnlineCompressTest.test6.
                 Statement s = createStatement();
@@ -170,6 +176,7 @@ public void testNegValueSupportedLogRecord()
     
     private void checkDataToCase606(int start_value, int end_value)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         getConnection().setAutoCommit(false);
         Statement s = createStatement();
         PreparedStatement insert_stmt = prepareStatement("insert into case606 values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
@@ -226,6 +233,7 @@ private void checkDataToCase606(int start_value, int end_value)
      * are working on hard upgrade to 10.3 from previous derby versions.
      */
     public void testImportExportLobsProcedures()
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         throws SQLException
     {
     
@@ -244,6 +252,7 @@ public void testImportExportLobsProcedures()
             // on soft-upgrade.
             Statement s = createStatement();
             assertStatementError("42Y03", s, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                 "call SYSCS_UTIL.SYSCS_EXPORT_TABLE_LOBS_TO_EXTFILE" +  
                 "(null , 'IET1' , 'iet1.del' , null, " + 
                 "null, null, 'iet1_lobs.dat')");
@@ -267,6 +276,7 @@ public void testImportExportLobsProcedures()
             SupportFilesSetup.deleteFile(lobsFileName);
 
             s.execute(
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
                 "call SYSCS_UTIL.SYSCS_EXPORT_TABLE_LOBS_TO_EXTFILE" +  
                 "(null , 'IET1' , '"  +  fileName  + 
                 "' , null, null, null, '" + lobsFileName + "')");
@@ -302,6 +312,7 @@ public void testImportExportLobsProcedures()
      * hard upgrade to 10.3 from previous derby versions.
      */
     public void testPolicyReloadingProcedure()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
         throws SQLException
     {
         int         currentPhase = getPhase();
@@ -446,6 +457,7 @@ public void testNewHeap()
         }
 
         // Now verify you can access the tables 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2611
         switch (getPhase())
         {
             case PH_CREATE: 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
index 37e0f6b9fd..43be476507 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_4.java
@@ -76,6 +76,7 @@ public Changes10_4(String name) {
      * @return the test suite created.
      */   
     public static Test suite(int phase) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.4");
         
         suite.addTestSuite(Changes10_4.class);
@@ -105,6 +106,7 @@ public void testMetaDataQueryRunInSYScompilationSchema() throws SQLException
         case PH_CREATE:
             // create the database if it was not already created. Note the
         	// JDBC url attributes.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3925
             String locale = "en";
             Locale[] availableLocales = Collator.getAvailableLocales();
             for (int i = 0; i < availableLocales.length; i++) {
@@ -470,6 +472,7 @@ public void testUniqueConstraint () throws SQLException {
                 assertStatementError ("23505", s, 
                             "insert into constraintest1 (i) values (2)");
                 //should able to drop nullablity
+//IC see: https://issues.apache.org/jira/browse/DERBY-3456
                 s.executeUpdate("alter table constraintest1 " +
                         "alter column i null");
                 //try creating index without seting column as not null
@@ -490,6 +493,8 @@ public void testUniqueConstraint () throws SQLException {
      * Verifies error messages priviously generated.
      */
     private void verifyError() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3523
+//IC see: https://issues.apache.org/jira/browse/DERBY-3523
         Statement stmt = createStatement();
         PreparedStatement ps = prepareStatement("select text " +
                                     "from errormessage where state = ?");
@@ -584,6 +589,7 @@ public void testErrorMessage () throws Exception {
      * Tests if alter column works for a column in unique constraint.
      */
     public void testAlterColumnOfUniqueConstraint () throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3566
         Statement stmt = createStatement();
         switch (getPhase()) {
            case PH_CREATE:
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_5.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_5.java
index 62586de056..a0e5fbc9b7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_5.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_5.java
@@ -60,6 +60,7 @@ public Changes10_5(String name) {
      */
     public static Test suite(int phase) {
         BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.5");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTestSuite(Changes10_5.class);
         return new SupportFilesSetup((Test) suite);
@@ -120,6 +121,7 @@ public void testUpdateStatisticsProcdure() throws SQLException
      */
     public void testDeterminismKeyword() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3570
         String  sqlstate = null;
         
         switch (getPhase())
@@ -229,6 +231,7 @@ public void testSQLRolesBasic() throws SQLException
         // set, so we can only check if the system tables for roles is
         // present.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3901
         Statement s = createStatement();
         String createRoleText = "create role foo";
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_6.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_6.java
index 9855035ba9..404cd2bf78 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_6.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_6.java
@@ -76,6 +76,7 @@ public Changes10_6(String name) {
      */
     public static Test suite(int phase) {
         BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.6");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTestSuite(Changes10_6.class);
         return new SupportFilesSetup((Test) suite);
@@ -164,6 +165,7 @@ public void testCLOBGETSUBSTRING() throws Exception
             // is remote and the alias descriptor will not serialize
             // across the client/server connection. Skip the following test.
             if (JVMInfo.isModuleAware()) { break; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
             returnType = getTypeDescriptor( rs.getObject( 1 ) );
             actualJdbcType = getJDBCTypeId( returnType );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java
index fc4a588cf1..0407a6fab4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java
@@ -87,6 +87,7 @@ public Changes10_7(String name)
      */
     public static Test suite(int phase) {
         BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.7");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTestSuite(Changes10_7.class);
         return new SupportFilesSetup((Test) suite);
@@ -141,6 +142,7 @@ public void testBoolean() throws SQLException
      * version of Derby
      */
     private Set<String> getSupportedTypes() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashSet<String> types = new HashSet<String>();
         ResultSet rs = getConnection().getMetaData().getTypeInfo();
         while (rs.next()) {
@@ -692,6 +694,7 @@ public void testTriggers() throws SQLException
      */
     public void testExternalSecuritySpecification() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
         String functionWithDefinersRights =
             "create function f_4551( a varchar( 100 ) ) returns int\n" +
             "language java parameter style java reads sql data\n" +
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
index 357c7cabe4..53bdb5920d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
@@ -72,6 +72,7 @@ public class Changes10_9 extends UpgradeChange
     public Changes10_9(String name)
     {
         super(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
         initPattern();
     }
 
@@ -83,6 +84,7 @@ public Changes10_9(String name)
 
     private static final String[] SUPPORT_FILES_SOURCE =
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
         "functionTests/tests/lang/dcl_java.jar",
         "functionTests/tests/lang/dcl_emc1.jar",
         "functionTests/tests/lang/dcl_emc2.jar",
@@ -97,9 +99,11 @@ public Changes10_9(String name)
      */
     public static Test suite(int phase) {
         BaseTestSuite suite = new BaseTestSuite("Upgrade test for 10.9");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTestSuite(Changes10_9.class);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
         return new SupportFilesSetup(
                 (Test)suite, SUPPORT_FILES_SOURCE);
     }
@@ -474,6 +478,7 @@ private void verifyCanConnect(DataSource ds) throws SQLException {
     public void testJarStorage()  throws Exception
     {
         Statement s = createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
 
         switch (getPhase()) {
         case PH_CREATE: // create with old version
@@ -670,6 +675,7 @@ private void verifyNewLocations(int noOfObjects)
      * where <em>h</em> id a lower case hex digit.
      */
     private void initPattern() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<Goal> l = new ArrayList<Goal>(100);
         // The UUID format is determined by
         // org.apache.derby.impl.services.uuid.BasicUUID#toString
@@ -700,6 +706,7 @@ private void initPattern() {
         l.add(new SingleChar('G'));
         l.add(new CharRange(new char[][]{{'0','9'}}, Goal.REPEAT));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         this.pattern = l.toArray(new Goal[l.size()]);
     }
 
@@ -899,11 +906,13 @@ public void testDropOrphanedStatistics()
         // serialize across a network connection: they are only meant to
         // be deserialized inside the engine.
         if (JVMInfo.isModuleAware()) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         // Helper object to obtain information about index statistics.
         IndexStatsUtil stats = new IndexStatsUtil(openDefaultConnection());
         Statement s = createStatement();
         // The expected initial number of statistics entries in TEST_TAB_2.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6064
         final int expected =
                 DisposableIndexStatistics.hasDerby5681Bug(getOldVersion()) ?
                     2 : 1;
@@ -947,6 +956,7 @@ public void testDropOrphanedStatistics()
                     "DROP CONSTRAINT TEST_TAB_2_FK_1");
             //Dropping the foreign key constraint does not remove it's 
             // statistics row because of DERBY-5681.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6064
             stats.assertTableStats("TEST_TAB_2", expected);
             assertStatementError("42Y03", s,
             "CALL SYSCS_UTIL.SYSCS_DROP_STATISTICS('APP','TEST_TAB_2', null)");
@@ -959,10 +969,12 @@ public void testDropOrphanedStatistics()
             break;
 
         case PH_HARD_UPGRADE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6064
             stats.assertTableStats("TEST_TAB_2", expected);
             s.execute("CALL SYSCS_UTIL.SYSCS_DROP_STATISTICS('APP','TEST_TAB_2', null)");
             stats.assertNoStatsTable("TEST_TAB_2");
             s.execute("CALL SYSCS_UTIL.SYSCS_UPDATE_STATISTICS('APP','TEST_TAB_2', null)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
             stats.assertNoStatsTable("TEST_TAB_2");
             break;
 
@@ -1011,10 +1023,12 @@ public void testDisposableStatisticsExplicit()
         // serialize across a network connection: they are only meant to
         // be deserialized inside the engine.
         if (JVMInfo.isModuleAware()) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         final String TBL = "ISTAT_DISPOSABLE_STATS";
         String updateStatsSQL = "call syscs_util.syscs_update_statistics(" +
                 "'APP', ?, null)";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6064
         DisposableIndexStatistics dis = new DisposableIndexStatistics(
                 getOldVersion(), getConnection(), TBL);
 
@@ -1029,6 +1043,8 @@ public void testDisposableStatisticsExplicit()
                 // causing the number of statistics entries to increase.
                 // Just after creation and before any update statistics expect
                 // all stats to exist.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
                 dis.assertStatsCount(false, false);
                 break;
             }
@@ -1046,6 +1062,8 @@ public void testDisposableStatisticsExplicit()
                 // After soft upgrade and update statistics expect the 
                 // orphaned index entry to be deleted, but the "unneeded
                 // disposable entries" are only deleted after hard upgrade.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
                 dis.assertStatsCount(true, false);
                 break;
             }
@@ -1073,6 +1091,8 @@ public void testDisposableStatisticsExplicit()
                 // Confirm that we disposed of the statistics that were added
                 // due to a bug or simply not needed by Derby.
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
                     dis.assertStatsCount(true, true);
                 } finally {
                     for (int i=0; i < tables.length; i++) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java
index 4d5621a9c4..1d5bf417ad 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java
@@ -48,21 +48,36 @@ public class OldVersions
         {10, 3, 3, 0}, // 10.3.3.0 (May 12, 2008 / SVN 652961)
         {10, 4, 1, 3}, // 10.4.1.3 (April 24, 2008 / SVN 648739)
         {10, 4, 2, 0}, // 10.4.2.0 (September 05, 2008 / SVN 693552)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4108
         {10, 5, 1, 1}, // 10.5.1.1 (April 28, 2009 / SVN 764942)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4344
         {10, 5, 3, 0}, // 10.5.3.0 (August 21, 2009 / SVN 802917)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4593
         {10, 6, 1, 0}, // 10.6.1.0 (May 18, 2010/ SVN 938214)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4864
         {10, 6, 2, 1}, // 10.6.2.1 (Oct 6, 2010/ SVN 999685)
         {10, 7, 1, 1}, // 10.7.1.1 (December 14, 2010/ SVN 1040133)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5016
         {10, 8, 1, 2}, // 10.8.1.2 (April 29, 2011/ SVN 1095077)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5287
         {10, 8, 2, 2}, // 10.8.2.2 (October 24, 2011/ SVN 1181258)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5924
         {10, 8, 3, 0}, // 10.8.3.0 (November 16, 2012/ SVN 1405108)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5688
         {10, 9, 1, 0}, // 10.9.1.0 (June 25, 2012/ SVN 1344872)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6104
         {10, 10, 1, 1}, // 10.10.1.1 (April 15, 2013/ SVN 1458268)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6218
         {10, 10, 2, 0}, // 10.10.2.0 (April 15, 2014/ SVN 1582446)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6588
         {10, 11, 1, 1}, // 10.11.1.1 (August 26, 2014 / SVN 1616546)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6811
         {10, 12, 1, 1}, // 10.12.1.1 (October 11, 2015 / SVN 1704137)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6911
         {10, 13, 1, 1}, // 10.13.1.1 (October 25, 2015 / SVN 1765088)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6988
         {10, 14, 2, 0}, // 10.14.2.0 (May 3, 2018/ SVN 1828579)
+//IC see: https://issues.apache.org/jira/browse/DERBY-7010
         {10, 15, 1, 3}, // 10.15.1.3 (March 5, 2019 / SVN 1853019)
     };
 
@@ -98,6 +113,7 @@ public static int[][] getSupportedVersions()
      */
     private static int[][] getSupportedVersions( int[][] old )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<int[]> list = new ArrayList<int[]>();
         int count = old.length;
         
@@ -111,6 +127,7 @@ private static int[][] getSupportedVersions( int[][] old )
             }
             // Derby 10.3.1.4 does not boot on the phoneME advanced platform,
             // (see DERBY-3176) so don't run upgrade tests in this combination.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5646
             if ( BaseTestCase.isCVM()
                   && old[i][0]==10 && old[i][1]==3 
                   && old[i][2]==1 && old[i][3]==4 ) {
@@ -131,6 +148,7 @@ private static int[][] getSupportedVersions( int[][] old )
             list.add( old[ i ] );
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return list.toArray(new int[list.size()][]);
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
index fbc1cfde60..42cad48082 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
@@ -43,6 +43,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * for a suite of upgrade tests.
  */
 final class PhaseChanger extends BaseTestSetup {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2000
 
     private final int phase;
     private final int[] version;
@@ -70,9 +71,11 @@ public PhaseChanger(Test test, int phase,
      */
     protected void setUp() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         UpgradeChange.phase.set(phase);
         UpgradeChange.oldVersion.set(version);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3982
         TestConfiguration config = TestConfiguration.getCurrent();
         trace = config.doTrace();
         if ( trace )
@@ -90,6 +93,8 @@ protected void setUp() throws SQLException
         
         if (loader != null) {
             previousLoader = Thread.currentThread().getContextClassLoader();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
             ClassLoaderTestSetup.setThreadLoader(loader);
         }
          
@@ -128,6 +133,7 @@ protected void setUp() throws SQLException
     protected void tearDown() throws Exception
     {
         if ( trace ) BaseTestCase.traceit(" Test upgrade done.");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3982
 
         // Get a handle to the old engine's ContextService if this version is
         // affected by DERBY-23. The actual workaround for DERBY-23 must be
@@ -135,6 +141,7 @@ protected void tearDown() throws Exception
         // to the service before shutdown, while it's still easily available.
         Object contextService = getDerby23ContextService();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5267
         DataSource ds = JDBCDataSource.getDataSource();
         JDBCDataSource.shutEngine(ds);
 
@@ -157,6 +164,8 @@ protected void tearDown() throws Exception
         clearDerby23ThreadLocals(contextService);
 
         if (loader != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
             ClassLoaderTestSetup.setThreadLoader(previousLoader);
         loader = null;
         previousLoader = null;
@@ -179,6 +188,7 @@ private void deregisterDriver() throws Exception
 
         boolean isAtLeast10_15 = 
             UpgradeRun.lessThan(new int[] {10,15,0,0}, version);
+//IC see: https://issues.apache.org/jira/browse/DERBY-7031
 
         boolean isAffectedVersion = isBetween10_2and10_8 || isAtLeast10_15;
 
@@ -187,6 +197,7 @@ private void deregisterDriver() throws Exception
             // that live in a class loader that is able to load the driver. So
             // create an instance of DriverUnloader in the old driver's class
             // loader.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Class<?> unloader = Class.forName(
                     DriverUnloader.class.getName(), true, loader);
             Method m = unloader.getMethod("unload", (Class[]) null);
@@ -195,6 +206,7 @@ private void deregisterDriver() throws Exception
             // Don't check this on a JVM which is
             // module aware because, in that case, the relevant driver is remote
             // in the server.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             if (!JVMInfo.isModuleAware())
             {
                 // Check that there weren't any drivers to unload except in the
@@ -228,6 +240,7 @@ private void clearDerby4895ThreadLocal() throws Exception {
         // a derby server. the field below no longer exists
         // in the TableDescriptor class on the trunk.
         if (JVMInfo.isModuleAware()) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         Class td = Class.forName(
                 "org.apache.derby.iapi.sql.dictionary.TableDescriptor",
@@ -303,6 +316,7 @@ private void clearDerby23ThreadLocals(Object contextService)
             // setting the field to null.
             Field tclField = cls.getDeclaredField("threadContextList");
             tclField.setAccessible(true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             ThreadLocal<?> tcl = (ThreadLocal) tclField.get(contextService);
             tcl.set(null);
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java
index 3206b4bf7e..098113a03b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java
@@ -92,6 +92,7 @@ public UpgradeChange(String name) {
      */
     final int getPhase()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return phase.get();
     }
     
@@ -100,6 +101,7 @@ final int getPhase()
      *
      * @return A version object.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6064
     final DerbyVersion getOldVersion() {
         return new DerbyVersion(
                 getOldMajor(), getOldMinor(), getOldFixPack(), getOldPoint());
@@ -159,6 +161,8 @@ boolean oldLessThan(int major, int minor, int fixpack, int point) {
         int[] old = (int[]) oldVersion.get();
         int[] version = new int[]{major, minor, fixpack, point};
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5105
+//IC see: https://issues.apache.org/jira/browse/DERBY-4835
         for (int i = 0; i < old.length; i++) {
             if (old[i] < version[i]) return true;
             if (old[i] > version[i]) return false;
@@ -187,6 +191,7 @@ boolean oldIs(int requiredMajor, int requiredMinor,
      */
     boolean oldIs(int requiredMajor, int requiredMinor) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         return (getOldMajor() == requiredMajor)
           && (getOldMinor() == requiredMinor);
      }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java
index e56e1c13da..28453fcdc3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java
@@ -45,6 +45,7 @@ public class UpgradeClassLoader
     private static final Version FIRST_MODULE_SUPPORT_VERSION = new Version(new int[] { 10, 15, 0, 0 });
     private static final String[] _preModuleSupport_jarFiles = {
             "derby.jar", 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             "derbynet.jar",
             "derbyTesting.jar",
             };
@@ -58,6 +59,7 @@ public class UpgradeClassLoader
             };
 
     static final String oldVersionsPath =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             getSystemProperty(_Suite.OLD_VERSIONS_PATH_PROPERTY);
     static final String jarPath =
             getSystemProperty(_Suite.OLD_RELEASE_PATH_PROPERTY);
@@ -84,6 +86,7 @@ protected static String getTextVersion(int[] iv)
      */
     public static ClassLoader makeClassLoader( final int[] version )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ClassLoader oldLoader = AccessController.doPrivileged(
                 new PrivilegedAction<ClassLoader>() {
             public ClassLoader run() {
@@ -141,6 +144,7 @@ private static String getOldJarURLLocation(int[] oldVersion) {
      */
     private static ClassLoader createClassLoader(int[] version)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         Version oldVersion = new Version(version);
         String[] jarFiles = (oldVersion.compareTo(FIRST_MODULE_SUPPORT_VERSION) < 0) ?
             _preModuleSupport_jarFiles : _postModuleSupport_jarFiles;
@@ -164,6 +168,7 @@ private static ClassLoader createClassLoader(int[] version)
 
             for (int i=0; i < jarFiles.length; i++) {
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     url[i] = new File(lib, jarFiles[i]).toURI().toURL();
                 } catch (MalformedURLException e) {
                     Assert.fail(e.toString());
@@ -186,6 +191,7 @@ private static ClassLoader createClassLoader(int[] version)
                 } catch (MalformedURLException e) {
                     Assert.fail(e.toString());
                 } catch (IOException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5775
                     BaseTestCase.alarm("IOException connecting to location: " + oldURLJarLocation + ", msg: '" + e.getMessage() + "'." 
                         + " Upgrade tests can NOT be run!");
                         e.printStackTrace();
@@ -198,10 +204,12 @@ private static ClassLoader createClassLoader(int[] version)
         // add junit.jar to the classpath
         int lastSlot = jarFiles.length;
         url[lastSlot] = Assert.class.getProtectionDomain().getCodeSource().getLocation();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         // Create a class loader which loads Derby classes from the specified
         // URL, and JDBC classes and other system classes from the platform
         // class loader.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6854
         ClassLoader oldVersionLoader =
             new URLClassLoader(url, java.sql.Connection.class.getClassLoader());
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java
index d25749b5a9..dfebadc1ba 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeRun.java
@@ -47,6 +47,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * connections.
  *
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4157
 class UpgradeRun extends UpgradeClassLoader
 {
 
@@ -68,6 +69,7 @@ class UpgradeRun extends UpgradeClassLoader
      */
 
     static final AdditionalDb[] ADDITIONAL_DBS = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3191
         new AdditionalDb("COLLATED_DB_10_3", true), // db with territory
                                                     // based collation
         new AdditionalDb("NO_ENCRYPT_10_2", true),
@@ -79,11 +81,14 @@ class UpgradeRun extends UpgradeClassLoader
     
     public static Test suite(final int[] version, boolean useCreateOnUpgrade) {
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4157
         ClassLoader oldLoader = makeClassLoader( version );
         
         // If no jars then just skip.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         if (oldLoader == null)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite suite = new BaseTestSuite(
                     "Empty: Skipped upgrade Tests (no jars) for " + getTextVersion(version));
             return suite;
@@ -97,6 +102,7 @@ public static Test suite(final int[] version, boolean useCreateOnUpgrade) {
         // forces us into embedded mode for releases
         // prior to 10.2.2.0.
         //
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (JVMInfo.isModuleAware() && lessThan(version, new int[] {10, 2, 2, 0}))
         {
             BaseTestSuite suite = new BaseTestSuite
@@ -123,6 +129,7 @@ public static Test suite(final int[] version, boolean useCreateOnUpgrade) {
             case UpgradeChange.PH_POST_SOFT_UPGRADE:
             case UpgradeChange.PH_POST_HARD_UPGRADE:
                 loader = oldLoader;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 phaseForOldRelease = true;
                 break;
             case UpgradeChange.PH_SOFT_UPGRADE:
@@ -133,6 +140,7 @@ public static Test suite(final int[] version, boolean useCreateOnUpgrade) {
             String testName = getTextVersion(version)
               + " Upgrade Phase: " + UpgradeChange.PHASES[phase] + " ";
             Test phaseTests = baseSuite(testName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
                     phase, version);
             
             Test phaseSet = new PhaseChanger(phaseTests, phase, loader, version, useCreateOnUpgrade);
@@ -145,6 +153,7 @@ public static Test suite(final int[] version, boolean useCreateOnUpgrade) {
         
         for (int i = 0; i < ADDITIONAL_DBS.length; i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3191
             if (ADDITIONAL_DBS[i].shutDown) {
                 setup = TestConfiguration.additionalDatabaseDecorator(
                     setup, ADDITIONAL_DBS[i].logicalName);
@@ -156,6 +165,7 @@ public static Test suite(final int[] version, boolean useCreateOnUpgrade) {
         
         Properties preReleaseUpgrade = new Properties();
         preReleaseUpgrade.setProperty(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 Property.ALPHA_BETA_ALLOW_UPGRADE, "true");
         
         setup = new SystemPropertyTestSetup(setup, preReleaseUpgrade);
@@ -246,6 +256,7 @@ public static Test suite(final int[] version, boolean useCreateOnUpgrade) {
      * 
      */
     private static Test baseSuite(String name, int phase, int[] version) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(name);
         
         int oldMajor = version[0];
@@ -253,6 +264,7 @@ private static Test baseSuite(String name, int phase, int[] version) {
 
         // No connection is expected in the post hard upgrade
         // phase, so don't bother adding test fixtures.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         if (phase != UpgradeChange.PH_POST_HARD_UPGRADE)
         {
             suite.addTest(BasicSetup.suite());
@@ -262,6 +274,7 @@ private static Test baseSuite(String name, int phase, int[] version) {
                     suite.addTest(Changes10_1.suite());
                 if (oldMinor < 2)
                    suite.addTest(Changes10_2.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2385
                 if (oldMinor < 3) {
                    //Pass the phase as a parameter to the
                    //suite method that will enable the test to add existing
@@ -269,24 +282,32 @@ private static Test baseSuite(String name, int phase, int[] version) {
                    //run. 
                    suite.addTest(Changes10_3.suite(phase));
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3040
                 if (oldMinor < 4)
                 	suite.addTest(Changes10_4.suite(phase));
                 if (oldMinor < 5)
                 	suite.addTest(Changes10_5.suite(phase));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4281
                 if (oldMinor < 6)
                 	suite.addTest(Changes10_6.suite(phase));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4657
                 if (oldMinor < 7)
                 	suite.addTest(Changes10_7.suite(phase));
                 if (oldMinor < 9)
                 	suite.addTest(Changes10_9.suite(phase));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5578
                 if (oldMinor < 10)
                 	suite.addTest(Changes10_10.suite(phase));
                 if (oldMinor < 11)
                     suite.addTest(Changes10_11.suite(phase));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6742
+//IC see: https://issues.apache.org/jira/browse/DERBY-6743
+//IC see: https://issues.apache.org/jira/browse/DERBY-6414
                 if (oldMinor < 12)
                     suite.addTest(Changes10_12.suite(phase));
                 if (oldMinor < 13)
                     suite.addTest(Changes10_13.suite(phase));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6962
                 if (oldMinor < 14)
                     suite.addTest(Changes10_14.suite(phase));
             }
@@ -296,6 +317,8 @@ private static Test baseSuite(String name, int phase, int[] version) {
             // an area that is subject to bugs. Here we run
             // all or a subset of DatabaseMetaData tests
             // as required.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
             switch (phase) {
             case UpgradeChange.PH_CREATE:
                 // No need to test, should have been covered
@@ -319,15 +342,22 @@ private static Test baseSuite(String name, int phase, int[] version) {
             // of DatabaseMetaData should be available.
             case UpgradeChange.PH_SOFT_UPGRADE:
             case UpgradeChange.PH_HARD_UPGRADE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                 runDataBaseMetaDataTest(suite, oldMinor);
                 break;
             }
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         else
         {
             suite.addTest(new BasicSetup("noConnectionAfterHardUpgrade"));
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6003
+//IC see: https://issues.apache.org/jira/browse/DERBY-4835
+//IC see: https://issues.apache.org/jira/browse/DERBY-5289
+//IC see: https://issues.apache.org/jira/browse/DERBY-5105
+//IC see: https://issues.apache.org/jira/browse/DERBY-5263
         if (phase == UpgradeChange.PH_SOFT_UPGRADE &&
                 suffersFromDerby4835or5289(version)) {
             // If the old version suffers from DERBY-4835 or DERBY-5289,
@@ -392,6 +422,7 @@ private static Test handleJavaSE6(int phase, int[] version, Test test)
         // we need to tell the JUnit infratructure not to
         // look for the  40 datasources (e.g. EmbeddedDataSource40)
         boolean oldReleaseNeedsJDBC3 = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         switch (phase)
         {
         case UpgradeChange.PH_CREATE:
@@ -423,6 +454,7 @@ private static Test handleJavaSE6(int phase, int[] version, Test test)
      * Note also, that this does not execute fixture initialCompilationTest.
      */
     private static void runDataBaseMetaDataTest (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite, int oldMinor)
     {
         BaseTestSuite dmdSuite =
@@ -438,11 +470,13 @@ private static void runDataBaseMetaDataTest (
             String name = m.getName();
             if (name.startsWith("test"))
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
                 if ((!(name.equals("testGetTablesModify") && oldMinor < 1)) &&
                    // these two tests will fail with versions before 10.2.1.6
                    // because of missing support for grant/revoke/privileges
                    (!(name.equals("testGetTablePrivileges") && oldMinor <2)) &&
                    (!(name.equals("testGetColumnPrivileges") && oldMinor <2)))
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
                     dmdSuite.addTest(new DatabaseMetaDataTest(name));
             }
         }
@@ -455,6 +489,7 @@ private static void runDataBaseMetaDataTest (
 
 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3191
 class AdditionalDb
 {
     final String logicalName;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java
index 52b2c84a08..f4116e8782 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTrajectoryTest.java
@@ -243,6 +243,7 @@ public UpgradeTrajectoryTest( Version.Trajectory trajectory, boolean[] hardUpgra
     public static Test suite()
     {
         BaseTestSuite suite = new BaseTestSuite("Upgrade trajectory test");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         addTrajectories( suite );
         
@@ -311,6 +312,7 @@ private static Version.Trajectory[] makeTrajectories()
     private static boolean shouldBuildAllTrajectories()
     {
         Boolean bool = Boolean.valueOf(getSystemProperty( ALL_TRAJECTORIES_PROPERTY ));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         return bool.booleanValue();
     }
@@ -377,6 +379,8 @@ private static void addHardUpgradeOnlyTrajectory(
      * </p>
      */
     private static void addTrajectory(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite, Version.Trajectory trajectory )
     {
         // a valid trajectory must have a start point and a different end point
@@ -392,6 +396,7 @@ private static void addTrajectory(
     }
 
     private static void addTrajectory(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite,
         Version.Trajectory trajectory,
         boolean[] hardUpgradeRequests,
@@ -430,6 +435,7 @@ private static boolean[] clone( boolean[] input )
      * </p>
      */
     private static void addTrajectory(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite,
         Version.Trajectory trajectory,
         boolean[] hardUpgradeRequests )
@@ -449,6 +455,7 @@ private static void addTrajectory(
         // prevents us from falling through and picking up the JDBC4 data source from
         // the system classpath rather than picking up a datasource from
         // the version-specific classloader.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4359
         if ( trajectory.getVersion( 0 ).compareTo( VERSION_10_2_2_0 ) < 0 )
         {
             setup = new JDBCClientSetup( setup, JDBCClient.EMBEDDED_30 );
@@ -524,6 +531,8 @@ private void compareDatabases( Version version, String leftDatabaseName, String
         throws Exception
     {
         ClassLoaderTestSetup.setThreadLoader( version.getClassLoader() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
 
         DataSource leftDS = makeDataSource( leftDatabaseName );
         DataSource rightDS = makeDataSource( rightDatabaseName );
@@ -586,6 +595,7 @@ private void compareDatabases( Version version, String leftDatabaseName, String
         throws Exception
     {
         ArrayList<String> result = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         StringBuffer buffer = new StringBuffer();
 
@@ -627,6 +637,7 @@ private void compareDatabases( Version version, String leftDatabaseName, String
         StringBuffer columnList = new StringBuffer();
         StringBuffer insertList = new StringBuffer();
         ArrayList<String> columnNames = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         PreparedStatement leftPS = chattyPrepare( leftConn, query );
         PreparedStatement rightPS = chattyPrepare( rightConn, query );
@@ -813,6 +824,8 @@ private void createDatabase( Version version, String logicalDatabaseName )
         throws Exception
     {
         ClassLoaderTestSetup.setThreadLoader( version.getClassLoader() );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
 
         DataSource ds = bootDatabase( logicalDatabaseName );
 
@@ -832,6 +845,8 @@ private void upgradeDatabase( Version softwareVersion, Version dataVersion, bool
         throws Exception
     {
         ClassLoaderTestSetup.setThreadLoader(softwareVersion.getClassLoader());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
 
         DataSource ds = upgradeDatabase( logicalDatabaseName, hardUpgrade );
 
@@ -972,6 +987,8 @@ private String trimDriverVersion( String driverVersion)
     private void saveOriginalClassLoader()
     {
         // remember the original class loader so that we can reset
+//IC see: https://issues.apache.org/jira/browse/DERBY-6619
+//IC see: https://issues.apache.org/jira/browse/DERBY-3745
         if ( _originalClassLoader.get() == null ) { 
             _originalClassLoader.set( ClassLoaderTestSetup.getThreadLoader() ); 
         }
@@ -1223,6 +1240,7 @@ private void compareQueries( Connection leftConn, Connection rightConn, int colC
      */
     private static Version.Trajectory[] buildMinimalSet( Version[] supportedVersions )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<Version.Trajectory>   trajectoryList = new ArrayList<Version.Trajectory>();
         int  versionCount = supportedVersions.length;
         boolean[]  include = new boolean[ versionCount ];
@@ -1246,6 +1264,7 @@ private static Version.Trajectory[] buildMinimalSet( Version[] supportedVersions
      */
     private static Version.Trajectory[] buildPowerSet( Version[] supportedVersions )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ArrayList<Version.Trajectory>   trajectoryList = new ArrayList<Version.Trajectory>();
         int            versionCount = supportedVersions.length;
         boolean[]  include = new boolean[ versionCount ];
@@ -1277,6 +1296,7 @@ private static Version.Trajectory[] squeezeArray( ArrayList<Version.Trajectory>
      * </p>
      */
     private static void buildPowerSetMinion
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ( Version[] supportedVersions, ArrayList<Version.Trajectory> result, boolean[] include, int idx, boolean removeSameBranchNeighbors )
     {
         int  versionCount = supportedVersions.length;
@@ -1300,6 +1320,7 @@ private static Version.Trajectory[] squeezeArray( ArrayList<Version.Trajectory>
      * </p>
      */
     private static void addSubset
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         ( Version[] supportedVersions, ArrayList<Version.Trajectory> result, boolean[] include, boolean removeSameBranchNeighbors )
     {
         int  versionCount = supportedVersions.length;
@@ -1348,6 +1369,8 @@ private static Version.Trajectory[] squeezeArray( ArrayList<Version.Trajectory>
     private String filterKnownProblems( String tableName, String actual )
     {
         if (
+//IC see: https://issues.apache.org/jira/browse/DERBY-4157
+//IC see: https://issues.apache.org/jira/browse/DERBY-4214
             _trajectory.endsAt( BRANCH_10_5 ) &&
             ( contains( actual, DERBY_4214_1 ) || contains( actual, DERBY_4214_2 ) )
            )
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Version.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Version.java
index 48c623d79b..2d36b9d6d1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Version.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/Version.java
@@ -55,6 +55,7 @@ public class Version implements Comparable<Version>
     // we keep one class loader per version so that we don't have an explosion
     // of class loaders for redundant versions
     private static HashMap<String, ClassLoader> _classLoaders =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             new HashMap<String, ClassLoader>();
     
     ///////////////////////////////////////////////////////////////////////////////////
@@ -175,6 +176,7 @@ public int compareTo( Version other )
     }
 
     public boolean equals( Object other ) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return (other instanceof Version) && (compareTo((Version) other) == 0);
     }
     public int hashCode() { return toString().hashCode(); }
@@ -239,6 +241,7 @@ public static final class Trajectory implements Comparable
          */
         public Trajectory( ArrayList<Version> versionList )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             if (versionList == null) {
                 versionList = new ArrayList<Version>();
             }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java
index 1f36da22be..78e123965b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java
@@ -34,6 +34,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * 
  * Each test against the old release consists of following phases:
    
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
     <OL>
     <LI> Create database with the <B>old</B> release.
     <LI> Boot the database with the <B>new</B> release in soft upgrade mode.
@@ -71,18 +72,21 @@ public class _Suite extends BaseTestCase {
      * To be able to override default values hard-coded for OLD_VERSIONS.
      */
      static final String OLD_VERSIONS_PATH_PROPERTY =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3982
          "derbyTesting.oldVersionsPath";
     /**
      * Property that indicates the location of the
      * old releases.
      */
     static final String OLD_RELEASE_PATH_PROPERTY =
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         "derbyTesting.oldReleasePath";
     
     /**
      * The saved location in svn at apache for older releases for testing
      */
     static final String OLD_JAR_URL =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3224
         "http://svn.apache.org/repos/asf/db/derby/jars";
     
     /**
@@ -125,6 +129,7 @@ public static Test suite() {
                 + OLD_RELEASE_PATH_PROPERTY + "=" + UpgradeRun.jarPath
                 + " / " + OLD_VERSIONS_PATH_PROPERTY + "=" + UpgradeRun.oldVersionsPath;
         BaseTestSuite suite = new BaseTestSuite(id);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         old = OldVersions.getSupportedVersions();
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers/DisposableIndexStatistics.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers/DisposableIndexStatistics.java
index de06934f99..f722955b08 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers/DisposableIndexStatistics.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers/DisposableIndexStatistics.java
@@ -62,6 +62,7 @@ public class DisposableIndexStatistics {
      * @param tableName base table name
      */
     public DisposableIndexStatistics(DerbyVersion oldVersion,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6064
                                      Connection con,
                                      String tableName) {
         this.oldVersion = oldVersion;
@@ -145,6 +146,7 @@ public void createAndPopulateTables()
         // DERBY-5681: Originally fixed in 10.9, but has now been backported
         //      all the way back to 10.3.
         int tableStatsCount = stats.getStatsTable(tbl).length;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6064
         if (hasDerby5681Bug(oldVersion)) {
             Assert.assertEquals(preFkAddition +1, tableStatsCount);
         } else {
@@ -154,6 +156,8 @@ public void createAndPopulateTables()
         // Several valid states here, use a relaxed range check.
         int max = getNumTotalPossibleStats();
         int min = max - (getNumNotNeededDisposableStats() + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
                          getNumOrphanedDisposableStats());
         int cur = getAllRelevantStats(null);
         Assert.assertTrue("cur=" + cur + ", min=" + min, cur >= min);
@@ -176,6 +180,7 @@ private void insertData(Connection con)
         // Populate primary key table (has a multi-column primary key)
         ps = con.prepareStatement(
                 "insert into " + pktbl + " values (DEFAULT, ?)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
         for (int row = 0; row < ROW_COUNT; row++) {
             ps.setInt(1, row);
             ps.executeUpdate();
@@ -189,6 +194,7 @@ private void insertData(Connection con)
         ps = con.prepareStatement(
                 "insert into " + tbl + " values (DEFAULT,?,?,?,?)");
         for (int row = 0; row < ROW_COUNT; row++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
             ps.setInt(1, (row % ROW_COUNT) +1);
             ps.setInt(2, (row % 2000) +1);
             ps.setInt(3, (row % 19) +1);
@@ -221,6 +227,8 @@ public void assertStatsCount(
 
         int expected = getNumTotalPossibleStats();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
         if (!hasDerby5681Bug(oldVersion)) {
             // Here we correct for the orphaned statistics entry, but not for
             // entries that are considered extraneous by newer releases (for
@@ -238,6 +246,7 @@ public void assertStatsCount(
         }
 
         // used for reporting only
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<IndexStatsUtil.IdxStats> entries =
                 new ArrayList<IndexStatsUtil.IdxStats>();
         int found = getAllRelevantStats(entries);
@@ -252,6 +261,7 @@ public void assertStatsCount(
 
     /** Converts the list of statistics to an array. */
     private IndexStatsUtil.IdxStats[] getStatArray(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             List<IndexStatsUtil.IdxStats> list) {
         return list.toArray(new IndexStatsUtil.IdxStats[list.size()]);
     }
@@ -295,6 +305,8 @@ public static int getNumTotalPossibleStats() {
 
     /** Number of disposable statistics entries. */
     public static int getNumNotNeededDisposableStats() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6283
+//IC see: https://issues.apache.org/jira/browse/DERBY-5680
         return 2;
     }
 
@@ -312,6 +324,7 @@ public static int getNumOrphanedDisposableStats() {
      * @return {@code true} if the old version has the bug.
      */
     public static boolean hasDerby5681Bug(DerbyVersion oldVersion) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6064
         if (oldVersion.atLeast(DerbyVersion._10_9)) {
             return false;
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/BigDecimalHandler.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/BigDecimalHandler.java
index f2ad8c7c9b..393aac2259 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/BigDecimalHandler.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/BigDecimalHandler.java
@@ -52,6 +52,8 @@ public class BigDecimalHandler {
 			// which may not be available with jvms that support JSR169,
 			// even if BigDecimal itself has been made available (e.g. 
 			// supporting J2ME/CDC/Foundation Profile 1.1).
+//IC see: https://issues.apache.org/jira/browse/DERBY-2224
+//IC see: https://issues.apache.org/jira/browse/DERBY-2225
 			Method getbd = ResultSet.class.getMethod("getBigDecimal", new Class[] {int.class});
 			representation = BIGDECIMAL_REPRESENTATION;
 		}
@@ -68,6 +70,7 @@ public class BigDecimalHandler {
 	
 	//Type conversions supported by ResultSet getBigDecimal method - JDBC3.0 Table B-6 
 	private static final int[] bdConvertibleTypes = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 	{	java.sql.Types.TINYINT,
 		java.sql.Types.SMALLINT,
 		java.sql.Types.INTEGER,
@@ -133,6 +136,8 @@ public static String getBigDecimalString(ResultSet rs, String columnName, int co
 			case STRING_REPRESENTATION:
 				bigDecimalString = rs.getString(columnName);
 				int columnType= rs.getMetaData().getColumnType(columnIndex);
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 				if((bigDecimalString != null) && !canConvertToDecimal(columnType))
 					throw new SQLException("Invalid data conversion. Method not called.");
 				break;
@@ -215,6 +220,7 @@ public static String getObjectString(ResultSet rs, String columnName, int column
 	 */
 	public static void updateBigDecimalString(ResultSet rs, int columnIndex, String bdString) throws SQLException{
 				
+//IC see: https://issues.apache.org/jira/browse/DERBY-398
 		switch(representation){
 			case BIGDECIMAL_REPRESENTATION:
 				BigDecimal bd = (bdString == null) ? null : new BigDecimal(bdString);
@@ -260,6 +266,7 @@ public static void updateBigDecimalString(ResultSet rs, String columnName,String
 	 * @throws SQLException
 	 */
 	public static String getBigDecimalString(CallableStatement cs, int parameterIndex, int parameterType) throws SQLException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 		String bigDecimalString = null;
 		
 		switch(representation){
@@ -290,6 +297,7 @@ public static void setBigDecimalString(PreparedStatement ps, int parameterIndex,
 		
 		switch(representation){
 			case BIGDECIMAL_REPRESENTATION:
+//IC see: https://issues.apache.org/jira/browse/DERBY-398
 				BigDecimal bd = (bdString == null) ? null : new BigDecimal(bdString);
 				ps.setBigDecimal(parameterIndex, bd);
 				break;
@@ -315,6 +323,7 @@ public static void setObjectString(PreparedStatement ps, int parameterIndex, Str
 		
 		switch(representation){
 			case BIGDECIMAL_REPRESENTATION:
+//IC see: https://issues.apache.org/jira/browse/DERBY-398
 				BigDecimal bd = (objectString == null) ? null : new BigDecimal(objectString);
 				ps.setObject(parameterIndex,bd);
 				break;
@@ -335,6 +344,7 @@ public static void setObjectString(PreparedStatement ps, int parameterIndex, Str
 	protected static boolean canConvertToDecimal(int type) throws SQLException{
 		boolean  canConvert = false;
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-453
 		for (int bdType = 0; bdType < bdConvertibleTypes.length; bdType++){
 			if(type == bdConvertibleTypes[bdType]){
 				canConvert = true;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/CanonTestCase.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/CanonTestCase.java
index 565ad727c4..26b5d6c239 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/CanonTestCase.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/CanonTestCase.java
@@ -45,6 +45,7 @@
  */
 abstract class CanonTestCase extends BaseJDBCTestCase {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1726
     final static String DEFAULT_ENCODING = "US-ASCII";
     final String outputEncoding;
 
@@ -74,6 +75,7 @@ void compareCanon(String canon) throws Throwable {
         rawBytes.close();
 
         byte[] testRawBytes = rawBytes.toByteArray();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4732
         rawBytes = null;
         BufferedReader cannonReader = null;
         BufferedReader testOutput = null;
@@ -84,6 +86,7 @@ void compareCanon(String canon) throws Throwable {
 
             InputStream canonStream = openTestResource(canonURL);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4732
             cannonReader = new BufferedReader(
                     new InputStreamReader(canonStream, outputEncoding));
 
@@ -113,6 +116,7 @@ void compareCanon(String canon) throws Throwable {
         } catch (Throwable t) {
             dumpForFail(testRawBytes);
             throw t;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4732
         } finally {
             if (cannonReader != null) {
                 try {
@@ -144,6 +148,7 @@ private void dumpForFail(byte[] rawOutput) throws IOException,
         File folder = getFailureFolder();
         final File outFile = new File(folder, getName() + ".out");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         OutputStream outStream = AccessController
                 .doPrivileged(new PrivilegedExceptionAction<OutputStream>() {
                     public OutputStream run() throws IOException {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/DerbyJUnitTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/DerbyJUnitTest.java
index 2f2133c6bd..80aa93cb4c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/DerbyJUnitTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/DerbyJUnitTest.java
@@ -181,6 +181,7 @@ public	DerbyJUnitTest() {}
 	 */
 	public	static	boolean	parseDebug()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-689
 		_debug = Boolean.getBoolean( DEBUG_FLAG );
 		
 		return true;
@@ -193,6 +194,7 @@ public	static	boolean	parseDebug()
 	 */
 	public	static	void	println( String text )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-874
 		if ( _debug ) { alarm( text ); }
 	}
 
@@ -236,6 +238,7 @@ public	static	void	printStackTrace( Throwable t )
 	 */
 	protected	static	boolean	faultInDriver( String[] clientSettings )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-499
 		String	currentClientName = clientSettings[ DRIVER_NAME ];
 		
 		try {
@@ -483,6 +486,7 @@ protected	static	void	dropSchemaObject( Connection conn, String genus, String ob
 
 			ps.execute();
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-874
 		catch (SQLException e)
 		{
 			if ( _debug ) { printStackTrace( e ); }
@@ -557,6 +561,7 @@ protected	Object	getColumn( ResultSet rs, String columnName, int jdbcType )
 		switch( jdbcType )
 		{
 		    case JDBC_BOOLEAN:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				retval = rs.getBoolean( columnName );
 				break;
 				
@@ -594,6 +599,7 @@ protected	Object	getColumn( ResultSet rs, String columnName, int jdbcType )
 				break;
 				
 		    case Types.DOUBLE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				retval = rs.getDouble( columnName );
 				break;
 				
@@ -647,6 +653,7 @@ protected	Object	getColumn( ResultSet rs, int param, Object value )
 		{
 			retval = rs.getObject( param );
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		else if ( value instanceof Boolean ) { retval = rs.getBoolean( param ); }
 		else if ( value instanceof Byte ) { retval = rs.getByte( param ); }
 		else if ( value instanceof Short ) { retval = rs.getShort( param ); }
@@ -678,6 +685,7 @@ protected	Object	getOutArg( CallableStatement cs, int arg, int jdbcType )
 		switch( jdbcType )
 		{
 		    case JDBC_BOOLEAN:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				retval = cs.getBoolean( arg );
 				break;
 				
@@ -715,6 +723,7 @@ protected	Object	getOutArg( CallableStatement cs, int arg, int jdbcType )
 				break;
 				
 		    case Types.DOUBLE:
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				retval = cs.getDouble( arg );
 				break;
 				
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/FTFileUtil.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/FTFileUtil.java
index 625ececd85..7bd9f24468 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/FTFileUtil.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/FTFileUtil.java
@@ -65,6 +65,8 @@ public static void mkFile(String fileName, int length) throws Exception
 	 * @param newName the file's new name
 	*/
 	public static void renameFile(String location, String name , 
+//IC see: https://issues.apache.org/jira/browse/DERBY-709
+//IC see: https://issues.apache.org/jira/browse/DERBY-537
                                   String newName) throws Exception
 	{
 		final File src = new File(location, name);
@@ -74,6 +76,7 @@ public static void renameFile(String location, String name ,
 		// called through a SQL statement and thus a generated
 		// class. The generated class on the stack has no permissions
 		// granted to it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
                 public Void run() throws Exception {
                     if(!src.renameTo(dst))
@@ -108,6 +111,7 @@ public static String fileExists(String fileName)
 		// class. The generated class on the stack has no permissions
 		// granted to it.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return Boolean.toString(PrivilegedFileOpsForTests.exists(fl));
     }
 
@@ -171,6 +175,7 @@ public static String removeDirectory(final String directory)
 		// class. The generated class on the stack has no permissions
 		// granted to it.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(new PrivilegedAction<String>() {
                     public String run()
                     {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/HarnessJavaTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/HarnessJavaTest.java
index adbcba42e0..0dcda6ebc8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/HarnessJavaTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/HarnessJavaTest.java
@@ -75,10 +75,12 @@ public void runTest() throws Throwable
 
         
         PrintStream out = System.out;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2434
         PrintStream testOut = new PrintStream(getOutputStream(),
                 false, outputEncoding);
         setSystemOut(testOut);
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Class<?> test = Class.forName(testClassName);
         
         Method main = test.getDeclaredMethod("main", MAIN_ARG_TYPE);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/IjTestCase.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/IjTestCase.java
index 86ad40f44f..f6860f4f30 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/IjTestCase.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/IjTestCase.java
@@ -85,6 +85,7 @@ public void runTest() throws Throwable {
 			+ getName() + ".out";
 		
 		final File out = outfile;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		FileInputStream fis = AccessController.doPrivileged(
                 new PrivilegedAction<FileInputStream>() {
 			public FileInputStream run() {
@@ -106,6 +107,7 @@ public FileInputStream run() {
 
         boolean deleted = PrivilegedFileOpsForTests.delete(outfile);
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		if (!deleted) {
 			println("Could not delete outfile for " + scriptName);
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/JarUtil.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/JarUtil.java
index f1be03c91c..b6e58fca1b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/JarUtil.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/JarUtil.java
@@ -70,4 +70,4 @@ public static void unjar(String jarpath, String outputdir)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ManyMethods.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ManyMethods.java
index f871fd7eaf..ac1d00926b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ManyMethods.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ManyMethods.java
@@ -228,6 +228,7 @@ public byte[][][] byteArrayArrayArrayMethod()
 
 	public Byte ByteMethod()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return (byte) 1;
 	}
 
@@ -238,6 +239,7 @@ public char charMethod()
 
 	public Character CharacterMethod()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return 'a';
 	}
 
@@ -248,6 +250,7 @@ public double doubleMethod()
 
 	public Double DoubleMethod()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return 1.5;
 	}
 
@@ -263,6 +266,7 @@ public float floatMethod()
 
 	public Float FloatMethod()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return 2.5F;
 	}
 
@@ -273,6 +277,7 @@ public int intMethod()
 
 	public Integer IntegerMethod()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return 2;
 	}
 
@@ -283,6 +288,7 @@ public long longMethod()
 
 	public Long LongMethod()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return 3L;
 	}
 
@@ -293,6 +299,7 @@ public short shortMethod()
 
 	public Short ShortMethod()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return (short) 4;
 	}
 
@@ -303,6 +310,7 @@ public boolean booleanMethod()
 
 	public Boolean BooleanMethod()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return true;
 	}
 
@@ -455,6 +463,7 @@ public static int overOverloadedStaticMethod()
 
 	public static Byte staticByteMethod()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return (byte) 1;
 	}
 
@@ -475,6 +484,7 @@ public static BigDecimal staticBigDecimalMethod()
 
 	public static Float staticFloatMethod()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return 2.5F;
 	}
 
@@ -506,6 +516,7 @@ public static String staticStringMethod()
 	public static Date staticDateMethod()
 	{
         /* August 2, 1997 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Calendar cal = Calendar.getInstance();
         cal.clear();
         cal.set(1997, Calendar.AUGUST, 2, 0, 0, 0);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/PrivilegedFileOpsForTests.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/PrivilegedFileOpsForTests.java
index 9f72db20ab..873e932a53 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/PrivilegedFileOpsForTests.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/PrivilegedFileOpsForTests.java
@@ -62,6 +62,7 @@ public static long length(final File file)
         if (file == null) {
             throw new IllegalArgumentException("file cannot be <null>");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
                     new PrivilegedAction<Long>() {
                         public Long run() {
@@ -80,10 +81,12 @@ public Long run() {
      * @see File#getAbsolutePath
      */
     public static String getAbsolutePath(final File file)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3905
             throws SecurityException {
         if (file == null) {
             throw new IllegalArgumentException("file cannot be <null>");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
                 new PrivilegedAction<String>() {
                     public String run() throws SecurityException {
@@ -101,6 +104,7 @@ public String run() throws SecurityException {
      * @see File#getAbsolutePath
      */
     public static URI toURI(final File file)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
             throws SecurityException {
         if (file == null) {
             throw new IllegalArgumentException("file cannot be <null>");
@@ -124,6 +128,7 @@ public URI run() throws SecurityException {
      * @see File#createTempFile(String, String, File)
      */
     public static File createTempFile(final String prefix,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5824
                                       final String suffix,
                                       final File directory)
             throws IOException
@@ -156,6 +161,7 @@ public static FileInputStream getFileInputStream(final File file)
             throw new IllegalArgumentException("file cannot be <null>");
         }
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return AccessController.doPrivileged(
                     new PrivilegedExceptionAction<FileInputStream>() {
                 public FileInputStream run() throws FileNotFoundException {
@@ -180,6 +186,7 @@ public static boolean exists(final File file)
         if (file == null) {
             throw new IllegalArgumentException("file cannot be <null>");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
                     new PrivilegedAction<Boolean>() {
                         public Boolean run() {
@@ -201,6 +208,7 @@ public static boolean delete(final File file)
         if (file == null) {
             throw new IllegalArgumentException("file cannot be <null>");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
                     new PrivilegedAction<Boolean>() {
                         public Boolean run() {
@@ -246,6 +254,7 @@ public Boolean run() {
      * @return {@code true} if successful, {@code false} otherwise
      */
     public static boolean setReadOnly(final File file) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5824
         return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
             @Override
             public Boolean run() {
@@ -264,11 +273,13 @@ public Boolean run() {
      *      or the path it is in, are missing
      */
     public static FileReader getFileReader(final File file)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2031
             throws FileNotFoundException {
         if (file == null) {
             throw new IllegalArgumentException("file cannot be <null>");
         }
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return AccessController.doPrivileged(
                     new PrivilegedExceptionAction<FileReader>() {
                         public FileReader run()
@@ -291,11 +302,13 @@ public FileReader run()
      *      or the path it is in, are missing
      */
     public static FileWriter getFileWriter(final File file)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1903
             throws IOException {
         if (file == null) {
             throw new IllegalArgumentException("file cannot be <null>");
         }
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return AccessController.doPrivileged(
                     new PrivilegedExceptionAction<FileWriter>() {
                         public FileWriter run()
@@ -315,6 +328,7 @@ public FileWriter run()
      * @see java.io.File#listFiles()
      */
     public static File[] listFiles(File dir) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6865
         return AccessController.doPrivileged(
                 (PrivilegedAction<File[]>) () -> dir.listFiles());
     }
@@ -331,7 +345,9 @@ public static File[] listFiles(File dir) {
      * @throws SecurityException
      */    
     public static void copy(final File source, final File target) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3905
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
                 public Void run() throws IOException {
                     recursiveCopy(source,target);
@@ -355,6 +371,7 @@ public Void run() throws IOException {
      * @throws FileNotFoundException
      */
     private static void  recursiveCopy(File source, File target)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
             throws IOException {
     
         // Share the copy buffer between all copy operations.
@@ -375,6 +392,7 @@ private static void  recursiveCopy(File source, File target)
                 if (entry.isDirectory()) {
                     copy(entry,targetEntry);
                 } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
                     copySingleFile(entry, targetEntry, buf);
                 }
             }
@@ -393,6 +411,7 @@ private static void  recursiveCopy(File source, File target)
      */
     private static void copySingleFile (File source, File target, byte[] buf)
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
 
         // Create a default buffer if necessary.
         if (buf == null) {
@@ -406,6 +425,7 @@ private static void copySingleFile (File source, File target, byte[] buf)
         InputStream in = new FileInputStream(source);
         OutputStream out = new FileOutputStream(target);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
         try {
             for (;;) {
                 int read = in.read(buf);
@@ -433,6 +453,7 @@ private static void copySingleFile (File source, File target, byte[] buf)
      */
     public static FileOutputStream getFileOutputStream(final File file)
             throws FileNotFoundException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4199
         return getFileOutputStream(file, false);
     }
 
@@ -453,10 +474,12 @@ public static FileOutputStream getFileOutputStream(final File file,
             throw new IllegalArgumentException("file cannot be <null>");
         }
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return AccessController.doPrivileged(
                     new PrivilegedExceptionAction<FileOutputStream>() {
                         public FileOutputStream run()
                                 throws FileNotFoundException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4199
                             return new FileOutputStream(file, append);
                         }
                     });
@@ -477,11 +500,13 @@ public FileOutputStream run()
      * @see org.apache.derbyTesting.junit.BaseTestCase#assertDirectoryDeleted
      */
     public static File[] persistentRecursiveDelete(final File dir)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4804
             throws FileNotFoundException {
         // Fail if the directory doesn't exist.
         if (!exists(dir)) {
             throw new FileNotFoundException(getAbsolutePath(dir));
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         final ArrayList<File> notDeleted = new ArrayList<File>();
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
@@ -546,6 +571,7 @@ private static boolean internalDelete(File f, List<File> failedDeletes) {
      * @return A string with file information (human-readable).
      */
     public static String getFileInfo(final File f) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(new PrivilegedAction<String>() {
             public String run() {
                 if (!f.exists()) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ProcedureTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
index 1fffa62e08..bc50f1e711 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
@@ -49,6 +49,8 @@ public static void insertRow(int p1, String p2) throws SQLException {
 	}
 	
 	public static void updateRow(int p1) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-551
+//IC see: https://issues.apache.org/jira/browse/DERBY-1261
 		Connection conn = DriverManager.getConnection("jdbc:default:connection");
 		PreparedStatement ps = conn.prepareStatement("update t1 set i=i+?");
 		ps.setInt(1, p1);
@@ -117,6 +119,7 @@ public static void dropTrigger() throws SQLException {
 	}
 	
 	public static int selectFromSpecificSchema(int p1) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1330
 		Connection conn = DriverManager.getConnection("jdbc:default:connection");
 		PreparedStatement ps = conn.prepareStatement("select * from mamta1.t12RoutineTest");
 		ps.executeQuery();
@@ -256,6 +259,7 @@ public static void selectRows(int p1, int p2, ResultSet[] data1, ResultSet[] dat
 
 		// return no results
 		if (p2 == 199) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1475
 			data1[0].close();
 			data1[0] = null;
 			data2[0].close();
@@ -274,6 +278,7 @@ public static void selectRows(int p1, int p2, ResultSet[] data1, ResultSet[] dat
 
 	// select all rows from a table
 	public static void selectRows(String table, ResultSet[] rs)
+//IC see: https://issues.apache.org/jira/browse/DERBY-821
 		throws SQLException
 	{
 		Connection conn = DriverManager.getConnection("jdbc:default:connection");
@@ -430,6 +435,7 @@ public static void ambigious1(int p1, String p2, ResultSet[] data1) {}
 
 	public static void ambigious2(int p1, Integer p2) {
         System.out.println("ambigious2(int,Integer) called");
+//IC see: https://issues.apache.org/jira/browse/DERBY-89
     };
 	public static void ambigious2(Integer p1, int p2) {
         System.out.println("ambigious2(Integer,int) called");
@@ -597,6 +603,7 @@ public static void oBOOLEAN(Boolean in, Boolean[] inout, Boolean[] out) throws S
 			inout[0] = null;
 		else
 			inout[0] = inout[0].booleanValue() && in.booleanValue();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 	}
 
@@ -618,6 +625,7 @@ public static void oALLINT(Integer in, Integer[] inout, Integer[] out) throws SQ
 		if (in == null)
 			;//inout[0] = null;
 		else if (inout[0] == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			inout[0] = 3 * in.intValue();
 		else
 			inout[0] = inout[0].intValue() + in.intValue();
@@ -706,6 +714,7 @@ public static int countRows(String schema, String table) throws SQLException
      */
      public static void multiResult(int p1, int p2, ResultSet[] data1, ResultSet[] data2) 
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-213
 
         Connection conn = DriverManager.getConnection("jdbc:default:connection");
         PreparedStatement ps = conn.prepareStatement("select * from AutoCommitTable where num = ?");
@@ -762,6 +771,8 @@ public static void LOTS_O_COLS_492(ResultSet [] rs)
 
 	public static void grantSelect() throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1729
+//IC see: https://issues.apache.org/jira/browse/DERBY-1736
 		Connection conn = DriverManager.getConnection("jdbc:default:connection");
 		PreparedStatement ps = conn.prepareStatement("grant select on t1 to user2");
 		ps.execute();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/PropertyUtil.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/PropertyUtil.java
index 0dba376266..eb56011687 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/PropertyUtil.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/PropertyUtil.java
@@ -36,6 +36,7 @@ public abstract class PropertyUtil extends org.apache.derby.iapi.util.PropertyUt
 	public static Serializable getDatabasePropertyDefault(String k) throws Exception
 	{
         LanguageConnectionContext lcc =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			(LanguageConnectionContext) getContextOrNull(LanguageConnectionContext.CONTEXT_ID);
 		if (lcc == null) throw new Exception("getPropertyDefault only works in a connection");
 		return lcc.getTransactionExecute().getPropertyDefault(k);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ProtocolTestGrammar.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ProtocolTestGrammar.java
index 6bc0281104..c9a34b8b5b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ProtocolTestGrammar.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ProtocolTestGrammar.java
@@ -87,6 +87,8 @@ public enum ProtocolTestGrammar {
     WRITE_ENCODED_LDSTRING,
     CHECK_SQLCARD,
     MORE_DATA,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4746
+//IC see: https://issues.apache.org/jira/browse/DERBY-2031
     READ_SECMEC_AND_SECCHKCD,
     SWITCH_TO_UTF8_CCSID_MANAGER,
     DELETE_DATABASE;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java
index 6b45ad903d..e62e16d293 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java
@@ -349,4 +349,4 @@ public class SQLStateConstants
     public static final String LANG_GRANT_REVOKE_WITH_LEGACY_ACCESS = "42Z60";
     public static final String SHUTDOWN_DATABASE = "08006";
     public static final String PROPERTY_UNSUPPORTED_CHANGE = "XCY02";
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/SQLToJUnit.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/SQLToJUnit.java
index 7fdc0f6a22..edb46e6544 100755
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/SQLToJUnit.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/SQLToJUnit.java
@@ -1293,6 +1293,7 @@ private void writePrologue() throws IOException
             "    }\n\n" +
             "    public static Test suite()\n" +
             "    {\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             "        BaseTestSuite suite = " +
             "new BaseTestSuite(\"IJToJUnitTest Test\");\n" +
             "        suite.addTest(TestConfiguration.defaultSuite(IJToJUnitTest.class));\n" +
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java
index 4bd52132f0..264b658b45 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/ScriptTestCase.java
@@ -50,6 +50,8 @@ public abstract class ScriptTestCase extends CanonTestCase {
 	 */
 	public ScriptTestCase(String script, boolean useSystemProperties)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4223
+//IC see: https://issues.apache.org/jira/browse/DERBY-4217
         this(script, null, null, null);
         this.useSystemProperties = useSystemProperties;
 	}
@@ -62,6 +64,7 @@ public ScriptTestCase(String script, boolean useSystemProperties)
 	 */
 	public ScriptTestCase(String script)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1726
         this(script, null, null, null);
 	}
 	
@@ -74,6 +77,7 @@ public ScriptTestCase(String script)
      */
     public ScriptTestCase(String script, String encoding)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1726
         this(script, encoding, encoding, null);
     }
 
@@ -90,9 +94,11 @@ public ScriptTestCase(String script, String encoding)
      * @param user       Run script as user
      */
     public ScriptTestCase(String script,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1726
             String inputEnc, String outputEnc, String user)
     {
         super(script, outputEnc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5342
         setSystemProperty("ij.showNoConnectionsAtStart", "true");
         setSystemProperty("ij.showNoCountForSelect", "true");
         inputEncoding = (inputEnc == null) ? DEFAULT_ENCODING : inputEnc;
@@ -126,7 +132,9 @@ public static Test getIJConfig(Test test)
 	{
         // Need the tools to run the scripts as this
         // test uses ij as the script runner.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2213
         if (!Derby.hasTools())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("empty: no tools support");
             
 		// No decorator needed currently.
@@ -160,6 +168,7 @@ public void runTest() throws Throwable
 		InputStream sqlIn = openTestResource(sql);
 
 		Connection conn;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3886
 
 		if (user != null) {
 			conn = openUserConnection(user);
@@ -167,6 +176,7 @@ public void runTest() throws Throwable
 			conn = getConnection();
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1726
         final String outputEnc;
         final String derby_ui_codeset = getSystemProperty("derby.ui.codeset");
 
@@ -190,6 +200,8 @@ public void runTest() throws Throwable
 				sqlIn,
 				inputEncoding,
                 getOutputStream(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-4223
+//IC see: https://issues.apache.org/jira/browse/DERBY-4217
 				outputEnc,
                 useSystemProperties);
 		
@@ -207,9 +219,11 @@ public void runTest() throws Throwable
     protected void setUp() {
         oldLocale = Locale.getDefault();
         LocaleTestSetup.setDefaultLocale(Locale.US);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // Reset IJ's locale to allow it to pick up the new locale from
         // the environment.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5217
         LocalizedResource.resetLocalizedResourceCache();
     }
 
@@ -220,8 +234,10 @@ protected void tearDown() throws Exception {
         super.tearDown();
 
         LocaleTestSetup.setDefaultLocale(oldLocale);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         // Forget the locale used by this test.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5217
         LocalizedResource.resetLocalizedResourceCache();
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers/DMLInStaticInitializer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers/DMLInStaticInitializer.java
index e0bd5bc8f8..bb042bcc7c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers/DMLInStaticInitializer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers/DMLInStaticInitializer.java
@@ -64,6 +64,7 @@ private static void doADMLStatement()
 		}
 		catch (SQLException se)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2518
 			if (!se.getSQLState().equals("38001")){
 				throw new ExceptionInInitializerError(se);
 			}
@@ -77,6 +78,7 @@ private static void doADMLStatement()
 			}
 			catch (SQLException se)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2518
 				if (!se.getSQLState().equals("38001")) {
 					throw new ExceptionInInitializerError(se);
 				}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers/InsertInStaticInitializer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers/InsertInStaticInitializer.java
index 6151b79958..619181dd30 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers/InsertInStaticInitializer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers/InsertInStaticInitializer.java
@@ -68,6 +68,7 @@ private static void doADMLStatement()
 		catch (SQLException se)
 		{
 			// we expected the above s.execute(INSERT) to fail
+//IC see: https://issues.apache.org/jira/browse/DERBY-2518
 			if (!se.getSQLState().equals("38001")) {
 				throw new ExceptionInInitializerError(se);
 			}
@@ -81,6 +82,7 @@ private static void doADMLStatement()
 			}
 			catch (SQLException se)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2518
 				if (!se.getSQLState().equals("38001"))
 					throw new ExceptionInInitializerError(se);
 			}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/T_Access.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/T_Access.java
index d9909586e9..d062733ef3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/T_Access.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/T_Access.java
@@ -36,6 +36,7 @@ public class T_Access
 	public static AccessFactory getAccessFactory() throws SQLException
 	{
 		LanguageConnectionContext lcc = ConnectionUtil.getCurrentLCC();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2164
 		return lcc.getTransactionExecute().getAccessManager();
 	}
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/T_ConsistencyChecker.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/T_ConsistencyChecker.java
index b79b011a6b..358ee108bd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/T_ConsistencyChecker.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/T_ConsistencyChecker.java
@@ -254,6 +254,7 @@ private void getDescriptors()
 	{
 		sd = dd.getSchemaDescriptor(schemaName, tc, true);
 		td = dd.getTableDescriptor(tableName, sd, tc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 
 		if (td == null)
 		{
@@ -285,6 +286,7 @@ private ExecRow getHeapRowOfNulls()
 
 		/* Get a row template for the base table */
 		baseRow = lcc.getLanguageConnectionFactory().getExecutionFactory().getValueRow(td.getNumberOfColumns());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 
 		/* Fill the row with nulls of the correct type */
 		ColumnDescriptorList cdl = td.getColumnDescriptorList();
@@ -361,6 +363,7 @@ private ExecRow getIndexTemplateRow(RowLocation baseRL)
 
 		/* Get a row template */
 		indexScanTemplate = lcc.getLanguageConnectionFactory().getExecutionFactory().getValueRow(baseColumns + 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2661
 
 		/* Fill the row with nulls of the correct type */
 		for (int column = 0; column < baseColumns; column++)
@@ -437,6 +440,7 @@ private ConglomerateDescriptor getIndexDescriptor()
      */
     public static String runConsistencyChecker() throws StandardException, java.sql.SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2138
         return countOpens() + countDependencies();
     }
 
@@ -458,6 +462,8 @@ public static String countOpens() throws StandardException
         TransactionController   tc;
 
         lcc = (LanguageConnectionContext)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
            getContext(LanguageConnectionContext.CONTEXT_ID);
         tc = lcc.getTransactionExecute();
 
@@ -493,6 +499,7 @@ public static String countDependencies() throws StandardException, java.sql.SQLE
 
         LanguageConnectionContext lcc = (LanguageConnectionContext)
              getContext(LanguageConnectionContext.CONTEXT_ID);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         dd = lcc.getDataDictionary();
         dm = dd.getDependencyManager();
@@ -517,6 +524,7 @@ public static String countDependencies() throws StandardException, java.sql.SQLE
      */
     private  static  Context    getContext( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getContext( contextID );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestPropertyInfo.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestPropertyInfo.java
index 828cd093ec..08d0c367d8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestPropertyInfo.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestPropertyInfo.java
@@ -141,6 +141,7 @@ private static Properties	getConglomerateProperties( String schemaName, String c
 		{
 			// get the TableDescriptor for the table
 			td = dd.getTableDescriptor(conglomerateName, sd, tc);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 
 			// Return an empty Properties if table does not exist or if it is for a view.
 			if ((td == null) || td.getTableType() == TableDescriptor.VIEW_TYPE) { return new Properties(); }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestRoutines.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestRoutines.java
index 7f76e95275..65488960d8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestRoutines.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestRoutines.java
@@ -67,6 +67,7 @@ public static void installRoutines(Connection conn) throws SQLException {
 		s.execute("CREATE PROCEDURE TESTROUTINE.SLEEP(IN SLEEP_TIME_MS BIGINT) NO SQL EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestRoutines.sleep' language java parameter style java");
 
 		s.execute("CREATE FUNCTION TESTROUTINE.HAS_SECURITY_MANAGER() RETURNS INT NO SQL EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestRoutines.hasSecurityManager' language java parameter style java");
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
 
 		s.execute("CREATE FUNCTION TESTROUTINE.READ_FILE(FILE_NAME VARCHAR(60), ENCODING VARCHAR(60)) RETURNS VARCHAR(32000) NO SQL EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestRoutines.readFile' language java parameter style java");
 		s.close();
@@ -83,8 +84,10 @@ public static void setSystemProperty(final String key, final String value) {
 		// called through a SQL statement and thus a generated
 		// class. The generated class on the stack has no permissions
 		// granted to it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
             	System.setProperty(key, value);
                 return null; // nothing to return
             }
@@ -106,6 +109,7 @@ public static void sleep(long ms) throws InterruptedException {
 	 */
 	public static int hasSecurityManager()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
 		return System.getSecurityManager() == null ? 0 : 1;
 	}
 	
@@ -124,6 +128,7 @@ public static String readFile(final String fileName, final String encoding)
 		// called through a SQL statement and thus a generated
 		// class. The generated class on the stack has no permissions
 		// granted to it.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         FileInputStream fin = AccessController.doPrivileged(
         new PrivilegedExceptionAction<FileInputStream>() {
             public FileInputStream run() throws FileNotFoundException {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestUtil.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestUtil.java
index ceb77b44eb..d0dd08c00c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestUtil.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/TestUtil.java
@@ -55,6 +55,8 @@ public class TestUtil {
 	//Used for JSR169
 	public static boolean HAVE_DRIVER_CLASS;
 	static{
+//IC see: https://issues.apache.org/jira/browse/DERBY-398
+//IC see: https://issues.apache.org/jira/browse/DERBY-597
 		try{
 			Class.forName("java.sql.Driver");
 			HAVE_DRIVER_CLASS = true;
@@ -171,6 +173,7 @@ private static int getFramework()
 	{
 		if (framework != UNKNOWN_FRAMEWORK)
 			return framework;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
               String frameworkString = AccessController.doPrivileged
                   (new PrivilegedAction<String>() {
                           public String run() {
@@ -180,6 +183,7 @@ public String run() {
                    );              
 		// last attempt to get useprocess to do networkserver stuff.
 		// If a suite has useprocess, it's possible there was no property set.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1141
 		if (frameworkString == null)
 		{
 		   String useprocessFramework = RunTest.framework;
@@ -204,6 +208,7 @@ else if (frameworkString.toUpperCase(Locale.ENGLISH).indexOf("DB2JNET") != -1)
 	    Get URL prefix for current framework.
 		
 		@return url, assume localhost - unless set differently in System property - 
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 		             and assume port 1527 for Network Tests
 		@see #getJdbcUrlPrefix(String server, int port)
 		
@@ -219,6 +224,7 @@ public static String getJdbcUrlPrefix()
     */
     public static String getHostName()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         String hostName = AccessController.doPrivileged
             (new PrivilegedAction<String>() {
                     public String run() {
@@ -269,6 +275,9 @@ public static String getJdbcUrlPrefix(String server, int port)
 	*/
 	public static void loadDriver() throws Exception
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-918
+//IC see: https://issues.apache.org/jira/browse/DERBY-934
+//IC see: https://issues.apache.org/jira/browse/DERBY-797
               final String driverName;
 		framework = getFramework();
 		switch (framework)
@@ -284,6 +293,9 @@ public static void loadDriver() throws Exception
 			case DERBY_NET_CLIENT_FRAMEWORK:
 				driverName = "org.apache.derby.jdbc.ClientDriver";
 				break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-918
+//IC see: https://issues.apache.org/jira/browse/DERBY-934
+//IC see: https://issues.apache.org/jira/browse/DERBY-797
                       default: 
                             driverName=  "org.apache.derby.jdbc.EmbeddedDriver";
                             break;
@@ -315,6 +327,7 @@ public Void run() throws Exception {
 	 */
     public static DataSource getDataSource(Properties attrs)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         String classname =
             getDataSourcePrefix() + REGULAR_DATASOURCE_STRING + "DataSource40";
         return (DataSource) getDataSourceWithReflection(classname, attrs);
@@ -330,6 +343,7 @@ public static DataSource getDataSource(Properties attrs)
 	 */
     public static XADataSource getXADataSource(Properties attrs)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         String classname =
             getDataSourcePrefix() + XA_DATASOURCE_STRING + "DataSource40";
         return (XADataSource) getDataSourceWithReflection(classname, attrs);
@@ -345,6 +359,7 @@ public static XADataSource getXADataSource(Properties attrs)
 	 *  @return datasource for current framework
 	 */
     public static ConnectionPoolDataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             getConnectionPoolDataSource(Properties attrs)
 	{
         String classname = getDataSourcePrefix() +
@@ -391,6 +406,7 @@ private static Object getDataSourceWithReflection(String classname, Properties a
 		
 		if (specialAttributes == null)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 			specialAttributes = new Hashtable<String, Class[]>();
 			specialAttributes.put("portNumber",INT_ARG_TYPE);
 			specialAttributes.put("driverType",INT_ARG_TYPE);
@@ -401,11 +417,14 @@ private static Object getDataSourceWithReflection(String classname, Properties a
 		}
 		
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(classname);
             ds = clazz.getConstructor().newInstance();
 
 		// for remote server testing, check whether the hostName is set for the test
 		// if so, and serverName is not yet set explicitly for the datasource, set it now
+//IC see: https://issues.apache.org/jira/browse/DERBY-434
+//IC see: https://issues.apache.org/jira/browse/DERBY-1052
 		String hostName = getHostName();
 		if ( (!isEmbeddedFramework()) && (hostName != null ) && (attrs.getProperty("serverName") == null) )
 			attrs.setProperty("serverName", hostName);
@@ -421,6 +440,7 @@ private static Object getDataSourceWithReflection(String classname, Properties a
 			if (argType  == INT_ARG_TYPE)
 			{
 				args = new Integer[] 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 				{ Integer.valueOf(value) };	
 			}
 			else if (argType  == BOOLEAN_ARG_TYPE)
@@ -493,6 +513,7 @@ public static void dumpSQLExceptions(SQLException sqle, boolean expected) {
 	  public static String sqlNameFromJdbc(int jdbcType) {
 		switch (jdbcType) {
 			case Types.BIT 		:  return "Types.BIT";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.BOOLEAN  : return "Types.BOOLEAN";
 			case Types.TINYINT 	:  return "Types.TINYINT";
 			case Types.SMALLINT	:  return "SMALLINT";
@@ -528,6 +549,7 @@ public static String sqlNameFromJdbc(int jdbcType) {
 	  public static String getNameFromJdbcType(int jdbcType) {
 		switch (jdbcType) {
 			case Types.BIT 		:  return "Types.BIT";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.BOOLEAN  : return "Types.BOOLEAN";
 			case Types.TINYINT 	:  return "Types.TINYINT";
 			case Types.SMALLINT	:  return "Types.SMALLINT";
@@ -715,6 +737,7 @@ public static int getJDBCMajorVersion(Connection conn)
 			// Check if setSavepoint() is present to decide whether the version
 			// is > 2.0.
 			conn.getClass().getMethod("setSavepoint", null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1546
 			DatabaseMetaData meta = conn.getMetaData();
 			Method method =
 				meta.getClass().getMethod("getJDBCMajorVersion", null);
@@ -728,6 +751,7 @@ public static int getJDBCMajorVersion(Connection conn)
 	}
 
     /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
         Drop the test objects passed in as a string identifying the
         type of object (e.g. TABLE, PROCEDURE) and its name.
         Thus, for example, a testObject array could be:
@@ -766,6 +790,7 @@ public static void cleanUpTest (Statement s, String[] testObjects)
      * @throws IllegalAccessException on failure to load driver.
      */
     public static Connection getConnection(String databaseName, String connAttrs)
+//IC see: https://issues.apache.org/jira/browse/DERBY-949
     	throws SQLException {
         try {
             Connection conn;
@@ -792,6 +817,8 @@ public static Connection getConnection(String databaseName, String connAttrs)
                         break;
                 } 
                 // q: do we need a privileged action here, like in loadDriver?
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Class<?> clazz = Class.forName(driverName);
                 clazz.getConstructor().newInstance();
 				
@@ -800,6 +827,7 @@ public static Connection getConnection(String databaseName, String connAttrs)
                 if (framework == DERBY_NET_FRAMEWORK)
                 {
                     if (( connAttrs == null) || ((connAttrs != null) && (connAttrs.indexOf("user") < 0)))
+//IC see: https://issues.apache.org/jira/browse/DERBY-993
                         url += ":" + "user=APP;password=APP;retrieveMessagesFromServerOnGetMessage=true;";
                 }
                 conn = DriverManager.getConnection(url);
@@ -825,6 +853,7 @@ public static Connection getConnection(String databaseName, String connAttrs)
     		System.out.println("FAILure: Not allowed to use class");
     		ille.printStackTrace();
     		return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     	} catch (NoSuchMethodException ille) {
     		System.out.println("FAILure: No such constructor");
     		ille.printStackTrace();
@@ -837,6 +866,8 @@ public static Connection getConnection(String databaseName, String connAttrs)
     }
     
     public static Connection getDataSourceConnection (Properties prop) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-398
+//IC see: https://issues.apache.org/jira/browse/DERBY-597
 		DataSource ds = TestUtil.getDataSource(prop);
 		try {
 			Connection conn = ds.getConnection();
@@ -863,6 +894,7 @@ public static void shutdownUsingDataSource (String dbName) throws SQLException {
 	//Used by metadata tests for DatabaseMetadata.getURL
 	public static boolean compareURL(String url) {
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-398
 		if(isEmbeddedFramework()) {
 			if(url.compareTo("jdbc:derby:wombat") == 0)
 				return true;
@@ -899,7 +931,9 @@ public static boolean compareURL(String url) {
 	 */
     public static void dumpAllStackTracesIfSupported(PrintWriter log)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3503
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 			String version = AccessController.doPrivileged
 				(new PrivilegedAction<String>(){
 						public String run(){
@@ -911,6 +945,7 @@ public String run(){
 			JavaVersionHolder j=  new JavaVersionHolder(version); 
 			
 			if (j.atLeast(1,5)){
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 				Class<?> c = Class.forName("org.apache.derbyTesting.functionTests.util.ThreadDump");
 				final Method m = c.getMethod("getStackDumpString",new Class[] {});
 				
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/Triggers.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/Triggers.java
index 3f994c0344..20ff5643d2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/Triggers.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/Triggers.java
@@ -92,6 +92,7 @@ public static void doConnStmt(String text) throws Throwable
 		if (stmt.execute(text))
 		{
 			ResultSet rs = stmt.getResultSet();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6516
             try {
                 while (rs.next()) {}
             } catch (SQLException e) {
@@ -111,6 +112,8 @@ public static void doConnStmt(String text) throws Throwable
 
 	public static void getConnection() throws Throwable
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-551
+//IC see: https://issues.apache.org/jira/browse/DERBY-1261
 		Connection conn = DriverManager.getConnection("jdbc:default:connection");
 		conn.close();
 		System.out.println("getConnection() called");
@@ -136,4 +139,4 @@ public static Long returnLong(Long x)
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptBaseStorageFactory.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptBaseStorageFactory.java
index d5d197fc2f..891cc494db 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptBaseStorageFactory.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptBaseStorageFactory.java
@@ -279,6 +279,7 @@ public boolean supportsWriteSync()
      * @return StorageFile
      */
     public StorageFile createTemporaryFile(String prefix, String suffix)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2247
                                                             throws IOException {
         return new CorruptFile(realStorageFactory.createTemporaryFile(
                 prefix, suffix));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java
index 5b71f81066..3932511c93 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptDiskStorageFactory.java
@@ -68,11 +68,14 @@ public class CorruptDiskStorageFactory extends CorruptBaseStorageFactory
 	 */
 	WritableStorageFactory getRealStorageFactory()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5542
 		String dirStorageFactoryClass =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 "org.apache.derby.impl.io.DirStorageFactory";
 		
 		WritableStorageFactory storageFactory = null;
 		try{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			Class<?> storageFactoryClass = Class.forName(dirStorageFactoryClass);
 			storageFactory = 
                 (WritableStorageFactory) storageFactoryClass.getConstructor().newInstance();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptFile.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptFile.java
index 48f5a823e1..718ad6299e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptFile.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptFile.java
@@ -362,6 +362,7 @@ protected StorageFile getRealFileInstance()
 	}
 
     public void limitAccessToOwner() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
         realFile.limitAccessToOwner();
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptRandomAccessFile.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptRandomAccessFile.java
index faf96d8fea..5fb2f73afe 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptRandomAccessFile.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/corruptio/CorruptRandomAccessFile.java
@@ -59,6 +59,7 @@ public class CorruptRandomAccessFile implements StorageRandomAccessFile
 
     public  CorruptRandomAccessFile clone()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         return new CorruptRandomAccessFile( realRaf.clone(), realFile );
     }
 
@@ -108,6 +109,8 @@ public void setLength(long newLength) throws IOException
      */
     public void sync() throws IOException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
         realRaf.sync();
 	}
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/ByteAlphabet.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/ByteAlphabet.java
index e2811c3ba8..8afd0bf742 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/ByteAlphabet.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/ByteAlphabet.java
@@ -117,6 +117,7 @@ public static ByteAlphabet cjkSubsetUTF16BE() {
      * Create an alphabet that consists of a single byte.
      */
     public static ByteAlphabet singleByte(byte b) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
         return new ByteAlphabet(
                 "Single byte: " + b,
                 new char[] { (char) (b & 0xff) },
@@ -144,6 +145,7 @@ private ByteAlphabet(String name, char[] chars, String encoding) {
             tmpBytes = new byte[] {0};
         }
         this.bytes = tmpBytes;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
         this.byteCount = tmpBytes.length;
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/CharAlphabet.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/CharAlphabet.java
index 21ee6a4f6a..9fd8a8b934 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/CharAlphabet.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/CharAlphabet.java
@@ -89,6 +89,7 @@ public static CharAlphabet cjkSubset() {
      * Get a Tamil alphabet
      */
     public static CharAlphabet tamil() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1895
         return new CharAlphabet("Tamil", CharAlphabet.TAMIL);
     }
 
@@ -96,6 +97,7 @@ public static CharAlphabet tamil() {
      * Get an alphabet consisting of a single character.
      */
     public static CharAlphabet singleChar(char ch) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5751
         return new CharAlphabet("Single char: " + ch, new char[] { ch });
     }
 
@@ -187,6 +189,7 @@ public void reset() {
      * @return A clone.
      */
     public CharAlphabet getClone() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4060
         return new CharAlphabet(name, chars);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetReader.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetReader.java
index e15f56e194..102c2be645 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetReader.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetReader.java
@@ -112,6 +112,7 @@ public LoopingAlphabetReader(long length,
         this.trailingBlanks = trailingBlanks;
         this.remainingNonBlanks = length - trailingBlanks;
         this.remainingBlanks = trailingBlanks;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4060
         this.alphabet = alphabet.getClone();
         fillBuffer(alphabet.charCount());
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetStream.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetStream.java
index 32a3c8b0ad..4490ce0487 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetStream.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams/LoopingAlphabetStream.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * alphabet.
  */
 public class LoopingAlphabetStream
+//IC see: https://issues.apache.org/jira/browse/DERBY-3735
     extends InputStream
     implements Resetable {
 
@@ -66,6 +67,7 @@ public LoopingAlphabetStream(long length) {
      * @param trailingBlanks number of trailing blanks
      */
     public LoopingAlphabetStream(long length, int trailingBlanks) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3735
         if (trailingBlanks > length) {
             throw new IllegalArgumentException("Number of trailing blanks " +
                     "cannot be greater than the total length.");
@@ -201,6 +203,7 @@ private int fillBlanks(byte[] buf, int off, int length) {
     // Resetable interface
 
     public void resetStream() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3735
         reset();
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseJDBCTestCase.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseJDBCTestCase.java
index 87341d8b54..598e7523ce 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseJDBCTestCase.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseJDBCTestCase.java
@@ -115,6 +115,7 @@ public Connection getConnection() throws SQLException
                 return conn;
             conn = null;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         return conn = openDefaultConnection();
     }
     
@@ -147,6 +148,7 @@ protected void initializeConnection(Connection conn) throws SQLException
      */
     public Statement createStatement() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2907
         Statement s = getConnection().createStatement();
         addStatement(s);
         return s;
@@ -159,6 +161,7 @@ public Statement createStatement() throws SQLException
     private void addStatement(Statement s)
     {
         if (statements == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             statements = new ArrayList<Statement>();
         statements.add(s);
     }
@@ -169,7 +172,9 @@ private void addStatement(Statement s)
      */
     private void addConnection(Connection c)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6150
         if (connections == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             connections = new ArrayList<Connection>();
         connections.add(c);     
     }
@@ -184,6 +189,7 @@ private void addConnection(Connection c)
      * @throws SQLException if closing the statement fails
      */
     public void closeStatement(Statement s) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5683
         s.close();
         if (statements != null) {
             statements.remove(s);
@@ -202,6 +208,7 @@ public void closeStatement(Statement s) throws SQLException {
     public Statement createStatement(int resultSetType,
             int resultSetConcurrency) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2907
         Statement s =
             getConnection().createStatement(resultSetType, resultSetConcurrency);
         addStatement(s);
@@ -219,6 +226,7 @@ public Statement createStatement(int resultSetType,
             			int resultSetConcurrency,
 	    			int resultSetHoldability) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2854
         return getConnection().createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
     }
 
@@ -285,8 +293,10 @@ public PreparedStatement prepareStatement(String sql,
      * @throws SQLException
      */
     public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2398
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2907
         PreparedStatement ps =
             getConnection().prepareStatement(sql, autoGeneratedKeys);
         
@@ -310,6 +320,7 @@ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
     public PreparedStatement prepareStatement(String sql,
         int [] columnIndexes) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2907
         PreparedStatement ps =
             getConnection().prepareStatement(sql, columnIndexes);
         addStatement(ps);
@@ -332,6 +343,7 @@ public PreparedStatement prepareStatement(String sql,
     public PreparedStatement prepareStatement(String sql,
         String [] columnNames) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2907
         PreparedStatement ps =
             getConnection().prepareStatement(sql, columnNames);
         addStatement(ps);
@@ -400,6 +412,7 @@ public CallableStatement prepareCall(String sql,
      * @param commit false if autoCommit should be disabled.
      */
     public void setAutoCommit(boolean commit) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3663
     	getConnection().setAutoCommit(commit);
     }
     /**
@@ -409,6 +422,7 @@ public void setAutoCommit(boolean commit) throws SQLException {
      */
     public void commit() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         getConnection().commit();
     }  
     
@@ -419,6 +433,7 @@ public void commit() throws SQLException
      */
     public void rollback() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         getConnection().rollback();
     } 
 
@@ -440,6 +455,7 @@ public void rollback() throws SQLException
      * </p>
      */
     protected void runBareOverridable() throws Throwable {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5726
         super.runBare();
     }
 
@@ -475,6 +491,7 @@ protected void tearDown()
     throws java.lang.Exception
     {
         if (statements != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             for (Statement s : statements) {
                 s.close();
             }
@@ -507,6 +524,7 @@ protected void tearDown()
      */
     public Connection openDefaultConnection()
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         Connection conn =  getTestConfiguration().openDefaultConnection();
         addConnection(conn);
         initializeConnection(conn);
@@ -529,6 +547,7 @@ public Connection openDefaultConnection()
      * @see BaseJDBCTestCase#initializeConnection(Connection)
      */
     public Connection openDefaultConnection(TestConfiguration tc)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         throws SQLException {
         Connection conn =  tc.openDefaultConnection();
         addConnection(conn);
@@ -607,8 +626,13 @@ public Connection openUserConnection(String user) throws SQLException
      * @see BaseJDBCTestCase#initializeConnection(Connection)
      */
     public Connection openConnection(String databaseName)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         throws SQLException {
         Connection conn =  getTestConfiguration().openConnection(databaseName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6150
+//IC see: https://issues.apache.org/jira/browse/DERBY-6150
+//IC see: https://issues.apache.org/jira/browse/DERBY-6150
+//IC see: https://issues.apache.org/jira/browse/DERBY-6150
         addConnection(conn);
         initializeConnection(conn);
         return conn;
@@ -622,12 +646,15 @@ public Connection openConnection(String databaseName)
      * @throws SQLException 
      */
     public int runScript(InputStream script, String encoding)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
         throws UnsupportedEncodingException, SQLException
     {
         // Sink output.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5771
         OutputStream sink = new TestNullOutputStream();
         
         // Use the same encoding as the input for the output.    
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         return ij.runScript(getConnection(), script, encoding,
                 sink, encoding);       
     }
@@ -642,6 +669,7 @@ public int runScript(InputStream script, String encoding)
      * @throws SQLException 
      */
     public int runScript(String resource,String encoding)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2055
         throws UnsupportedEncodingException, SQLException,
         PrivilegedActionException,IOException
     {
@@ -684,6 +712,7 @@ public int runSQLCommands(String sqlCommands)
      *         <code>false</code> otherwise.
      */
      public static boolean usingEmbedded() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
          return TestConfiguration.getCurrent().getJDBCClient().isEmbedded();
      }
     
@@ -694,6 +723,7 @@ public static boolean usingEmbedded() {
     *         <code>false</code> otherwise.
     */
     public static boolean usingDerbyNetClient() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         return TestConfiguration.getCurrent().getJDBCClient().isDerbyNetClient();
     }
     
@@ -704,6 +734,7 @@ public static boolean usingDerbyNetClient() {
     *         <code>false</code> otherwise.
     */
     public static boolean usingDB2Client() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         return TestConfiguration.getCurrent().getJDBCClient().isDB2Client();
     }
     
@@ -725,6 +756,7 @@ public String getDatabaseProperty(String propertyName) throws SQLException
         rs.next();
 
         String val = rs.getString(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5683
 
         rs.close();
         closeStatement(ps);
@@ -744,6 +776,7 @@ public String getDatabaseProperty(String propertyName) throws SQLException
      * @throws SQLException if obtaining a stream fails
      */
     public static void assertEquals(Blob b1, Blob b2)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1474
             throws IOException, SQLException {
         if (b1 == null || b2 == null) {
             assertNull("Blob b2 is null, b1 is not", b1);
@@ -762,6 +795,7 @@ public static void assertEquals(Blob b1, Blob b2)
         }
         
         // wrap buffered stream around the binary stream
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         is1 = new BufferedInputStream(is1);
         is2 = new BufferedInputStream(is2);
  
@@ -794,6 +828,7 @@ public static void assertEquals(Blob b1, Blob b2)
      * @throws SQLException if obtaining a stream fails
      */
     public static void assertEquals(Clob c1, Clob c2)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1474
             throws IOException, SQLException {
         if (c1 == null || c2 == null) {
             assertNull("Clob c2 is null, c1 is not", c1);
@@ -808,6 +843,7 @@ public static void assertEquals(Clob c1, Clob c2)
         assertNotNull(r2); // java.sql.Blob object cannot represent NULL
 
         // wrap buffered reader around the character stream
+//IC see: https://issues.apache.org/jira/browse/DERBY-378
         r1 = new BufferedReader(r1);
         r2 = new BufferedReader(r2);
 
@@ -839,6 +875,8 @@ public static void assertEquals(Clob c1, Clob c2)
      * @throws AssertionFailedError if Time objects are not equal.
      */
     public static void assertEquals(String msg, Time t1, Time t2) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3224
+//IC see: https://issues.apache.org/jira/browse/DERBY-3176
         if(null == t1 && null == t2) {
             return;
         }
@@ -862,10 +900,12 @@ public static void assertSQLState(String message,
                                       SQLException exception) {
         // Make sure exception is not null. We want to separate between a
         // null-exception object, and a null-SQLState.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1361
         assertNotNull("Exception cannot be null when asserting on SQLState", 
                       exception);
         
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1149
             String state = exception.getSQLState();
             
             if ( state != null )
@@ -881,7 +921,9 @@ public static void assertSQLState(String message,
             
             // Save the SQLException
             e.initCause(exception);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5540
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3763
             if (usingDB2Client())
             {
                 /* For JCC the error message is a series of tokens representing
@@ -940,6 +982,7 @@ public static void assertWarning( Connection conn, String expected )
      * @param exception the exception to check the SQLState of.
      */
     public static void assertSQLState(String expected, SQLException exception) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1534
         assertSQLState("Unexpected SQL state.", expected, exception);
     }
 
@@ -951,6 +994,7 @@ public static void assertSQLState(String expected, SQLException exception) {
      * @throws AssertionFailedError if the error code is wrong
      */
     public static void assertErrorCode(int expected, SQLException exception) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
         assertNotNull("Exception should not be null", exception);
         int actual = exception.getErrorCode();
         if (actual != expected) {
@@ -969,7 +1013,9 @@ public static void assertErrorCode(int expected, SQLException exception) {
     public void assertCompileError(String sqlState, String sql) {
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2907
             PreparedStatement pSt = prepareStatement(sql);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3763
             if (usingDB2Client())
             {
                 /* For JCC the prepares are deferred until execution,
@@ -980,6 +1026,7 @@ public void assertCompileError(String sqlState, String sql) {
                  * about unbound parameters.
                  */
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1976
                     pSt.execute();
                 } finally {
                     pSt.close();
@@ -1144,6 +1191,7 @@ public static void dropView(Connection conn, String viewName) throws SQLExceptio
      * @param query the query to compile and execute.
      */
     public static void assertStatementError(String[] sqlStates,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4928
             Statement st, String query) {
         assertStatementErrorMinion(sqlStates, ORDERED, st, query);
     }
@@ -1183,6 +1231,7 @@ public static void assertStatementErrorUnordered(String[] sqlStates,
     private static void assertStatementErrorMinion(
             String[] sqlStates, boolean orderedStates,
             Statement st, String query) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> statesBag = null;
         if (!orderedStates) {
             statesBag = new ArrayList<String>(Arrays.asList(sqlStates));
@@ -1190,6 +1239,7 @@ private static void assertStatementErrorMinion(
         try {
             boolean haveRS = st.execute(query);
             fetchAndDiscardAllResults(st, haveRS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3520
             String errorMsg = "Expected error(s) '" ;
             for (int i = 0; i < sqlStates.length;i++)
                 errorMsg += " " + sqlStates[i];
@@ -1198,6 +1248,7 @@ private static void assertStatementErrorMinion(
         } catch (SQLException se) {
             int count = 0;
             do {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4928
                 if (orderedStates) {
                     assertSQLState(sqlStates[count], se);
                 } else {
@@ -1237,6 +1288,7 @@ public static void assertStatementError(String sqlState, Statement st, String qu
      * @param c        the connection
      */
     public static void assertCommitError(String sqlState, Connection c) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         try {
             c.commit();
             fail();
@@ -1261,6 +1313,7 @@ public static void assertCommitError(String sqlState, Connection c) {
      * @param query the query to compile and execute.
      */
     public static void assertStatementError(String sqlState, int errorCode, Statement st, String query) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2567
         try {
             boolean haveRS = st.execute(query);
             fetchAndDiscardAllResults(st, haveRS);
@@ -1268,6 +1321,7 @@ public static void assertStatementError(String sqlState, int errorCode, Statemen
                 "' but no error was thrown.");
         } catch (SQLException se) {
             assertSQLState(sqlState, se);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2601
             assertErrorCode(errorCode, se);
         }
         
@@ -1284,6 +1338,7 @@ public static void assertStatementError(String sqlState, int errorCode, Statemen
      * @param ps PreparedStatement query object to execute.
      */
     public static void assertPreparedStatementError(String sqlState,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4208
                                                     PreparedStatement ps) {
         try {
             boolean haveRS = ps.execute();
@@ -1351,6 +1406,7 @@ public void assertCallError(String expectedSE, String callSQL)
      */
     public static void assertNextError(String sqlState,ResultSet rs)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2299
     	try {
     		rs.next();
     		fail("Expected error on next()");
@@ -1393,6 +1449,7 @@ public static void assertUpdateCount(Statement st,
         int expectedRC, String sql) throws SQLException
     {
         assertEquals("Update count does not match:",
+//IC see: https://issues.apache.org/jira/browse/DERBY-2907
             expectedRC, st.executeUpdate(sql));
     }
 
@@ -1424,6 +1481,7 @@ public static void assertUpdateCount(PreparedStatement pSt,
      * @return the last exception in the chain.
      */
     public SQLException getLastSQLException(SQLException sqle) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2567
         SQLException current = sqle;
         SQLException next = sqle.getNextException();
         while (next != null) {
@@ -1489,6 +1547,7 @@ public static void assertSQLExceptionEquals(SQLException se1,
                  se1.getMessage(), se2.getMessage());
 
         // Check that getCause() returns the same value on the two exceptions.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5540
         Throwable se1Cause = se1.getCause();
         Throwable se2Cause = se2.getCause();
         if (se1Cause == null) {
@@ -1515,6 +1574,7 @@ public static void assertSQLExceptionEquals(SQLException se1,
      */
     public static void assertEquivalentDataType(int expectedType, int type)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2333
      if (expectedType == type)
          return;
      if (expectedType == java.sql.Types.DECIMAL && 
@@ -1567,6 +1627,7 @@ public static int getClientTransactionID(Connection conn)
      * @throws SQLException
      */
     public static void checkEstimatedRowCount(Connection conn, double expectedCount) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         if (! (conn instanceof EmbedConnection))
 	    { return; }
 	
@@ -1617,6 +1678,7 @@ protected void  checkAllConsistency(
     }
 
     protected static void dumpRs(ResultSet s, PrintStream out)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6378
             throws SQLException
     {
         if (s == null) {
@@ -1689,6 +1751,7 @@ public static void dumpRs(ResultSet s) throws SQLException {
     protected void    goodStatement( Connection conn, String command ) throws SQLException
     {
         PreparedStatement    ps = chattyPrepare( conn, command );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6429
 
         ps.execute();
         ps.close();
@@ -1713,8 +1776,10 @@ protected void    goodUpdate( Connection conn, String update, int expectedRowCou
      * Assert that the statement returns the correct results.
      */
     protected void assertResults( Connection conn, String query, String[][] rows, boolean trimResults )
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6511
         PreparedStatement   ps = chattyPrepare( conn, query );
         ResultSet                   rs = ps.executeQuery();
 
@@ -1728,6 +1793,7 @@ protected void assertResults( Connection conn, String query, String[][] rows, bo
      * Assert that the ResultSet returns the desired rows.
      */
     protected void assertResults( ResultSet rs, String[][] rows, boolean trimResults )
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         throws SQLException
     {
         int     rowCount = rows.length;
@@ -1845,6 +1911,7 @@ protected void    expectExecutionError( Connection conn, String sqlState, String
 	  */
 	private static Object	getLanguageConnectionContext( Connection conn )
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6751
         final EmbedConnection   econn = (EmbedConnection) conn;
         return AccessController.doPrivileged
             (
@@ -1861,4 +1928,5 @@ public LanguageConnectionContext run()
 
 } // End class BaseJDBCTestCase
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-993
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java
index c446e9f89b..60b26528eb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java
@@ -27,6 +27,7 @@
  * Base class for JDBC JUnit test decorators.
  */
 public abstract class BaseJDBCTestSetup
+//IC see: https://issues.apache.org/jira/browse/DERBY-2000
     extends BaseTestSetup {
 	
 	public BaseJDBCTestSetup(Test test) {
@@ -46,6 +47,7 @@ public BaseJDBCTestSetup(Test test) {
      */
     public final TestConfiguration getTestConfiguration()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
     	return TestConfiguration.getCurrent();
     }
     
@@ -69,6 +71,8 @@ public final Connection getConnection() throws SQLException
     			return conn;
     		conn = null;
     	}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
     	return conn = getTestConfiguration().openDefaultConnection();
     }
     
@@ -90,6 +94,7 @@ public void println(final String text) {
     protected void tearDown()
     throws java.lang.Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5705
         clearConnection();
     }
 
@@ -99,6 +104,8 @@ protected void tearDown()
      */
     void clearConnection() throws SQLException {
         JDBC.cleanup(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
+//IC see: https://issues.apache.org/jira/browse/DERBY-1701
         conn = null;
     }
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseTestCase.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseTestCase.java
index f6fa2eecef..1986b87f8e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseTestCase.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/BaseTestCase.java
@@ -97,11 +97,13 @@ public void runBare() throws Throwable {
         TestConfiguration config = getTestConfiguration();
         boolean trace = config.doTrace();
         boolean stopAfterFirstFail = config.stopAfterFirstFail();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2667
         long startTime = 0;
         if ( trace )
         {
             startTime = System.currentTimeMillis();
             out.println();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5300
             String  junitClassName = this.getClass().getName();
             junitClassName=Utilities.formatTestClassNames(junitClassName);
             out.print(traceClientType());
@@ -110,6 +112,7 @@ public void runBare() throws Throwable {
 
         // install a default security manager if one has not already been
         // installed
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
         if ( System.getSecurityManager() == null )
         {
             if (config.defaultSecurityManagerSetup())
@@ -118,18 +121,21 @@ public void runBare() throws Throwable {
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2667
         try {
             super.runBare();   
         }
         // To log the exception to file, copy the derby.log file and copy
         // the database of the failed test.
         catch (Throwable running) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4199
             PrintWriter stackOut = null;
             try{
                 String failPath = PrivilegedFileOpsForTests.getAbsolutePath(getFailureFolder());
                 // Write the stack trace of the error/failure to file.
                 stackOut = new PrintWriter(
                         PrivilegedFileOpsForTests.getFileOutputStream(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4270
                             new File(failPath, ERRORSTACKTRACEFILE), true));
                 stackOut.println("[Error/failure logged at " +
                         new java.util.Date() + "]");
@@ -142,6 +148,7 @@ public void runBare() throws Throwable {
                 // Copy some other likely files, the rolling log files
                 // These might occur if the tests are run with 
                 // derby.stream.error.style=rollingFile
+//IC see: https://issues.apache.org/jira/browse/DERBY-6380
                 for (int i=0; i < 10; i++) {
                     String logName = "derby-" + i + ".log";
                     File origRolLog = new File(DEFAULT_DB_DIR, logName);
@@ -159,6 +166,7 @@ public void runBare() throws Throwable {
                 // is an exception saving the db or derby.log we will print it
                 // and additionally try to log it to file.
                 BaseTestCase.printStackTrace(ioe);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4199
                 if (stackOut != null) {
                     stackOut.println("Copying derby.log or database failed:");
                     ioe.printStackTrace(stackOut);
@@ -169,6 +177,7 @@ public void runBare() throws Throwable {
                 if (stackOut != null) {
                     stackOut.close();
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6401
                 if (stopAfterFirstFail) {
                     // if run with -Dderby.tests.stopAfterFirstFail=true
                     // exit after reporting failure. Useful for debugging
@@ -184,6 +193,7 @@ public void runBare() throws Throwable {
             if ( trace )
             {
                 long timeUsed = System.currentTimeMillis() - startTime;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3556
                 out.print("used " + timeUsed + " ms ");
             }
         }
@@ -194,6 +204,7 @@ public void runBare() throws Throwable {
      */
     public final TestConfiguration getTestConfiguration()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
     	return TestConfiguration.getCurrent();
     }
     
@@ -212,6 +223,7 @@ public final File getFailureFolder() {
      * @param text String to print
      */
     public static void alarm(final String text) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-993
         out.println("ALARM: " + text);
     }
 
@@ -220,6 +232,7 @@ public static void alarm(final String text) {
      * @param text String to print
      */
     public static void println(final String text) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         if (TestConfiguration.getCurrent().isVerbose()) {
             out.println("DEBUG: " + text);
             out.flush();
@@ -231,6 +244,7 @@ public static void println(final String text) {
      * @param text String to print
      */
     public static void traceit(final String text) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3982
         if (TestConfiguration.getCurrent().doTrace()) {
             out.println(text);
         }
@@ -262,6 +276,7 @@ public static void printStackTrace(Throwable t)
      * @param out the new stream
      */
     protected static void setSystemOut(final PrintStream out) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
                 System.setOut(out);
@@ -291,8 +306,10 @@ public Void run() {
      * @param value value of the property
      */
     protected static void setSystemProperty(final String name, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1303
 					    final String value)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
                 System.setProperty(name, value);
@@ -308,6 +325,7 @@ public Void run() {
      */
     public static void removeSystemProperty(final String name)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
                 System.getProperties().remove(name);
@@ -323,6 +341,7 @@ public Void run() {
      */
     protected static String getSystemProperty(final String name)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(new PrivilegedAction<String>() {
             public String run() {
                 return System.getProperty(name);
@@ -340,6 +359,7 @@ public String run() {
      * @return The list indicates files with certain prefix.
      */
     protected static String[] getFilesWith(final File dir, String prefix) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(new PrivilegedAction<String[]>() {
                     public String[] run() {
                         //create a FilenameFilter and override its accept-method to file
@@ -363,6 +383,7 @@ public boolean accept(File dir, String name) {
      */
     protected static URL getTestResource(final String name)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(new PrivilegedAction<URL>() {
             public URL run() {
                 return BaseTestCase.class.getClassLoader().getResource(name);
@@ -379,6 +400,7 @@ public URL run() {
     protected static InputStream openTestResource(final URL url)
         throws PrivilegedActionException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
                 new PrivilegedExceptionAction<InputStream>() {
             public InputStream run() throws IOException {
@@ -407,6 +429,7 @@ public static void assertSecurityManager()
      * @throws AssertionFailedError if the stream contents are not equal
      */
     public static void assertEquals(InputStream is1, InputStream is2)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1524
             throws IOException {
         if (is1 == null || is2 == null) {
             assertNull("InputStream is2 is null, is1 is not", is1);
@@ -495,6 +518,7 @@ public static void assertThrowableEquals(Throwable t1,
      */
     public  static  void    assertEquals( byte[] expected, byte[] actual )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
         if ( assertSameNullness( expected, actual ) ) { return; }
         
         assertEquals( expected.length, actual.length );
@@ -531,6 +555,7 @@ public  static  void    assertEquals( int[] expected, int[] actual )
     {
         if ( assertSameNullness( expected, actual ) ) { return; }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         assertEquals( expected.length, actual.length );
         for ( int i = 0; i < expected.length; i++ )
         {
@@ -545,6 +570,7 @@ public  static  void    assertEquals( int[] expected, int[] actual )
      */
     public  static  void    assertEquals( long[] expected, long[] actual )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6188
         if ( assertSameNullness( expected, actual ) ) { return; }
         
         assertEquals( expected.length, actual.length );
@@ -561,7 +587,9 @@ public  static  void    assertEquals( long[] expected, long[] actual )
      * @param file2 the second file to compare
      */
 	public static void assertEquals(final File file1, final File file2) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2342
 		AccessController.doPrivileged
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         (new PrivilegedAction<Void>() {
         	public Void run() {
         		try {
@@ -601,6 +629,7 @@ public static void assertExecJavaCmdAsExpected(String[] expectedString,
 	    String expectedStrings = "";
 	    for (int i = 0; i < expectedString.length; i++) 
 	        expectedStrings += "\t[" +i + "]" + expectedString[i] +  "\n";
+//IC see: https://issues.apache.org/jira/browse/DERBY-4762
 	    Assert.assertEquals("expectedExitValue:" + expectedExitValue +
 	            " does not match exitValue:" + exitValue +"\n" +
 	            "expected output strings:\n" + expectedStrings + 
@@ -609,6 +638,7 @@ public static void assertExecJavaCmdAsExpected(String[] expectedString,
 	    if (expectedString != null) {
 	        for (int i = 0; i < expectedString.length; i++) {
 	            assertTrue("Could not find expectedString:" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4762
 	                    expectedString[i] + " in output:" + output,
 	                    output.indexOf(expectedString[i]) >= 0);
 	        }
@@ -620,6 +650,7 @@ public static void assertExecJavaCmdAsExpected(String[] expectedString,
      * but with {@code addClassPath == true}.
      */
     public static Process execJavaCmd(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6704
         String jvm, String cp, String[] cmd, final File dir)
             throws IOException {
         return execJavaCmd(jvm, cp, cmd, dir, true);
@@ -646,11 +677,13 @@ public static Process execJavaCmd(
 	 * @throws IOException
 	 */
     public static Process execJavaCmd(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6704
         String jvm, String cp, String[] cmd, final File dir, boolean addClassPath)
             throws IOException
     {
         boolean useModules = JVMInfo.isModuleAware();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return execJavaCmd(jvm, cp, cmd, dir, addClassPath, useModules);
     }
   
@@ -689,7 +722,9 @@ public static Process execJavaCmd(
         // Is this an invocation of a jar file with java -jar ...?
         final boolean isJarInvocation = cmd.length > 0 && cmd[0].equals("-jar");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 	    ArrayList<String> cmdlist = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5808
         cmdlist.add(jvm == null ? getJavaExecutableName() : jvm);
 	    if (isJ9Platform())
 	    {
@@ -697,6 +732,7 @@ public static Process execJavaCmd(
             // also add the setting for emma.active so any tests
             // that fork will work correctly. See DERBY-5558.
             String emmaactive=getSystemProperty("emma.active");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6079
             if (emmaactive != null) {
                 cmdlist.add("-Demma.active=" + emmaactive);            
             }
@@ -736,23 +772,28 @@ public static Process execJavaCmd(
             }
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5817
         if (runsWithJaCoCo()) {
             // Property (http://www.eclemma.org/jacoco/trunk/doc/agent.html):
             // -javaagent:[yourpath/]jacocoagent.jar=[opt1]=[val1],[opt2]=[val2]
             String agent = getSystemProperty(JACOCO_AGENT_PROP);
             cmdlist.add(agent + (agent.endsWith("=") ? "": ",") +
                     "destfile=" + getJaCoCoOutFile());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6697
             cmdlist.add("-Djacoco.active=");
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5819
         if (isSunJVM() && Boolean.valueOf(
                     getSystemProperty("derby.test.debugSubprocesses")).
                 booleanValue()) {
             setupForDebuggerAttach(cmdlist);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (useModulePath)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             cmdlist.add("--add-modules");
             cmdlist.add(ModuleUtil.TESTING_MODULE_NAME + "," + DerbyConstants.JUNIT_MODULE_NAME);
         }
@@ -763,13 +804,16 @@ public static Process execJavaCmd(
             // been set in addition to -jar, as that's probably a mistake in
             // the calling code.
             assertNull("Both -jar and classpath specified", cp);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6704
         } else if (addClassPath) {
             String myClasspath;
             if (cp != null) { myClasspath = cp; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             else if (useModulePath) { myClasspath = JVMInfo.getSystemModulePath(); }
             else { myClasspath = getSystemProperty("java.class.path"); }
 
             // on Windows, the garbled "file:" prefix results in an unreadable classpath
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             if (isWindowsPlatform())
             {
                 myClasspath = myClasspath.replace("file:/", "/");
@@ -784,11 +828,13 @@ public static Process execJavaCmd(
 	        cmdlist.add(cmd[i]);
 	    }
 	    final String[] command = (String[]) cmdlist.toArray(cmd);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4762
 	    println("execute java command:");
 	    for (int i = 0; i < command.length; i++) {
 	        println("command[" + i + "]" + command[i]);
 	    }
 	    try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return AccessController.doPrivileged(
                     new PrivilegedExceptionAction<Process>() {
                 public Process run() throws IOException {
@@ -797,13 +843,16 @@ public Process run() throws IOException {
 	            }
 	        });
 	    } catch (PrivilegedActionException pe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             println("Failed to run command: " + pe.getMessage());
             if (TestConfiguration.getCurrent().isVerbose())
             {
                 pe.printStackTrace(out);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
                 out.flush();
             }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-3829
             throw (IOException) pe.getException();
 	    }
 	}
@@ -814,6 +863,7 @@ public Process run() throws IOException {
      * shorthand for {@code execJavaCmd(null, null, cmd, null)}.
      */
     public static Process execJavaCmd(String[] cmd) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5808
         return execJavaCmd(null, null, cmd, null);
     }
 
@@ -824,6 +874,9 @@ public static Process execJavaCmd(String[] cmd) throws IOException {
      */
     public static final String getJavaExecutableName() {
         String vmname = getSystemProperty("com.ibm.oti.vm.exe");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4179
+//IC see: https://issues.apache.org/jira/browse/DERBY-4646
+//IC see: https://issues.apache.org/jira/browse/DERBY-4647
 
         if (vmname == null) {
             vmname = getSystemProperty("java.vm.name");
@@ -861,6 +914,7 @@ public static final boolean isJ9Platform() {
     }
 
     public static final boolean isSunJVM() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4867
         String vendor = getSystemProperty("java.vendor");
         return "Sun Microsystems Inc.".equals(vendor) ||
                 "Oracle Corporation".equals(vendor);
@@ -881,6 +935,7 @@ public static boolean isCVM() {
      */
     public static boolean isPhoneME() {
         return isCVM() &&
+//IC see: https://issues.apache.org/jira/browse/DERBY-5412
                 getSystemProperty("java.vm.version").startsWith("phoneme");
     }
 
@@ -896,6 +951,7 @@ public static boolean isPhoneME() {
     
     public static final boolean isPlatform(String osName)  {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4319
         return getSystemProperty("os.name").equals(osName);
     }
 
@@ -941,6 +997,7 @@ public static final boolean shortCircuitFor_derby_7011()
         boolean isModuleAware = JVMInfo.isModuleAware();
         boolean isJenkinsRun = getSystemProperty("user.dir").startsWith("/home/jenkins");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-7011
         return isModuleAware && isJenkinsRun;
     }
 
@@ -957,14 +1014,18 @@ public static final boolean isJava7() {
     }
 
     public static final boolean isJava8() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         return getSystemProperty("java.version").startsWith("1.8");
     }
 
     public static final boolean runsWithEmma() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5514
         return getSystemProperty("java.class.path").indexOf("emma.jar") != -1;
     }
 
     public static boolean runsWithJaCoCo() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6067
         return SecurityManagerSetup.jacocoEnabled;
     }
 
@@ -984,6 +1045,7 @@ public static boolean runsWithJaCoCo() {
      * @return a file to which a sub-process can write code coverage data
      */
     private static synchronized File getJaCoCoOutFile() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5817
         return new File(currentDirectory(),
                 "jacoco.exec." + (++spawnedCount));
     }
@@ -997,6 +1059,7 @@ private static synchronized File getJaCoCoOutFile() {
      */
     private static synchronized File getEmmaOutFile() {
         return new File(currentDirectory(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-5817
                 "coverage-" + (++spawnedCount) + ".ec");
     }
 
@@ -1023,6 +1086,7 @@ public static URL getEmmaJar() {
      *      or -1 if the version can't be obtained for some reason.
      */
     public static int getClassVersionMajor() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5262
         String tmp = getSystemProperty("java.class.version");
         if (tmp == null) {
             println("VM doesn't have property java.class.version");
@@ -1053,6 +1117,7 @@ public static final boolean hasInterruptibleIO() {
 
         try {
             AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 new PrivilegedExceptionAction<Void>() {
                     public Void run() throws
                         IOException, InterruptedIOException {
@@ -1062,6 +1127,7 @@ public Void run() throws
                         String sysHome = getSystemProperty("derby.system.home");
 
                         StringBuffer arbitraryRAFFileNameB = new StringBuffer();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4974
 
                         arbitraryRAFFileNameB.append(sysHome);
                         arbitraryRAFFileNameB.append(File.separatorChar);
@@ -1093,6 +1159,7 @@ public Void run() throws
                 // Better to assume nothing when the test fails. Then, tests
                 // will not be skipped and we would not miss that something is
                 // amiss.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4974
                 println("Could not test for interruptible IO," +
                         " so assuming we don't have it: " + e);
                 e.getCause().printStackTrace();
@@ -1105,7 +1172,9 @@ public Void run() throws
 
 
     public static final boolean isIBMJVM() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4836
         return ("IBM Corporation".equals(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4667
                 getSystemProperty("java.vendor")));
     }
 
@@ -1120,14 +1189,17 @@ public static final boolean isIBMJVM() {
      *      subprocess or one of the output collector threads to terminate
      */
     public static String readProcessOutput(Process pr)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5608
             throws InterruptedException {
         SpawnedProcess wrapper = new SpawnedProcess(pr, "readProcessOutput");
         wrapper.suppressOutputOnComplete();
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
             wrapper.complete();
         } catch (IOException ioe) {
             fail("process completion method failed", ioe);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5608
         String output = "<STDOUT>" + wrapper.getFullServerOutput() +
                 "<END STDOUT>\n";
         output += "<STDERR>" + wrapper.getFullServerError() +
@@ -1155,6 +1227,7 @@ public static String readProcessOutput(Process pr)
      * @param dir the root to start deleting from (root will also be deleted)
      */
     public static void assertDirectoryDeleted(File dir) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5836
         File[] fl = null;
         int attempts = 0;
         while (attempts < 4) {
@@ -1242,6 +1315,7 @@ public static void removeFiles(String[] list)
      */
     public static void fail(String msg, Throwable t)
             throws AssertionFailedError {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6660
         throw newAssertionFailedError(msg, t);
     }
 
@@ -1284,6 +1358,7 @@ public static void assertLaunchedJUnitTestMethod(String testLaunchMethod)
      * @throws Exception
      */
     public static void assertLaunchedJUnitTestMethod(String testLaunchMethod,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5382
             String databaseName)
             throws Exception 
     {
@@ -1295,6 +1370,7 @@ public static void assertLaunchedJUnitTestMethod(String testLaunchMethod,
 
     /** Returns once the system timer has advanced at least one tick. */
     public static void sleepAtLeastOneTick() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5797
         long currentTime = System.currentTimeMillis(); 
         while (System.currentTimeMillis() == currentTime) {
             sleep(1);
@@ -1304,6 +1380,7 @@ public static void sleepAtLeastOneTick() {
     /** Return true if the JVM is at least at the indicated rev level */
     public static boolean vmAtLeast( int major, int minor )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6755
         String version = AccessController.doPrivileged
             (new PrivilegedAction<String>(){
                 public String run(){
@@ -1328,6 +1405,7 @@ public static void sleep(long ms) {
     }
 
     private static String traceClientType() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5300
        if (TestConfiguration.getCurrent().getJDBCClient().isEmbedded()) {
             return "(emb)";
         } else {
@@ -1336,6 +1414,7 @@ private static String traceClientType() {
     }
     
     private static void setupForDebuggerAttach(ArrayList<String> cmdlist) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5819
         if (debugPort == 0) {
             // lazy initialization
             String dbp = getSystemProperty("derby.test.debugPortBase");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ChangeConfigurationSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ChangeConfigurationSetup.java
index 36f41b38e6..2ff233ae64 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ChangeConfigurationSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ChangeConfigurationSetup.java
@@ -22,6 +22,7 @@
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2215
 abstract class ChangeConfigurationSetup extends TestSetup {
     
     private TestConfiguration old;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ChangeUserSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ChangeUserSetup.java
index 20376fcff9..1c4d8fc030 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ChangeUserSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ChangeUserSetup.java
@@ -28,6 +28,7 @@
  * Optionally the passwordToken can be changed as well. 
  * 
  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2215
 final class ChangeUserSetup extends ChangeConfigurationSetup {
     
     private final String user;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ClassLoaderTestSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ClassLoaderTestSetup.java
index 0231956d47..0d3179f8dd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ClassLoaderTestSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ClassLoaderTestSetup.java
@@ -45,6 +45,7 @@ public ClassLoaderTestSetup(Test test) {
     }
 
     private static ClassLoader makeClassLoader() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6881
         PrivilegedAction<ClassLoader> pa = () -> new URLClassLoader(new URL[0]);
         return AccessController.doPrivileged(pa);
     }
@@ -54,6 +55,7 @@ protected void setUp() throws Exception {
         super.setUp();
         TestConfiguration.getCurrent().shutdownEngine();
         oldLoader = getThreadLoader();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6881
         setThreadLoader(makeClassLoader());
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ClasspathSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ClasspathSetup.java
index d35ba3c472..be32a2c6ac 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ClasspathSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ClasspathSetup.java
@@ -82,6 +82,7 @@ protected void setUp()
     {
         AccessController.doPrivileged
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
              new PrivilegedAction<Void>()
              {
                  public Void run()
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/CleanDatabaseTestSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/CleanDatabaseTestSetup.java
index d73096b1a4..3a388d28b5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/CleanDatabaseTestSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/CleanDatabaseTestSetup.java
@@ -38,6 +38,7 @@
  * automatically clean them up by implementing the decorateSQL method.. 
  * As an example:
  * <code>
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
         return new CleanDatabaseTestSetup(suite) {
             protected void decorateSQL(Statement s) throws SQLException {
 
@@ -71,6 +72,7 @@ public CleanDatabaseTestSetup(Test test) {
      */
     public CleanDatabaseTestSetup(Test test, 
             boolean useNetworkClient,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3163
             String hostName,
             int portNo) {
         super(test);
@@ -91,6 +93,7 @@ public CleanDatabaseTestSetup(Test test,
      * initialize their schema requirments.
      */
     protected void setUp() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3163
         if (jdbcClient != null )
         { // We have network client (useNetworkClient) on a given host and port.
             TestConfiguration current = TestConfiguration.getCurrent();
@@ -107,7 +110,9 @@ protected void setUp() throws Exception {
         // this decorator to start with a clean database.
         CleanDatabaseTestSetup.cleanDatabase(conn, true);  
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1700
         Statement s = conn.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5734
         try {
             decorateSQL(s);
             s.close();
@@ -183,10 +188,13 @@ protected void tearDown() throws Exception {
      * @throws SQLException database error
      */
      public static void cleanDatabase(Connection conn, boolean compress) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2033
          clearProperties(conn);
          removeObjects(conn);
          if (compress)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2048
              compressObjects(conn);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3681
          removeRoles(conn);
          removeUsers( conn );
      }
@@ -225,12 +233,14 @@ private static void removeObjects(Connection conn) throws SQLException {
    
         DatabaseMetaData dmd = conn.getMetaData();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2007
         SQLException sqle = null;
         // Loop a number of arbitary times to catch cases
         // where objects are dependent on objects in
         // different schemas.
         for (int count = 0; count < 5; count++) {
             // Fetch all the user schemas into a list
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             List<String> schemas = new ArrayList<String>();
             ResultSet rs = dmd.getSchemas();
             while (rs.next()) {
@@ -249,6 +259,7 @@ private static void removeObjects(Connection conn) throws SQLException {
     
             // DROP all the user schemas.
             sqle = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             for (String schema : schemas) {
                 try {
                     JDBC.dropSchema(dmd, schema);
@@ -266,6 +277,7 @@ private static void removeObjects(Connection conn) throws SQLException {
 
     private static void removeRoles(Connection conn) throws SQLException {
         // No metadata for roles, so do a query against SYSROLES
+//IC see: https://issues.apache.org/jira/browse/DERBY-3681
         Statement stm = conn.createStatement();
         Statement dropStm = conn.createStatement();
 
@@ -275,6 +287,7 @@ private static void removeRoles(Connection conn) throws SQLException {
             "cast(isdef as char(1)) = 'Y'");
 
         while (rs.next()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
             dropStm.executeUpdate("DROP ROLE " + JDBC.escape(rs.getString(1)));
         }
 
@@ -289,6 +302,7 @@ private static void removeUsers(Connection conn) throws SQLException
         // Get the users
         Statement stm = conn.createStatement();
         ResultSet rs = stm.executeQuery( "select username from sys.sysusers" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> users = new ArrayList<String>();
         
         while ( rs.next() ) { users.add( rs.getString( 1 ) ); }
@@ -322,6 +336,7 @@ private static void removeUsers(Connection conn) throws SQLException
       */
      private static final String[] COMPRESS_DB_OBJECTS =
      {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2048
          "SYS.SYSDEPENDS",
      };
      
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java
index 25f08c8f69..643b7b7ca8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java
@@ -56,6 +56,7 @@ public void setConfiguration(TestConfiguration config) {
 
         // Enable statement pooling by default.
         enableStatementPooling(ds);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6073
 
         // NOTE: Any other setup of the data source that gets added here,
         // probably also needs to be added to singleUseDS(). Otherwise, that
@@ -71,6 +72,7 @@ private static void enableStatementPooling(ConnectionPoolDataSource ds) {
         // Note that this does not automatically test the pooling itself, but it
         // should test basic JDBC operations on the logical wrapper classes.
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             J2EEDataSource.setBeanProperty(ds, "maxStatements", 2);
         } catch (AssertionFailedError afe) {
             // Ignore this, it will fail later if it is an actual error.
@@ -159,6 +161,7 @@ public Connection openConnection(String databaseName,
             // a new DataSource with the createDatabase property set.
             if (!"XJ004".equals(e.getSQLState()))
                 throw e;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             HashMap<String, Object> hm =
                     DataSourceConnector.makeCreateDBAttributes( config );
             DataSourceConnector.copyProperties(connectionProperties, hm);
@@ -175,6 +178,7 @@ public void shutDatabase() throws SQLException {
     }
 
     public void shutEngine(boolean deregisterDriver) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (SanityManager.DEBUG) {
              // "false" only used with driver manager
             SanityManager.ASSERT(deregisterDriver);
@@ -188,6 +192,7 @@ public void shutEngine(boolean deregisterDriver) throws SQLException {
     
     public void setLoginTimeout( int seconds ) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         ds.setLoginTimeout( seconds );
     }
     
@@ -221,6 +226,7 @@ private ConnectionPoolDataSource singleUseDS( HashMap hm )
         // too, just like it's enabled for the default data source in
         // setConfiguration().
         enableStatementPooling(sds);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6073
 
         return sds;
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Connector.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Connector.java
index 6ad4666145..1a426b84db 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Connector.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Connector.java
@@ -59,6 +59,7 @@ interface Connector {
      * defined by the configuration passed to setConfiguration.
      * If the database does not exist then it should be created.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
     abstract Connection openConnection(String databaseName) throws SQLException;
    
     /**
@@ -74,6 +75,7 @@ abstract Connection openConnection(String user, String password)
      * defined by the configuration passed to setConfiguration.
      * If the database does not exist then it should be created.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
      abstract Connection openConnection(String databaseName, String user, String password)
          throws SQLException;
 
@@ -106,11 +108,13 @@ abstract Connection openConnection(String databaseName, String user, String pass
      * Return nothing, exception is expected to be thrown with SQLState XJ015
      * @param deregisterDriver if true, deregister driver
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
     abstract void shutEngine(boolean deregisterDriver) throws SQLException;
    
     /**
      * Set the login timeout for getting connections. Timeout is measured in seconds.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
     abstract void setLoginTimeout( int seconds ) throws SQLException;
     
     /**
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ConnectorSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ConnectorSetup.java
index 2174731e08..20a9efe288 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ConnectorSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ConnectorSetup.java
@@ -38,9 +38,11 @@ public ConnectorSetup(Test test, String connectorClass) {
     TestConfiguration getNewConfiguration(TestConfiguration old) {
         // Copy the current configuration
         TestConfiguration newConfig = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
             new TestConfiguration(old);
         
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(connectorClass);
             newConfig.connector = (Connector) clazz.getConstructor().newInstance();
         } catch (Exception e) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DataSourceConnector.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DataSourceConnector.java
index 4e989b28df..400e72a902 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DataSourceConnector.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DataSourceConnector.java
@@ -71,6 +71,7 @@ public Connection openConnection() throws SQLException {
     }
 
     public Connection openConnection(String databaseName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         JDBCDataSource.setBeanProperty(ds, "databaseName", databaseName);
         try {
             return ds.getConnection();
@@ -117,6 +118,7 @@ public Connection openConnection(String databaseName, String user, String passwo
         (String databaseName, String user, String password, Properties connectionProperties)
          throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         JDBCDataSource.setBeanProperty(ds, "databaseName", databaseName);
         try {
             return ds.getConnection(user, password);
@@ -126,6 +128,7 @@ public Connection openConnection(String databaseName, String user, String passwo
             // a new DataSource with the createDatabase property set.
             if (!"XJ004".equals(e.getSQLState()))
                 throw e;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             HashMap<String, Object> hm = makeCreateDBAttributes( config );
             copyProperties(connectionProperties, hm);
             DataSource tmpDs = singleUseDS( hm );
@@ -141,6 +144,7 @@ public void shutDatabase() throws SQLException {
     }
 
     public void shutEngine(boolean deregisterDriver) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (SanityManager.DEBUG) {
              // "false" only used with driver manager
             SanityManager.ASSERT(deregisterDriver);
@@ -153,6 +157,7 @@ public void shutEngine(boolean deregisterDriver) throws SQLException {
     
     public void setLoginTimeout( int seconds ) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         ds.setLoginTimeout( seconds );
     }
     
@@ -173,6 +178,7 @@ private DataSource singleUseDS( HashMap hm )
 
     static HashMap<String, Object> makeCreateDBAttributes( TestConfiguration configuration )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<String, Object> hm = JDBCDataSource.getDataSourceProperties( configuration );
         hm.put( "createDatabase", "create" );
 
@@ -202,6 +208,7 @@ public String getDatabaseName() {
      * Copy attributes from a {@code Properties} object to a {@code Map}.
      */
     static void copyProperties(Properties src, Map<String, Object> dest) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         if (src != null) {
             for (String key : src.stringPropertyNames()) {
                 dest.put(key, src.getProperty(key));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DatabasePropertyTestSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DatabasePropertyTestSetup.java
index fbb1762a8d..8d168e6f02 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DatabasePropertyTestSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DatabasePropertyTestSetup.java
@@ -55,6 +55,7 @@ public class DatabasePropertyTestSetup extends BaseJDBCTestSetup {
      */
     public static Test setLockTimeouts(Test test, int deadlockTime, int waitTime)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2003
         final Properties properties = new Properties();
         if (deadlockTime >= 0)
         {
@@ -70,6 +71,7 @@ public static Test setLockTimeouts(Test test, int deadlockTime, int waitTime)
         if (properties.isEmpty())
             return test;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2007
         return new DatabasePropertyTestSetup(test, properties, true);
     }
     
@@ -201,6 +203,7 @@ protected void tearDown()
                     // We don't want to reset the properties, but we should
                     // still clear the reference to the default connection to
                     // allow it to be garbage collected.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5705
                     clearConnection();
                 }
             };
@@ -225,6 +228,7 @@ public static Test singleProperty(Test test, String property, String value)
     public static Test singleProperty(Test test, String property, String value,
             boolean reboot)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2300
         final Properties properties = new Properties();
         properties.setProperty(property, value);
 
@@ -241,6 +245,7 @@ public static Test singleProperty(Test test, String property, String value,
 	public DatabasePropertyTestSetup(Test test,
 			Properties newValues)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2007
         this(test, newValues, false);
     }
     
@@ -337,6 +342,8 @@ else if(!sqle.getSQLState().equals(SQLStateConstants.PROPERTY_UNSUPPORTED_CHANGE
         newValues = null;
         oldValues = null;
         if (staticProperties) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
             TestConfiguration.getCurrent().shutdownDatabase();
         }
     }
@@ -349,6 +356,9 @@ private void clearProperties(Connection conn) throws SQLException
         // Clear all the system properties set by the new set
         // that will not be reset by the old set. Ignore any 
         // invalid property values.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1522
+//IC see: https://issues.apache.org/jira/browse/DERBY-1827
+//IC see: https://issues.apache.org/jira/browse/DERBY-1826
         for (Enumeration e = newValues.propertyNames(); e.hasMoreElements();)
         {
             String key = (String) e.nextElement();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Decorator.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Decorator.java
index 03a35e6444..255412b1d8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Decorator.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Decorator.java
@@ -55,6 +55,8 @@ private Decorator() {
      */
     public static Test encryptedDatabase(Test test)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2687
+//IC see: https://issues.apache.org/jira/browse/DERBY-5622
         return encryptedDatabaseBpw(test, getBootPhrase(16));
     }
 
@@ -77,7 +79,9 @@ public static Test encryptedDatabaseBpw(Test test, String bootPassword)
     {
         if (JDBC.vmSupportsJSR169())
             return new BaseTestSuite("no encryption support");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
         Properties attributes = new Properties();
         attributes.setProperty("dataEncryption", "true");
         attributes.setProperty("bootPassword", bootPassword);
@@ -104,6 +108,8 @@ public static Test encryptedDatabaseBpw(Test test, String bootPassword)
      */
     public static Test encryptedDatabase(Test test, final String algorithm)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2687
+//IC see: https://issues.apache.org/jira/browse/DERBY-5622
         return encryptedDatabaseBpw(test, algorithm, getBootPhrase(16));
     }
 
@@ -160,6 +166,7 @@ private static String getBootPhrase(int length)
      */
     public static Test territoryCollatedDatabase(Test test, final String locale)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
         Properties attributes = new Properties();
         attributes.setProperty("collation", "TERRITORY_BASED");
         
@@ -193,6 +200,7 @@ public static Test logDeviceAttributeDatabase(Test test, final String logDevice)
      */
     public static Test territoryCollatedCaseInsensitiveDatabase(Test test, final String locale)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
         Properties attributes = new Properties();
         attributes.setProperty("collation", "TERRITORY_BASED:SECONDARY");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Derby.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Derby.java
index 37cbf656b4..61d1bfdc9e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Derby.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Derby.java
@@ -94,9 +94,11 @@ public static boolean hasClient()
             return true;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return hasCorrectJar("/derbytools.jar",
                 JDBC.vmSupportsJNDI() ?
                 "org.apache.derby.jdbc.ClientDataSource" :
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
                 "org.apache.derby.jdbc.BasicClientDataSource40");
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyConstants.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyConstants.java
index 5e710c7a43..34be889256 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyConstants.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyConstants.java
@@ -37,5 +37,6 @@ public interface DerbyConstants {
     String TEST_DBO = "TEST_DBO";
 
     /** Name of the automatic JUnit module. */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
     String JUNIT_MODULE_NAME = "junit";
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyDistribution.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyDistribution.java
index 27b008f3f8..3c089b1dd9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyDistribution.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyDistribution.java
@@ -90,6 +90,7 @@ public class DerbyDistribution implements Comparable<DerbyDistribution> {
      * @see #newInstance(DerbyVersion, File)
      */
     private DerbyDistribution(DerbyVersion version,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5475
                               File[] productionJars, File[] testingJars) {
         if (version == null) {
             throw new NullPointerException("version is null");
@@ -102,6 +103,7 @@ private DerbyDistribution(DerbyVersion version,
         this.derbyClientJarPath = getPath(root, JAR_CLIENT);
         this.derbyEngineJarPath = getPath(root, JAR_ENGINE);
         this.derbyNetJarPath = getPath(root, JAR_NET);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         this.derbySharedJarPath = getPath(root, JAR_SHARED);
         this.derbyToolsJarPath = getPath(root, JAR_TOOLS);
     }
@@ -134,6 +136,7 @@ public String getDerbyRunJarPath() {
 
     /** Returns the path to {@code derbyclient.jar}. */
     public String getDerbyClientJarPath() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         String retval = derbyClientJarPath;
         if (version.atLeast(DerbyVersion.FIRST_JIGSAW_VERSION))
         {
@@ -169,6 +172,7 @@ public String getDerbyNetJarPath() {
 
     /** Returns the path to {@code derbyshared.jar}. */
     public String getDerbySharedJarPath() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         return derbySharedJarPath;
     }
 
@@ -226,6 +230,7 @@ private static boolean hasRequiredJars(List jars) {
                 }
             }
             if (!hasJar) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5897
                 BaseTestCase.println("missing jar: " + REQUIRED_JARS[i]);
                 return false;
             }
@@ -303,6 +308,7 @@ private static boolean isTestingJar(String name) {
     private static String constructJarClasspath(File[] jars) {
         StringBuffer sb = new StringBuffer(512);
         for (int i=0; i < jars.length; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5475
             try {
                 sb.append(jars[i].getCanonicalPath());
             } catch (IOException ioe) {
@@ -338,6 +344,7 @@ private static String constructJarClasspath(File[] jars) {
      * @throws IllegalArgumentException if {@code version} is {@code null}
      */
     public static DerbyDistribution newInstance(DerbyVersion version,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6126
                                                 File baseDir) {
         return newInstance(version, baseDir, baseDir);
     }
@@ -364,6 +371,7 @@ public static DerbyDistribution newInstance(DerbyVersion version,
                                                 File baseDir, File testDir) {
         File[] productionJars = getProductionJars(baseDir);
         File[] testingJars = getTestingJars(testDir);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<File> tmpJars = new ArrayList<File>();
         tmpJars.addAll(Arrays.asList(productionJars));
         tmpJars.addAll(Arrays.asList(testingJars));
@@ -372,6 +380,7 @@ public static DerbyDistribution newInstance(DerbyVersion version,
         }
         // Invalid distribution, ignore it.
         BaseTestCase.println("Distribution deemed invalid (note that running " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6126
                 "off classes isn't supported): " + baseDir.getAbsolutePath() +
                 (baseDir.equals(testDir) ? ""
                                          : ", " + testDir.getAbsolutePath()));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyVersion.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyVersion.java
index 00eb39e6a2..d79ca1a890 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyVersion.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DerbyVersion.java
@@ -124,6 +124,7 @@ public DerbyVersion(int major, int minor, int fixpack, int point) {
         this.minor = minor;
         this.fixpack = fixpack;
         this.point = point;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5475
         this.simpleVersion = new Version(major, minor);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DriverManagerConnector.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DriverManagerConnector.java
index 0dff576adb..dc49a8a25b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DriverManagerConnector.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DriverManagerConnector.java
@@ -41,6 +41,7 @@ public void setConfiguration(TestConfiguration config) {
     }
 
     public Connection openConnection() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         return openConnection(config.getDefaultDatabaseName(), config.getUserName(), config.getUserPassword());
     }
 
@@ -83,6 +84,7 @@ public Connection openConnection(String databaseName, String user, String passwo
          throws SQLException
     {
         String url = config.getJDBCUrl(databaseName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
 
         try {
             DriverManager.getDriver(url);
@@ -116,6 +118,7 @@ public Connection openConnection(String databaseName, String user, String passwo
             if (!expectedState.equals(e.getSQLState()))
                 throw e;
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
             Properties attributes = new Properties(connectionAttributes);
             attributes.setProperty("create", "true");
 
@@ -126,6 +129,7 @@ public Connection openConnection(String databaseName, String user, String passwo
     private static void printFullException( Throwable t, int indentLevel )
     {
         if ( t == null ) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
 
         String              tab = "    ";
         StringBuilder   buffer = new StringBuilder();
@@ -155,6 +159,7 @@ private static void printFullException( Throwable t, int indentLevel )
      * with the user and password defined by the configuration.
      */
     public void shutDatabase() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         Properties p = new Properties();
         p.setProperty("shutdown", "true");
         getConnectionByAttributes(config.getJDBCUrl(), p);
@@ -171,6 +176,7 @@ public void shutDatabase() throws SQLException {
      * @throws java.sql.SQLException
      */
     public void shutEngine(boolean deregisterDriver) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         Properties p = new Properties();
         p.setProperty("shutdown", "true");
         
@@ -183,6 +189,7 @@ public void shutEngine(boolean deregisterDriver) throws SQLException {
     
     public void setLoginTimeout( int seconds ) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         DriverManager.setLoginTimeout( seconds );
     }
     
@@ -197,6 +204,7 @@ public int getLoginTimeout() throws SQLException
      * and then the passed in attribute is set.
      */
     private Connection getConnectionByAttributes(
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             String url,
             Properties p)
         throws SQLException
@@ -211,6 +219,7 @@ private Connection getConnectionByAttributes(
             attributes.setProperty(key, p.getProperty(key));
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4741
         try {
             DriverManager.getDriver(url);
         } catch (SQLException e) {
@@ -237,6 +246,7 @@ public String getDatabaseName(){
     private void loadJDBCDriver() throws SQLException {
         String driverClass = config.getJDBCClient().getJDBCDriverName();
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(driverClass);
             clazz.getConstructor().newInstance();
         } catch (ClassNotFoundException cnfe) {
@@ -248,6 +258,7 @@ private void loadJDBCDriver() throws SQLException {
         } catch (InstantiationException ie) {
             throw new SQLException("Failed to load JDBC driver '" + driverClass
                     + "': " + ie.getMessage());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         } catch (NoSuchMethodException ie) {
             throw new SQLException("Failed to load JDBC driver '" + driverClass
                     + "': " + ie.getMessage());
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DropDatabaseSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DropDatabaseSetup.java
index 11a3206f3a..527629cc9b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DropDatabaseSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/DropDatabaseSetup.java
@@ -31,11 +31,13 @@
  *
  */
 class DropDatabaseSetup extends BaseTestSetup {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2000
 
     private final String logicalDBName;
     private final boolean shutdownBeforeDrop;
 
     DropDatabaseSetup(Test test, String logicalDBName) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6546
         this(test, logicalDBName, true);
     }
 
@@ -64,6 +66,7 @@ private void shutdownDatabase() throws SQLException {
         // Ensure the database is booted
         // since that is what shutdownDatabase() requires.
         boolean shutdown;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         try {
             config.openConnection(logicalDBName).close();
             shutdown = true;
@@ -121,10 +124,12 @@ static void removeDirectory(String path)
     static void removeDirectory(final File dir) {
         // Check if anything to do!
         // Database may not have been created.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         if (!PrivilegedFileOpsForTests.exists(dir)) {
             return;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5836
         BaseTestCase.assertDirectoryDeleted(dir);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/EnvTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/EnvTest.java
index 0a6f417cc7..6dc3b1d873 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/EnvTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/EnvTest.java
@@ -51,6 +51,7 @@ public EnvTest(String name)
      * @param text String to print
      */
     public void traceit(final String text) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4808
         setName(text);
         PrintStream out = System.out;
         String KEY_TRACE = "derby.tests.trace";
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/IndexStatsUtil.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/IndexStatsUtil.java
index 7b77af5c99..fb92842508 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/IndexStatsUtil.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/IndexStatsUtil.java
@@ -55,6 +55,7 @@ public class IndexStatsUtil {
     private static final int NO_EXPECTATION = -1;
     private static final String SEP =
                 BaseJDBCTestCase.getSystemProperty("line.separator");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
 
     private final Connection con;
     /** Timeout in milliseconds. */
@@ -77,6 +78,7 @@ public class IndexStatsUtil {
      * @param con connection to the database to query
      */
     public IndexStatsUtil(Connection con) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
         this(con, 0L);
     }
 
@@ -118,6 +120,7 @@ public void assertNoStats()
      * @throws SQLException if obtaining the statistics fails
      */
     public void assertNoStatsTable(String table)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
             throws SQLException {
         assertTableStats(table, 0);
     }
@@ -130,6 +133,7 @@ public void assertNoStatsTable(String table)
      */
     public void assertStats(int expectedCount)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
         IdxStats[] ret = getStats();
         if (ret.length != expectedCount) {
             Assert.assertEquals(buildStatString(ret, "<ALL TABLES>"),
@@ -147,6 +151,7 @@ public void assertStats(int expectedCount)
      */
     public void assertTableStats(String table, int expectedCount)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
         getStatsTable(table, expectedCount);
     }
 
@@ -160,6 +165,7 @@ public void assertTableStats(String table, int expectedCount)
      */
     public void assertIndexStats(String index, int expectedCount)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
         getStatsIndex(index, expectedCount);
     }
 
@@ -193,6 +199,7 @@ public IdxStats[] getStats()
             throws SQLException {
         if (psGetStats == null) {
             psGetStats = con.prepareStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
                     "select * from SYS.SYSSTATISTICS " +
                     "order by TABLEID, REFERENCEID, COLCOUNT");
         }
@@ -208,6 +215,7 @@ public IdxStats[] getStats()
      */
     public IdxStats[] getStatsTable(String table)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
         return getStatsTable(table, NO_EXPECTATION);
     }
 
@@ -254,6 +262,7 @@ public IdxStats[] getStatsTable(String table, int expectedCount)
      * @throws SQLException if obtaining statistics fails
      */
     public IdxStats[] getNewStatsTable(String table, IdxStats[] currentStats)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
             throws SQLException {
         if (timeout == 0) {
             throw new IllegalStateException(
@@ -272,6 +281,7 @@ public IdxStats[] getNewStatsTable(String table, IdxStats[] currentStats)
      */
     public IdxStats[] getStatsIndex(String index)
              throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
         return getStatsIndex(index, NO_EXPECTATION);
     }
 
@@ -390,6 +400,7 @@ private Map<String, String> getIdToNameMap()
             psGetIdToNameMapTable = con.prepareStatement(
                     "select TABLEID, TABLENAME from SYS.SYSTABLES");
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Map<String, String> map = new HashMap<String, String>();
         ResultSet rs = psGetIdToNameMapConglom.executeQuery();
         while (rs.next()) {
@@ -413,6 +424,7 @@ private Map<String, String> getIdToNameMap()
      * @throws SQLException if accessing the result set fails
      */
     private IdxStats[] buildStatisticsList(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             ResultSet rs, Map<String, String> idToName)
             throws SQLException {
         List<IdxStats> stats = new ArrayList<IdxStats>();
@@ -434,6 +446,7 @@ private IdxStats[] buildStatisticsList(
      * Releases resources and closes the associated connection.
      */
     public void release() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5759
         release(true);
     }
 
@@ -461,6 +474,7 @@ public void release(boolean closeConnection) {
             if (!con.isClosed()) {
                 con.rollback();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5759
             if (closeConnection) {
                 con.close();
             }
@@ -483,7 +497,9 @@ public void release(boolean closeConnection) {
      * @throws SQLException if obtaining statistics fails
      */
     private void awaitChange(IdxStats[] current, long timeout)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3790
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Set<IdxStats> oldStats = new HashSet<IdxStats>(Arrays.asList(current));
         Set<IdxStats> newStats = null;
         long start = System.currentTimeMillis();
@@ -573,6 +589,7 @@ public String toString() {
             sb.append("{tableId=").append(tableId).
                     append(", tableName=").append(tableName).
                     append(", indexName=").append(indexName).
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
                     append(", lcols=").append(lcols).
                     append(", rows=").append(rows).
                     append(", unique/card=").append(card).
@@ -587,6 +604,7 @@ public String toString() {
          * @return {@code true} if the other object is considered equal to this
          */
         public boolean equals(Object obj) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4834
             if (obj == null) {
                 return false;
             }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/J2EEDataSource.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/J2EEDataSource.java
index 1e0a2b19b7..8b2db1ab2a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/J2EEDataSource.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/J2EEDataSource.java
@@ -79,6 +79,7 @@ public static XADataSource getXADataSource()
      */
     public static void setBeanProperty(Object ds, String property, Object value) {
        // reuse code from JDBCDataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-2474
         JDBCDataSource.setBeanProperty(ds, property, value);
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBC.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBC.java
index 73c7486b4c..0c540591ca 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBC.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBC.java
@@ -50,6 +50,7 @@ public class JDBC {
     public static class GeneratedId {
         public boolean equals(Object o) {
             String tmpstr = (String)o;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6977
             if (!(o instanceof String)) { return false; }
             if (!(tmpstr.startsWith("SQL"))) { return false; }
             if (tmpstr.length() != GENERATED_NAME_LENGTH) { return false; }
@@ -82,6 +83,8 @@ public String toString() {
      * just synonyms.
      */
     public static final String[] GET_TABLES_SYNONYM =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3000
+//IC see: https://issues.apache.org/jira/browse/DERBY-1790
         new String[] {"SYNONYM"};
     
     /**
@@ -112,6 +115,7 @@ public String toString() {
     /** Is the Lucene core jar file on the classpath */
     public  static  final   boolean HAVE_LUCENE_CORE =
         haveClass( "org.apache.lucene.analysis.Analyzer" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 
     /** Is the Lucene analyzer jar file on the classpath */
     public  static  final   boolean HAVE_LUCENE_ANALYZERS =
@@ -124,6 +128,7 @@ public String toString() {
     /** Is the json-simple core jar file on the classpath */
     public  static  final   boolean HAVE_JSON_SIMPLE =
         haveClass( "org.json.simple.JSONArray" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6825
 
     /**
      * Does java.sql.ResultSet implement java.lang.AutoCloseable?
@@ -132,7 +137,9 @@ public String toString() {
     private static final boolean HAVE_AUTO_CLOSEABLE_RESULT_SET;
     static {
         boolean autoCloseable;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Class<?> acClass = Class.forName("java.lang.AutoCloseable");
             autoCloseable = acClass.isAssignableFrom(ResultSet.class);
         } catch (Throwable t) {
@@ -144,6 +151,7 @@ public String toString() {
     private static final boolean HAVE_REFERENCEABLE;
     static {
         boolean ok = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         try {
             Class.forName("javax.naming.Referenceable");
             ok = true;
@@ -155,6 +163,7 @@ public String toString() {
     private static final boolean HAVE_SQLTYPE;
     static {
         boolean ok = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         try {
             Class.forName("java.sql.SQLType");
             ok = true;
@@ -169,6 +178,7 @@ public String toString() {
      */
     private static final boolean HAVE_MBEAN_SERVER =
             haveClass("javax.management.MBeanServer");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6097
 
     /**
      * Can we load a specific class, use this to determine JDBC level.
@@ -180,6 +190,7 @@ static boolean haveClass(String className)
         try {
             Class.forName(className);
             return true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3966
         } catch (Throwable e) {
         	return false;
         }    	
@@ -190,6 +201,7 @@ static boolean haveClass(String className)
      * later.
      */
     public static boolean vmSupportsJDBC42() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6000
         return vmSupportsJDBC41() && HAVE_SQLTYPE;
     }
 
@@ -198,6 +210,7 @@ public static boolean vmSupportsJDBC42() {
      * later. JDBC 4.1 is a superset of JDBC 4.0 and of JSR-169.
      */
     public static boolean vmSupportsJDBC41() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4869
         return vmSupportsJDBC4() && HAVE_AUTO_CLOSEABLE_RESULT_SET;
     }
 
@@ -246,6 +259,7 @@ public static boolean vmSupportsJSR169()
      * @return {@code true} if JNDI is available.
      */
     public static boolean vmSupportsJNDI() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         return HAVE_REFERENCEABLE;
     }
 
@@ -253,6 +267,7 @@ public static boolean vmSupportsJNDI() {
      * Return true if the JVM supports the Java Management Extensions (JMX).
      */
     public static boolean vmSupportsJMX() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6097
         return HAVE_MBEAN_SERVER;
     }
 
@@ -309,6 +324,7 @@ public static void cleanup(Connection conn) throws SQLException
 	 */
 	public static void dropSchema(DatabaseMetaData dmd, String schema) throws SQLException
 	{		
+//IC see: https://issues.apache.org/jira/browse/DERBY-1556
 		Connection conn = dmd.getConnection();
 		Assert.assertFalse(conn.getAutoCommit());
 		Statement s = dmd.getConnection().createStatement();
@@ -361,6 +377,7 @@ public static void dropSchema(DatabaseMetaData dmd, String schema) throws SQLExc
         // foreign key constraints leading to a dependency loop.
         // Drop any constraints that remain and then drop the tables.
         // If there are no tables then this should be a quick no-op.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2595
         ResultSet table_rs = dmd.getTables((String) null, schema, (String) null,
                 GET_TABLES_TABLE);
 
@@ -368,6 +385,7 @@ public static void dropSchema(DatabaseMetaData dmd, String schema) throws SQLExc
             String tablename = table_rs.getString("TABLE_NAME");
             rs = dmd.getExportedKeys((String) null, schema, tablename);
             while (rs.next()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2007
                 short keyPosition = rs.getShort("KEY_SEQ");
                 if (keyPosition != 1)
                     continue;
@@ -430,6 +448,7 @@ public static void dropSchema(DatabaseMetaData dmd, String schema) throws SQLExc
 
 		// Finally drop the schema if it is not APP
 		if (!schema.equals("APP")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2007
 			s.executeUpdate("DROP SCHEMA " + JDBC.escape(schema) + " RESTRICT");
 		}
 		conn.commit();
@@ -484,6 +503,7 @@ private static void dropUsingDMD(
 		String dropLeadIn = "DROP " + dropType + " ";
 		
         // First collect the set of DROP SQL statements.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> ddl = new ArrayList<String>();
 		while (rs.next())
 		{
@@ -502,6 +522,7 @@ private static void dropUsingDMD(
             return;
                 
         // Execute them as a complete batch, hoping they will all succeed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2007
         s.clearBatch();
         int batchCount = 0;
         for (Iterator i = ddl.iterator(); i.hasNext(); )
@@ -534,6 +555,7 @@ private static void dropUsingDMD(
 		for (int i = 0; i < results.length; i++)
 		{
 			int result = results[i];
+//IC see: https://issues.apache.org/jira/browse/DERBY-4313
 			if (result == Statement.EXECUTE_FAILED)
 				hadError = true;
 			else if (result == Statement.SUCCESS_NO_INFO || result >= 0) {
@@ -543,6 +565,7 @@ else if (result == Statement.SUCCESS_NO_INFO || result >= 0) {
 			else
 				Assert.fail("Negative executeBatch status");
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-2007
         s.clearBatch();
         if (didDrop) {
             // Commit any work we did do.
@@ -560,6 +583,7 @@ else if (result == Statement.SUCCESS_NO_INFO || result >= 0) {
             do {
                 hadError = false;
                 didDrop = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 for (ListIterator<String> i = ddl.listIterator(); i.hasNext();) {
                     String sql = i.next();
                     if (sql != null) {
@@ -626,6 +650,7 @@ public static void assertMetaDataMatch(DatabaseMetaData dmd,
 
      */
     public static void assertEmpty(ResultSet rs)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
     throws SQLException
     {
         assertDrainResults(rs, 0);
@@ -637,6 +662,7 @@ public static void assertEmpty(ResultSet rs)
      */
     public static void assertClosed(ResultSet rs)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2461
         try { 
             rs.next();
             Assert.fail("ResultSet not closed");
@@ -671,6 +697,9 @@ public static void assertNoWarnings(SQLWarning warning)
      */
     public static void assertNoMoreResults(Statement s) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3304
+//IC see: https://issues.apache.org/jira/browse/DERBY-3037
+//IC see: https://issues.apache.org/jira/browse/DERBY-1585
     	Assert.assertFalse(s.getMoreResults());
         Assert.assertTrue(s.getUpdateCount() == -1);
         Assert.assertNull(s.getResultSet());
@@ -738,8 +767,10 @@ public static void assertDrainResultsHasData(ResultSet rs)
 	 * @throws SQLException
 	 */
 	public static int assertDrainResults(ResultSet rs)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1976
 	    throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
 		return assertDrainResults(rs, -1);
 	}
 
@@ -761,6 +792,7 @@ public static int assertDrainResults(ResultSet rs,
 	    int expectedRows) throws SQLException
 	{
 		ResultSetMetaData rsmd = rs.getMetaData();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
         List<List<String>> seen = new ArrayList<List<String>>();
         List<String> seenRow = new ArrayList<String>();
 		
@@ -782,6 +814,7 @@ public static int assertDrainResults(ResultSet rs,
 
         if (expectedRows >= 0) {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
                 Assert.assertEquals("Unexpected row count:", expectedRows, rows);
             } catch (AssertionFailedError e) {
                 throw addRsToReport(e, rsmd, seen, seenRow, rs);
@@ -804,6 +837,7 @@ public static int assertDrainResults(ResultSet rs,
      * @throws SQLException Error accessing meta data
      */
     private static void assertResultColumnNullable(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
             ResultSet rs,
             List<List<String>> seen,
             List<String> seenRow,
@@ -831,6 +865,7 @@ private static void assertResultColumnNullable(
     public static void assertColumnNames(ResultSet rs,
         String... expectedColNames) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1976
         ResultSetMetaData rsmd = rs.getMetaData();
         int actualCols = rsmd.getColumnCount();
 
@@ -977,6 +1012,7 @@ public static void assertDatabaseMetaDataColumns(ResultSet rs,
     public static void assertColumnTypes(ResultSet rs,
         int[] expectedTypes) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         ResultSetMetaData rsmd = rs.getMetaData();
         int actualCols = rsmd.getColumnCount();
 
@@ -1001,6 +1037,7 @@ public static void assertColumnTypes(ResultSet rs,
     public static void assertParameterTypes (PreparedStatement ps,
 	        int[] expectedTypes) throws Exception
 	    {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5496
             if ( vmSupportsJSR169() )
             {
                 Assert.fail( "The assertParameterTypes() method only works on platforms which support ParameterMetaData." );
@@ -1019,6 +1056,7 @@ public static void assertParameterTypes (PreparedStatement ps,
 	            Assert.assertEquals
                     ("Types do not match for parameter " + (i+1),
                      expectedTypes[i],
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                      ((Integer) getParameterType.invoke( pmd, new Object[] { i + 1 } )).intValue()
                      );
 	        }
@@ -1034,6 +1072,7 @@ public static void assertParameterTypes (PreparedStatement ps,
     public static void assertNullability(ResultSet rs,
             boolean[] nullability) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         ResultSetMetaData rsmd = rs.getMetaData();
         int actualCols = rsmd.getColumnCount();
 
@@ -1056,6 +1095,7 @@ public static void assertNullability(ResultSet rs,
      *  As a side effect, this method closes the ResultSet.
      */
     public static void assertSingleValueResultSet(ResultSet rs,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2033
             String value) throws SQLException
     {
         String[] row = new String[] {value};
@@ -1114,9 +1154,11 @@ public static void assertFullResultSet(ResultSet rs,
      *  more on how this parameter is used, see assertRowInResultSet().
      */
     public static void assertFullResultSet(ResultSet rs,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1976
         Object [][] expectedRows, boolean allAsTrimmedStrings)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2502
         assertFullResultSet( rs, expectedRows, allAsTrimmedStrings, true );
     }
 
@@ -1160,6 +1202,7 @@ public static void assertFullResultSet(ResultSet rs,
         Object [][] expectedRows, boolean allAsTrimmedStrings, boolean closeResultSet)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4471
         assertFullResultSetMinion(rs, expectedRows, allAsTrimmedStrings,
                                   closeResultSet, null);
     }
@@ -1202,6 +1245,7 @@ private static void assertFullResultSetMinion(
         int rows;
         ResultSetMetaData rsmd = rs.getMetaData();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
         List<List<String>> seen = new ArrayList<List<String>>();
         List<String> seenRow = new ArrayList<String>();
 
@@ -1222,6 +1266,7 @@ private static void assertFullResultSetMinion(
 
             // Assert warnings on result set, but only for embedded, cf
             // DERBY-159.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4471
             if (TestConfiguration.getCurrent().getJDBCClient().isEmbedded() &&
                 warnings != null) {
 
@@ -1232,6 +1277,7 @@ private static void assertFullResultSetMinion(
                     wstr = w.getSQLState();
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
                 try {
                     Assert.assertEquals(
                             "Warning assertion error on row " + (rows+1),
@@ -1249,6 +1295,7 @@ private static void assertFullResultSetMinion(
             if (rows < expectedRows.length)
             {
                 // dumps itself in any assertion seem
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
                 assertRowInResultSet(rs, seen, seenRow, rows + 1,
                     expectedRows[rows], allAsTrimmedStrings);
             }
@@ -1258,6 +1305,7 @@ private static void assertFullResultSetMinion(
         }
 
         if ( closeResultSet ) { rs.close(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2502
 
         // And finally, assert the row count.
         try {
@@ -1303,6 +1351,7 @@ public static void assertPartialResultSet(ResultSet rs,
         throws SQLException
     {
         int rows;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
         final List<List<String>> seen = new ArrayList<List<String>>();
         final List<String> seenRow = new ArrayList<String>();
         final ResultSetMetaData rsmd = rs.getMetaData();
@@ -1323,6 +1372,7 @@ public static void assertPartialResultSet(ResultSet rs,
              */
             if (rows < expectedRows.length)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
                 assertRowInResultSet(rs, seen, seenRow, rows + 1,
                     expectedRows[rows], true, colsToCheck);
             }
@@ -1331,6 +1381,7 @@ public static void assertPartialResultSet(ResultSet rs,
         }
 
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2502
 
         // And finally, assert the row count.
         try {
@@ -1380,6 +1431,7 @@ public static void assertPartialResultSet(ResultSet rs,
      * @throws java.sql.SQLException
      */
     private static void assertRowInResultSet(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
             ResultSet rs,
             List<List<String>> seen,
             List<String> seenRow,
@@ -1409,6 +1461,7 @@ private static void assertRowInResultSet(
      *   where 0 &lt;= i &lt; expectedRow.length.
      */
     private static void assertRowInResultSet(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
             ResultSet rs,
             List<List<String>> seen,
             List<String> seenRow,
@@ -1418,6 +1471,7 @@ private static void assertRowInResultSet(
             BitSet colsToCheck) throws SQLException
     {
         int cPos = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1976
         ResultSetMetaData rsmd = rs.getMetaData();
         for (int i = 0; i < expectedRow.length; i++)
         {
@@ -1425,6 +1479,7 @@ private static void assertRowInResultSet(
                 ? (i+1)
                 : colsToCheck.nextSetBit(cPos) + 1;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2052
             Object obj;
             if (asTrimmedStrings)
             {
@@ -1461,6 +1516,7 @@ private static void assertRowInResultSet(
                     obj = ((String)obj).trim();
 
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
             else {
                 obj = rs.getObject(cPos);
             }
@@ -1470,6 +1526,7 @@ private static void assertRowInResultSet(
             boolean ok = (rs.wasNull() && (expectedRow[i] == null))
                 || (!rs.wasNull()
                     && (expectedRow[i] != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2102
                     && (expectedRow[i].equals(obj)
                         || (obj instanceof byte[] // Assumes byte arrays
                             && Arrays.equals((byte[] )obj,
@@ -1483,6 +1540,7 @@ private static void assertRowInResultSet(
                     found = bytesToString((byte[] )obj);
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
                 try {
                     Assert.fail("Column value mismatch @ column '" +
                             rsmd.getColumnName(cPos) + "', row " + rowNum +
@@ -1514,6 +1572,7 @@ private static void assertRowInResultSet(
      */
     public static void assertSameContents(ResultSet rs1, ResultSet rs2)
             throws SQLException, IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2242
         ResultSetMetaData rsmd = rs1.getMetaData();
         int columnCount = rsmd.getColumnCount();
         while (rs1.next()) {
@@ -1579,6 +1638,7 @@ public static void assertUnorderedResultSet(
     public static void assertUnorderedResultSet(
             ResultSet rs, Object[][] expectedRows, boolean asTrimmedStrings)
                 throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5764
         assertRSContains(rs, expectedRows, asTrimmedStrings, true);
     }
 
@@ -1623,6 +1683,7 @@ private static void assertRSContains(
         }
 
         ResultSetMetaData rsmd = rs.getMetaData();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
         List<List<String>> seen = new ArrayList<List<String>>();
         List<String> seenRow = new ArrayList<String>();
 
@@ -1633,6 +1694,7 @@ private static void assertRSContains(
             throw addRsToReport(e, rsmd, seen, seenRow, rs);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<List<String>> expected =
                 new ArrayList<List<String>>(expectedRows.length);
         for (int i = 0; i < expectedRows.length; i++) {
@@ -1640,6 +1702,7 @@ private static void assertRSContains(
                                 expectedRows[0].length, expectedRows[i].length);
             List<String> row = new ArrayList<String>(expectedRows[i].length);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5305
             for (int j = 0; j < expectedRows[i].length; j++) {
                 String val = (String) expectedRows[i][j];
                 row.add(asTrimmedStrings ?
@@ -1649,6 +1712,7 @@ private static void assertRSContains(
             expected.add(row);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         List<List<String>> actual =
                 new ArrayList<List<String>>(expectedRows.length);
         while (rs.next()) {
@@ -1656,6 +1720,7 @@ private static void assertRSContains(
             for (int i = 1; i <= expectedRows[0].length; i++) {
                 String s = rs.getString(i);
                 seenRow.add(s);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
 
                 row.add(asTrimmedStrings ?
                         (s == null ? null : s.trim()) :
@@ -1673,6 +1738,7 @@ private static void assertRSContains(
 
         try {
             if (rowCountsMustMatch) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
                 String message = "Unexpected row count, expected: " +
                         expectedRows.length + ", actual: " + actual.size() + "\n" +
                         "\t expected rows: \n\t\t" + expected +
@@ -1680,11 +1746,13 @@ private static void assertRSContains(
                 Assert.assertEquals(message,
                         expectedRows.length, actual.size());
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5885
             if ( !actual.containsAll(expected) )
             {
                 expected.removeAll( actual );
                 BaseTestCase.println
                         ( "These expected rows don't appear in the actual result: " + expected );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5667
                 String message = "Missing rows in ResultSet; \n\t expected rows: \n\t\t"
                         + expected + "\n\t actual result: \n\t\t" + actual;
                 Assert.fail( message );
@@ -1702,6 +1770,7 @@ private static void assertRSContains(
      * @throws SQLException if something goes wrong
      */
     public static void assertCurrentSchema(Connection con, String schema)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3690
             throws SQLException {
         Statement stmt = con.createStatement();
         try {
@@ -1721,6 +1790,7 @@ public static void assertCurrentSchema(Connection con, String schema)
      * @throws SQLException if something goes wrong
      */
     public static void assertCurrentUser(Connection con, String user)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4551
             throws SQLException {
         Statement stmt = con.createStatement();
         try {
@@ -1780,6 +1850,7 @@ public static String escape(String name)
      */
     private static String compressQuotes(String source, String quotes)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3223
         String  result = source;
         int         index;
 
@@ -1892,6 +1963,7 @@ public static String sqlNameFromJdbc(int jdbcType) {
      */
     public static void checkPlan(Statement s, String[] sequence)
             throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4471
 
         ResultSet rs = s.executeQuery(
                 "values SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS()");
@@ -1905,12 +1977,14 @@ public static void checkPlan(Statement s, String[] sequence)
     }
 
     private static AssertionFailedError addRsToReport(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6642
             AssertionFailedError afe,
             ResultSetMetaData rsmd,
             List<List<String>> seen,
             List<String> seenRow,
             ResultSet rs) throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6660
         try {
             if (rs == null) {
                 return BaseTestCase.newAssertionFailedError(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCClient.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCClient.java
index 67c26bb10a..e07440f072 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCClient.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCClient.java
@@ -47,8 +47,10 @@ public final class JDBCClient {
             "org.apache.derby.jdbc.EmbeddedDriver", 
 
             JDBC.vmSupportsJNDI() ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
             "org.apache.derby.jdbc.EmbeddedDataSource":
             "org.apache.derby.jdbc.BasicEmbeddedDataSource40",
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
 
             JDBC.vmSupportsJNDI() ?
             "org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource":
@@ -67,6 +69,7 @@ static JDBCClient getDefaultEmbedded()
     {
         if (JDBC.vmSupportsJDBC4())
             return EMBEDDED_40;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
         if (JDBC.vmSupportsJDBC3())
             return EMBEDDED_30;
         
@@ -84,6 +87,7 @@ static JDBCClient getDefaultEmbedded()
             JDBC.vmSupportsJDBC4() ?
             (JDBC.vmSupportsJNDI() ?
             "org.apache.derby.jdbc.ClientDataSource40" :
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
             "org.apache.derby.jdbc.BasicClientDataSource40") :
              "org.apache.derby.jdbc.ClientDataSource",
 
@@ -115,8 +119,12 @@ static JDBCClient getDefaultEmbedded()
      * client for Derby).
      */
     static final JDBCClient DB2CLIENT= new JDBCClient(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3763
             "DB2Client",
             "com.ibm.db2.jcc.DB2Driver",
+//IC see: https://issues.apache.org/jira/browse/DERBY-2036
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             null, null, null,
             "jdbc:derby:net://");
     
@@ -125,6 +133,9 @@ static JDBCClient getDefaultEmbedded()
     */
     public boolean isEmbedded()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2036
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
     	return getName().startsWith("Embedded");
     }
     /**
@@ -174,6 +185,9 @@ public String getDataSourceClassName() {
      * @return class name for ConnectionPoolDataSource implementation.
      */
     public String getConnectionPoolDataSourceClassName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2036
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         return poolDsClassName;
     }
 
@@ -210,6 +224,9 @@ public String toString() {
      * Create a JDBC client definition.
      */
     private JDBCClient(String frameWork, String driverClassName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2036
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
                        String dataSourceClassName,
                        String connectionPoolDataSourceClassName,
                        String xaDataSourceClassName,
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCDataSource.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCDataSource.java
index 5f6e4d5066..40194692a4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCDataSource.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCDataSource.java
@@ -66,6 +66,7 @@ public static javax.sql.DataSource getDataSource(String dbName)
      * of the logical databases in the current configuration.
      */
     public static javax.sql.DataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
          getDataSourceLogical(String logicalDatabasename)
     {
         // default DataSource
@@ -104,6 +105,7 @@ static Object getDataSource(TestConfiguration config,
         if (beanProperties == null)
              beanProperties = getDataSourceProperties(config);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         return getDataSourceObject(dsClassName,
             beanProperties);
     }
@@ -114,17 +116,21 @@ static Object getDataSource(TestConfiguration config,
      */
     static HashMap<String, Object> getDataSourceProperties(TestConfiguration config)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashMap<String, Object> beanProperties = new HashMap<String, Object>();
         
         if (!config.getJDBCClient().isEmbedded()) {
             beanProperties.put("serverName", config.getHostName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             beanProperties.put("portNumber", config.getPort());
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         beanProperties.put("databaseName", config.getDefaultDatabaseName());
         beanProperties.put("user", config.getUserName());
         beanProperties.put("password", config.getUserPassword());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
         String attributes = config.getConnectionAttributesString();
         if (attributes != null) {
             beanProperties.put("connectionAttributes", attributes);
@@ -144,6 +150,7 @@ static HashMap<String, Object> getDataSourceProperties(TestConfiguration config)
      */
     static javax.sql.DataSource getDataSourceObject(String classname, HashMap beanProperties)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ClassLoader contextLoader = AccessController.doPrivileged(
                 new PrivilegedAction<ClassLoader>() {
             public ClassLoader run() {
@@ -156,6 +163,7 @@ public ClassLoader run() {
             if (contextLoader != null)
             {
                 try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     Class<?> clazz = Class.forName(classname, true, contextLoader);
                     ds = (javax.sql.DataSource) clazz.getConstructor().newInstance();
                 } catch (Exception e) {
@@ -166,6 +174,7 @@ public ClassLoader run() {
             
             if (ds == null)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Class<?> clazz = Class.forName(classname);
                 ds = (javax.sql.DataSource) clazz.getConstructor().newInstance();
             }
@@ -179,8 +188,10 @@ public ClassLoader run() {
                 setBeanProperty(ds, property, value);
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6108
             if ( !BaseTestCase.isJ9Platform() && !BaseTestCase.isCVM() )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
                 ds.setLoginTimeout( TestConfiguration.getCurrent().getLoginTimeout() );
             }
             
@@ -269,6 +280,7 @@ private static String getGetterName(String attribute) {
      */
     public static void shutdownDatabase(javax.sql.DataSource ds)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2296
         setBeanProperty(ds, "shutdownDatabase", "shutdown");
         try {
             ds.getConnection();
@@ -285,6 +297,7 @@ public static void shutdownDatabase(javax.sql.DataSource ds)
      * The shutdownDatabase property is cleared by this method.
      */
     public static void shutEngine(javax.sql.DataSource ds) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4361
         setBeanProperty(ds, "shutdownDatabase", "shutdown");
         JDBCDataSource.setBeanProperty(ds, "databaseName", "");
         try {
@@ -293,6 +306,7 @@ public static void shutEngine(javax.sql.DataSource ds) throws SQLException {
         } catch (SQLException e) {
              BaseJDBCTestCase.assertSQLState("Engine shutdown", "XJ015", e);
         } finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
             clearStringBeanProperty(ds, "shutdownDatabase");
         }
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCPerfTestCase.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCPerfTestCase.java
index 367dc3ee89..ce28caa6ad 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCPerfTestCase.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/JDBCPerfTestCase.java
@@ -147,6 +147,7 @@ protected void runBareOverridable() throws Throwable
         for (int i = 0; i < repeats; i++)
         {
             println("Repeat ="+i);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5726
             super.runBareOverridable();
             testRunNum++;
         }
@@ -165,6 +166,7 @@ protected void runBareOverridable() throws Throwable
             total = runs[0];
 
         System.out.println("Test-" + getName() +
+//IC see: https://issues.apache.org/jira/browse/DERBY-2200
                 ": framework:"+ getTestConfiguration().getJDBCClient().getName()+
                 ":iterations: " + iterations
                 + " : Avg elapsedTime(ms): " + 
@@ -185,6 +187,7 @@ protected void runTest() throws Throwable {
         endTime = System.currentTimeMillis();
         runs[testRunNum] = (endTime-startTime);
         System.out.println("Test-" + getName() + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2200
                 ": framework:"+ getTestConfiguration().getJDBCClient().getName()+
                 ": run#" + testRunNum
                 + " iterations: " + iterations + " : elapsedTime(ms): "
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/LocaleTestSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/LocaleTestSetup.java
index 64260fb5a7..a48de09230 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/LocaleTestSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/LocaleTestSetup.java
@@ -44,6 +44,7 @@ public LocaleTestSetup(Test test, Locale newLocale) {
 	 * Set up the new locale for the test
 	 */
 	protected void setUp() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         setDefaultLocale(newLocale);
 	}
 	
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/NetworkServerControlWrapper.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/NetworkServerControlWrapper.java
index 86dc75e110..c39a5d8083 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/NetworkServerControlWrapper.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/NetworkServerControlWrapper.java
@@ -58,6 +58,7 @@ public class NetworkServerControlWrapper {
     NetworkServerControlWrapper()
             throws Exception {
         // Try to load the NetworkServerControl class.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Class<?> clazzSC = null;
         try {
             clazzSC =
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/NetworkServerTestSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
index 3cf70fbd4c..a97b838262 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
@@ -47,6 +47,7 @@
  * 
  */
 final public class NetworkServerTestSetup extends BaseTestSetup {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2000
 
     /**
      * <p>
@@ -167,6 +168,7 @@ public NetworkServerTestSetup(  Test test,
         super(test);
         this.asCommand = asCommand;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2196
         this.systemProperties = null;
         this.startupArgs = null;
         this.useSeparateProcess = false;
@@ -174,6 +176,8 @@ public NetworkServerTestSetup(  Test test,
 
         this.startServerAtSetup = startServerAtSetup;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         this.moduleOrClassPath = null;
         this.useModules = false;
         this.suppressServerDiagnostics = false;
@@ -203,6 +207,7 @@ public NetworkServerTestSetup(  Test test,
          boolean serverShouldComeUp
         )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         this(test, systemProperties, startupArgs, serverShouldComeUp, null, JVMInfo.isModuleAware(), false);
     }
   
@@ -241,7 +246,9 @@ public NetworkServerTestSetup(  Test test,
         this.startupArgs = startupArgs;
         this.useSeparateProcess = true;
         this.serverShouldComeUp = serverShouldComeUp;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         this.startServerAtSetup = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         this.moduleOrClassPath = moduleOrClassPath;
         this.useModules = useModules;
         this.suppressServerDiagnostics = suppressServerDiagnostics;
@@ -255,6 +262,7 @@ protected void setUp() throws Exception {
         
         networkServerController = getNetworkServerControl();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         if (startServerAtSetup)
         {
             // DERBY-4201: A network server instance used in an earlier test
@@ -263,6 +271,7 @@ protected void setUp() throws Exception {
             waitForAvailablePort();
 
             if (useSeparateProcess)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3504
             { spawnedServer = startSeparateProcess(); }
             else if (asCommand)
             { startWithCommand(); }
@@ -272,16 +281,19 @@ else if (asCommand)
             if (serverShouldComeUp)
             {
                 if (!pingForServerStart(networkServerController)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6012
                     String msg = getTimeoutErrorMsg("network server to start");
                     // Dump the output from the spawned process
                     // and destroy it.
                     if (spawnedServer != null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
                         spawnedServer.complete(2000);
                         msg = spawnedServer.getFailMessage(msg);
                         spawnedServer = null;
                     }
                     //DERBY-6012 print thread dump and java core
                     JVMInfo.javaDump();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6012
                     fail(msg + Utilities.NL + ExceptionUtil.dumpThreads());
                 }
             }
@@ -301,6 +313,7 @@ else if (asCommand)
      */
     public static void waitForAvailablePort()
             throws InterruptedException, UnknownHostException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6179
         waitForAvailablePort(TestConfiguration.getCurrent().getPort());
     }
 
@@ -319,7 +332,9 @@ public static void waitForAvailablePort()
      */
     public static void waitForAvailablePort(int port)
             throws InterruptedException, UnknownHostException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5547
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6179
         InetAddress serverAddress = InetAddress.getByName(
                 TestConfiguration.getCurrent().getHostName());
 
@@ -336,6 +351,7 @@ public static void waitForAvailablePort(int port)
                     Thread.sleep(SLEEP_TIME);
                 } else {
                     BaseTestCase.fail(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6179
                         getTimeoutErrorMsg("server port to become available",
                             port),
                         ioe);
@@ -354,6 +370,7 @@ public static void waitForAvailablePort(int port)
     private static void probeServerPort(final int port, final InetAddress addr)
             throws IOException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
                 public Void run() throws IOException {
                     new ServerSocket(port, 0, addr).close();
@@ -367,11 +384,14 @@ public Void run() throws IOException {
 
     private void startWithAPI() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         BaseTestCase.println("Starting network server with NetworkServerControl api:");
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             serverOutput = AccessController.doPrivileged(
                     new PrivilegedAction<FileOutputStream>() {
                 public FileOutputStream run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
                     File logs = new File("logs");
                     logs.mkdir();
                     File console = new File(logs, "serverConsoleOutput.log");
@@ -398,6 +418,7 @@ public void run() {
 
                 String[]    args = getDefaultStartupArgs( false );
                 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 BaseTestCase.println("Starting network server with this command: " + Arrays.asList(args));
                 
                 org.apache.derby.drda.NetworkServerControl.main( args );
@@ -409,6 +430,7 @@ public void run() {
     private SpawnedProcess startSeparateProcess() throws Exception
     {
         BaseTestCase.println("Starting network server as a separate process:");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         ArrayList<String> al = new ArrayList<String>();
         boolean         skipHostName = false;
 
@@ -417,10 +439,12 @@ private SpawnedProcess startSeparateProcess() throws Exception
         // running with Emma we don't run with the security manager, as the
         // default server policy doesn't contain needed permissions and,
         // additionally, Emma sources do not use doPrivileged blocks anyway.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6067
         if (!TestConfiguration.loadingFromJars() ||
                 BaseTestCase.runsWithEmma() || BaseTestCase.runsWithJaCoCo())
         {
             boolean setNoSecurityManager = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3504
             for (int i = 0; i < systemProperties.length; i++)
             {
                 if (systemProperties[i].startsWith("java.security."))
@@ -452,7 +476,9 @@ private SpawnedProcess startSeparateProcess() throws Exception
             al.add( "-D" + systemProperties[ i ] );
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         String serverName = NetworkServerControl.class.getName();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (useModules)
         {
             al.add("-m");
@@ -477,6 +503,7 @@ private SpawnedProcess startSeparateProcess() throws Exception
         final   String[]  command = new String[ al.size() ];
         al.toArray(command);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         Process serverProcess = BaseTestCase.execJavaCmd
           (null, moduleOrClassPath, command, null, true, useModules);
 
@@ -505,6 +532,7 @@ protected void tearDown() throws Exception {
             } catch (Exception e) {
             }
       
+//IC see: https://issues.apache.org/jira/browse/DERBY-3544
             Throwable failedShutdown = null;
             if (running)
             {
@@ -512,6 +540,7 @@ protected void tearDown() throws Exception {
                     networkServerController.shutdown();
                 } catch (Throwable t)
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                     String errorMessage = t.getMessage();
                     //
                     // The following error message is expected if we
@@ -526,6 +555,7 @@ protected void tearDown() throws Exception {
             }
  
             if ( serverOutput != null ) { serverOutput.close(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1966
             networkServerController = null;
             serverOutput = null;
 
@@ -533,13 +563,16 @@ protected void tearDown() throws Exception {
                 // Destroy the process if a failed shutdown
                 // to avoid hangs running tests as the complete()
                 // waits for the process to complete.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                 if (suppressServerDiagnostics) { spawnedServer.suppressOutputOnComplete(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
                 spawnedServer.complete(getWaitTime());
                 spawnedServer = null;
             }
 
             // Throw an error to record the fact that the
             // shutdown failed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3544
             if (failedShutdown != null)
             {
                 if (failedShutdown instanceof Exception)
@@ -568,6 +601,7 @@ public  static String[] getDefaultStartupArgs( boolean skipHostName )
     {
         TestConfiguration config = TestConfiguration.getCurrent();
         ArrayList<String> argsList = new ArrayList<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         argsList.add( "start" );
 
@@ -638,6 +672,7 @@ public static NetworkServerControl getNetworkServerControl()
      * will decide what is the best port number to use.
      */
     public static NetworkServerControl getNetworkServerControl(int port)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         throws Exception
     {
         TestConfiguration config = TestConfiguration.getCurrent();
@@ -655,6 +690,7 @@ public static NetworkServerControl getNetworkServerControl(int port)
     public static NetworkServerControl getNetworkServerControlDefault()
         throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         TestConfiguration config = TestConfiguration.getCurrent();
         final String user = config.getUserName();
         final String password = config.getUserPassword();
@@ -669,6 +705,7 @@ public static void waitForServerStart(NetworkServerControl networkServerControll
        throws InterruptedException 
     {
         if (!pingForServerStart(networkServerController)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6012
              fail(getTimeoutErrorMsg("network server to start"));
         }
     }
@@ -680,6 +717,7 @@ public static void waitForServerStart(NetworkServerControl networkServerControll
      */
     public static void setWaitTime( long newWaitTime )
    {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2196
         waitTime = newWaitTime;
     }
     
@@ -690,6 +728,7 @@ public static void setWaitTime( long newWaitTime )
      */
     public static void setDefaultWaitTime()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         waitTime = WAIT_TIME;
     }
     
@@ -703,6 +742,7 @@ public static void setDefaultWaitTime()
      * @return true if server responds in time, false otherwise
      */
     public static boolean pingForServerUp(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         NetworkServerControl networkServerController, Process serverProcess,
         boolean expectServerUp)
         throws InterruptedException
@@ -734,6 +774,7 @@ public static boolean pingForServerUp(
         while (true) {
             try {
                 networkServerController.ping();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5643
                 long elapsed = System.currentTimeMillis() - startTime;
                 if (expectServerUp) {
                     if (elapsed > 60000L) {
@@ -760,6 +801,7 @@ public static boolean pingForServerUp(
 
                     return false;
                 }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
                 if (expectServerUp){
                     if (System.currentTimeMillis() - startTime > waitTime) 
                         return false;
@@ -768,6 +810,7 @@ public static boolean pingForServerUp(
                 else
                     return false;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2714
             if (serverProcess != null) {
                 // if the server runs in a separate process, check whether the
                 // process is still alive
@@ -786,6 +829,7 @@ public static boolean pingForServerUp(
                     return false;
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
             Thread.sleep(SLEEP_TIME);
         }
     }
@@ -795,6 +839,7 @@ private static  boolean vetPing( Throwable t )
     {
         if ( !t.getClass().getName().equals( "java.lang.Exception" ) ) { return false; }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-3834
         return ( t.getMessage().startsWith( "DRDA_NoIO.S:" ) );
     }
     
@@ -809,6 +854,7 @@ private static  boolean isDRDAerror( Throwable t )
     public static boolean pingForServerStart(NetworkServerControl control)
         throws InterruptedException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3088
         return pingForServerUp(control, null, true);
     }
     
@@ -833,6 +879,7 @@ public static long getWaitTime() {
             try {
                 waitTime = (Long.parseLong(waitString)*1000);
             } catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5643
                 BaseTestCase.fail(
                         "trouble setting WAIT_TIME from passed in property " +
                         "derby.tests.networkServerStartTimeout", e);
@@ -850,6 +897,7 @@ private static String getTimeoutErrorMsg(String failedAction, int port) {
     }
 
     private static String getTimeoutErrorMsg(String failedAction) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6179
         TestConfiguration conf = TestConfiguration.getCurrent();
         int port = conf.getPort();
         return getTimeoutErrorMsg(failedAction, port);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ReleaseRepository.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ReleaseRepository.java
index 1e8603610f..70f3945a69 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ReleaseRepository.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ReleaseRepository.java
@@ -171,6 +171,7 @@ public boolean accept(File pathname) {
         traceit("{ReleaseRepository} " + tmpCandDists.length +
                 " candidate releases at " + reposLocation);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         dists = new ArrayList<DerbyDistribution>(tmpCandDists.length);
         for (int i=0; i < tmpCandDists.length; i++) {
             File dir = tmpCandDists[i];
@@ -192,6 +193,7 @@ public boolean accept(File pathname) {
                         dir.getAbsolutePath());
                 continue;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6126
             DerbyDistribution dist = DerbyDistribution.newInstance(
                     version, dir);
             // TODO: 10.0.1.2 is considered invalid because it doesn't have a
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java
index 0a2f86a10a..56c72bf2e6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java
@@ -47,6 +47,8 @@ public class RuntimeStatisticsParser {
      * 
      */
     public RuntimeStatisticsParser(String rts) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2491
+//IC see: https://issues.apache.org/jira/browse/DERBY-47
     	statistics = rts;
         if (rts.indexOf(" at serializable isolation level ") != -1)
             isolationLevel = Connection.TRANSACTION_SERIALIZABLE;
@@ -57,6 +59,8 @@ else if (rts.indexOf("at read committed isolation level") != -1)
         else if (rts.indexOf("at repeatable read isolation level") != -1)
             isolationLevel = Connection.TRANSACTION_REPEATABLE_READ;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2491
+//IC see: https://issues.apache.org/jira/browse/DERBY-47
         if (rts.indexOf("Distinct Scan ResultSet") > 0) {
         	distinctScan = true;
         }
@@ -65,6 +69,7 @@ else if (rts.indexOf("at repeatable read isolation level") != -1)
         	tableScan = true;
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2641
         indexScan = (rts.indexOf("Index Scan ResultSet") >= 0);
         indexRowToBaseRow =
             (rts.indexOf("Index Row to Base Row ResultSet") >= 0);
@@ -73,11 +78,14 @@ else if (rts.indexOf("at repeatable read isolation level") != -1)
         if (rts.indexOf("Eliminate duplicates = true") > 0) {
         	eliminatedDuplicates = true;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2542
         if (rts.indexOf("Scroll Insensitive ResultSet:") > 0)
             scrollInsensitive = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2642
         qualifiers = findQualifiers();
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4038
         startPosition = getStartPosition();
         stopPosition = getStopPosition();
     }
@@ -120,6 +128,7 @@ public String toString() {
      * @return set of <code>Qualifier</code>s
      */
     private HashSet<Qualifier> findQualifiers() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         HashSet<Qualifier> set = new HashSet<Qualifier>();
         int startPos = statistics.indexOf("qualifiers:\n");
         if (startPos >= 0) {
@@ -130,6 +139,7 @@ private HashSet<Qualifier> findQualifiers() {
             while (t.hasMoreTokens()) {
                 String s = t.nextToken();
                 StringTokenizer t2 = new StringTokenizer(s, "\t ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4087
 
                 if (t2.nextToken().equals("Operator:")) {
                     String operator = t2.nextToken();
@@ -170,6 +180,8 @@ public int getIsolationLevel() {
      * query.
      */
     public boolean usedDistinctScan() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2491
+//IC see: https://issues.apache.org/jira/browse/DERBY-47
     	return distinctScan;
     }
     
@@ -186,6 +198,7 @@ public boolean usedTableScan() {
      * @return true if a Table Scan ResultSet was used for tableName
      */
     public boolean usedTableScan(String tableName){
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         return (statistics.indexOf("Table Scan ResultSet for " + 
                     tableName + " ")!= -1);
     }
@@ -199,6 +212,7 @@ public boolean usedTableScan(String tableName){
     public boolean usedSpecificIndexForIndexScan(
     		String tableName, String indexName){
         return (statistics.indexOf("Index Scan ResultSet for " + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3831
                     tableName + " using index " + indexName + " ")!= -1);
     }
 
@@ -217,6 +231,7 @@ public boolean usedIndexScan(String tableName){
      *     for the passed tableName
      */
     public boolean usedConstraintForIndexScan(String tableName){
+//IC see: https://issues.apache.org/jira/browse/DERBY-4038
         return (statistics.indexOf("Index Scan ResultSet for " + 
                     tableName + " using constraint")!= -1);
     }
@@ -225,6 +240,7 @@ public boolean usedConstraintForIndexScan(String tableName){
      * Return whether or not an index scan result set was used in the query.
      */
     public boolean usedIndexScan() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2641
         return indexScan;
     }
 
@@ -251,7 +267,9 @@ public boolean usedIndexRowToBaseRow() {
      */
     public boolean usedIndexRowToBaseRow(String tableName) {
        
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
             return (statistics.indexOf("Index Row to Base Row ResultSet for " + 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3831
                         tableName + ":")!= -1);       
     }
         
@@ -262,6 +280,8 @@ public boolean usedIndexRowToBaseRow(String tableName) {
     public boolean usedDistinctScan(String tableName) {
         return (statistics.indexOf("Distinct Scan ResultSet for " + 
                 tableName + " ")!= -1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3831
+//IC see: https://issues.apache.org/jira/browse/DERBY-3831
 
     }
    
@@ -276,6 +296,7 @@ public boolean eliminatedDuplicates() {
     }
     
     public boolean isScrollInsensitive(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-2542
         return scrollInsensitive;
     }
 
@@ -284,6 +305,7 @@ public boolean isScrollInsensitive(){
      */
     public boolean hasGreaterThanOrEqualQualifier() {
         // < negated is equivalent to >=
+//IC see: https://issues.apache.org/jira/browse/DERBY-2642
         return qualifiers.contains(new Qualifier("<", true));
     }
 
@@ -298,6 +320,7 @@ public boolean hasLessThanQualifier() {
      * Return whether or not the query used an equals scan qualifier.
      */
     public boolean hasEqualsQualifier() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4038
         return qualifiers.contains(new Qualifier("=", false));
     }
     
@@ -337,6 +360,7 @@ public boolean hasNoQualifiers() {
      */
     public boolean rowsQualifiedEquals(int qualRows)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2740
         return (statistics.indexOf("Number of rows qualified=" +
             qualRows + "\n") != -1);
     }
@@ -346,6 +370,7 @@ public boolean rowsQualifiedEquals(int qualRows)
      */
     public boolean usedHashJoin()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3686
         return (statistics.indexOf("Hash Join ResultSet") != -1);
     }
 
@@ -354,6 +379,7 @@ public boolean usedHashJoin()
      */
     public boolean usedNLLeftOuterJoin()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4405
         return (statistics.indexOf("Nested Loop Left Outer Join") != -1);
     }
 
@@ -399,6 +425,7 @@ public boolean whatSortingRequired() {
     }
 
     public boolean usedExternalSort() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3842
         return (statistics.indexOf("Sort type=external") != -1 );
     }
 
@@ -414,6 +441,7 @@ public String toString() {
     public String [] getStartPosition() {
         int startStartIndex = statistics.indexOf("start position:");
         int endStartIndex = statistics.indexOf("stop position:");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4038
         if (startStartIndex >= 0 && endStartIndex >= 0)
         {
             String positionLines = statistics.substring(startStartIndex, endStartIndex);
@@ -437,6 +465,8 @@ public String toString() {
         {
             String positionLines = statistics.substring(startStopIndex, endStopIndex);
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-5496
+//IC see: https://issues.apache.org/jira/browse/DERBY-5496
             return Utilities.split(positionLines, '\n');
         }
         else 
@@ -454,6 +484,7 @@ public String toString() {
     public void assertSequence(String[] strings) {
 
         // Make strings ready for comparison:
+//IC see: https://issues.apache.org/jira/browse/DERBY-4736
         for (int i=0; i < strings.length; i++) {
             StringBuffer sb = new StringBuffer();
 
@@ -464,6 +495,7 @@ public void assertSequence(String[] strings) {
                     // this would mess up if the string has an _ somewhere in
                     // the middle, e.g. if a table name has an _ in it. So, 
                     // only do this for the first 15 characters.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3808
                     if (j < 15)
                         sb.append('\t');
                     else
@@ -482,6 +514,7 @@ public void assertSequence(String[] strings) {
 
             if (pos == -1) {
                 throw new AssertionError(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3808
                     "Sequence " + strings[i] + "not found in statistics");
             }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SQLUtilities.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SQLUtilities.java
index a2547321df..0bd852f1e0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SQLUtilities.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SQLUtilities.java
@@ -32,6 +32,7 @@ public class SQLUtilities {
 
     public static String[] allDataTypesColumnNames =
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2463
             "SMALLINTCOL",
             "INTEGERCOL",
             "BIGINTCOL",
@@ -86,6 +87,7 @@ public  static void createAndPopulateAllDataTypesTable(Statement s) throws SQLEx
 
         StringBuffer createSQL = new StringBuffer(
                 "create table AllDataTypesTable (");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
         for (int type = 0; type < SQLUtilities.SQLTypes.length - 1; type++) {
             createSQL.append(allDataTypesColumnNames[type] + " " + SQLUtilities.SQLTypes[type]
                     + ",");
@@ -121,6 +123,7 @@ public static RuntimeStatisticsParser  getRuntimeStatisticsParser(Statement s) t
         ResultSet rs = s.executeQuery("values SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS()");
         rs.next();
         String rts = rs.getString(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2478
         rs.close();
         return new RuntimeStatisticsParser(rts);
     }
@@ -136,6 +139,7 @@ public static RuntimeStatisticsParser executeAndGetRuntimeStatistics(Connection
         ResultSet rs = s.getResultSet();
         if (rs != null)
             JDBC.assertDrainResults(rs);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2478
         RuntimeStatisticsParser parser = getRuntimeStatisticsParser(s2);
         s.close();
         s2.close();
@@ -145,6 +149,7 @@ public static RuntimeStatisticsParser executeAndGetRuntimeStatistics(Connection
 	// Note: This array is accessed in lang.NullIfTest
 	public static String[] SQLTypes =
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3034
 	        "SMALLINT",
 	        "INTEGER",
 	        "BIGINT",
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SecurityManagerSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SecurityManagerSetup.java
index 70bf93f564..8582dcaf88 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SecurityManagerSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SecurityManagerSetup.java
@@ -376,6 +376,7 @@ private static boolean determineClasspath()
 
 		//We need the junit classes to instantiate this class, so the
 		//following should not cause runtime errors.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         setCodebase(TESTING_JUNIT, getURL(junit.framework.Test.class));
 	
         // Load indirectly so we don't need ant-junit.jar at compile time.
@@ -384,6 +385,7 @@ private static boolean determineClasspath()
         setCodebase(TESTING_ANT, "org.apache.tools.ant.Task");
 
         // variables for lucene jar files
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
         URL luceneCore = getURL( "org.apache.lucene.store.FSDirectory" );
         if ( luceneCore != null )
         {
@@ -393,6 +395,8 @@ private static boolean determineClasspath()
 
         // Load indirectly, normally no EMMA jars in the classpath.
         // This property is needed to set correct permissions in policy files.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3445
+//IC see: https://issues.apache.org/jira/browse/DERBY-3153
         URL emma = getURL("com.vladium.emma.EMMAException");
         if (emma != null) {
             classPathSet.setProperty("emma.active", "");
@@ -405,8 +409,10 @@ private static boolean determineClasspath()
          * needed for reading the DTD files.
          */
         setCodebase(JAXP, XML.getJAXPParserLocation());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 		URL testing = getURL(SecurityManagerSetup.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5262
         URL ppTesting = null;
         // Only try to load PackagePrivateTestSuite if the running JVM is
         // Java 1.5 or newer (class version 49 = Java 1.5).
@@ -417,6 +423,7 @@ private static boolean determineClasspath()
 		if (isClasspath) {
             // ppTesting can be null, for instance if 'classes.pptesting' is
             // not on the classpath.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             setCodebase(PACKAGE_PRIVATE_CLASSES, ppTesting);
             isJars = false;
 		}
@@ -429,6 +436,7 @@ private static boolean determineClasspath()
         if (testing.getProtocol().equals("file")) {
            File f = new File(testing.getPath());
            classPathSet.setProperty("derbyTesting.testjarpath", f.getAbsolutePath());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
            classPathSet.setProperty(Property.DERBY_INSTALL_PATH, f.getParentFile().getAbsolutePath());
         }
 
@@ -489,6 +497,7 @@ private static boolean determineClasspath()
      */
     public static Properties getPolicyFilePropertiesForOldHarness()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1791
         return classPathSet;
     }
 	
@@ -497,10 +506,12 @@ public static Properties getPolicyFilePropertiesForOldHarness()
      * If the class cannot be loaded, null is returned.
      */
     public static URL getURL(String className) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2213
         try {
             return getURL(Class.forName(className));
         } catch (ClassNotFoundException e) {
             return null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6067
         } catch (NoClassDefFoundError e) {
             return null;
         }
@@ -512,6 +523,7 @@ public static URL getURL(String className) {
 	static URL getURL(final Class cl)
 	{
         return AccessController.doPrivileged(new PrivilegedAction<URL>() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 			public URL run() {
 
@@ -520,6 +532,7 @@ public URL run() {
                  * as can happen with Xalan and/or a JAXP parser), so in that
                  * case we just return null.
                  */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1758
                 if (cl.getProtectionDomain().getCodeSource() == null)
                     return null;
 
@@ -534,11 +547,14 @@ public URL run() {
     private static void uninstallSecurityManager()
     {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
             AccessController.doPrivileged
             (
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
              new PrivilegedAction<Void>()
              {
                  public Void run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2000
                       System.setSecurityManager(null);
                      return null;
                  }
@@ -559,10 +575,13 @@ public Void run() {
      * @throws IOException if reading or writing a policy resource fails
      */
     private static String getEffectivePolicyResource(String policy1,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5631
                                                      String policy2)
             throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5631
         String resource = policy1;
         if (!NO_POLICY.equals(resource)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5631
             URL url1 = getResourceURL(policy1);
             resource = url1.toExternalForm();
             if (policy2 != null) {
@@ -584,6 +603,7 @@ private static String getEffectivePolicyResource(String policy1,
      * @throws MalformedURLException if the resource string not a valid URL
      */
     private static URL getResourceURL(final String policy)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5631
             throws MalformedURLException {
         URL url = BaseTestCase.getTestResource(policy);
         if (url == null) {
@@ -617,6 +637,7 @@ private static String mergePolicies(URL policy1, URL policy2)
 
         // Read the contents of both policy files and write them out to
         // a new policy file. Construct a somewhat informative file name.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5631
         final File mergedPF = new File(varDir,
                 new File(policy2.getPath()).getName() +
                     "-MERGED_WITH-" +
@@ -637,6 +658,7 @@ private static String mergePolicies(URL policy1, URL policy2)
         i2.close();
         o.close();
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return AccessController.doPrivileged(
                         new PrivilegedExceptionAction<String>() {
                     public String run() throws MalformedURLException {
@@ -652,6 +674,7 @@ public String run() throws MalformedURLException {
     private static InputStream openStream(final URL resource)
             throws IOException {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return AccessController.doPrivileged(
                     new PrivilegedExceptionAction<InputStream>(){
                         public InputStream run() throws IOException {
@@ -667,6 +690,7 @@ public InputStream run() throws IOException {
     /** Creates the specified directory if it doesn't exist. */
     private static void mkdir(final File dir) {
         AccessController.doPrivileged(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             new PrivilegedAction<Void>() {
                 public Void run() {
                     if (!dir.exists() && !dir.mkdir()) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ServerSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ServerSetup.java
index d6c0ab7302..c5bcedd202 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ServerSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/ServerSetup.java
@@ -42,6 +42,7 @@ public ServerSetup(Test test, String host, int port) {
     }
 
     public ServerSetup(Test test, String host, int port, String dbPath) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
         super(test);
         this.host = host;
         this.port = port;
@@ -71,6 +72,7 @@ void setJDBCClient(JDBCClient newClient)
     /**
      * Specify a dbPath to use in place of the default.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
     void setDbPath(String dbPath)
     {
         this.dbPath = dbPath;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SpawnedProcess.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SpawnedProcess.java
index 3720d23ca0..b0d20864cc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SpawnedProcess.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SpawnedProcess.java
@@ -136,6 +136,7 @@ public SpawnedProcess(Process javaProcess, String name) {
         this.javaProcess = javaProcess;
         this.name = name;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
         errSaver = startStreamSaver(javaProcess.getErrorStream(), name
                 .concat(":System.err"));
         outSaver = startStreamSaver(javaProcess.getInputStream(), name
@@ -154,6 +155,7 @@ private TimerTask scheduleKill(Process process, String name) {
         synchronized (KILL_THRESHOLD_PROPERTY) {
             if (KILL_TIMER == null) {
                 // Can't use 1.5 methods yet due to J2ME. Add name later.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
                 KILL_TIMER = new Timer(true);
             }        
         }
@@ -170,6 +172,7 @@ private TimerTask scheduleKill(Process process, String name) {
      * @see #getFullServerError() to obtain suppressed output from stderr
      */
     public void suppressOutputOnComplete() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5608
         suppressOutput = true;
     }
 
@@ -195,6 +198,8 @@ public Process getProcess() {
     public String getFullServerOutput() throws InterruptedException {
         // First wait until we've read all the output.
         outSaver.thread.join();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5288
+//IC see: https://issues.apache.org/jira/browse/DERBY-5288
 
         synchronized (this) {
             return outSaver.stream.toString();
@@ -212,6 +217,7 @@ public String getFullServerOutput() throws InterruptedException {
     public String getFullServerError() throws InterruptedException {
         // First wait until we've read all the output on stderr.
         errSaver.thread.join();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5608
 
         synchronized (this) {
             return errSaver.stream.toString();
@@ -231,6 +237,7 @@ public String getFullServerError() throws InterruptedException {
     public String getNextServerOutput() {
         byte[] fullData;
         synchronized (this) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5288
             fullData = outSaver.stream.toByteArray();
         }
         
@@ -245,6 +252,7 @@ public String getNextServerOutput() {
      * easier debugging if the reason the process failed is there!
      */
     public String getFailMessage(String reason) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
         sleep(500);
         StringBuffer sb = new StringBuffer();
         sb.append(reason);
@@ -257,6 +265,7 @@ public String getFailMessage(String reason) {
             sb.append("running");
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5288
         ByteArrayOutputStream err = errSaver.stream;
         ByteArrayOutputStream out = outSaver.stream;
 
@@ -286,6 +295,7 @@ public String getFailMessage(String reason) {
      * @throws IOException if printing diagnostics fails
      */
     public int complete()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
             throws IOException {
         return complete(Long.MAX_VALUE);         
     }
@@ -311,6 +321,7 @@ public int complete(long timeout)
         Integer exitCode = null;
         while (exitCode == null) {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 exitCode = javaProcess.exitValue();
             } catch (IllegalThreadStateException itse) {
                 // This exception means the process is running.
@@ -325,6 +336,7 @@ public int complete(long timeout)
         killTask.cancel();
         joinWith(errSaver.thread);
         joinWith(outSaver.thread);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
         cleanupProcess();
         printDiagnostics(exitCode.intValue());
         return exitCode.intValue();
@@ -352,6 +364,7 @@ private synchronized void printDiagnostics(int exitCode)
             throws IOException {
         // Always write the error, except when suppressed.
         ByteArrayOutputStream err = errSaver.stream;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5608
         if (!suppressOutput && err.size() != 0) {
             System.err.println("START-SPAWNED:" + name + " ERROR OUTPUT:");
             err.writeTo(System.err);
@@ -360,6 +373,7 @@ private synchronized void printDiagnostics(int exitCode)
 
         // Only write contents of stdout if it appears the server
         // failed in some way, or output is suppressed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5288
         ByteArrayOutputStream out = outSaver.stream;
         if (!suppressOutput && exitCode != 0 && out.size() != 0) {
             System.out.println("START-SPAWNED:" + name
@@ -412,6 +426,7 @@ private void closeStream(Object stream) {
      * to the stream.
      */
     private static class StreamSaver {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5288
         final ByteArrayOutputStream stream;
         final Thread thread;
         StreamSaver(ByteArrayOutputStream stream, Thread thread) {
@@ -460,6 +475,7 @@ public void run() {
         streamReader.setDaemon(true);
         streamReader.start();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5288
         return new StreamSaver(out, streamReader);
     }
 
@@ -470,6 +486,7 @@ public void run() {
      */
     private static class ProcessKillerTask
         extends TimerTask {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
 
         private final String name;
         private Process process;
@@ -509,6 +526,7 @@ public synchronized void run() {
             }
             if (retriesAllowed == 0) {
                 System.err.println(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5617
                         "DEBUG: Failed to destroy process '" + name + "'");
             } 
             process = null;
@@ -532,6 +550,7 @@ public synchronized void run() {
      */
     @SuppressWarnings("SleepWhileInLoop")
     public boolean waitForExit(long patience, long sleepInterval)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6704
             throws InterruptedException {
         boolean completed = false;
         while (!completed && patience > 0) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SupportFilesSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SupportFilesSetup.java
index c90815cf7c..a009412d2f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SupportFilesSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SupportFilesSetup.java
@@ -88,6 +88,7 @@ public SupportFilesSetup(Test test)
      */
     public SupportFilesSetup(Test test, String[] readOnly)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2435
         this(test, readOnly, (String[]) null, (String[]) null, (String[]) null);
     }
     
@@ -98,6 +99,7 @@ public SupportFilesSetup(Test test, String[] readOnly)
    */
     public SupportFilesSetup(Test test, String[] readOnly, String[] readWrite)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2435
         this(test, readOnly, readWrite, (String[]) null, (String[]) null);
     }
     
@@ -119,6 +121,7 @@ public SupportFilesSetup(Test test, String[] readOnly, String[] readWrite)
     
     protected void setUp() throws PrivilegedActionException, IOException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
         privCopyFiles(EXTIN, readOnly, readOnlyTargetFileNames);
         privCopyFiles(EXTINOUT, readWrite, readWriteTargetFileNames);
         privCopyFiles(EXTOUT, (String[]) null, (String[]) null);
@@ -134,6 +137,7 @@ protected void tearDown()
     public  static   void privCopyFiles(final String dirName, final String[] resources, final String[] targetNames)
     throws PrivilegedActionException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
             public Void run() throws IOException, PrivilegedActionException {
               copyFiles(dirName, resources, targetNames);
@@ -158,6 +162,7 @@ private static  void copyFiles(String dirName, String[] resources, String[] targ
                 "org/apache/derbyTesting/".concat(resources[i]);
             
             String baseName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2435
 
             if ( targetNames == null )
             {
@@ -226,6 +231,7 @@ public static URL getWriteOnlyURL(String name) throws MalformedURLException
      */
     public static File getReadOnly(String name)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
         return getFile(EXTIN, name);
     }
     
@@ -235,6 +241,7 @@ public static File getReadOnly(String name)
      */
     public static String getReadOnlyFileName(final String name)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
                 new PrivilegedAction<String>() {
             public String run() {
@@ -250,6 +257,7 @@ public String run() {
      */
     public static String getReadWriteFileName(final String name)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6246
         return AccessController.doPrivileged(
                 new PrivilegedAction<String>() {
             public String run() {
@@ -264,6 +272,7 @@ public String run() {
      */
     public static File getReadWrite(String name)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
         return getFile(EXTINOUT, name);
     }
     /**
@@ -272,6 +281,7 @@ public static File getReadWrite(String name)
      */
     public static File getWriteOnly(String name)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
         return getFile(EXTOUT, name);
     }
     
@@ -284,9 +294,11 @@ private static File getFile(String dirName, String name)
     private static URL getURL(final File file) throws MalformedURLException
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return AccessController.doPrivileged(
                     new PrivilegedExceptionAction<URL>() {
                 public URL run() throws MalformedURLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     return file.toURI().toURL();
                 }
             });
@@ -298,6 +310,7 @@ public URL run() throws MalformedURLException {
 
     public static void deleteFile(final String fileName) 
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6635
         deleteFile( new File(fileName) );
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java
index caf613823f..5688478f05 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/SystemPropertyTestSetup.java
@@ -46,6 +46,7 @@ public class SystemPropertyTestSetup extends TestSetup {
 	 * @param newValues properties to be set
 	 */
 	public SystemPropertyTestSetup(Test test,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1764
 			Properties newValues,
 			boolean staticProperties)
 	{
@@ -76,6 +77,7 @@ public SystemPropertyTestSetup(Test test,
      */
     public static Test singleProperty(Test test, String property, String value)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6233
         return singleProperty(test, property, value, false);
     }
 
@@ -114,6 +116,7 @@ protected void setUp()
         // Shutdown the engine before setting the properties. This
         // is because the properties may change authentication settings
         // to NATIVE authentication and we may be missing a credentials DB.
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
         if (staticProperties) {
             // Use deregister == false here lest in client server mode
             // we try to connect to a network server without an embedded
@@ -176,6 +179,7 @@ private void setProperties(Properties values)
                 change = !old.equals(value);
                 
                 //Reference equality is ok here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5342
     			if (values != oldValues)
     			   oldValues.setProperty(key, old);
     		}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/TestConfiguration.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/TestConfiguration.java
index 61df97d00c..648204430e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/TestConfiguration.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/TestConfiguration.java
@@ -98,6 +98,7 @@ public final class TestConfiguration {
         	lastAssignedPort = Integer.parseInt(port);
         }
         basePort = lastAssignedPort;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4700
         bogusPort = ++lastAssignedPort;
     }
     private static int assignedPortCount = 2;
@@ -153,11 +154,13 @@ public final class TestConfiguration {
     private static final TestConfiguration DEFAULT_CONFIG;
         
     static {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2446
         DEFAULT_CONFIG = JUNIT_CONFIG;
         
         final   File dsh = new File("system");
 
         String absolutePath = PrivilegedFileOpsForTests.getAbsolutePath(dsh);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         BaseTestCase.setSystemProperty(
                 "derby.system.home", absolutePath);
@@ -169,10 +172,12 @@ public final class TestConfiguration {
      * concurrently with different configurations.
      */
     private static final ThreadLocal<TestConfiguration>
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             CURRENT_CONFIG = new ThreadLocal<TestConfiguration>() {
         protected TestConfiguration initialValue() {
             return DEFAULT_CONFIG;
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
     };
    
     /**
@@ -200,6 +205,7 @@ public static TestConfiguration getCurrent() {
      * @see ReleaseRepository
      */
     public static synchronized ReleaseRepository getReleaseRepository() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5475
         if (releaseRepository == null) {
             try {
                 releaseRepository = ReleaseRepository.getInstance();
@@ -235,6 +241,7 @@ static void setCurrent(TestConfiguration config)
      */
     public static Test defaultSuite(Class testClass)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1758
         return defaultSuite(testClass, true);
     }
 
@@ -254,6 +261,7 @@ public static Test defaultSuite(Class testClass, boolean cleanDB)
          
         if (cleanDB)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2021
             suite.addTest(new CleanDatabaseTestSetup(embeddedSuite(testClass)));
             suite.addTest(new CleanDatabaseTestSetup(clientServerSuite(testClass)));
         }
@@ -283,6 +291,7 @@ public static Test defaultSuite(Class testClass, boolean cleanDB)
      */
     public static Test defaultExistingServerSuite(Class testClass)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2807
         return defaultExistingServerSuite(testClass, true);
     }
     
@@ -347,6 +356,7 @@ public static Test existingServerSuite(Class testClass,
         if (cleanDB)
         {
             suite.addTest(new CleanDatabaseTestSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4427
                     clientExistingServerSuite(testClass, hostName, portNumber)));
         }
         else
@@ -358,10 +368,15 @@ public static Test existingServerSuite(Class testClass,
     }
     public static Test existingServerSuite(Class testClass, 
             boolean cleanDB,
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
             String hostName,
             int portNumber,
             String dbPath)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
          final BaseTestSuite suite = new BaseTestSuite(suiteName(testClass));
          
         if (cleanDB)
@@ -389,6 +404,7 @@ public static Test existingServerSuite(Class testClass,
     public static Test forceJDBC3Suite(Class testClass)
     {
         final BaseTestSuite suite = new BaseTestSuite(suiteName(testClass));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(
             new CleanDatabaseTestSetup(
@@ -408,6 +424,8 @@ public static Test forceJDBC3Suite(Class testClass)
     static String suiteName(Class testClass)
     {
         int lastDot = testClass.getName().lastIndexOf('.');
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-1971
         String suiteName = testClass.getName();
         if (lastDot != -1)
             suiteName = suiteName.substring(lastDot + 1, suiteName.length());
@@ -421,6 +439,7 @@ static String suiteName(Class testClass)
       */
     public static Test embeddedSuite(Class testClass)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(testClass,
                 suiteName(testClass)+":embedded");
     }
@@ -433,6 +452,7 @@ public static Test embeddedSuite(Class testClass)
      */
     public static Test clientServerSuite(Class testClass)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         return clientServerDecorator(bareClientServerSuite(testClass));
     }
     /**
@@ -443,6 +463,7 @@ public static Test clientServerSuite(Class testClass)
      */
 
     public static Test clientServerSuiteWithAlternativePort(Class testClass) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         return clientServerDecoratorWithAlternativePort(
                 bareClientServerSuite(testClass));
     }
@@ -455,6 +476,7 @@ public static Test clientServerSuiteWithAlternativePort(Class testClass) {
     public static Test clientExistingServerSuite(Class testClass)
     {
         // Will not start server and does not stop it when done.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         return defaultExistingServerDecorator(bareClientServerSuite(testClass));
     }
     
@@ -470,6 +492,7 @@ public static Test clientExistingServerSuite(Class testClass)
     public static Test clientExistingServerSuite(Class testClass, String hostName, int portNumber)
     {
                // Will not start server and does not stop it when done!.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         return existingServerDecorator(bareClientServerSuite(testClass),
                 hostName, portNumber);
     }
@@ -495,6 +518,7 @@ public static Test clientExistingServerSuite(Class testClass,
      */
     public static Test clientServerDecorator(Test suite)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
         Test test = new NetworkServerTestSetup(suite, false);
             
         return defaultServerDecorator(test);
@@ -513,6 +537,7 @@ public static Test clientServerDecorator(Test suite)
      */
     public static Test clientServerDecorator
       (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
        Test suite,
        String[] systemProperties,
        String[] startupArgs,
@@ -546,6 +571,8 @@ public static Test clientServerDecorator(Test suite)
     public static Test clientServerDecoratorWithPort(Test suite, int port)
     {
         Test test = new NetworkServerTestSetup(suite, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4223
+//IC see: https://issues.apache.org/jira/browse/DERBY-4217
 
         return existingServerDecorator(test,"localhost",port);
     }
@@ -555,7 +582,10 @@ public static Test clientServerDecoratorWithPort(Test suite, int port)
      */
     public static Test clientServerDecoratorWithAlternativePort(Test suite) {
         Test test = new NetworkServerTestSetup(suite, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3211
         return defaultServerDecoratorWithAlternativePort(test);
     }
     /**
@@ -568,9 +598,11 @@ public static Test defaultExistingServerDecorator(Test test)
         // server is already started.
         // Need to have client 
         // and not running in J2ME (JSR169).
+//IC see: https://issues.apache.org/jira/browse/DERBY-2807
         if (!(Derby.hasClient())
                 || JDBC.vmSupportsJSR169())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite(
                 "empty: no network server support in JSR169 " +
                 "(or derbyclient.jar missing).");
@@ -606,6 +638,7 @@ public static Test defaultServerDecorator(Test test)
     * non-default hostname and portnumber.
     */
     public static Test existingServerDecorator(Test test, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3163
             String hostName, int PortNumber)
     {
     	// Need to have network server and client and not
@@ -624,11 +657,16 @@ public static Test existingServerDecorator(Test test,
     * non-default hostname, portnumber and database name.
     */
     public static Test existingServerDecorator(Test test, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
             String hostName, int PortNumber, String dbPath)
     {
     	// Need to have network server and client and not
         // running in J2ME (JSR169).
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         if (!supportsClientServer()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("empty: no network server support");
         }
 
@@ -645,7 +683,11 @@ public static Test existingServerDecorator(Test test,
     public static Test defaultServerDecoratorWithAlternativePort(Test test) {
         // Need to have network server and client and not
         // running in J2ME (JSR169).
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         if (!supportsClientServer()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("empty: no network server support");
         }
 
@@ -663,6 +705,7 @@ public static Test defaultServerDecoratorWithAlternativePort(Test test) {
      * Check if client and server testing is supported in the test environment.
      */
     private static boolean supportsClientServer() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         return JDBC.vmSupportsJDBC3() && Derby.hasClient() && Derby.hasServer();
     }
 
@@ -676,6 +719,7 @@ private static boolean supportsClientServer() {
      * environment
      */
     private static Test bareClientServerSuite(Class testClass) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite(suiteName(testClass) + ":client");
 
@@ -693,6 +737,7 @@ public static synchronized String generateUniqueDatabaseName()
         // Forward slash is ok, Derby treats database names
         // as URLs and translates forward slash to the local
         // separator.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         String dbName = "singleUse/oneuse";
         dbName = dbName.concat(Integer.toHexString(uniqueDB++));
         return dbName;
@@ -716,6 +761,7 @@ public static TestSetup singleUseDatabaseDecorator(Test test)
     {
         String dbName = generateUniqueDatabaseName();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2295
         return new DatabaseChangeSetup(new DropDatabaseSetup(test, dbName), dbName, dbName, true);
     }
 
@@ -735,6 +781,9 @@ public static TestSetup singleUseDatabaseDecorator(Test test)
      */
     public static TestSetup singleUseDatabaseDecorator(Test test, String dbName)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4179
+//IC see: https://issues.apache.org/jira/browse/DERBY-4646
+//IC see: https://issues.apache.org/jira/browse/DERBY-4647
         return new DatabaseChangeSetup(
             new DropDatabaseSetup(test, dbName), dbName, dbName, true);
     }
@@ -759,6 +808,7 @@ public static TestSetup singleUseDatabaseDecoratorNoShutdown(Test test)
         String dbName = generateUniqueDatabaseName();
 
         return new DatabaseChangeSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6546
             new DropDatabaseSetup(test, dbName, false),
             dbName, dbName, true);
     }
@@ -781,6 +831,7 @@ public static TestSetup singleUseDatabaseDecoratorNoShutdown(Test test)
      */
     public static DatabaseChangeSetup additionalDatabaseDecorator(Test test, String logicalDbName)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2295
         return new DatabaseChangeSetup(new DropDatabaseSetup(test, logicalDbName),
                                        logicalDbName,
                                        generateUniqueDatabaseName(),
@@ -827,6 +878,7 @@ public static DatabaseChangeSetup additionalDatabaseDecoratorNoShutdown(
         )
     {
         return new DatabaseChangeSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6546
             new DropDatabaseSetup(test, logicalDbName, false),
             logicalDbName,
             generateUniqueDatabaseName(),
@@ -851,6 +903,7 @@ public static DatabaseChangeSetup additionalDatabaseDecoratorNoShutdown(
         String logicalDbName, String physicalDbName )
     {
         return new DatabaseChangeSetup(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6546
             new DropDatabaseSetup(test, logicalDbName, false),
             logicalDbName,
             physicalDbName,
@@ -872,6 +925,7 @@ public static DatabaseChangeSetup additionalDatabaseDecoratorNoShutdown(
      */
     public static Test changeUserDecorator(Test test, String user, String password)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         return new ChangeUserSetup(test, user, password);
     }   
     
@@ -893,6 +947,7 @@ public static Test changeUserDecorator(Test test, String user, String password)
      * This decorator must be the outer one in this mode.
      * <code>
      * test = DatabasePropertyTestSetup.builtinAuthentication(test,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2466
                 new String[] {TEST_DBO,"U1","U2",},
                 "nh32ew");
        test = TestConfiguration.sqlAuthorizationDecorator(test);
@@ -912,11 +967,14 @@ public static Test sqlAuthorizationDecorator(Test test)
         // reset it.
         final Properties sqlAuth = new Properties();
         sqlAuth.setProperty("derby.database.sqlAuthorization", "true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5705
         Test setSQLAuthMode = DatabasePropertyTestSetup.getNoTeardownInstance(
                 test, sqlAuth, true);
         
         return changeUserDecorator(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
             new DatabaseChangeSetup(setSQLAuthMode, DEFAULT_DBNAME_SQL, DEFAULT_DBNAME_SQL, true),
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
             DerbyConstants.TEST_DBO, "dummy"); // DRDA doesn't like empty pw
     }
 
@@ -932,6 +990,7 @@ public static Test sqlAuthorizationDecorator(Test test)
      */
     public static Test sqlAuthorizationDecoratorSingleUse(Test test)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6546
         return sqlAuthorizationDecoratorSingleUse(
                 test, DEFAULT_DBNAME_SQL, false);
     }
@@ -957,9 +1016,11 @@ public static Test sqlAuthorizationDecoratorSingleUse(
         // reset it.
         final Properties sqlAuth = new Properties();
         sqlAuth.setProperty("derby.database.sqlAuthorization", "true");
+//IC see: https://issues.apache.org/jira/browse/DERBY-5705
         Test setSQLAuthMode = DatabasePropertyTestSetup.getNoTeardownInstance(
                 test, sqlAuth, true);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6546
         setSQLAuthMode = new DropDatabaseSetup(
                 setSQLAuthMode, dbName, shutdownDatabase);
         
@@ -967,6 +1028,7 @@ public static Test sqlAuthorizationDecoratorSingleUse(
             ( setSQLAuthMode, dbName, dbName, true );
 
         return changeUserDecorator(setSQLAuthMode,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
                                    DerbyConstants.TEST_DBO,
                                    "dummy"); // DRDA doesn't like empty pw
     }
@@ -992,6 +1054,7 @@ public static Test sqlAuthorizationDecorator(Test test,
             String[] users, String passwordToken)
     {
         String[] usersWithDBO = new String[users.length + 1];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2419
         usersWithDBO[0] = DerbyConstants.TEST_DBO;
         System.arraycopy(users, 0, usersWithDBO, 1, users.length);
         return sqlAuthorizationDecorator(
@@ -1016,9 +1079,11 @@ public static Test sqlAuthorizationDecorator(Test test,
     public static Test connectionCPDecorator(Test test)
     {
         if (JDBC.vmSupportsJDBC3()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
             return new ConnectorSetup(test,
              "org.apache.derbyTesting.junit.ConnectionPoolDataSourceConnector");
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("ConnectionPoolDataSource not supported");
         }
 
@@ -1038,9 +1103,11 @@ public static Test connectionCPDecorator(Test test)
     public static Test connectionXADecorator(Test test)
     {
         if (JDBC.vmSupportsJDBC3()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2215
             return new ConnectorSetup(test,
                 "org.apache.derbyTesting.junit.XADataSourceConnector");
         } else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             return new BaseTestSuite("XADataSource not supported");
         }
     }
@@ -1055,6 +1122,7 @@ public static Test connectionXADecorator(Test test)
      */
     public static TestSetup connectionDSDecorator(Test test)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         return new ConnectorSetup(test,
             "org.apache.derbyTesting.junit.DataSourceConnector");
     }
@@ -1069,6 +1137,7 @@ public static TestSetup connectionDSDecorator(Test test)
      */
     public static Test forceJDBC3Embedded(Test test)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         if (JDBC.vmSupportsJDBC4()) {
             test = new JDBCClientSetup(test, JDBCClient.EMBEDDED_30);
         }
@@ -1106,6 +1175,7 @@ public static Test forceJDBC3NetClient(Test test)
      */
     public static Test changeSSLDecorator(Test test, String ssl)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2274
         return new ChangeSSLSetup(test, ssl);
     }   
     
@@ -1116,6 +1186,7 @@ public static Test changeSSLDecorator(Test test, String ssl)
     private TestConfiguration() {
         // Check for possibly passed in DatabaseName
         // this is used in OCRecoveryTest
+//IC see: https://issues.apache.org/jira/browse/DERBY-5382
         String propDefDbName = getSystemProperties().getProperty(
                 "derby.tests.defaultDatabaseName");
         if (propDefDbName != null)
@@ -1123,22 +1194,28 @@ private TestConfiguration() {
         else
             this.defaultDbName=DEFAULT_DBNAME;
         usedDbNames.add(DEFAULT_DBNAME);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         logicalDbMapping.put(DEFAULT_DBNAME, DEFAULT_DBNAME);
         this.userName = DEFAULT_USER_NAME;
         this.userPassword = DEFAULT_USER_PASSWORD;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4898
         this.connectionAttributes = new Properties();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5363
         this.hostName = DEFAULT_HOSTNAME;
         this.port = basePort;
         this.isVerbose = Boolean.valueOf(
             getSystemProperties().getProperty(KEY_VERBOSE)).
             booleanValue();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2667
         this.doTrace = Boolean.valueOf(
             getSystemProperties().getProperty(KEY_TRACE)).
             booleanValue();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6401
         this.stopAfterFirstFail = Boolean.valueOf(
                 getSystemProperties().getProperty(KEY_STOP_AFTER_FIRST_FAIL)).
                 booleanValue();
         this.jdbcClient = JDBCClient.getDefaultEmbedded();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2274
         this.ssl = null;
         this.jmxPort = getNextAvailablePort();
         println("basePort=" + basePort + ", bogusPort=" + bogusPort +
@@ -1151,6 +1228,7 @@ private TestConfiguration() {
     /**
      * Obtain a new configuration identical to the passed one.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
     TestConfiguration(TestConfiguration copy)
     {
         this.defaultDbName = copy.defaultDbName;
@@ -1174,6 +1252,7 @@ private TestConfiguration() {
         initConnector(copy.connector);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2215
     TestConfiguration(TestConfiguration copy, JDBCClient client,
             String hostName, int port)
     {
@@ -1202,6 +1281,7 @@ private TestConfiguration() {
         initConnector(copy.connector);
     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4417
     TestConfiguration(TestConfiguration copy, JDBCClient client,
             String hostName, int port, String dataBasePath)
     {
@@ -1213,9 +1293,13 @@ private TestConfiguration() {
         this.connectionAttributes = new Properties(copy.connectionAttributes);
 
         this.isVerbose = copy.isVerbose;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2667
         this.doTrace = copy.doTrace;
         this.port = port;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         this.jmxPort = copy.jmxPort;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4700
+//IC see: https://issues.apache.org/jira/browse/DERBY-4700
         if (bogusPort == port) {
             throw new IllegalStateException(
                     "port cannot equal bogusPort: " + bogusPort);
@@ -1224,8 +1308,10 @@ private TestConfiguration() {
         this.jdbcClient = client;
         this.hostName = hostName;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2274
         this.ssl = copy.ssl;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         this.url = createJDBCUrlWithDatabaseName(defaultDbName);
         initConnector(copy.connector);
     }
@@ -1240,9 +1326,13 @@ private TestConfiguration() {
     TestConfiguration(TestConfiguration copy, String user,
             String password, String passwordToken)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         this.defaultDbName = copy.defaultDbName;
         this.usedDbNames.addAll(copy.usedDbNames);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         logicalDbMapping.putAll(copy.logicalDbMapping);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1555
         this.userName = user;
         this.userPassword = password;
         this.passwordToken = passwordToken == null ?
@@ -1257,9 +1347,12 @@ private TestConfiguration() {
         this.jdbcClient = copy.jdbcClient;
         this.hostName = copy.hostName;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2274
+//IC see: https://issues.apache.org/jira/browse/DERBY-2274
         this.ssl = copy.ssl;
         
         this.url = copy.url;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         initConnector(copy.connector);
     }
 
@@ -1273,6 +1366,7 @@ private TestConfiguration() {
      * @param copy configuration to copy
      * @param ssl default SSL mode
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2274
     TestConfiguration(TestConfiguration copy, String ssl)
     {
         this(copy);
@@ -1290,9 +1384,11 @@ private TestConfiguration() {
      * @param defaultDb Indicates that the passed <code>dbName</code> is supposed
      * to be used as the default database name.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
     TestConfiguration(TestConfiguration copy, String logicalDbName,
                       String dbName, boolean defaultDb)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         this.usedDbNames.addAll(copy.usedDbNames);
         this.usedDbNames.add(dbName);
         logicalDbMapping.putAll(copy.logicalDbMapping);
@@ -1302,6 +1398,7 @@ private TestConfiguration() {
         // since having more physical databases accessible throught the same
         // logical database name will access only the last physical database
         Assert.assertNull(logicalDbMapping.put(logicalDbName, dbName));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         if (defaultDb) {
             this.defaultDbName = dbName;
@@ -1312,18 +1409,33 @@ private TestConfiguration() {
         this.userName = copy.userName;
         this.userPassword = copy.userPassword;
         this.connectionAttributes = new Properties(copy.connectionAttributes);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
 
         this.isVerbose = copy.isVerbose;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2667
+//IC see: https://issues.apache.org/jira/browse/DERBY-2667
+//IC see: https://issues.apache.org/jira/browse/DERBY-2667
         this.doTrace = copy.doTrace;
         this.port = copy.port;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         this.jmxPort = copy.jmxPort;
         
         this.jdbcClient = copy.jdbcClient;
         this.hostName = copy.hostName;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2274
         this.ssl = copy.ssl;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         this.url = createJDBCUrlWithDatabaseName(this.defaultDbName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         initConnector(copy.connector);
     }
   
@@ -1335,21 +1447,28 @@ private TestConfiguration() {
     private TestConfiguration(Properties props) 
         throws NumberFormatException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         defaultDbName = props.getProperty(KEY_DBNAME, DEFAULT_DBNAME);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         usedDbNames.add(defaultDbName);
         logicalDbMapping.put(defaultDbName, defaultDbName);
         userName = props.getProperty(KEY_USER_NAME, DEFAULT_USER_NAME);
         userPassword = props.getProperty(KEY_USER_PASSWORD, 
                                          DEFAULT_USER_PASSWORD);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4898
         connectionAttributes = new Properties();
         hostName = props.getProperty(KEY_HOSTNAME, DEFAULT_HOSTNAME);
         isVerbose = Boolean.valueOf(props.getProperty(KEY_VERBOSE)).booleanValue();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2667
         doTrace =  Boolean.valueOf(props.getProperty(KEY_TRACE)).booleanValue();
         port = basePort;
         jmxPort = getNextAvailablePort();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4700
+//IC see: https://issues.apache.org/jira/browse/DERBY-4700
         println("basePort=" + basePort + ", bogusPort=" + bogusPort +
                 ", jmxPort=" + jmxPort);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2274
         ssl = props.getProperty(KEY_SSL);
         
         String framework = props.getProperty(KEY_FRAMEWORK, DEFAULT_FRAMEWORK);
@@ -1361,7 +1480,10 @@ private TestConfiguration(Properties props)
         } else {
             jdbcClient = JDBCClient.getDefaultEmbedded();
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         url = createJDBCUrlWithDatabaseName(defaultDbName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
+//IC see: https://issues.apache.org/jira/browse/DERBY-2217
         initConnector(null);
     }
 
@@ -1372,6 +1494,7 @@ private TestConfiguration(Properties props)
      * @param attrs the extra connection attributes
      * @return a copy of the configuration with extra attributes
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
     TestConfiguration addConnectionAttributes(Properties attrs) {
         TestConfiguration copy = new TestConfiguration(this);
         Enumeration e = attrs.propertyNames();
@@ -1391,6 +1514,7 @@ TestConfiguration addConnectionAttributes(Properties attrs) {
      */
     public  static final Properties getSystemProperties() {
         // Fetch system properties in a privileged block.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return AccessController.doPrivileged(
                 new PrivilegedAction<Properties>() {
             public Properties run() {
@@ -1405,8 +1529,11 @@ public Properties run() {
      * @return JDBC connection url, without attributes.
      */
     private String createJDBCUrlWithDatabaseName(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
         if (JDBC.vmSupportsJDBC3())
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1952
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             String url;
            if (jdbcClient.isEmbedded()) {
                url = jdbcClient.getUrlBase();
@@ -1434,15 +1561,18 @@ private void initConnector(Connector oldConnector)
             // configuration we are copying from.
             
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Class<?> clazz = Class.forName(oldConnector.getClass().getName());
                 connector = (Connector) clazz.getConstructor().newInstance();
             } catch (Exception e) {
                 Assert.fail(e.getMessage());
             }            
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2024
         else if (JDBC.vmSupportsJDBC3())
         {
             try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 Class<?> clazz = Class.forName("org.apache.derbyTesting.junit.DriverManagerConnector");
                 connector = (Connector) clazz.getConstructor().newInstance();
             } catch (Exception e) {
@@ -1454,6 +1584,7 @@ else if (JDBC.vmSupportsJDBC3())
         }
         connector.setConfiguration(this);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         try {
             String  loginTimeoutString = BaseTestCase.getSystemProperty( KEY_LOGIN_TIMEOUT );
             
@@ -1519,6 +1650,7 @@ public String getDefaultDatabaseName() {
      * @return Physical name of the database.
      */
     public String getPhysicalDatabaseName(String logicalName) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2295
         return (String) logicalDbMapping.get(logicalName);
     }
 
@@ -1549,6 +1681,7 @@ public String getUserPassword() {
      * @return connection attributes (never {@code null})
      */
     public Properties getConnectionAttributes() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4884
         return connectionAttributes;
     }
 
@@ -1588,6 +1721,7 @@ String getConnectionAttributesString() {
      * @return host name.
      */
     public String getHostName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1157
         return hostName;
     }
 
@@ -1597,10 +1731,12 @@ public String getHostName() {
      * @return true if base port is default.
      */
     public static boolean isDefaultBasePort() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6178
         return (basePort == DEFAULT_PORT);
     }
 
     public static int getBasePort() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2076
         return basePort;
     }
 
@@ -1645,6 +1781,7 @@ public int getNextAvailablePort() {
      *         connections
      */
     public int getJmxPort() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3385
         return jmxPort;
     }
 
@@ -1655,6 +1792,7 @@ public int getJmxPort() {
      * @return A port number where no Derby network servers are started.
      */
     public int getBogusPort() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4700
         return bogusPort;
     }
 
@@ -1664,6 +1802,7 @@ public int getBogusPort() {
      * @return ssl mode
      */
     public String getSsl() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2274
         return ssl;
     }
 
@@ -1677,6 +1816,9 @@ public String getSsl() {
      */
     public Connection openDefaultConnection()
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2036
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         return connector.openConnection();
     }
     
@@ -1702,6 +1844,7 @@ Connection openDefaultConnection(String user, String password)
      * to <code>additionalDatabaseDecorator</code> function.
      * @return connection to specified database.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
     Connection openConnection(String logicalDatabaseName)
         throws SQLException
     {
@@ -1774,7 +1917,11 @@ public  Connection openPhysicalConnection( String physicalDatabaseName, String u
      */
     public void shutdownDatabase()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2036
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
             connector.shutDatabase();
             Assert.fail("Database failed to shut down");
         } catch (SQLException e) {
@@ -1792,6 +1939,7 @@ public void shutdownDatabase()
     public void shutdownEngine()
     {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
             connector.shutEngine(true);
             Assert.fail("Engine failed to shut down");
         } catch (SQLException e) {
@@ -1809,6 +1957,8 @@ public void shutdownEngine()
      */
     public void shutdownEngine(boolean deregisterDeriver)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2043
+//IC see: https://issues.apache.org/jira/browse/DERBY-2047
         try {
             connector.shutEngine(deregisterDeriver);
             Assert.fail("Engine failed to shut down");
@@ -1820,6 +1970,7 @@ public void shutdownEngine(boolean deregisterDeriver)
     /** Get the login timeout from the connector */
     public  int getLoginTimeout() throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         return connector.getLoginTimeout();
     }
 
@@ -1868,7 +2019,9 @@ public void waitForShutdownComplete(String physicalDatabaseName) {
      *
      */
     public void stopNetworkServer() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2855
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3151
             NetworkServerControlWrapper networkServer =
                     new NetworkServerControlWrapper();
 
@@ -1891,9 +2044,11 @@ public void startNetworkServer() throws SQLException
         Exception failException = null;
         try {
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-3151
             NetworkServerControlWrapper networkServer =
                     new NetworkServerControlWrapper();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
  	    serverOutput = AccessController.doPrivileged(
                             new PrivilegedAction<FileOutputStream>() {
                 public FileOutputStream run() {
@@ -1967,6 +2122,7 @@ public boolean isVerbose() {
      * than the println method in <tt>BaseJDBCTestCase</tt>.
      */
     private void println(CharSequence msg) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4700
         if (isVerbose) {
             System.out.println("DEBUG: {TC@" + hashCode() + "} " + msg);
         }
@@ -1978,10 +2134,12 @@ private void println(CharSequence msg) {
      * @return JUnit test method trace flag.
      */
     public boolean doTrace() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2667
         return doTrace;
     }
 
     public boolean stopAfterFirstFail() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6401
         return stopAfterFirstFail;
     }
 	/**
@@ -2038,6 +2196,7 @@ File getFailureFolder(TestCase test){
         sb.append(className);
         sb.append(File.separatorChar);
         // DERBY-5620: Ensure valid file name.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5620
         char[] tmpName = test.getName().toCharArray();
         for (int i=0; i < tmpName.length; i++) {
             switch (tmpName[i]) {
@@ -2058,6 +2217,7 @@ File getFailureFolder(TestCase test){
         // Create the folder
         // TODO: Dump this configuration in some human readable format
         synchronized (base) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
                 public Boolean run() {
                     if (folder.exists()) {
@@ -2113,6 +2273,7 @@ public Boolean run() {
      * Indirection for obtaining connections based upon
      * this configuration.
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2215
     Connector connector;
     
     /*
@@ -2133,7 +2294,9 @@ boolean defaultSecurityManagerSetup() {
     		SecurityManagerSetup.noSecurityManager();
     		return false;
     	} else {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5631
             if (SecurityManagerSetup.NO_POLICY.equals(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2033
                     BaseTestCase.getSystemProperty("java.security.policy")))
             {
                 // Explict setting of no security manager
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Utilities.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Utilities.java
index 25bd48953a..f55136b4a3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Utilities.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/Utilities.java
@@ -246,6 +246,7 @@ public static void sleep(long millis) {
     public static String formatTestClassNames(String test) {
         final String COMMON_FUNCTIONTEST_PREFIX = "org.apache.derbyTesting.functionTests.tests.";
         final String COMMON_TEST_PREFIX = "org.apache.derbyTesting.";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5300
         if (test.startsWith(COMMON_FUNCTIONTEST_PREFIX)) {
             return test.substring(COMMON_FUNCTIONTEST_PREFIX.length());
         } else if (test.startsWith(COMMON_TEST_PREFIX)) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XADataSourceConnector.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XADataSourceConnector.java
index c406262407..2ca90d0f7a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XADataSourceConnector.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XADataSourceConnector.java
@@ -72,6 +72,7 @@ public Connection openConnection() throws SQLException {
     }
 
     public Connection openConnection(String databaseName) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
         JDBCDataSource.setBeanProperty(ds, "databaseName", databaseName);
         try {
             return ds.getXAConnection().getConnection();
@@ -104,6 +105,7 @@ public Connection openConnection(String user, String password)
             if (!"XJ004".equals(e.getSQLState()))
                 throw e;
             return singleUseDS( DataSourceConnector.makeCreateDBAttributes( config ) ).
+//IC see: https://issues.apache.org/jira/browse/DERBY-2087
                    getXAConnection(user, password).getConnection(); 
        }
     }
@@ -127,6 +129,7 @@ public Connection openConnection(String databaseName, String user, String passwo
             // a new DataSource with the createDatabase property set.
             if (!"XJ004".equals(e.getSQLState()))
                 throw e;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             HashMap<String, Object> hm =
                     DataSourceConnector.makeCreateDBAttributes( config );
             DataSourceConnector.copyProperties(connectionProperties, hm);
@@ -148,6 +151,7 @@ public void shutEngine(boolean deregisterDriver) throws SQLException {
     
     public void setLoginTimeout( int seconds ) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6094
         ds.setLoginTimeout( seconds );
     }
     
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XATestUtil.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XATestUtil.java
index d0c67174ab..5b522e17be 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XATestUtil.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XATestUtil.java
@@ -39,6 +39,7 @@ public class XATestUtil {
      * Return a new Xid for testing.
     */
     public static Xid getXid(int formatId, int b1, int b2) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         byte[] globalId = new byte[Xid.MAXGTRIDSIZE];
         byte[] branchId = new byte[Xid.MAXBQUALSIZE];
 
@@ -79,6 +80,7 @@ public static void createXATransactionView(Statement s) throws SQLException
                 "create view XATESTUTIL.global_xactTable as " +
                 "select  cast(global_xid as char(2)) as gxid," +
                 " status, " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-434
                 " CAST (case when first_instant is NULL then 'NULL' else 'false' end AS VARCHAR(8)) as readOnly, " +
                 " cast (username as char(10)) as username, type " +
                 " from syscs_diag.transaction_table");
@@ -94,9 +96,11 @@ public static void checkXATransactionView(Connection conn,String[][] expectedRow
         Statement s = conn.createStatement();
         ResultSet rs = s.executeQuery(
                 "select * from XATESTUTIL.global_xactTable where gxid is not null order by gxid");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2474
         if (expectedRows == null)
             JDBC.assertEmpty(rs);
         else
+//IC see: https://issues.apache.org/jira/browse/DERBY-4155
             JDBC.assertUnorderedResultSet(rs, expectedRows);
         rs.close();
     }
@@ -151,6 +155,7 @@ class utilXid implements Xid, Serializable {
 
     private byte[] branch_id;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
     utilXid(int format_id, byte[] global_id, byte[] branch_id) {
         this.format_id = format_id;
         this.global_id = global_id;
@@ -191,6 +196,7 @@ public byte[] getBranchQualifier() {
     public boolean equals(Object obj) {
         boolean ret = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5917
         if (obj instanceof utilXid) {
             utilXid that = (utilXid) obj;
             ret = this.format_id == that.format_id &&
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XML.java b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XML.java
index ecdfc139a7..f1635f04fd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XML.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/junit/XML.java
@@ -65,6 +65,7 @@ public class XML {
      */
     private static final String HELPER_FILE_LOCATION =
         "org/apache/derbyTesting/functionTests/tests/lang/xmlTestFiles/";
+//IC see: https://issues.apache.org/jira/browse/DERBY-1758
 
     /**
      * Return true if the classpath contains JAXP and
@@ -83,6 +84,7 @@ public static boolean classpathHasJAXP()
      */
     public static boolean classpathMeetsXMLReqs()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6624
         return HAVE_XPATH;
     }
 
@@ -100,6 +102,7 @@ public static boolean classpathMeetsXMLReqs()
      *  file's content.
      */
     public static void insertFile(Connection conn, String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1758
         String colName, String fName, int numRows)
         throws IOException, SQLException, PrivilegedActionException
     {
@@ -226,6 +229,7 @@ private static boolean checkXPathSupport()
         try {
             Class<?> factoryClass =
                     Class.forName("javax.xml.xpath.XPathFactory");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6624
 
             Method newFactory =
                     factoryClass.getMethod("newInstance");
@@ -243,6 +247,8 @@ private static boolean checkXPathSupport()
 
     private static boolean checkJAXPImplementation() {
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Class<?> factoryClass =
                     Class.forName("javax.xml.parsers.DocumentBuilderFactory");
             Method newFactory =
@@ -272,10 +278,12 @@ protected static String getJAXPParserLocation()
          * parser in the classpath, the result for J2ME would be
          * be a NoClassDefFound error (DERBY-2153).
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-2739
         if (!classpathHasJAXP())
             return null;
 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Class<?> jaxpFinderClass = Class.forName("org.apache.derbyTesting.junit.JAXPFinder");
             Method locatorMethod = jaxpFinderClass.getDeclaredMethod("getJAXPParserLocation");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/_Suite.java
index 0d9b32eb65..a197fd95ca 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/_Suite.java
@@ -38,14 +38,17 @@ public class _Suite extends BaseTestCase{
     
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("BasicPerf");
         
         suite.addTest(ValuesTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2200
         suite.addTest(CountTest.suite());
         suite.addTest(HeapScan.suite());
         suite.addTest(CoveredIdxScan.suite());
         suite.addTest(SortTest.suite());
         suite.addTest(SelectDistinctTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3981
 
         return suite;
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/BlobAccessTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/BlobAccessTest.java
index 42c1875d02..91bb5861f3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/BlobAccessTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/BlobAccessTest.java
@@ -118,6 +118,7 @@ public void initializeConnection(Connection conn)
      * @return A suite of tests.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite mainSuite = new BaseTestSuite("BlobAccessTest suite");
         if (!disableSmallBlobs) {
             int iters = 50;
@@ -136,6 +137,7 @@ public static Test suite() {
             int iters = 5;
             int reps = 3;
             println("Adding large Blob tests.");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite largeSuite = new BaseTestSuite("Large Blob suite");
             largeSuite.addTest(new BlobAccessTest(
                     "testFetchLargeBlobs", iters, reps));
@@ -337,6 +339,7 @@ public void testFetchLargeBlobPieceByPiece()
      */
     public void testFetchLargeBlobPieceByPieceModified()
             throws IOException, SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3805
         fetchBlobPieceByPiece(true, FETCH_GETBYTES);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/ClobAccessTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/ClobAccessTest.java
index 861a76e105..3ec86fd557 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/ClobAccessTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/ClobAccessTest.java
@@ -96,6 +96,7 @@ public class ClobAccessTest
      * should be specified.
      */
     private static final String runLargeClobTests =
+//IC see: https://issues.apache.org/jira/browse/DERBY-3810
             System.getProperty("derby.tests.runLargeClobTests", null);
     private static final int largeClobSizeMB =
             Integer.getInteger("derby.tests.largeClobSize", 15).intValue();
@@ -125,6 +126,7 @@ public void initializeConnection(Connection conn)
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite mainSuite = new BaseTestSuite("ClobAccessTest suite");
         if (!disableSmallClobs) {
             int iters = 50;
@@ -142,6 +144,7 @@ public static Test suite() {
         if (!disableLargeClobs) {
             int iters = 5;
             int reps = 1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3810
             String[] tests = new String[] {
                     "testFetchLargeClobs",
                     "testFetchLargeClobsModified",
@@ -153,6 +156,7 @@ public static Test suite() {
                     "testFetchLargeClobPieceByPieceModified",
                     "testLargeClobGetLength",
                     "testLargeClobGetLengthModified",
+//IC see: https://issues.apache.org/jira/browse/DERBY-4241
                     "testLargeClobTruncateLengthMinusOne",
                     "testFetchLargeClobPieceByPieceBackwards",
                 };
@@ -164,6 +168,7 @@ public static Test suite() {
                 }
             }
             println("Adding " + tests.length + " large Clob tests.");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
             BaseTestSuite largeSuite = new BaseTestSuite("Large Clob suite");
             for (int i=0; i < tests.length; i++) {
                 largeSuite.addTest(new ClobAccessTest(tests[i] , iters, reps));
@@ -510,6 +515,7 @@ public void testLargeClobGetLengthModified() throws SQLException {
      * storage as part of the truncate operation.
      */
     public void testLargeClobTruncateLengthMinusOne()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4241
             throws SQLException {
         // Select just one Clob.
         PreparedStatement ps = prepareStatement(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/CountTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/CountTest.java
index fe05474371..245e86c989 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/CountTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/CountTest.java
@@ -43,6 +43,7 @@ public class CountTest extends JDBCPerfTestCase {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("CountTest");
         int iterations = 1200, repeats = 4;
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/CoveredIdxScan.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/CoveredIdxScan.java
index 761f97ad84..81faccb13e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/CoveredIdxScan.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/CoveredIdxScan.java
@@ -38,6 +38,7 @@ public class CoveredIdxScan extends HeapScan {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite scan = new BaseTestSuite("CoveredIdxScanTests");
         int iterations = 700, repeats = 4;
 
@@ -64,6 +65,7 @@ public CoveredIdxScan(String name,int iterations, int repeats)
      */
     public void setUp() throws Exception {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4607
         select = prepareStatement("SELECT i1 FROM " + tableName +
         " WHERE i1 > ? and i1 <= ?");
     }
@@ -104,6 +106,7 @@ public void ScanCoveredIdxInt() throws Exception
         }
         assertEquals(rowcount,actualCount);
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4607
         commit();
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/HeapScan.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/HeapScan.java
index 9876712300..800f680e31 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/HeapScan.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/HeapScan.java
@@ -46,6 +46,7 @@ public class HeapScan extends JDBCPerfTestCase {
      */
     public static Test suite()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("HeapScanTests");
         suite.addTest(baseSuite("HeapScan:CHAR", false));
         suite.addTest(baseSuite("HeapScan:BINARY", true));
@@ -64,6 +65,7 @@ public static Test suite()
     private static Test baseSuite(String name, boolean binaryData) {
         int iterations = 700, repeats = 4;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite heapScan = new BaseTestSuite(name);
         heapScan.addTest(new HeapScan("Scan100", binaryData,
                                       iterations, repeats));
@@ -107,6 +109,7 @@ public HeapScan(String name, boolean binaryData,
     public void setUp() throws Exception {
 
         select = prepareStatement("SELECT * FROM " + tableName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4607
 
         // Create a SELECT statement that uses predicates. Also initialize
         // the predicates with some data of the correct type for this test
@@ -181,6 +184,7 @@ public void Scan100GetData() throws Exception
         }
         assertEquals(actualCount,rowcount);
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4607
         commit();
     }
 
@@ -193,6 +197,7 @@ public void Scan100WithPredicate() throws SQLException {
         ResultSet rs = selectWithPred.executeQuery();
         assertFalse("should be empty", rs.next());
         rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4607
         commit();
     }
 
@@ -204,6 +209,7 @@ public void tearDown() throws Exception {
         // we need to set the fields to null to allow them to be garbage
         // collected.
         select = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4607
         selectWithPred = null;
         super.tearDown();
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/IndexScanTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/IndexScanTest.java
index 94d01d3956..3f200f0bed 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/IndexScanTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/IndexScanTest.java
@@ -80,6 +80,7 @@ protected void tearDown() throws Exception {
      * @return a test suite
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("IndexScanTest");
         suite.addTest(new IndexScanTest("varchar10", 5000, 4));
         suite.addTest(new IndexScanTest("varchar100", 5000, 4));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/SelectDistinctTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/SelectDistinctTest.java
index e03f309c24..481ece22cc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/SelectDistinctTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/SelectDistinctTest.java
@@ -81,6 +81,7 @@ private SelectDistinctTest(String name, int iterations, int repeats) {
      * @return all test cases in this class
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("SelectDistinctTest");
         suite.addTest(new SelectDistinctTest(TEST_CHAR5, 2000, 4));
         suite.addTest(new SelectDistinctTest(TEST_BINARY5, 2000, 4));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/SortTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/SortTest.java
index 7addfed2a0..7d447e1383 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/SortTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/SortTest.java
@@ -46,6 +46,7 @@ public static Test suite()
     {
         int iterations = 350, repeats = 4;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("SortTests");
         suite.addTest(new SortTest("SortDesc100",iterations,repeats));
         suite.addTest(new SortTest("SortDesc100GetData",iterations,repeats));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/ValuesTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/ValuesTest.java
index 5a832f38a5..c345d4fc10 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/ValuesTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic/jdbc/ValuesTest.java
@@ -42,6 +42,7 @@ public static Test suite()
         int iterations = 100000;
         int repeats = 4;
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("ValuesTest");
         
         // To add embed tests.
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/BackToBackLoadGenerator.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/BackToBackLoadGenerator.java
index f64a0f4d61..8962a487cc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/BackToBackLoadGenerator.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/BackToBackLoadGenerator.java
@@ -131,6 +131,7 @@ public void printReport(PrintStream out) {
         out.println("Number of transactions:\t" + count);
         out.println("Average throughput (tx/s):\t" + tps);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
         for (int i = 0; i < threads.length; i++)
         {
             threads[i].getClient().printReport( out );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/BankAccountFiller.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/BankAccountFiller.java
index c0533f3ce3..e49ee0cee8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/BankAccountFiller.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/BankAccountFiller.java
@@ -97,6 +97,7 @@ public class BankAccountFiller implements DBFiller {
      */
     public BankAccountFiller(int branches, int tellersPerBranch,
                              int accountsPerBranch) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         if (branches <= 0 || tellersPerBranch <= 0 || accountsPerBranch <= 0) {
             throw new IllegalArgumentException(
                 "all arguments must be greater than 0");
@@ -116,6 +117,7 @@ public BankAccountFiller(int branches, int tellersPerBranch,
      * @param scale the scale factor for this database
      */
     public BankAccountFiller(int scale) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         this(scale, DEFAULT_TELLERS_PER_BRANCH, DEFAULT_ACCOUNTS_PER_BRANCH);
     }
 
@@ -147,6 +149,7 @@ private static void createTables(Connection c) throws SQLException {
         Statement s = c.createStatement();
 
         s.executeUpdate("CREATE TABLE " + ACCOUNT_TABLE +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5067
                         "(ACCOUNT_ID INT NOT NULL, " +
                         "BRANCH_ID INT NOT NULL, " +
                         // The balance column must be able to hold 10
@@ -156,6 +159,7 @@ private static void createTables(Connection c) throws SQLException {
                         "EXTRA_DATA CHAR(" + ACCOUNT_EXTRA + ") NOT NULL)");
 
         s.executeUpdate("CREATE TABLE " + BRANCH_TABLE +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5067
                         "(BRANCH_ID INT NOT NULL, " +
                         // The balance column must be able to hold 10
                         // digits and sign per TPC-B spec, so BIGINT
@@ -164,6 +168,7 @@ private static void createTables(Connection c) throws SQLException {
                         "EXTRA_DATA CHAR(" + BRANCH_EXTRA + ") NOT NULL)");
 
         s.executeUpdate("CREATE TABLE " + TELLER_TABLE +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5067
                         "(TELLER_ID INT NOT NULL, " +
                         "BRANCH_ID INT NOT NULL, " +
                         // The balance column must be able to hold 10
@@ -193,12 +198,14 @@ private static void createTables(Connection c) throws SQLException {
     private void fillTables(Connection c) throws SQLException {
 
         Statement s = c.createStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5067
 
         PreparedStatement atIns =
             c.prepareStatement("INSERT INTO " + ACCOUNT_TABLE +
                                "(ACCOUNT_ID, BRANCH_ID, ACCOUNT_BALANCE, " +
                                "EXTRA_DATA) VALUES (?, ?, 0, ?)");
         atIns.setString(3, createJunk(ACCOUNT_EXTRA)); // same for all rows
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         for (int id = 0; id < accountsPerBranch * branches; id++) {
             atIns.setInt(1, id);
             atIns.setInt(2, id / accountsPerBranch);
@@ -206,6 +213,7 @@ private void fillTables(Connection c) throws SQLException {
         }
         atIns.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5067
         s.executeUpdate("ALTER TABLE " + ACCOUNT_TABLE + " ADD CONSTRAINT " +
                 ACCOUNT_TABLE + "_PK PRIMARY KEY (ACCOUNT_ID)");
 
@@ -216,12 +224,14 @@ private void fillTables(Connection c) throws SQLException {
                                "(BRANCH_ID, BRANCH_BALANCE, EXTRA_DATA) " +
                                "VALUES (?, 0, ?)");
         btIns.setString(2, createJunk(BRANCH_EXTRA)); // same for all rows
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         for (int id = 0; id < branches; id++) {
             btIns.setInt(1, id);
             btIns.executeUpdate();
         }
         btIns.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5067
         s.executeUpdate("ALTER TABLE " + BRANCH_TABLE + " ADD CONSTRAINT " +
                 BRANCH_TABLE + "_PK PRIMARY KEY (BRANCH_ID)");
 
@@ -232,6 +242,7 @@ private void fillTables(Connection c) throws SQLException {
                                "(TELLER_ID, BRANCH_ID, TELLER_BALANCE, " +
                                "EXTRA_DATA) VALUES (?, ?, 0, ?)");
         ttIns.setString(3, createJunk(TELLER_EXTRA)); // same for all rows
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         for (int id = 0; id < tellersPerBranch * branches; id++) {
             ttIns.setInt(1, id);
             ttIns.setInt(2, id / tellersPerBranch);
@@ -239,6 +250,7 @@ private void fillTables(Connection c) throws SQLException {
         }
         ttIns.close();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5067
         s.executeUpdate("ALTER TABLE " + TELLER_TABLE + " ADD CONSTRAINT " +
                 TELLER_TABLE + "_PK PRIMARY KEY (TELLER_ID)");
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/Client.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/Client.java
index 1742494427..cd24e55121 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/Client.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/Client.java
@@ -54,5 +54,6 @@ public interface Client {
      *
      * @param out stream to print the report to
      */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
     void printReport(PrintStream out);
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/PoissonLoadGenerator.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/PoissonLoadGenerator.java
index 627438e33d..f899a138d2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/PoissonLoadGenerator.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/PoissonLoadGenerator.java
@@ -198,6 +198,7 @@ public void printReport(PrintStream out) {
         out.println("Minimum response time (ms):\t" + min);
         out.println("Maximum response time (ms):\t" + max);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
         for (int i = 0; i < threads.length; i++)
         {
             threads[i].getClient().printReport( out );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/Runner.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/Runner.java
index 8290cf95d5..e989761319 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/Runner.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/Runner.java
@@ -59,6 +59,7 @@ public class Runner {
     private static String load; // required argument
     /** Map containing load-specific options. */
     private final static HashMap<String, String> loadOpts =
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             new HashMap<String, String>();
     /** The name of the load generator to use in the test. */
     private static String generator = "b2b";
@@ -88,6 +89,7 @@ public static void main(String[] args) throws Exception {
             System.exit(1);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(driver);
         clazz.getConstructor().newInstance();
 
@@ -143,6 +145,7 @@ private static void parseArgs(String[] args) throws Exception {
             } else if (args[i].equals("-load")) {
                 load = args[++i];
             } else if (args[i].equals("-load_opts")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
                 parseLoadOpts(args[++i]);
             } else if (args[i].equals("-gen")) {
                 generator = args[++i];
@@ -172,6 +175,7 @@ private static void parseArgs(String[] args) throws Exception {
      * @param optsString the comma-separated list of options
      */
     private static void parseLoadOpts(String optsString) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         String[] opts = optsString.split(",");
         for (int i = 0; i < opts.length; i++) {
             String[] keyValue = opts[i].split("=", 2);
@@ -217,6 +221,7 @@ static int getLoadOpt(String option, int defaultValue) {
 "  -init: initialize database (otherwise, reuse database)\n" +
 "  -load: type of load, required argument, valid types:\n" +
 "      * sr_select - single-record (primary key) select from table with\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
 "                    100 000 rows. It accepts the following load-specific\n" +
 "                    options (see also -load_opts):\n" +
 "            - blob or clob: use BLOB or CLOB data instead of VARCHAR\n" +
@@ -236,7 +241,9 @@ static int getLoadOpt(String option, int defaultValue) {
 "      * sr_update_multi - single-record update on a random table\n" +
 "                    (32 tables with a single row each)\n" +
 "      * index_join - join of two tables (using indexed columns)\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4363
 "      * group_by - GROUP BY queries against TENKTUP1\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
 "      * bank_tx - emulate simple bank transactions, similar to TPC-B. The\n" +
 "                  following load-specific options are accepted:\n" +
 "            - branches=NN: specifies the number of branches in the db\n" +
@@ -245,15 +252,20 @@ static int getLoadOpt(String option, int defaultValue) {
 "              in the database has (default: 10)\n" +
 "            - accountsPerBranch=NN: specifies the number of accounts in\n" +
 "              each branch (default: 100000)\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
 "      * seq_gen - sequence generator concurrency. Accepts\n" +
 "                    the following load-specific options (see also -load_opts):\n" +
 "            - numberOfGenerators: number of sequences to create\n" +
 "            - tablesPerGenerator: number of tables to create per sequence\n" +
 "            - insertsPerTransaction: number of inserts to perform per transaction\n" +
 "            - debugging: 1 means print debug chatter, 0 means do not print the chatter\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
+//IC see: https://issues.apache.org/jira/browse/DERBY-5426
+//IC see: https://issues.apache.org/jira/browse/DERBY-4526
 "            - identityTest: 1 means do identity column testing, any other number \n" +
 "                    means do sequence generator testing. If no identityTest is specified \n" +
 "                    then sequence generator testing will be done by default \n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
 "  -load_opts: comma-separated list of load-specific options\n" +
 "  -gen: load generator, default: b2b, valid types:\n" +
 "      * b2b - clients perform operations back-to-back\n" +
@@ -280,6 +292,7 @@ private static void printUsage(PrintStream out) {
     private static int getTextType() {
         boolean blob = hasOption("blob");
         boolean clob = hasOption("clob");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         if (blob && clob) {
             System.err.println("Cannot specify both 'blob' and 'clob'");
             printUsage(System.err);
@@ -303,6 +316,7 @@ private static int getTextType() {
     private static DBFiller getDBFiller() {
         if (load.equals("sr_select") || load.equals("sr_update")) {
             return new SingleRecordFiller(100000, 1, getTextType(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
                                           hasOption("secondary"),
                                           hasOption("nonIndexed"));
         } else if (load.equals("sr_select_big") ||
@@ -313,13 +327,16 @@ private static DBFiller getDBFiller() {
             return new SingleRecordFiller(1, 32);
         } else if (load.equals("index_join")) {
             return new WisconsinFiller();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4363
         } else if (load.equals("group_by")) {
             return new WisconsinFiller(getLoadOpt("numRows", 10000));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         } else if (load.equals("bank_tx")) {
             return new BankAccountFiller(
                 getLoadOpt("branches", 1),
                 getLoadOpt("tellersPerBranch", 10),
                 getLoadOpt("accountsPerBranch", 100000));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
         } else if (load.equals("seq_gen")) {
             return new SequenceGeneratorConcurrency.Filler();
         }
@@ -337,6 +354,7 @@ private static DBFiller getDBFiller() {
     private static Client newClient() {
         if (load.equals("sr_select")) {
             return new SingleRecordSelectClient(100000, 1, getTextType(),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
                     hasOption("secondary"), hasOption("nonIndexed"));
         } else if (load.equals("sr_update")) {
             return new SingleRecordUpdateClient(100000, 1, getTextType(),
@@ -351,13 +369,16 @@ private static Client newClient() {
             return new SingleRecordUpdateClient(1, 32);
         } else if (load.equals("index_join")) {
             return new IndexJoinClient();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4363
         } else if (load.equals("group_by")) {
             return new GroupByClient();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         } else if (load.equals("bank_tx")) {
             return new BankTransactionClient(
                 getLoadOpt("branches", 1),
                 getLoadOpt("tellersPerBranch", 10),
                 getLoadOpt("accountsPerBranch", 100000));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
         } else if (load.equals("seq_gen")) {
             return new SequenceGeneratorConcurrency.SGClient();
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SequenceGeneratorConcurrency.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SequenceGeneratorConcurrency.java
index 49f6811054..d10285f0d5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SequenceGeneratorConcurrency.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SequenceGeneratorConcurrency.java
@@ -61,6 +61,9 @@ public LoadOptions()
             _tablesPerGenerator = Runner.getLoadOpt( "tablesPerGenerator", 1 );
             _insertsPerTransaction = Runner.getLoadOpt( "insertsPerTransaction", 1 );
             //If no identityTest is specified, then do sequence testing.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
+//IC see: https://issues.apache.org/jira/browse/DERBY-5426
+//IC see: https://issues.apache.org/jira/browse/DERBY-4526
             _runIdentityTest = ( Runner.getLoadOpt( "identityTest", 0 ) == 1);
             _debugging = ( Runner.getLoadOpt( "debugging", 0 ) == 1 );
         }
@@ -88,6 +91,9 @@ public String toString()
             buffer.append( " generators = " + _numberOfGenerators );
             buffer.append( ", tablesPerGenerator = " + _tablesPerGenerator );
             buffer.append( ", insertsPerTransaction = " + _insertsPerTransaction );
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
+//IC see: https://issues.apache.org/jira/browse/DERBY-5426
+//IC see: https://issues.apache.org/jira/browse/DERBY-4526
             buffer.append( ", identityTest = " + _runIdentityTest );
             buffer.append( ", debugging = " + _debugging );
             buffer.append( " )" );
@@ -125,9 +131,13 @@ public void fill( Connection conn ) throws SQLException
 
             for ( int sequence = 0; sequence < numberOfGenerators; sequence++ )
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
+//IC see: https://issues.apache.org/jira/browse/DERBY-5426
+//IC see: https://issues.apache.org/jira/browse/DERBY-4526
             	if (!runIdentityTest)
                     runDDL( conn, "create sequence " + makeSequenceName( sequence ) );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
                 for ( int table = 1; table <= tablesPerGenerator; table++ )
                 {
                 	if (runIdentityTest)
@@ -174,9 +184,11 @@ public SGClient()
         {
             _clientNumber = _clientCount++;
             _transactionCount = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             _errorLog = new HashMap<String, int[]>();
             _loadOptions = new LoadOptions();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
             _psArray = new PreparedStatement[ _loadOptions.getNumberOfGenerators() ] [ _loadOptions.getTablesPerGenerator() + 1 ];
             _randomNumberGenerator = new Random();
 
@@ -207,6 +219,9 @@ public void init( Connection conn ) throws SQLException
                     PreparedStatement ps;
                     String valuesClause = "values ( next value for " + sequenceName + " )";
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
+//IC see: https://issues.apache.org/jira/browse/DERBY-5426
+//IC see: https://issues.apache.org/jira/browse/DERBY-4526
                     if ( table == 0 ){
                     	if(!runIdentityTest) 
                         	ps = prepareStatement( _conn, debugging, valuesClause );
@@ -238,6 +253,7 @@ public void doWork() throws SQLException
 
             int rowNumber = 0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
             PreparedStatement ps = null;
             ResultSet rs = null;
             
@@ -263,6 +279,7 @@ public void doWork() throws SQLException
                     
                 }
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
             catch (Throwable t)
             {
                 debugPrint
@@ -270,6 +287,7 @@ public void doWork() throws SQLException
                      "Error on client " + _clientNumber +
                      " on sequence " + sequence +
                      " in transaction " + _transactionCount +
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
                      " on row " + rowNumber +
                      ": " + t.getMessage()
                      );
@@ -290,6 +308,7 @@ public void doWork() throws SQLException
 
         private ResultSet close( ResultSet rs, boolean debugging )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4565
             try {
                 if ( rs != null ) { rs.close(); }
             }
@@ -324,6 +343,7 @@ private int getPositiveRandomNumber()
 
         public void printReport(PrintStream out)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             for (String key : _errorLog.keySet()) {
                 int[] value = (int[]) _errorLog.get( key );
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordFiller.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordFiller.java
index 787accdb05..7fb0be05f5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordFiller.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordFiller.java
@@ -90,6 +90,7 @@ public SingleRecordFiller(int records, int tables, int type,
                               boolean withSecIndex, boolean withNonIndexed) {
         tableSize = records;
         numberOfTables = tables;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         dataType = type;
         switch (type) {
             case Types.VARCHAR:
@@ -104,6 +105,7 @@ public SingleRecordFiller(int records, int tables, int type,
             default:
                 throw new IllegalArgumentException("type = " + type);
         }
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         withSecIndexColumn = withSecIndex;
         withNonIndexedColumn = withNonIndexed;
     }
@@ -116,6 +118,7 @@ public void fill(Connection c) throws SQLException {
                     withSecIndexColumn, withNonIndexedColumn);
             WisconsinFiller.dropTable(c, tableName);
             s.executeUpdate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5067
                     "CREATE TABLE " + tableName + "(ID INT NOT NULL, " +
                     (withSecIndexColumn ? "SEC INT, " : "") +
                     (withNonIndexedColumn ? "NI INT, " : "") +
@@ -172,9 +175,11 @@ public void fill(Connection c) throws SQLException {
                 }
             }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5067
             s.executeUpdate("ALTER TABLE " + tableName + " ADD CONSTRAINT " +
                     tableName + "_PK PRIMARY KEY (ID)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
             if (withSecIndexColumn) {
                 s.executeUpdate(
                         "CREATE INDEX " + tableName + "_SECONDARY_INDEX ON " +
@@ -201,6 +206,7 @@ public void fill(Connection c) throws SQLException {
                 buf.append(alphabet.charAt(r.nextInt(alphabet.length())));
             }
             RANDOM_STRINGS[i] = buf.toString();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
             for (int j = 0; j < TEXT_SIZE; j++) {
                 RANDOM_BYTES[i][j] = (byte) RANDOM_STRINGS[i].charAt(j);
             }
@@ -239,6 +245,7 @@ static byte[] randomBytes(int seed) {
      */
     static String getTableName(int records, int table, int dataType,
                                boolean withSecIndex, boolean withNonIndexed) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         String name = "SINGLE_RECORD_" + records + "_" + table;
         if (withSecIndex) {
             name += "_SECIDX";
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordSelectClient.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordSelectClient.java
index 67286302b4..d252d937ea 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordSelectClient.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordSelectClient.java
@@ -54,6 +54,7 @@ public class SingleRecordSelectClient implements Client {
      * @param tables the number of tables in the test
      */
     public SingleRecordSelectClient(int records, int tables) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         this(records, tables, Types.VARCHAR, false, false);
     }
 
@@ -76,6 +77,7 @@ public SingleRecordSelectClient(int records, int tables, int type,
         r = new Random();
         pss = new PreparedStatement[tables];
         dataType = type;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         if (secIndex && nonIndexed) {
             throw new IllegalArgumentException(
                 "Cannot select on both secondary index and non-index column");
@@ -110,6 +112,7 @@ public void doWork() throws SQLException {
         ResultSet rs = ps.executeQuery();
         rs.next();
         rs.getInt(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         fetchTextColumn(rs, 2);
         rs.close();
         conn.commit();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordUpdateClient.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordUpdateClient.java
index 45e96e04b6..5d69782a79 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordUpdateClient.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/SingleRecordUpdateClient.java
@@ -54,6 +54,7 @@ public class SingleRecordUpdateClient implements Client {
      * @param tables the number of tables in the test
      */
     public SingleRecordUpdateClient(int records, int tables) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         this(records, tables, Types.VARCHAR, false, false);
     }
 
@@ -99,6 +100,7 @@ public void init(Connection c) throws SQLException {
     public void doWork() throws SQLException {
         PreparedStatement ps = pss[r.nextInt(pss.length)];
         int seed = r.nextInt();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3619
         if (dataType == Types.VARCHAR) {
             ps.setString(1, SingleRecordFiller.randomString(seed));
         } else if (dataType == Types.BLOB) {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/WisconsinFiller.java b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/WisconsinFiller.java
index 7c10bcdd9c..600a53dcdd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/WisconsinFiller.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients/WisconsinFiller.java
@@ -37,6 +37,7 @@ public class WisconsinFiller implements DBFiller {
     int numRows;
     public WisconsinFiller(int nRows)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4363
         super();
         numRows = nRows;
     }
@@ -53,6 +54,7 @@ public void fill(Connection c) throws SQLException {
         dropTable(c, "BPRIME");
 
         wisconsin.createTables(c, false, numRows);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4363
 
         c.commit();
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/MailJdbc.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/MailJdbc.java
index 29209246a3..f015a997fc 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/MailJdbc.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/MailJdbc.java
@@ -33,6 +33,7 @@ public class MailJdbc {
 	public static void main(String[] args) throws Exception {
 		boolean useexistingdb = false;
 		String type = args[0];
+//IC see: https://issues.apache.org/jira/browse/DERBY-4203
 		if (args.length > 1 && args[1].equals("samedb"))
 			useexistingdb = true;
 		System.out.println("Test started with " + type + " driver");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Backup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Backup.java
index cc582fc23e..9960482bce 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Backup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Backup.java
@@ -40,6 +40,8 @@ public Backup(String name)throws Exception{
 		//After fix of Derby-1062 only owner can perform backup
 		//Please refer Derby-4295
 		//conn = DbTasks.getConnection("BACKUP", "Backup");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
+//IC see: https://issues.apache.org/jira/browse/DERBY-4295
 		conn = DbTasks.getConnection("REFRESH", "Refresh");
 	}
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Browse.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Browse.java
index b3e0d7c90d..d3ccd188ef 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Browse.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Browse.java
@@ -36,6 +36,7 @@ public class Browse extends Thread {
 	public Browse(String name) throws Exception{
 		//sets the name of the thread
 		setName(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 		conn = DbTasks.getConnection("BROWSE", "Browse");
 	}
 
@@ -49,6 +50,7 @@ public void run() {
 				deleteMailByUser(conn, this.getName());
 				moveToFolders(conn, this.getName());
 				//Try to avoid deadlock situation with delete from Refresh thread
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 				Thread.sleep(100000);
 				//Checking whether Refresh thread is running after doing Browse work
 				//If Refresh is not running, interrupt the thread
@@ -71,6 +73,7 @@ public void run() {
 
 	public void readInbox(Connection conn, String thread_name) throws Exception{
 		dbtasks.readMail(conn, thread_name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 		dbtasks.totals(thread_name);
 	}
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Purge.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Purge.java
index 806016f37e..0c43faa209 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Purge.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Purge.java
@@ -39,6 +39,7 @@ public class Purge extends Thread {
 	public Purge(String name) throws Exception{
 		//Sets the thread name
 		setName(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 		conn = DbTasks.getConnection("PURGE", "Purge");
 	}
 
@@ -47,6 +48,7 @@ public void run() {
 			while (true) {
 				//Wait for some activity to happen before deleting the mails,
 				// so sleep for sometime
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 				Thread.sleep(250000);
 				//Deleting mails
 				purgeFromInbox(conn);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Refresh.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Refresh.java
index 0ffafc7e5e..2dabeaa054 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Refresh.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks/Refresh.java
@@ -41,6 +41,7 @@ public class Refresh extends Thread {
 	public Refresh(String name) throws Exception{
 		//sets the thread name
 		setName(name);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 		conn = DbTasks.getConnection("REFRESH", "Refresh");
 	}
 
@@ -51,6 +52,7 @@ public void run() {
 			while (true) {
 				doWork();
 				try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 					Thread.sleep(150000);
 				} catch (InterruptedException ie) {
 					MailJdbc.logAct.logMsg("#### " + getName()
@@ -78,6 +80,7 @@ private void doWork() {
 		try {
 			insertMail(conn, this.getName());
 			//Try to avoid deadlock situation by Purge thread
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
             Thread.sleep(60000);
 		} catch (Exception e) {
 			MailJdbc.logAct.logMsg(LogFile.ERROR + "insertMail() failed "
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils/DbTasks.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils/DbTasks.java
index e2a8b687e6..2ba100621c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils/DbTasks.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils/DbTasks.java
@@ -73,6 +73,7 @@ public static void jdbcLoad(String driverType, boolean useexistingdb) {
 					.logMsg("\n\n*****************************************************");
 			// setting the properties like user, password etc for both the
 			// database and the backup database
+//IC see: https://issues.apache.org/jira/browse/DERBY-4203
 			if (useexistingdb)
 		        setSystemProperty("database", "jdbc:derby:mailsdb");
 			else
@@ -81,6 +82,9 @@ public static void jdbcLoad(String driverType, boolean useexistingdb) {
 			setSystemProperty("ij.password", "Refresh");
 		} else {
 			setSystemProperty("driver", "org.apache.derby.jdbc.ClientDriver");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 			MailJdbc.logAct
 			.logMsg(" \n*****************************************************");
 			MailJdbc.logAct
@@ -98,6 +102,7 @@ public static void jdbcLoad(String driverType, boolean useexistingdb) {
 			
 		}
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4203
 			if (useexistingdb)
 			{
 				MailJdbc.logAct
@@ -131,10 +136,12 @@ public static void jdbcLoad(String driverType, boolean useexistingdb) {
 	public static Connection getConnection(String usr, String passwd){
 		try {
 			// Returns the Connection object
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName(System.getProperty("driver"));
             clazz.getConstructor().newInstance();
 
 			Connection con = DriverManager.getConnection(System
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 					.getProperty("database"), usr, passwd);
 			return con;
 		} catch (Exception e) {
@@ -154,12 +161,15 @@ public void readMail(Connection conn, String thread_name) throws Exception{
 		boolean saveAutoCommit = conn.getAutoCommit();
 		int saveIsolation = conn.getTransactionIsolation();
 		Statement stmt = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 		Statement attach_stmt = null;
 		int inbox_count = 0;
 		int attach_count = 0;
 		long size = 0;
 		try {
 			conn.setAutoCommit(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			conn.setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
 			long s_select = System.currentTimeMillis();
 			stmt = conn.createStatement();
@@ -186,6 +196,7 @@ public void readMail(Connection conn, String thread_name) throws Exception{
 			log.logMsg(LogFile.INFO + thread_name + " : "
 					+ "Time taken to scan the entire REFRESH.INBOX for count :"
 					+ PerfTime.readableTime(e_select - s_select));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			rs.close();
 			rs1.close();
 			attach_stmt.close();
@@ -199,6 +210,7 @@ public void readMail(Connection conn, String thread_name) throws Exception{
 		}
 		try {
 			int inbox_id = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 			if((inbox_count - 1) <= 0)
 				inbox_id = 1;
 			else {
@@ -253,6 +265,8 @@ public void readMail(Connection conn, String thread_name) throws Exception{
 							+ sqe.getMessage());
 			sqe.printStackTrace();
 			errorPrint(sqe);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			conn.rollback();
 			throw sqe;
 		}
@@ -276,9 +290,11 @@ public synchronized void deleteMailByUser (Connection conn,
 					.prepareStatement(Statements.updateStr);
 			Statement stmt = conn.createStatement();
 			ResultSet rs = stmt
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 					.executeQuery("select max(id) from REFRESH.INBOX ");
 			if (rs.next())
 				id_count = rs.getInt(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			rs.close();
 			stmt.close();
 			short to_delete = 1;
@@ -313,6 +329,8 @@ public synchronized void deleteMailByUser (Connection conn,
 					+ sqe.getMessage());
 			sqe.printStackTrace();
 			errorPrint(sqe);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			conn.rollback();
 			throw sqe;
 		}
@@ -338,8 +356,10 @@ public void deleteMailByThread(Connection conn, String thread_name)
 					+ "Time taken to delete mails by thread :"
 					+ PerfTime.readableTime(e_delete - s_delete));
 			MailJdbc.logAct.logMsg(LogFile.INFO + thread_name + " : " + count
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 					+ " rows deleted from REFRESH.INBOX");
 			delete_count = delete_count + count;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			deleteThread.close();
 			stmt.close();
 			conn.commit();
@@ -349,6 +369,8 @@ public void deleteMailByThread(Connection conn, String thread_name)
 					+ sqe.getMessage());
 			sqe.printStackTrace();
 			errorPrint(sqe);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			conn.rollback();
 			throw sqe;
 		}
@@ -374,6 +396,7 @@ public void moveToFolders(Connection conn, String thread_name) throws Exception{
 				int message_id = 0;
 				int count = rs.getInt(1);
                 //If there is zero row, nothing to do	
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 				if (count==0)
 					return;
 				//If there is just one row, id is 1 (start from 1)
@@ -397,8 +420,10 @@ public void moveToFolders(Connection conn, String thread_name) throws Exception{
 						+ PerfTime.readableTime(e_folder - s_folder));
 				MailJdbc.logAct.logMsg(LogFile.INFO + thread_name + " : "
 						+ "Mail with id : " + message_id
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 						+ " is moved to folder" + folder_id);
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			stmt.close();
 			moveToFolder.close();
 			rs.close();
@@ -409,6 +434,10 @@ public void moveToFolders(Connection conn, String thread_name) throws Exception{
 					+ sqe.getMessage());
 			sqe.printStackTrace();
 			errorPrint(sqe);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			conn.rollback();
 			throw sqe;
 		}
@@ -432,6 +461,7 @@ public void insertMail(Connection conn, String thread_name)
 					Statements.insertStr, Statement.RETURN_GENERATED_KEYS);
 			String name = new String("ABCD");
 			String l_name = new String("WXYZ");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 			long total_ins_inb = 0;
 			long total_ins_att = 0;
 			int row_count = 0;
@@ -441,6 +471,8 @@ public void insertMail(Connection conn, String thread_name)
 			for (int i = 0; i < num; i++) {
 				long s_insert = System.currentTimeMillis();
 				String new_name = new String(increment(name, 60));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 				String new_lname = new String(decrement(l_name, 60));
 				insertFirst.setString(1, new_name);
 				insertFirst.setString(2, new_lname);
@@ -451,6 +483,8 @@ public void insertMail(Connection conn, String thread_name)
 				try {
 					// to create a stream of random length between 200 bytes and 3MB
 					int clobLength = Rn.nextInt(3078000 - 200 + 1) + 200;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 					streamReader = new LoopingAlphabetReader(clobLength,
 							CharAlphabet.modernLatinLowercase());
 					insertFirst.setCharacterStream(4, streamReader, clobLength);
@@ -465,6 +499,9 @@ public void insertMail(Connection conn, String thread_name)
 					insert_count = insert_count + 1;
 				}
 				streamReader.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 
 				long e_insert = System.currentTimeMillis();
 				total_ins_inb = total_ins_inb + (e_insert - s_insert);
@@ -501,6 +538,8 @@ public void insertMail(Connection conn, String thread_name)
 						throw e;
 					}
 					int result_attach = insertAttach.executeUpdate();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 					streamIn.close();
 					if (result_attach != 0) {
 						blob_count = blob_count + 1;
@@ -511,6 +550,7 @@ public void insertMail(Connection conn, String thread_name)
 				 }
 				}
 			id_count++;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			rs.close();
 			stmt1.close();
 			insertAttach.close();
@@ -521,6 +561,7 @@ public void insertMail(Connection conn, String thread_name)
 			log.logMsg(LogFile.INFO + thread_name + " : "
 					+ "Time taken to insert " + row_count + " rows to REFRESH.ATTACH :"			
 					+ PerfTime.readableTime(total_ins_att));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			insertFirst.close();
 			conn.commit();
 		}
@@ -529,6 +570,8 @@ public void insertMail(Connection conn, String thread_name)
 					+ "Error while inserting REFRESH.ATTACH:" + sqe.getMessage());
 			sqe.printStackTrace();
 			errorPrint(sqe);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			conn.rollback();
 			throw sqe;
 		}
@@ -546,6 +589,7 @@ public synchronized void deleteMailByExp(Connection conn, String thread_name) th
 			long s_delExp = System.currentTimeMillis();
 			Statement selExp = conn.createStatement();
 			MailJdbc.logAct.logMsg(LogFile.INFO + thread_name + " : "
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 				+ "delete mails which are older than 1 day with sleep 250000 ");
 			int count = 0;
 			count = selExp.executeUpdate(Statements.del_jdbc_exp);
@@ -565,6 +609,10 @@ public synchronized void deleteMailByExp(Connection conn, String thread_name) th
 					+ sqe.getMessage());
 			sqe.printStackTrace();
 			errorPrint(sqe);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			conn.rollback();
 			throw sqe;
 		}
@@ -582,6 +630,8 @@ public void Backup(Connection conn, String thread_name) throws Exception{
 			conn.setAutoCommit(true);
 			CallableStatement cs = conn
 					.prepareCall("CALL SYSCS_UTIL.SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT(?, ?)");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 			cs.setString(1, System.getProperty("user.dir") + File.separator
 					+ "mailbackup");
 			cs.setInt(2, 1);
@@ -597,6 +647,8 @@ public void Backup(Connection conn, String thread_name) throws Exception{
 			sqe.printStackTrace();
 			errorPrint(sqe);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 		finally{
 			conn.setAutoCommit(saveAutoCommit);
 		}
@@ -608,12 +660,15 @@ public void Backup(Connection conn, String thread_name) throws Exception{
 	}
 
 	public void compressTable(Connection conn, String tabname,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			String thread_name) throws Exception
 	// periodically compresses the table to get back the free spaces available
 	// after
 	// the deletion of some rows
 	{
 		long s_compress = System.currentTimeMillis();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 		long dbsize = databaseSize(new File("mailsdb"));
 		MailJdbc.logAct.logMsg(LogFile.INFO + thread_name + " : "
 				+ "dbsize before compress : " + dbsize);
@@ -636,7 +691,11 @@ public void compressTable(Connection conn, String tabname,
 			sqe.printStackTrace();
 			errorPrint(sqe);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 		finally{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 		    conn.setAutoCommit(saveAutoCommit);
 		}
 		long e_compress = System.currentTimeMillis();
@@ -644,7 +703,9 @@ public void compressTable(Connection conn, String tabname,
 				+ "Finished Compressing the table: " + tabname);
 		log.logMsg(LogFile.INFO + thread_name + " : "
 				+ "Time taken to compress the table : " + tabname
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 				+ " " + PerfTime.readableTime(e_compress - s_compress));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 		dbsize = databaseSize(new File("mailsdb"));
 		MailJdbc.logAct.logMsg(LogFile.INFO + thread_name + " : "
 				+ "dbsize after compress : " + dbsize);
@@ -658,6 +719,7 @@ public synchronized void checkDbSize(Connection conn, String thread_name)
 			int del_count = 0;
 			int count = 0;
 			int diff = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 			ArrayList<Integer> idArray = new ArrayList<Integer>();
 			Statement stmt = conn.createStatement();
 			Statement stmt1 = conn.createStatement();
@@ -667,6 +729,7 @@ public synchronized void checkDbSize(Connection conn, String thread_name)
 			while (rs.next())
 				count = rs.getInt(1);
 			//Generate the random number between (count - 36)==>24 to 1
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 			if (count > 50) {
 				diff = Rn.nextInt((count - 36) - 1);
 				if (diff == 0) 
@@ -674,15 +737,18 @@ public synchronized void checkDbSize(Connection conn, String thread_name)
 				ResultSet rs1 = stmt1
 						.executeQuery("select id from REFRESH.INBOX");
 				while (rs1.next()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 					idArray.add(rs1.getInt(1));
 				}
 				for (int i = 0; i <= diff; i++) {
 					del_count = del_count
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 							+ stmt2
 									.executeUpdate("delete from REFRESH.INBOX where id ="
 											+ idArray.get(i));
 
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 				rs1.close();
 			}
 			delete_count = delete_count + del_count;
@@ -725,6 +791,7 @@ public void grantRevoke(Connection conn, String thread_name) throws Exception{
 			stmt.execute(Statements.grantExe4);
 			stmt.execute(Statements.grantExe5);
 			conn.commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 			stmt.close();
 			MailJdbc.logAct.logMsg(LogFile.INFO + thread_name + " : "
 					+ "Finished Granting permissions");
@@ -734,11 +801,14 @@ public void grantRevoke(Connection conn, String thread_name) throws Exception{
 			sqe.printStackTrace();
 			errorPrint(sqe);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
+//IC see: https://issues.apache.org/jira/browse/DERBY-3448
 		finally {
 			conn.setAutoCommit(saveAutoCommit);
 		}
 	}
 	public static long databaseSize(File dbname) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 	    long length = 0;
 	    if (dbname.isDirectory()) {
 	        String[] children = dbname.list();
@@ -760,6 +830,7 @@ public static void setSystemProperty(String key, String value) {
 	}
 
 	public void totals(String thread_name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 		MailJdbc.logAct.logMsg(LogFile.INFO + thread_name + " : " + "total number of inserts : "
 				+ insert_count);
 		MailJdbc.logAct.logMsg(LogFile.INFO + thread_name + " : " + "total number of deletes : "
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils/ThreadUtils.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils/ThreadUtils.java
index e68c87b6d2..0f3723e8fd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils/ThreadUtils.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils/ThreadUtils.java
@@ -38,6 +38,7 @@ public class ThreadUtils {
 
 	//constructor which will start the threads
 	public static void startThreads() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 		threadutil.run();
 	}
 
@@ -61,6 +62,7 @@ public void run() {
 										  // make sure insert attachment has been finished
 			Thread.sleep(sleep_time);
 			t.start();
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 			MailJdbc.logAct.logMsg(LogFile.INFO + "Started: " + t.getName() + " with 150000 sleep time");
 			userThreads.add(t);
 			//Starting Backup Thread
@@ -90,6 +92,7 @@ public static synchronized boolean isThreadRunning(String name) {
 	public static synchronized Thread getThread(String name) {
 		if (name.equalsIgnoreCase("Refresh Thread")) {
 			return (Refresh) userThreads.get(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4166
 		} if (name.equalsIgnoreCase("Purging Thread")) {
 			return (Purge) userThreads.get(2);
 		} else {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/NsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/NsTest.java
index dbe5c6fd99..7b2642ee78 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/NsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/NsTest.java
@@ -72,6 +72,7 @@ public class NsTest extends Thread
     private static  final   long    MILLIS_PER_MINUTE = 1000L * 60L;
     
     private static  final   String  USAGE =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         "Usage:\n" +
         "\n" +
         "    java org.apache.derbyTesting.system.nstest.NsTest [ DerbyClient | Embedded [ small ] ]\n" +
@@ -84,6 +85,7 @@ public class NsTest extends Thread
         "\n" +
         "    -D" + OUTPUT_FILE + "=fileName    Redirects output and errors to a file.\n" +
         "\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         "    -D" + JUST_COUNT_ERRORS + "=true    Makes the test run quietly at steady-state, counting errors, and printing a summary at the end.\n" +
         "\n" +
         "    -D" + DURATION + "=$number    Run for this number of minutes.\n";
@@ -246,8 +248,10 @@ public class NsTest extends Thread
 	public static int numActiveTestThreads() {
 		int activeThreadCount=0;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         if ( testThreads != null )
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
             for (int i = 0; i < testThreads.length ; i++)
             {
                 if (testThreads[i] != null && testThreads[i].isAlive())
@@ -259,6 +263,7 @@ public static int numActiveTestThreads() {
 	}
 
     public  static  void    updateMemoryTracker
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         ( long newTotalMemory, long newFreeMemory, Date newTimestamp )
     {
         _totalMemory = newTotalMemory;
@@ -268,6 +273,7 @@ public static int numActiveTestThreads() {
 
     public  static  void    updateSequenceTracker( long newValue )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         _maxSequenceCounter = newValue;
     }
 
@@ -341,6 +347,7 @@ else if ((ttype == TESTER1) || (ttype == TESTER2) || (ttype == TESTER3))
 	private static void setSmallConfig() {
         
 		INIT_THREADS = 3; //keep this low to avoid deadlocks
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
 		MAX_INITIAL_ROWS = 150; //for a small test
 		MAX_ITERATIONS = 50; //for a small test
 		MAX_LOW_STRESS_ROWS = 10; //for a small test
@@ -360,9 +367,11 @@ private static void setSmallConfig() {
 	//
 	// ****************************************************************************
 	public static void main(String[] args) throws SQLException, IOException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 	InterruptedException, Exception, Throwable
     {
         _startTimestamp = System.currentTimeMillis();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 		String outputFile = System.getProperty( OUTPUT_FILE );
         statisticsLogger = System.out;
@@ -371,6 +380,7 @@ public static void main(String[] args) throws SQLException, IOException,
             statisticsLogger = new PrintStream( outputFile );
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		String duration = System.getProperty( DURATION );
         if ( duration != null )
         {
@@ -385,6 +395,7 @@ public static void main(String[] args) throws SQLException, IOException,
         Runtime.getRuntime().addShutdownHook( new Thread( new ShutdownHook() ) );
 
 		Connection conn = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
 		if (args.length >= 1) {
 			driver_type = args[0];
 			if (!((driver_type.equalsIgnoreCase("DerbyClient"))
@@ -393,20 +404,25 @@ public static void main(String[] args) throws SQLException, IOException,
 				printUsage();
 				return;
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			logger.println("Test nstest starting....., using driver: "
 					+ driver_type);
 		} else {
 			driver_type = "DerbyClient";
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
 		if (args.length >= 2) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
 			String testConfiguration = args [1];
 			if (testConfiguration.equalsIgnoreCase("small"))
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				logger.println("using small config");
 				setSmallConfig();
 			}    
 		}
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		TimerThread timerThread = null;
         if ( _duration > 0L )
         {
@@ -416,10 +432,12 @@ public static void main(String[] args) throws SQLException, IOException,
 
 		// Load the driver and get a connection to the database
 		String jdbcUrl = "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz;
 		try {
 			if (driver_type.equalsIgnoreCase("Embedded")) {
 				// logger.println("Driver embedd : " + driver_type);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				logger.println("Loading the embedded driver...");
 				clazz = Class.forName(embedDriver);
                 clazz.getConstructor().newInstance();
@@ -439,6 +457,7 @@ public static void main(String[] args) throws SQLException, IOException,
 			}
 			prop.setProperty("user", user);
 			prop.setProperty("password", password);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			logger
 			.println("Getting a connection using the url: " + jdbcUrl);
 			logger.println("JDBC url= " + jdbcUrl);
@@ -477,6 +496,7 @@ public static void main(String[] args) throws SQLException, IOException,
 		try {
 			conn.close();
 		} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			logger
 			.println("FAIL - Error closing the connection in nstest.main():");
 			printException("Closing connection in nstest.main()", e);
@@ -485,6 +505,7 @@ public static void main(String[] args) throws SQLException, IOException,
 		// check memory in separate thread-- allows us to monitor usage during
 		// database calls
 		// 200,000 msec = 3min, 20 sec delay between checks
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		logger.println("Starting memory checker thread");
 		MemCheck mc = new MemCheck(200000);
 		mc.start();
@@ -504,6 +525,7 @@ public static void main(String[] args) throws SQLException, IOException,
 
 		if (NsTest.schemaCreated == false) {
 			// Table was created by this object, so we need to load it
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			logger
 			.println("Kicking off initialization threads that will populate the test table");
 			NsTest initThreads[] = new NsTest[INIT_THREADS];
@@ -524,6 +546,7 @@ public static void main(String[] args) throws SQLException, IOException,
 		// created the schema
 		if (NsTest.schemaCreated) // true means that the schema was created by
 			// another jvm
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			logger
 			.println("Schema has already been created by another process!");
 
@@ -532,6 +555,7 @@ public static void main(String[] args) throws SQLException, IOException,
 		// not need to create one of their own.
 		// The CREATE_DATABASE_ONLY FLAG is set with the rest of the flags
 		if (CREATE_DATABASE_ONLY) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			logger
 			.println("Finished creating the database, TEST THREADS WILL NOT RUN!!");
 			// Finally also stop the memory checker and sequence threads, else the test will
@@ -546,17 +570,20 @@ public static void main(String[] args) throws SQLException, IOException,
 		// Now kick off the actual test threads that will do the work for us.
 		// Note that we use the value TESTER when initializing the threads.
 		// The total number of threads is NUMTESTER1+NUMTESTER2+NUMTESTER3
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		logger
 		.println("Kicking off test threads that will work over the test table");
 
 		int numTestThread = 0;
 		int maxTestThreads = 0;
 		String runBackup = System.getProperty( BACKUP_FLAG );
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
 		if ((runBackup != null) && (runBackup.equalsIgnoreCase("false")))
 				maxTestThreads = NUMTESTER1 + NUMTESTER2 + NUMTESTER3;
 		else
 				maxTestThreads = 1 + NUMTESTER1 + NUMTESTER2 + NUMTESTER3;
 		testThreads = new NsTest[maxTestThreads];
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
 
 		// This loop is made of 3 subloops that will initialize the required
 		// amount of tester threads
@@ -566,6 +593,7 @@ public static void main(String[] args) throws SQLException, IOException,
 			// Check for property setting to decide the need for starting
 			// BackupRestore thread
 			if ((runBackup != null) && (runBackup.equalsIgnoreCase("false"))) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				logger.println("BackupRestore Thread not started...");
 			} else {
 				// Otherwise, start the BackupRestore Thread by default
@@ -597,17 +625,20 @@ public static void main(String[] args) throws SQLException, IOException,
 
 		// check sequence value thread
 		// 60,000 msec = 1 minute delay between checks
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		logger.println("Starting sequence reader thread");
 		SequenceReader  sequenceReader = new SequenceReader( DriverManager.getConnection( jdbcUrl, prop ), 60000 );
 		sequenceReader.start();
 
 		// Wait for the test threads to finish and join back
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		for (int j = 0; j < maxTestThreads; j++)
         {
             logger.println("Waiting for thread " + j+ " to join back/finish");
 			testThreads[j].join();
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         if ( timerThread != null )
         {
             timerThread.stopNow();
@@ -616,6 +647,7 @@ public static void main(String[] args) throws SQLException, IOException,
         }
 
         // stop the sequence reader thread
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		sequenceReader.stopNow = true;
 		sequenceReader.interrupt();
 		sequenceReader.join();
@@ -638,6 +670,7 @@ public  static  void    printStatistics()
         else { _statisticsAlreadyPrinted = true; }
 
         _endTimestamp = System.currentTimeMillis();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 		statisticsLogger.println("");
 		statisticsLogger.println("STATISTICS OF OPERATIONS DONE");
@@ -666,13 +699,16 @@ public  static  void    printStatistics()
 		.println("NOTE: Failing operations could be because of locking issue that are\n"
 				+ "directly related to the application logic.  They are not necessarily bugs.");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         statisticsLogger.println( "\nMax sequence counter peeked at = " + _maxSequenceCounter + "\n" );
         
         statisticsLogger.println( "\nLast total memory = " + _totalMemory + ", last free memory = " + _freeMemory + " as measured at " + _lastMemoryCheckTime + "\n" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
         if ( _errors.size() > 0 )
         {
             // sort the errors by the timestamps of their first occurrences
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
             NsTestError[]   errors = new NsTestError[ _errors.size() ];
             _errors.values().toArray( errors );
             Arrays.sort( errors );
@@ -726,8 +762,10 @@ private static  void    countAndPrintSQLStates()
     private static  void    printError( NsTestError error )
     {
         Throwable   throwable = error.throwable();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         String          stackTrace = getStackTrace( throwable );
         int             count = error.count();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         Timestamp   firstOccurrenceTime = new Timestamp( error.getFirstOccurrenceTime() );
         Timestamp   lastOccurrenceTime = new Timestamp( error.getLastOccurrenceTime() );
         String      sqlState = (throwable instanceof SQLException) ? 
@@ -745,6 +783,7 @@ private static  void    printError( NsTestError error )
         buffer.append( "\n" );
         buffer.append( ERROR_BANNER2 );
         buffer.append( "\n" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         buffer.append( ERROR_BANNER2 );
         buffer.append( "First occurrence at " + firstOccurrenceTime );
         buffer.append( ", last occurrence at " + lastOccurrenceTime );
@@ -798,6 +837,7 @@ private static  void    printError( NsTestError error )
 	public void run() {
 
 		logger.println(this.getName() + " is now running");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 		if (this.type == INIT) {
 			Initializer Init = new Initializer(this.getName());
@@ -821,6 +861,7 @@ public void run() {
 				Tstr4 = new BackupRestoreReEncryptTester(
 						"BackupRestoreReEncrypt" + this.getName());
 			} catch (IOException ioe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				logger
 				.println(ioe
 						+ "=====> Unable to create backup log file, test cannot proceed ");
@@ -848,9 +889,11 @@ public void run() {
 	// ****mixed but rather one exception printed at a time
     public static synchronized void printException(String where, Exception e)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         if ( justCountErrors() )
         {
             addError( e );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
             vetError( e );
             return;
         }
@@ -871,6 +914,7 @@ public static synchronized void printException(String where, Exception e)
 						+ " SQLSTATE: " + m);
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-5452
 		if (e.getMessage() == null) {
 			logger.println("NULL error message detected");
 			logger.println("Here is the NULL exection - " + e.toString());
@@ -880,6 +924,7 @@ public static synchronized void printException(String where, Exception e)
 		logger.println("At this point - " + where
 				+ ", exception thrown was : " + e.getMessage());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         vetError( e );
 	}
 
@@ -922,6 +967,7 @@ public static void startNetworkServer() throws Exception {
 			nsw.start();
 			Thread.sleep(10000);
 		} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			e.printStackTrace( logger );
 			throw e;
 		}
@@ -931,6 +977,7 @@ public static void startNetworkServer() throws Exception {
     /** Return true if the connection is dead */
     public  static  boolean deadConnection( Throwable t )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         if ( t instanceof SQLException )
         {
             SQLException    se = (SQLException) t;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/NsTestError.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/NsTestError.java
index 1083a46422..a472002bd5 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/NsTestError.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/NsTestError.java
@@ -56,6 +56,7 @@ public  NsTestError( Throwable throwable )
     {
         _throwable = throwable;
         _count = 1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         _firstOccurrenceTime = System.currentTimeMillis();
         _lastOccurrenceTime = _firstOccurrenceTime;
     }
@@ -86,6 +87,7 @@ public  NsTestError( Throwable throwable )
 
     public  int compareTo( NsTestError that )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         if ( that == null ) { return -1; }
         else
         {
@@ -107,6 +109,7 @@ public  int compareTo( NsTestError that )
     /** Increment the number of times this error was seen */
     public  void    increment()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         _count++;
         _lastOccurrenceTime = System.currentTimeMillis();
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/DbSetup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/DbSetup.java
index da213f1321..cacbf00c58 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/DbSetup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/DbSetup.java
@@ -42,6 +42,7 @@ public static boolean doIt(Connection conn) throws Throwable {
 		boolean finished = false;
 
 		NsTest.logger.println("dbSetup.doIt() starting...");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 		try {
 			conn.setAutoCommit(false);
@@ -57,6 +58,7 @@ public static boolean doIt(Connection conn) throws Throwable {
 					+ " where tablename = 'NSTESTTAB'");
 			if (rs.next()) {
 				rs.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println("table 'NSTESTTAB' already exists");
 				finished = true;
 				NsTest.schemaCreated = true; // indicates to other classes
@@ -74,6 +76,7 @@ public static boolean doIt(Connection conn) throws Throwable {
 		// if we reach here then the table does not exist, so we create it
 		if (finished == false) {
 			try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger
 				.println("creating table 'NSTESTTAB' and corresponding indices");
 				s.execute("create table nstesttab (" + "id int,"
@@ -86,6 +89,7 @@ public static boolean doIt(Connection conn) throws Throwable {
 						+ "t_timestamp timestamp," + "t_varchar varchar(100),"
 						+ "t_clob clob(1K)," + "t_blob blob(10K),"
 						+ "serialkey bigint generated always as identity, "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 						+ "sequenceColumn bigint, "
 						+ "unique (serialkey)) ");
 
@@ -113,9 +117,11 @@ public static boolean doIt(Connection conn) throws Throwable {
 				s
 				.execute("create index t_serialkey_ind on nstesttab (serialkey)");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                 NsTest.logger.println( "Creating nstesttab_seq sequence" );
                 s.execute( "create sequence nstesttab_seq as bigint start with 0" );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger
 				.println("creating table 'NSTRIGTAB' and corresponding indices");
 				s.execute("create table NSTRIGTAB (" + "id int,"
@@ -127,6 +133,7 @@ public static boolean doIt(Connection conn) throws Throwable {
 						+ "t_smallint smallint," + "t_time time,"
 						+ "t_timestamp timestamp," + "t_varchar varchar(100),"
 						+ "t_clob clob(1K)," + "t_blob blob(10K),"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 						+ "serialkey bigint, "
 						+ "sequenceColumn bigint )");
 				// create trigger
@@ -138,9 +145,11 @@ public static boolean doIt(Connection conn) throws Throwable {
 						+ "OLDROW.T_FLOAT, OLDROW.T_INT,OLDROW.T_LONGINT, OLDROW.T_numeric_large,"
 						+ "OLDROW.T_real,OLDROW.T_smallint,OLDROW.T_time,OLDROW.T_timestamp,OLDROW.T_varchar,"
 						+ "OLDROW.T_clob,OLDROW.T_blob, "
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 						+ "OLDROW.serialkey, "
 						+ "OLDROW.sequenceColumn )");
 			} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                 if ( NsTest.justCountErrors() ) { NsTest.printException( DbSetup.class.getName(), e ); }
 				else { e.printStackTrace( NsTest.logger ); }
 				NsTest.logger
@@ -162,6 +171,7 @@ public static boolean doIt(Connection conn) throws Throwable {
 	// stack traces that are not
 	// ****mixed but rather one exception printed at a time
 	public static synchronized void printException(String where, Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         if ( NsTest.justCountErrors() )
         {
             NsTest.addError( e );
@@ -183,6 +193,7 @@ public static synchronized void printException(String where, Exception e) {
 						+ " SQLSTATE: " + m);
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-5465
 		if (e.getMessage() == null) {
 			NsTest.logger.println("NULL error message detected");
 			NsTest.logger.println("Here is the NULL exection - " + e.toString());
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/Initializer.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/Initializer.java
index 4ea93f0989..a789b25d13 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/Initializer.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/Initializer.java
@@ -52,6 +52,7 @@ public void startInserts() {
 		// point, we just need to get a connection to the database
 		try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger.println(thread_id
 					+ " is getting a connection to the database...");
 
@@ -60,6 +61,7 @@ public void startInserts() {
 						NsTest.prop);
 			} else {
 				if(NsTest.driver_type.equalsIgnoreCase("DerbyClient")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 					NsTest.logger.println("-->Using derby client url");
 					conn = DriverManager.getConnection(NsTest.clientDbURL,
 							NsTest.prop);
@@ -81,6 +83,7 @@ public void startInserts() {
 
 				conn.setAutoCommit(false);
 			} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println("FAIL: " + thread_id
 						+ "'s setAutoCommit() failed:");
 				printException("setAutoCommit() in Initializer", e);
@@ -93,6 +96,7 @@ public void startInserts() {
 				//NsTest.logger.println("Intializer.java: exited add_one_row: "
 				//		+ numInserts + " rows");
 			} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println(" FAIL: " + thread_id
 						+ " unexpected exception:");
 				printException("add_one_row() in Initializer", e);
@@ -105,6 +109,7 @@ public void startInserts() {
 			try {
 				conn.commit();
 			} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger
 						.println("FAIL: " + thread_id + "'s commit() failed:");
 				printException("commit in Initializer", e);
@@ -120,6 +125,7 @@ public void startInserts() {
 	// stack traces that are not
 	// ****mixed but rather one exception printed at a time
 	public synchronized void printException(String where, Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         if ( NsTest.justCountErrors() )
         {
             NsTest.addError( e );
@@ -141,6 +147,7 @@ public synchronized void printException(String where, Exception e) {
 						+ " SQLSTATE: " + m);
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-5465
 		if (e.getMessage() == null) {
 			e.printStackTrace( NsTest.logger );
 		}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/NWServerThread.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/NWServerThread.java
index 1468ffebf0..e10f6aec46 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/NWServerThread.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init/NWServerThread.java
@@ -53,6 +53,7 @@ public NWServerThread(String address, int port) throws Exception {
 			inetaddr = InetAddress.getByName(address);
 
 		} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger
 					.println("Invalid host address passed, cannot start server");
 			if ( NsTest.justCountErrors() ) { NsTest.printException( NWServerThread.class.getName(), e ); }
@@ -68,6 +69,7 @@ public NWServerThread(String address, int port) throws Exception {
 	public void run() {
 		try {
 			NetworkServerControl nsw = new NetworkServerControl(inetaddr, port);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			nsw.start(new PrintWriter(NsTest.logger));
 			NsTest.logger.println("===> Derby Network Server on " + address + ":"
 					+ port + " <===");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/BackupRestoreReEncryptTester.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/BackupRestoreReEncryptTester.java
index bbf0ddb610..6f8be0ebc1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/BackupRestoreReEncryptTester.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/BackupRestoreReEncryptTester.java
@@ -85,6 +85,7 @@ public void startTesting() {
 			// Get the connection. It will be closed at the end of the loop
 			connex = getConnection();
 			if (connex == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println("FAIL: " + getThread_id()
 						+ " could not get the database connection");
 				return; // quit
@@ -101,6 +102,7 @@ public void startTesting() {
 			} catch (Exception e) {
 				message = getTimestamp() + "FAILED - BackUp thread doBackup"
 						+ getThread_id() + " threw " + e;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println(message);
 				log(message);
 				printException("call to doBackup() in BackupThread ", e);
@@ -123,6 +125,7 @@ public void startTesting() {
 						+ " call to doRestoreandReEncrypt() in BackupThread FAILED "
 						+ e.getSQLState() + " " + e);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				e.printStackTrace( logger );
 			}
 
@@ -141,6 +144,7 @@ public void startTesting() {
             // first check if there are still active tester threads, so 
             // we do not make backups on an unchanged db every 10 mins for
             // the remainder of MAX_ITERATIONS.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
             if (NsTest.numActiveTestThreads() > 1)
             {
                 log("active test threads > 1, backup will continue in 10 minutes");
@@ -155,6 +159,7 @@ public void startTesting() {
 		}// end of for (int i=0;...)
 
 		NsTest.logger.println("Thread " + getThread_id() + " is now terminating");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 	}// end of startTesting()
 
@@ -182,6 +187,7 @@ public void doBackup() throws SQLException {
 					+ getThread_id() + " threw " + e;
 			log(message);
 			printException("call to doConsistCheck() in BackupThread ", e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			e.printStackTrace( logger );
 		}
 		log("--------------------- B A C K U P  S E C T I O N  E N D ----------------------------");
@@ -229,6 +235,7 @@ public void doRestoreandReEncrypt() throws SQLException {
 		} catch (SQLException e) {
 			log(getTimestamp() + " FAILURE ! to restore database " + dbUrl);
 			e.printStackTrace( logger );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 		}
 
@@ -313,6 +320,7 @@ public void log(String msg) {
 		logger.write(msg + "\n");
 		logger.flush();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		NsTest.logger.println(msg);
 	}
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester1.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester1.java
index d7109fbf3b..74e271e056 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester1.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester1.java
@@ -58,6 +58,7 @@ public void startTesting() {
 		// this connection will remain open forever.
 		connex = getConnection();
 		if (connex == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger.println("FAIL: " + getThread_id()
 					+ " could not get the database connection");
 			return; // quit
@@ -68,12 +69,14 @@ public void startTesting() {
 		try {
 			connex.setAutoCommit(false);
 		} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger.println("FAIL: " + getThread_id()
 					+ "'s setAutoCommit() failed:");
 			printException("setting AutoCommit", e);
 
             // if you can't change the autocommit state, the connection is unusable.
             // get out of here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
             return;
 		}
 
@@ -99,6 +102,7 @@ public void startTesting() {
 			case 0: // do a select operation
 				try {
 					int numSelected = doSelectOperation(NsTest.MAX_LOW_STRESS_ROWS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 					NsTest.logger.println(getThread_id() + " selected "
 							+ numSelected + " rows");
 				} catch (Exception e) {
@@ -110,6 +114,7 @@ public void startTesting() {
 					else { e.printStackTrace( NsTest.logger ); }
 
                     // if the connection is dead, there's no point in hanging around
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                     if ( NsTest.deadConnection( e ) ) { return; }
 				}
 				break;
@@ -119,6 +124,7 @@ public void startTesting() {
 			case 3: // do Insert/Update/Delete operations
 				for (int j = 0; j < NsTest.MAX_LOW_STRESS_ROWS; j++) {
 					doIUDOperation();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                     if ( deadConnection() ) { return; }
 				}
 				break;
@@ -131,12 +137,14 @@ public void startTesting() {
 			try {
 				connex.commit();
 			} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger
 						.println("FAIL: " + getThread_id() + "'s commit() failed:");
 				printException("committing Xn in Tester1", e);
 
                 // if you can't commit, the connection is unusable.
                 // get out of here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                 return;
 			}
 		}// end of for (int i=0;...)
@@ -144,6 +152,7 @@ public void startTesting() {
 		// close the connection before the thread terminates
 		closeConnection();
 		NsTest.logger.println("Thread " + getThread_id()+ " is now terminating");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 	}//end of startTesting()
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester2.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester2.java
index 470fa21b6b..9535bf0a3c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester2.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester2.java
@@ -63,6 +63,7 @@ public void startTesting() {
 			//the connection will now open. It closes at the end of the loop
 			connex = getConnection();
 			if (connex == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println("FAIL: " + getThread_id()
 						+ " could not get database connection");
 				return; //quit
@@ -73,12 +74,14 @@ public void startTesting() {
 			try {
 				connex.setAutoCommit(false);
 			} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println("FAIL: " + getThread_id()
 						+ "'s setAutoCommit() failed:");
 				printException("setting AutoCommit in Tester2", e);
                 
                 // if you can't change the autocommit state, the connection is unusable.
                 // get out of here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                 return;
 			}
 
@@ -97,6 +100,7 @@ public void startTesting() {
 				case 0: //do a select operation
 					try {
 						int numSelected = doSelectOperation(NsTest.MAX_LOW_STRESS_ROWS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 						NsTest.logger.println(getThread_id() + " selected "
 								+ numSelected + " rows");
 					} catch (Exception e) {
@@ -121,12 +125,14 @@ public void startTesting() {
 				try {
 					connex.commit();
 				} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 					NsTest.logger.println("FAIL: " + getThread_id()
 							+ "'s commit() failed:");
 					printException("committing Xn in Tester2", e);
                     
                     // if you can't commit, the connection is unusable.
                     // get out of here.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                     return;
 				}
 			}//end of for(int numOp=1...)
@@ -137,6 +143,7 @@ public void startTesting() {
 		}//end of for (int i=0;...)
 
 		NsTest.logger.println("Thread " + getThread_id() + " is now terminating");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 	}//end of startTesting()
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester3.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester3.java
index ef634c54c2..01b226e2de 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester3.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/Tester3.java
@@ -61,6 +61,7 @@ public void startTesting() {
 			//Get the connection.  It will be closed at the end of the loop
 			connex = getConnection();
 			if (connex == null) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println("FAIL: " + getThread_id()
 						+ " could not get the database connection");
 				return; //quit
@@ -73,6 +74,7 @@ public void startTesting() {
 			//Now select nstest.NUM_HIGH_STRESS_ROWS number of rows
 			try {
 				int numSelected = doSelectOperation(NsTest.NUM_HIGH_STRESS_ROWS);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println(getThread_id()+" Tester3: Rows selected "+numSelected);
 			} catch (Exception e) {
 				NsTest.logger.println("doSelect in thread " + getThread_id()
@@ -88,6 +90,7 @@ public void startTesting() {
 		}//end of for (int i=0;...)
 
 		NsTest.logger.println("Thread " + getThread_id() + " is now terminating");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 	}//end of startTesting()
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/TesterObject.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/TesterObject.java
index ec999b68be..00dce4f7a4 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/TesterObject.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester/TesterObject.java
@@ -54,6 +54,7 @@ public class TesterObject {
 	public TesterObject(String name) {
 		this.thread_id = name;
 		dbutil = new DbUtil(getThread_id());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		NsTest.logger.println("==========> " + getThread_id()
 				+ " THREAD starting <======");
 	}
@@ -70,6 +71,7 @@ public Connection getConnection() {
 		Connection conn = null;
 		String jdbcurl = "";
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger.println(getThread_id()
 					+ " is getting a connection to the database...");
 
@@ -80,6 +82,7 @@ public Connection getConnection() {
 					jdbcurl = NsTest.clientDbURL + ";" + NsTest.bootPwd;
 
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger.println("-->Thread " + getThread_id()
 					+ " starting with url " + jdbcurl + " <--");
 			conn = DriverManager.getConnection(jdbcurl, NsTest.prop);
@@ -100,6 +103,7 @@ public Connection getConnection() {
     public  Connection  getNewConnection()
     {
         Connection  conn = getConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
         if ( conn == null )
         {
@@ -118,6 +122,7 @@ public void setIsolationLevel(int level) {
 		try {
 			connex.setTransactionIsolation(level);
 		} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger.println("FAIL: " + getThread_id()
 					+ " could not set isolation level");
 			printException("setting transaction isolation", e);
@@ -133,7 +138,9 @@ public void setIsolationLevel(int level) {
 	// *******************************************************************************
 	public void closeConnection() {
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger.println(getThread_id()
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
 					+ " is closing its connection to the database...");
 			connex.close();
 		} catch (Exception e) {
@@ -156,6 +163,7 @@ public void doIUDOperation() {
 		int decider = (int) (Math.random() * 100) % 3;
 
         if ( connex == null ) { connex = getNewConnection(); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 		switch (decider) {
 
@@ -183,6 +191,7 @@ public void doIUDOperation() {
 					NsTest.addStats(NsTest.FAILED_UPDATE, 1);
 			} catch (Exception e) {
 				printException("executing update_one_row", e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                 if ( NsTest.deadConnection( e ) ) { markDeadConnection(); }
 			}
 			break;
@@ -197,6 +206,8 @@ public void doIUDOperation() {
 					NsTest.addStats(NsTest.FAILED_DELETE, 1);
 			} catch (Exception e) {
 				printException("executing delete_one_row()", e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                 if ( NsTest.deadConnection( e ) ) { markDeadConnection(); }
 			}
 			break;
@@ -223,6 +234,7 @@ public int doSelectOperation(int numRowsToSelect) throws SQLException {
 		ResultSet rSet = null;
 		Statement s = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		NsTest.logger.println(getThread_id() + " is selecting " + numRowsToSelect
 				+ " rows");
 		try {
@@ -235,20 +247,24 @@ public int doSelectOperation(int numRowsToSelect) throws SQLException {
 					+ " t_date, t_decimal, t_decimal_nn, t_double, "
 					+ " t_float, t_int, t_longint, t_numeric_large,"
 					+ " t_real, t_smallint, t_time, t_timestamp,"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 					+ " t_varchar, serialkey, sequenceColumn from nstesttab where serialkey <= "
 					+ numRowsToSelect);
 		} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger
 			.println("FAIL: doSelectOperation() had problems creating/executing query");
 			printException(
 					"FAIL: doSelectOperation() had problems creating/executing query",
 					e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
             if ( rSet != null ) { rSet.close(); }
 			if ( s != null ) { s.close(); }
 
             return numRowsSelected;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5421
 		if (rSet != null) {
 		    // Now work over the returned ResultSet and keep track of number of
 		    // rows returned
@@ -306,10 +322,12 @@ public int doSelectOperation(int numRowsToSelect) throws SQLException {
 
 		            // get value of sequence column
 		            long lg3 = rSet.getLong(17);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 
 		            numRowsSelected++;
 		        }
 		        NsTest.addStats(NsTest.SELECT, 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		        NsTest.logger.println(this.thread_id + " selected " + numRowsSelected
 		                + " rows");
 		    } catch (Exception e) {
@@ -317,6 +335,7 @@ public int doSelectOperation(int numRowsToSelect) throws SQLException {
 		        .println("FAIL: doSelectOperation() had problems working over the ResultSet");
 		        NsTest.addStats(NsTest.FAILED_SELECT, 1);
 		        printException("processing ResultSet during row data retrieval", e);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 		        if ( rSet != null ) { rSet.close(); }
 		        if ( s != null ) { s.close(); }
 		        NsTest.logger.println("Closed the select statement");
@@ -328,6 +347,7 @@ public int doSelectOperation(int numRowsToSelect) throws SQLException {
 			if ((rSet != null) && (s != null)) {
 				rSet.close();
 				s.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println("Closed the select statement");
 			}
 		} catch (Exception e) {
@@ -360,6 +380,7 @@ public void startTesting() {
 	// ***Method is synchronized so that the output file will contain sensible
 	// stack traces that are not mixed but one exception printed at a time
 	public synchronized void printException(String where, Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         if ( NsTest.justCountErrors() )
         {
             NsTest.addError( e );
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils/DbUtil.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils/DbUtil.java
index 654fef23d1..b2aecb4114 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils/DbUtil.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils/DbUtil.java
@@ -96,6 +96,7 @@ public int add_one_row(Connection conn, String thread_id) throws Exception {
 					+ " t_date, t_decimal, t_decimal_nn, t_double, "
 					+ " t_float, t_int, t_longint, t_numeric_large,"
 					+ " t_real, t_smallint, t_time, t_timestamp,"
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 					+ " t_varchar,t_clob,t_blob,sequenceColumn) values ("
 					+ " ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,cast('00000000000000000000000000000000031' as clob(1K)),cast(X'000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031' as blob(10K)), next value for nstesttab_seq)");
 			
@@ -195,6 +196,7 @@ public int add_one_row(Connection conn, String thread_id) throws Exception {
 			try {
 				rowsAdded = ps.executeUpdate();
 			} catch (SQLException sqe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                 if ( NsTest.justCountErrors() )
                 {
                     NsTest.addError( sqe );
@@ -202,7 +204,9 @@ public int add_one_row(Connection conn, String thread_id) throws Exception {
                 else
                 {
                     if (sqe.getSQLState().equalsIgnoreCase("40XL1")) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
                         NsTest.logger
+//IC see: https://issues.apache.org/jira/browse/DERBY-5454
                             .println("LOCK TIMEOUT obtained during insert - add_one_row() "
                                      + sqe.getSQLState());
                     }
@@ -218,6 +222,7 @@ else if (sqe.getSQLState().equalsIgnoreCase("23505")) {
 				
 			}
 			if (rowsAdded == 1) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 				NsTest.logger.println(thread_id + " inserted 1 row with id "
 						//+ id_ind + NsTest.SUCCESS);
                         + id_ind);
@@ -251,6 +256,7 @@ public int update_one_row(Connection conn, String thread_id)
 		conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
 		long skey = pick_one(conn, thread_id);
 		if (skey == 0) { // means we did not find a row
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger.println(thread_id
 					+ " could not find a row to update or there was an error.");
 			return rowsUpdated;
@@ -295,6 +301,7 @@ public int update_one_row(Connection conn, String thread_id)
 			break;
 			
 		case TDECIMAL:
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
 			d = rand.nextDouble() * Math.pow(10, Math.abs(rand.nextInt() % 6));
 			ps2.setDouble(1, d);
 			ds2 = String.valueOf(d);
@@ -375,6 +382,7 @@ public int update_one_row(Connection conn, String thread_id)
 		try {
 			rowsUpdated = ps2.executeUpdate();
 		} catch (SQLException sqe) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger.println(sqe.getSQLState() + " " + sqe.getErrorCode()
 					+ " " + sqe.getMessage());
 			if ( NsTest.justCountErrors() ) { NsTest.printException( DbUtil.class.getName(), sqe ); }
@@ -416,6 +424,7 @@ public int delete_one_row(Connection conn, String thread_id)
 			ps = conn
 			.prepareStatement(" delete from nstesttab where serialkey = ?");
 		} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger
 			.println("Unexpected error preparing the statement in delete_one()");
 			printException("delete_one_row prepare ", e);
@@ -435,6 +444,7 @@ public int delete_one_row(Connection conn, String thread_id)
 			ps.setLong(1, skey);
 			rowsDeleted = ps.executeUpdate();
 		} catch (Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger
 			.println("Error in delete_one(): either with setLong() or executeUpdate");
 			printException("failure to execute delete stmt", e);
@@ -445,6 +455,7 @@ public int delete_one_row(Connection conn, String thread_id)
 		}
 		
 		if (rowsDeleted > 0)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 			NsTest.logger.println(thread_id + " deleted row with serialkey "
 					+ skey + NsTest.SUCCESS);
 		else
@@ -464,6 +475,7 @@ public long pick_one(Connection conn, String thread_id) throws Exception {
 				
 		Random rand = new Random();
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5454
 		long minVal = NsTest.NUM_UNTOUCHED_ROWS + 1;//the max we start with
 		long maxVal = NsTest.numInserts;// this is an almost accurate count of
 		// the max serialkey since it keeps a count of the num of inserts made
@@ -477,6 +489,7 @@ public long pick_one(Connection conn, String thread_id) throws Exception {
 		long rowToReturn = minVal + (long)(rand.nextDouble() * (maxVal - minVal));
 		return rowToReturn;
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5421
 	}//of method pick_one(...)
 	
 	// ** This method abstracts exception message printing for all exception
@@ -486,6 +499,7 @@ public long pick_one(Connection conn, String thread_id) throws Exception {
 	// stack traces that are not
 	// ****mixed but rather one exception printed at a time
 	public synchronized void printException(String where, Exception e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         if ( NsTest.justCountErrors() )
         {
             NsTest.addError( e );
@@ -514,6 +528,7 @@ public synchronized void printException(String where, Exception e) {
 						+ " " + se.getErrorCode());
 			}
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-5465
 		if (e.getMessage() == null) {
 			NsTest.logger.println(getThreadName()
 					+ " dbUtil --> NULL error message detected");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils/MemCheck.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils/MemCheck.java
index 4d055e3120..6f10577307 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils/MemCheck.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils/MemCheck.java
@@ -54,12 +54,14 @@ public void run() {
 				// first check if there are still active tester threads, so 
 				// we do not make backups on an unchanged db every 10 mins for
 				// the remainder of MAX_ITERATIONS.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5649
 				if (NsTest.numActiveTestThreads() != 0 && NsTest.numActiveTestThreads() > 1)
 				{
 					continue;
 				}
 				else
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
 					NsTest.logger.println("no more test threads, finishing memcheck thread also");
 					showmem();
 					stopNow=true;
@@ -77,6 +79,7 @@ public static void showmem() {
 		Runtime rt = null;
 		Date d = null;
 		rt = Runtime.getRuntime();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6533
         long    totalMemory = rt.totalMemory();
         long    freeMemory = rt.freeMemory();
 		d = new Date();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client/Display.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client/Display.java
index d12d5cadf2..824d68e860 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client/Display.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client/Display.java
@@ -82,6 +82,7 @@ public void displayStockLevel(Object displayData, short w, short d,
      * @throws Exception
      */
     public void displayOrderStatus(Object displayData, boolean byName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
             Customer customer, Order order, OrderLine[] lineItems) throws Exception;
               
     /**
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client/Submitter.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client/Submitter.java
index 9d18f5037f..867e4da54b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client/Submitter.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client/Submitter.java
@@ -531,9 +531,11 @@ private String transactionCount(String name, int count, int total)
     
     private String percent(int count, int total)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4892
         BigDecimal c = BigDecimal.valueOf((long) count * 100L);
         BigDecimal t = BigDecimal.valueOf((long) total);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         BigDecimal p = c.divide(t, 2, RoundingMode.DOWN);
         
         return p.toString().concat("%");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct/Standard.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct/Standard.java
index 39c11a2cc4..318354f2be 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct/Standard.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct/Standard.java
@@ -121,6 +121,7 @@ public void stockLevel(Display display, Object displayData, short w,
                         "SELECT D_NEXT_O_ID FROM DISTRICT WHERE D_W_ID = ? AND D_ID = ?");
 
                 PreparedStatement sl2 = prepareStatement(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
                         "SELECT COUNT(DISTINCT(S_I_ID)) AS LOW_STOCK FROM ORDERLINE, STOCK " +
                         "WHERE OL_W_ID = ? AND OL_D_ID = ? " +
                         "AND OL_O_ID < ? AND OL_O_ID >= ? " +
@@ -140,14 +141,17 @@ public void stockLevel(Display display, Object displayData, short w,
                 rs.next();
                 int nextOrder = rs.getInt("D_NEXT_O_ID");
                 reset(sl1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
 
                 sl2.setInt(3, nextOrder);
                 sl2.setInt(4, nextOrder - 20);
 
                 rs = sl2.executeQuery();
                 rs.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
                 lowStock = rs.getInt("LOW_STOCK");
                 reset(sl2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
 
                 conn.commit();
             } finally {
@@ -162,6 +166,7 @@ public void stockLevel(Display display, Object displayData, short w,
         }
 
         if (display != null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
             display.displayStockLevel(displayData, w, d, threshold, lowStock);
     }
        
@@ -199,6 +204,7 @@ public void orderStatus(Display display, Object displayData, short w,
                 
                 nameList.add(customer);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
             reset(osCustomerByName);
             if (nameList.isEmpty())
                 throw new SQLException("Order Status by name - no matching customer "
@@ -250,6 +256,7 @@ public void orderStatus(Display display, Object displayData, short w,
             customer.setMiddle(rs.getString("C_MIDDLE"));
             customer.setLast(rs.getString("C_LAST"));    
             reset(osCustomerById);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
 
             getOrderStatusForCustomer(display, displayData, false, customer);
         } catch (SQLException e) {
@@ -287,6 +294,7 @@ private void getOrderStatusForCustomer(Display display, Object displayData,
         ResultSet rs = osLastOrderNumber.executeQuery();
         rs.next();
         order.setId(rs.getInt("LAST_ORDER"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         reset(osLastOrderNumber);
         
         // Details for the order.
@@ -555,6 +563,7 @@ private void paymentById(Display display, Object displayData, short w, short d,
     }
     
     private static final String[] STOCK_INFO = {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
     "SELECT S_QUANTITY, S_DIST_01, S_DATA FROM STOCK WHERE S_I_ID = ? AND S_W_ID = ?",
     "SELECT S_QUANTITY, S_DIST_02, S_DATA FROM STOCK WHERE S_I_ID = ? AND S_W_ID = ?",
     "SELECT S_QUANTITY, S_DIST_03, S_DATA FROM STOCK WHERE S_I_ID = ? AND S_W_ID = ?",
@@ -760,6 +769,7 @@ public void scheduleDelivery(Display display, Object displayData, short w,
         
         int isolation = conn.getTransactionIsolation(); 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
 
             conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
             
@@ -912,6 +922,7 @@ public void delivery() throws Exception {
     public void sortOrderItems(int[] items, short[] quantities, short[] supplyW) {
 
         OrderItem4Sort[] list = new OrderItem4Sort[items.length];
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
 
         for (int i = 0; i < items.length; i++)
         {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct/StatementHelper.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct/StatementHelper.java
index 5b2151096d..13850f8f29 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct/StatementHelper.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct/StatementHelper.java
@@ -61,6 +61,7 @@ class StatementHelper {
      */
     private Map<String, PreparedStatement> statements =
             new IdentityHashMap<String, PreparedStatement>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
     /**
      * Prepare a statement, looking in the map first.
@@ -68,6 +69,7 @@ class StatementHelper {
      * it is prepared and put into the map for future use.
      */
     protected PreparedStatement prepareStatement(String sql) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         PreparedStatement ps = statements.get(sql);
         if (ps != null)
             return ps;
@@ -82,6 +84,7 @@ protected PreparedStatement prepareStatement(String sql) throws SQLException {
     }
 
     public void close() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (PreparedStatement ps : statements.values()) {
             ps.close();
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/load/SimpleInsert.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/load/SimpleInsert.java
index 5f42018571..a45d96c00c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/load/SimpleInsert.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/load/SimpleInsert.java
@@ -91,6 +91,7 @@ public void setupLoad(Connection conn, short scale) throws SQLException {
      */
     void setupConnection(Connection conn, short scale) throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2095
         this.conn = conn;
         conn.setAutoCommit(false);
         conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
@@ -123,6 +124,7 @@ public void populateAllTables() throws Exception {
         // load item table
         itemTable(1, Load.ITEM_COUNT);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2095
         for (short w = 1; w <= scale; w++) {
             populateForOneWarehouse(w);
         }
@@ -386,6 +388,7 @@ public void orderTable(short w, short d) throws SQLException {
         int[] cid = random.randomIntPerm(Load.CUSTOMER_COUNT_W
                 / Load.DISTRICT_COUNT_W);
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2095
         for (int o_id = 1; o_id <= cid.length; o_id++) {
             psO.setInt(1, o_id);
             psO.setInt(4, cid[o_id-1]);
@@ -409,6 +412,7 @@ public void orderTable(short w, short d) throws SQLException {
             psNO.setShort(2, d);
             psNO.setShort(3, w);
             for (int ol_number = 1; ol_number <= o_ol_cnt; ol_number++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2095
 
                 psOL.setInt(1, o_id);
                 psOL.setInt(4, ol_number);
@@ -416,6 +420,7 @@ public void orderTable(short w, short d) throws SQLException {
                 // OL_I_ID random within [1 .. 100,000]
                 psOL.setInt(5, random.randomInt(1, Load.ITEM_COUNT));
                 psOL.setShort(6, w);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2095
                 if (o_id <= Load.NEWORDERS_BREAKPOINT) {
                     psOL.setTimestamp(7, o_entry_d);
                     psOL.setString(9, "0.00");
@@ -427,6 +432,7 @@ public void orderTable(short w, short d) throws SQLException {
                 psOL.setString(10, random.randomAString24());
                 psOL.executeUpdate();
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2095
             if (o_id > Load.NEWORDERS_BREAKPOINT) {
                 psNO.setInt(1, o_id);
                 psNO.executeUpdate();
@@ -444,6 +450,7 @@ public void orderTable(short w, short d) throws SQLException {
     }
 
     public void setSeed(long seed) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         this.seed = seed;
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Checks.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Checks.java
index c9d24a2a30..2a148d9d4f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Checks.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Checks.java
@@ -62,6 +62,7 @@ public Checks(String name, short scale) {
 
     public void setUp() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2278
         this.check = new OEChecks();
         check.initialize(new HandleCheckError() {
             public void handleCheckError(String error) {
@@ -76,6 +77,7 @@ public void handleCheckError(String error) {
      * @param scale
      */
     public static Test checkAllRowCounts(short scale) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("Order Entry -Check Row Counts");
 
@@ -98,6 +100,7 @@ public static Test checkAllRowCounts(short scale) {
      */
     public static Test consistencyChecks()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("Order Entry -Consistency checks");
 
@@ -114,6 +117,7 @@ public static Test consistencyChecks()
      *         database
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("OrderEntry - checks");
         suite.addTest(checkAllRowCounts((short) 1));
         suite.addTest(consistencyChecks());
@@ -262,6 +266,7 @@ public void testCondition4() throws SQLException {
      * @throws Exception
      */
     public void testWarehouseRows() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2278
         check.testWarehouseRows();
     }
 
@@ -271,6 +276,7 @@ public void testWarehouseRows() throws Exception {
      * @throws Exception
      */
     public void testStockRows() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2278
         check.testStockRows();
     }
 
@@ -280,6 +286,7 @@ public void testStockRows() throws Exception {
      * @throws Exception
      */
     public void testOrdersRows() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2278
         check.testOrdersRows();
     }
 
@@ -289,6 +296,7 @@ public void testOrdersRows() throws Exception {
      * @throws Exception
      */
     public void testDistrictRows() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2278
         check.testDistrictRows();
     }
 
@@ -298,6 +306,7 @@ public void testDistrictRows() throws Exception {
      * @throws Exception
      */
     public void testCustomerRows() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2278
         check.testCustomerRows();
     }
 
@@ -307,6 +316,7 @@ public void testCustomerRows() throws Exception {
      * @throws Exception
      */
     public void testItemRows() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2278
         check.testItemRows();
     }
 
@@ -316,6 +326,7 @@ public void testItemRows() throws Exception {
      * @throws Exception
      */
     public void testNewOrdersRows() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2278
         check.testNewOrdersRows();
     }
 
@@ -325,6 +336,7 @@ public void testNewOrdersRows() throws Exception {
      * @throws Exception
      */
     public void testHistoryRows() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2278
         check.testHistoryRows();
     }
 
@@ -334,6 +346,7 @@ public void testHistoryRows() throws Exception {
      * @throws Exception
      */
     public void testOrderLineRows() throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2278
         check.testOrderLineRows();
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Populate.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Populate.java
index 03e7a3fc62..974490a125 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Populate.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Populate.java
@@ -149,13 +149,16 @@ private static void printUsage() {
      */
     public static Test suite() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Order Entry");
         
         suite.addTest(new Populate("testCreateDB"));
 
         // Create Schema
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         Schema.addBaseSchema(suite);
         if (createConstraintsBeforeLoad)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2095
             Schema.addConstraints(suite);
         
         // this will populate db
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Schema.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Schema.java
index 06d1dc3b93..830beac711 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Schema.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run/Schema.java
@@ -52,8 +52,10 @@ public Schema(String name) {
      */
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("Order Entry- Schema");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         // Create Schema
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         addBaseSchema(suite);
         addConstraints(suite);
         return suite;
@@ -63,6 +65,7 @@ public static void addBaseSchema(BaseTestSuite suite) {
         // Create Schema
         suite.addTest(new Schema("schema.sql"));
         suite.addTest(new Schema("dataroutines.sql"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         suite.addTest(new Schema("delivery.sql"));
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/OETest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/OETest.java
index b6800163ec..2c4aa598d2 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/OETest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/OETest.java
@@ -46,14 +46,17 @@ public OETest(String name) {
     
       
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("Order Entry");
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-2095
         suite.addTest(Schema.suite());
         // Test load part
         suite.addTest(new Populate("testLoad"));
         // perform checks tests.
         suite.addTest(Checks.suite());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         suite.addTestSuite(OperationsTester.class);
         suite.addTestSuite(OETest.class);
         
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/OperationsTester.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/OperationsTester.java
index 5090a9ef0d..7eca537dce 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/OperationsTester.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/OperationsTester.java
@@ -46,6 +46,7 @@ public class OperationsTester extends BaseJDBCTestCase implements Display {
     private final short w = 1;
     
     public OperationsTester(String name) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         super(name);
         
     }
@@ -74,6 +75,7 @@ public void testStockLevel() throws Exception
             int threshold = rand.threshold();
             
             HashMap<String, Number> inputData = new HashMap<String, Number>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             inputData.put("d", d);
             inputData.put("threshold", threshold);
             
@@ -101,7 +103,10 @@ public void testOrderStatus() throws Exception
             short d = rand.district();
             int c = rand.NURand1023();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             HashMap<String, Number> inputData = new HashMap<String, Number>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             inputData.put("d", d);
             inputData.put("c", c);
 
@@ -115,10 +120,13 @@ public void testOrderStatus() throws Exception
                 w, rand.district(), rand.randomCLast());
         for (int i = 0; i < 50; i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
             short d = rand.district();
             String customerLast = rand.randomCLast();
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             HashMap<String, Object> inputData = new HashMap<String, Object>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             inputData.put("d", d);
             inputData.put("customerLast", customerLast);
 
@@ -151,6 +159,7 @@ public void testPayment() throws Exception
     }
     public void testNewOrder() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         for (int x = 0; x < 50; x++)
         {
             int itemCount = rand.randomInt(5, 15);
@@ -178,6 +187,7 @@ public void testNewOrder() throws Exception
     }
     public void testScheduleDelivery() throws Exception
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         for (int i = 0; i < 50; i++)
             ops.scheduleDelivery(this, null, w, rand.carrier());
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/_Suite.java
index d204de2fd8..459fc1cf6b 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test/_Suite.java
@@ -34,6 +34,7 @@ private _Suite(String name) {
 
     public static Test suite() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite("oe");
         
         suite.addTest(OETest.suite());
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/util/OERandom.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/util/OERandom.java
index 2b251e725f..c9370bd953 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/util/OERandom.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/util/OERandom.java
@@ -105,6 +105,7 @@ public String randomDecimalString(int start, int end, int scale) {
      */
     public BigDecimal payment()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         return randomDecimal(1, 500000, 2);
     }
 
@@ -137,6 +138,8 @@ public short district()
      */
     public short carrier()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         return (short) randomInt(1, 10);
     }
 
@@ -336,6 +339,7 @@ public String randomCLastPopulate(int cid) {
         // First thousand customers (C_ID is one based)
         // have a fixed last name based upon the contiguous
         // values from 0-999, section 4.3.3.1
+//IC see: https://issues.apache.org/jira/browse/DERBY-2094
         if (cid <= 1000)
             return randomCLast(cid-1); // range 0 - 999
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/RunOptimizerTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/RunOptimizerTest.java
index e0d63b387a..4927855889 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/RunOptimizerTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/RunOptimizerTest.java
@@ -54,6 +54,7 @@ public static void main(String[] args) {
 		boolean reset=false;
 		boolean verbose=false;
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 			String mode=System.getProperty("derby.optimizertest.mode");
 			if(mode!=null){
 				if(mode.equalsIgnoreCase("client")){
@@ -65,6 +66,7 @@ public static void main(String[] args) {
 				}
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3845
 			File dir = new File("testdb");
 			if((!dir.exists())){
 				reset=true; // If nonexisting must always .init and .createObjects
@@ -72,6 +74,7 @@ public static void main(String[] args) {
 
 			System.out.println("Running test with url "+jdbcurl);
 			if(args.length>0){
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 				for(int i=0;i<args.length;i++){
 					if(args[i].equalsIgnoreCase("-reset"))
 						reset=true;
@@ -87,6 +90,7 @@ else if(args[i].equalsIgnoreCase("-verbose"))
 				}
 			
 			Class.forName(driverClass);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3845
 			if (reset) { // Must also be done if db nonexisting
                 System.out.println("Initializing db ...");
 				conn = DriverManager.getConnection(jdbcurl);
@@ -140,6 +144,7 @@ private static void printUsage(){
 	}
 	private static void printResults(){
 		System.out.println("\n\n========================= R E S U L T S =========================\n");
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 			for(int i=0;i<QueryList.getQList().size();i++){
 			System.out.println("\n________________________________________________________________________________________________");
 			GenericQuery gq=(GenericQuery)QueryList.getQList().get(i);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/query/GenericQuery.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/query/GenericQuery.java
index 8db7916e52..7135ff4382 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/query/GenericQuery.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/query/GenericQuery.java
@@ -59,6 +59,7 @@ public void generateQueries(Properties prop){
 		Enumeration qenum=prop.keys();
 		while(qenum.hasMoreElements()){
 			String queryName=(String)qenum.nextElement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 			queries.add(prop.getProperty(queryName));
 		}
 	}
@@ -70,6 +71,7 @@ public void  executeQueries(boolean prepare,boolean verbose) throws SQLException
 		rowsExpected=new int[queries.size()]; //initialize the array with correct size
 		String query="";
 		if(prepare){	
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 			if (verbose)
 				System.out.println("=====================> Using java.sql.PreparedStatement <====================");					
 		}else{
@@ -80,6 +82,7 @@ public void  executeQueries(boolean prepare,boolean verbose) throws SQLException
 		try{
 			for(int k=0;k<queries.size();k++){
 				
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 				query = queries.get(k);
 				String [] times=new String [StaticValues.ITER];
 				int rowsReturned=0;
@@ -110,6 +113,7 @@ public void  executeQueries(boolean prepare,boolean verbose) throws SQLException
 						rowsReturned++;
 					}
 					long time_taken=(System.currentTimeMillis() - start);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 					if (verbose){
 						System.out.println("Time required to execute:");
 						System.out.println(query);
@@ -117,6 +121,7 @@ public void  executeQueries(boolean prepare,boolean verbose) throws SQLException
 					
 						System.out.println("==> "+time_taken+" milliseconds "+" OR "+TestUtils.getTime(time_taken));
 					}
+//IC see: https://issues.apache.org/jira/browse/DERBY-3845
 					times[i]=TestUtils.getTime(time_taken);
 					rs.close();
 					if(prepare){
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/utils/DataUtils.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/utils/DataUtils.java
index e3a56ec5f5..0996bbf8fa 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/utils/DataUtils.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/utils/DataUtils.java
@@ -38,6 +38,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class DataUtils {
 	public static void dropObjects(Connection conn, boolean verbose) throws SQLException {
 		Statement stmt = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 		if (verbose)
 			System.out.println("Dropping existing Tables and Views...");
 		for (int i=0;i<TestViews.dropViews.size();i++){
@@ -65,6 +66,7 @@ public static void dropObjects(Connection conn, boolean verbose) throws SQLExcep
 	}
 	public static void createObjects(Connection conn,boolean verbose) throws SQLException {
 		Statement stmt = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 		if (verbose)
 			System.out.println("Creating Tables...");
 		for (int i = 1; i <= StaticValues.NUM_OF_TABLES; i++) {
@@ -86,6 +88,7 @@ public static void createObjects(Connection conn,boolean verbose) throws SQLExce
 
 			}
 		}// end for
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 		if (verbose)
 			System.out.println("Creating Views...");
 		for (int i=0;i<TestViews.createViews.size();i++){
@@ -115,6 +118,7 @@ public static void insertData(Connection conn,boolean verbose){
 					totalRows = rs.getInt(1);
 				}
 				if (totalRows >= StaticValues.NUM_OF_ROWS) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 					if (verbose)
 						System.out.println(" InsertData.insert_data() => "
 							+ totalRows + " exists in table " + tableName
@@ -141,6 +145,7 @@ public static void insertData(Connection conn,boolean verbose){
 								throw sqe;
 							}
 						}
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 						if (verbose)
 							System.out.println("Rows deleted from " + tableName + "= "
 								+ stmt.executeUpdate("DELETE FROM " + tableName));
@@ -180,6 +185,7 @@ public static void insertData(Connection conn,boolean verbose){
 					}
 					ps.close();
 					conn.commit();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2392
 					if (verbose)
 						System.out.println("Inserted " + (k - 1) + " rows into "
 							+ tableName + " in "
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/Sttest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/Sttest.java
index 80e47dded5..1c0217d386 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/Sttest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/Sttest.java
@@ -128,6 +128,7 @@ public static void main(String[] args) throws SQLException, IOException,
 		// get any properties user may have set in Sttest.properties file
 		// these will override any of those set above
 		userProperties();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		Class<?> clazz = Class.forName(driver);
         clazz.getConstructor().newInstance();
 		if (Setup.doit(dbURL) == false)
@@ -176,6 +177,7 @@ public static void sttTop() throws SQLException, IOException,
 	InterruptedException, Exception, Throwable {
 		rand = new Random();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2312
 		Datatypes.Rn = rand;
 		// harder to actually delete rows when there are
 		// more connections, so repeat operation more often
@@ -346,6 +348,7 @@ public void run() {
 					}
 					MemCheck.showmem();
 					// compress 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4213
 					try {
 						compress(conn);
 					} catch  (Exception e) {
@@ -375,6 +378,7 @@ public void run() {
 					int addrows = 0;
 					for (int i = 0; i <= ind2; i++) {
 						Datatypes.add_one_row(conn, thread_id);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2312
 						addrows++;
 						conn.commit();
 						if (mode == INIT) {
@@ -390,6 +394,7 @@ public void run() {
 					int updaterow = 0;
 					for (int i = 0; i <= ind2; i++) {
 						Datatypes.update_one_row(conn, thread_id);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2312
 						updaterow++;
 						conn.commit();
 						yield();
@@ -444,6 +449,7 @@ public void run() {
 					e.printStackTrace();
 				}
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-2312
 		}// end while
 		try {
 			conn.close();
@@ -487,6 +493,7 @@ static synchronized void compress(Connection conn)
 		System.out.println("compressing table");
 		boolean autocom = conn.getAutoCommit();
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4213
 			conn.setAutoCommit(true);
 			CallableStatement cs = conn.prepareCall(
 				"CALL SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE(?, ?, ?, ?, ?)");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/CompressTable.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/CompressTable.java
index d52d356790..a58a99525d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/CompressTable.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/CompressTable.java
@@ -47,6 +47,7 @@ public static void main(String[] args) throws SQLException, IOException,
 		Connection conn = null;
 		Date d = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Class<?> clazz = Class.forName(driver);
         clazz.getConstructor().newInstance();
 		
@@ -80,6 +81,7 @@ static synchronized void compress(Connection conn)
 	throws java.lang.Exception {
 		System.out.println("compressing table");
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4213
 			conn.setAutoCommit(true);
 			CallableStatement cs = conn
 				.prepareCall("CALL SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE(?, ?, ?, ?, ?)");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/Datatypes.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/Datatypes.java
index 6cac4aa8df..af131bcf5c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/Datatypes.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/Datatypes.java
@@ -97,6 +97,8 @@ public static synchronized void add_one_row(Connection conn, int thread_id)
 					+ " t_float, t_int, t_longint, t_numeric_large,"
 					+ " t_real, t_smallint, t_time, t_timestamp,"
 					+ " t_varchar) values ("
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 					+ " ?,?, ?,?, ?, ?,?, ?, ?, ?,?, ?, ?, ?, ?, ?,?)" 
 					/* autoincrement feature added, so we need to specify the
 					 * column name for prepared statement, otherwise auto increment
@@ -120,6 +122,8 @@ public static synchronized void add_one_row(Connection conn, int thread_id)
 			ps.setString(2, cs2.substring(0, i2));
 			//"t_blob"
 			int blobLength = Rn.nextInt(102400 - 0 + 1) + 0;//to create a stream of random length between 0 and 100K
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 			streamIn = new LoopingAlphabetStream(blobLength);
 			ps.setBinaryStream(3, streamIn, blobLength);
 			//"t_clob
@@ -228,6 +232,7 @@ public static int[] pick_some(Connection conn, int thread_id, int quantity)
 		//pick the rows
 		try {
 			ps = conn
+//IC see: https://issues.apache.org/jira/browse/DERBY-4213
 			.prepareStatement(" select id from  Datatypes where id >= ?");
 		} catch (SQLException se) {
 			if (se.getNextException() == null)
@@ -240,6 +245,8 @@ public static int[] pick_some(Connection conn, int thread_id, int quantity)
 		int list[] = new int[quantity];
 		int j = 0;
 		for (int i = 0; i < quantity; i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 			ind = Rn.nextInt();
 			try {
 				ps.setInt(1, ind);
@@ -254,6 +261,7 @@ public static int[] pick_some(Connection conn, int thread_id, int quantity)
 					list[i] = j;
 
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-4213
 				else {
 					// the random number is higher than the
 					// highest id value in the database. 
@@ -289,6 +297,8 @@ public static void delete_one_row(Connection conn, int thread_id)
 		String column = null;
 		int ind = 0;
 		ResultSet rs = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 		ind = Math.abs(Rn.nextInt());
 		while (ind % NUMTYPES == TDECIMAL || ind % NUMTYPES == TVARCHAR
 				|| ind % NUMTYPES == TCHAR)
@@ -314,6 +324,8 @@ public static void delete_one_row(Connection conn, int thread_id)
 		BigDecimal bdec = null;
 		switch (ind % NUMTYPES) {
 		case TCHAR:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 			ds = cs.substring(Math.abs(Rn.nextInt() % 100));
 			ps.setString(1, ds);
 			break;
@@ -441,6 +453,8 @@ public static void delete_one_row(Connection conn, int thread_id)
 								+ " SQLSTATE: " + m);
 					}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 					if (rows < 0)
 						System.out.println("t" + thread_id + " delete failed.");
 				}
@@ -467,6 +481,8 @@ public static synchronized void update_one_row(Connection conn,
 		long min = 0;
 		double x;
 		long id_to_update;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 		InputStream streamIn = null;
 		Reader streamReader = null;
 		rs = stmt.executeQuery("select max(serialkey) from Datatypes");
@@ -500,6 +516,8 @@ public static synchronized void update_one_row(Connection conn,
 		int type = (ind % NUMTYPES);
 		switch (type) {
 		case TCHAR:
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 			ds2 = cs.substring(Math.abs(Rn.nextInt() % 100));
 			ps2.setString(1, ds2);
 			break;
@@ -573,6 +591,8 @@ public static synchronized void update_one_row(Connection conn,
 			break;
 		case TTIME:
 			Time tt = new Time(1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 			tt.setTime(Math.abs(Rn.nextInt()));
 			ps2.setTime(1, tt);
 			ds2 = tt.toString();
@@ -613,9 +633,12 @@ public static synchronized void update_one_row(Connection conn,
 				System.out.println(se.getNextException().getMessage()
 						+ " SQLSTATE: " + m);
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-2311
+//IC see: https://issues.apache.org/jira/browse/DERBY-2309
 			if (rows < 0)
 				System.out.println("t" + thread_id + " update failed.");
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-4148
 		if (streamReader != null)
 			streamReader.close();
 		if (streamIn !=null)
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/Setup.java b/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/Setup.java
index 89f971d43c..d4446468ca 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/Setup.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils/Setup.java
@@ -116,4 +116,4 @@ public static boolean doit(String dbURL) throws Throwable {
 			}
 			return (true);
 	}
-}
\ No newline at end of file
+}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/crypto/T_Cipher.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/crypto/T_Cipher.java
index e5a5cdecc4..9e3c1ddf5e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/crypto/T_Cipher.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/crypto/T_Cipher.java
@@ -86,6 +86,7 @@ public T_Cipher()
 	*/
 
 	public String getModuleToTestProtocolName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		return org.apache.derby.shared.common.reference.Module.CipherFactoryBuilder;
 	}
 
@@ -99,6 +100,7 @@ protected String getProvider()
 	// allow for alternate providers
 	String testProvider = 
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         AccessController.doPrivileged(new PrivilegedAction<String>() {
             public String run() {
 		    	return System.getProperty("testEncryptionProvider");
@@ -116,6 +118,7 @@ public void runTests() throws T_Fail {
 
 		File testFile = new File("extinout/T_Cipher.data");
 		deleteFile(testFile);
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
 
 		String bootPassword = "a secret, don't tell anyone";
 
@@ -208,8 +211,10 @@ protected void setupCiphers(String bootPassword) throws T_Fail, StandardExceptio
         REPORT("encryption algorithm used : " + getAlgorithm());
         REPORT("encryption provider used : " + provider);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1156
         CipherFactoryBuilder cb =  (CipherFactoryBuilder)
             startSystemModule(org.apache.derby.shared.common.reference.Module.CipherFactoryBuilder);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
         factory = cb.createCipherFactory(true, props, false);
 
@@ -613,8 +618,10 @@ private void printByteArray(String name, byte[] array)
 	 */
 	private void deleteFile(final File f)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run()  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
 		    	if (f.exists())
 		    	    f.delete();
 		    	return null;
@@ -627,6 +634,7 @@ public Void run()  {
      * can't call this entry point.
      */
     private  static  Object  startSystemModule( final String factoryInterface )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java
index 7db0f4522b..7c1c74d8e7 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java
@@ -76,9 +76,11 @@ public void boot(boolean create, Properties startParams)
 		output = Monitor.getStream();
 
 		contextService = getContextService();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		this.currentOutput = output;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		vectorOfTests = new Vector<UnitTest>();
 		namesOfTests = new Hashtable<String, String>();
 
@@ -88,6 +90,7 @@ public void boot(boolean create, Properties startParams)
 		} catch (SecurityException se) {
 		}
 		findTests(getMonitor().getApplicationProperties(), startParams);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		if ( !alreadyRun )
 		{
@@ -101,6 +104,7 @@ public void boot(boolean create, Properties startParams)
 			System.out.println("Shutting down due to unit test failure.");
 			output.printlnWithHeader("Shutting down due to unit test failure, see log for more information.");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			getMonitor().shutdown();
 		}
 	}
@@ -133,6 +137,7 @@ private void findTests(Properties testList, Properties startParams) {
 
 				try {
 					Object unitTest =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 						bootServiceModule(false, this, unitTestClass,
 												  startParams);
 					if (unitTest instanceof UnitTest) {
@@ -213,6 +218,7 @@ private boolean runATest(UnitTest aTest){
 
 		if (performanceReportOn){
 			endTime = new Date();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			emitAMessage("Test '" + thisTestName + "' took " + (endTime.getTime() - startTime.getTime()) + " milliseconds.");
 		}
 
@@ -297,12 +303,14 @@ public void setPerformanceReportOn(boolean performanceReportOn){
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Bomb.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Bomb.java
index 44c3c38d2c..693977a264 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Bomb.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Bomb.java
@@ -47,6 +47,7 @@ private T_Bomb()
 			PropertyUtil.getSystemInt(BOMB_DELAY_PN,0,
 									  Integer.MAX_VALUE,
 									  DEFAULT_BOMB_DELAY);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		v = new Vector<T_Bombable>();
 		t = new Thread(this);
 		t.setDaemon(true);
@@ -117,6 +118,7 @@ public void run() {
 	private void blowUp()
 	{
 			performLastGasp();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			ContextService csf = getContextService();
 			if (csf != null)
 			{
@@ -135,6 +137,7 @@ private void blowUp()
 
 	private void performLastGasp()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         for (T_Bombable b : v) {
 			try{
 			 b.lastChance();
@@ -155,6 +158,7 @@ private void performLastGasp()
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getFactory();
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Generic.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Generic.java
index 05ae98d399..1ad195a560 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Generic.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/T_Generic.java
@@ -120,6 +120,7 @@ public boolean Execute(HeaderPrintWriter out)
 		
 		catch (Throwable t)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2472
 			FAIL(t.toString());
 			t.printStackTrace(out.getPrintWriter());
 			return false;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/UnitTestMain.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/UnitTestMain.java
index 24a238b735..f90119ee38 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/UnitTestMain.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/harness/UnitTestMain.java
@@ -42,6 +42,7 @@ public class UnitTestMain  {
 
 	public static void main(String args[]) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         AccessController.doPrivileged
             (
              new PrivilegedAction<Object>()
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/ArrayInputStreamTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/ArrayInputStreamTest.java
index 62430caf81..9d38cd9a7c 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/ArrayInputStreamTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/ArrayInputStreamTest.java
@@ -33,6 +33,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class ArrayInputStreamTest extends BaseTestCase {
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(ArrayInputStreamTest.class);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.java
index fc7e78fb67..bd29f1c95f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/AssertFailureTest.java
@@ -52,7 +52,9 @@ public AssertFailureTest(String name) {
 
     public static Test suite() {
         BaseTestSuite suite = new BaseTestSuite("AssertFailureTest");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3618
         try {
             //Only add the tests if this is a sane build.
             Class.forName("org.apache.derby.shared.common.sanity." +
@@ -85,6 +87,7 @@ public void testAssertFailureThreadDump() {
 
         // Assert that the string is correct, by checking that
         // it starts the right way.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         String expected = "---------------\n" +
             		"Stack traces for all live threads:\nThread name=";
 
@@ -106,6 +109,7 @@ public void testAssertFailureNoThreadDump() {
 
         // Assert that the string is correct, by checking that is starts
         // the right way.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         String expected = "(Skipping thread dump because of insufficient " +
             		"permissions:\njava.security.AccessControlException:";
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/BlockedByteArrayTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/BlockedByteArrayTest.java
index 4d7d6994eb..8da860132a 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/BlockedByteArrayTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/BlockedByteArrayTest.java
@@ -140,6 +140,7 @@ public void testLength()
      * @throws IOException if something goes wrong
      */
     public void testCapacityGrowth()
+//IC see: https://issues.apache.org/jira/browse/DERBY-4103
             throws IOException {
         BlockedByteArray src = createBlockedByteArray(0);
         src.setLength(1*1024*1024); // 1 MB
@@ -161,6 +162,7 @@ public void testCapacityGrowth()
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(BlockedByteArrayTest.class);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java
index f2fd07c0c2..ee2a49ccbe 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/CharacterStreamDescriptorTest.java
@@ -44,6 +44,7 @@ public CharacterStreamDescriptorTest(String name) {
      * Tests the default values set by the builder.
      */
     public void testDefaultValues() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
         InputStream emptyStream = new ByteArrayInputStream(new byte[] {});
         CharacterStreamDescriptor.Builder b =
                 new CharacterStreamDescriptor.Builder().stream(emptyStream);
@@ -61,6 +62,7 @@ public void testDefaultValues() {
     }
 
     public void testSetValues() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
         final long charLength = 1023;
         final long byteLength = 1023*2;
         final long curBytePos = 4;
@@ -87,6 +89,7 @@ public void testSetValues() {
         assertEquals(charLength, csd.getCharLength());
         assertEquals(maxCharLen, csd.getMaxCharLength());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
         PositionedStream emptyPS = new PositionedTestStream(curBytePos);
         // Set only a few values.
         csd = new CharacterStreamDescriptor.Builder().bufferable(true).
@@ -99,6 +102,7 @@ public void testSetValues() {
         // Set data offset and update the character position accordingly.
         csd = new CharacterStreamDescriptor.Builder().bufferable(true).
                 positionAware(true).dataOffset(dataOffset).
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
                 curCharPos(CharacterStreamDescriptor.BEFORE_FIRST).
                 stream(emptyPS.asInputStream()).build();
         assertEquals(true, csd.isBufferable());
@@ -110,6 +114,7 @@ public void testSetValues() {
     }
 
     public void testCopyState() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
         final long charLength = 1023;
         final long byteLength = 1023*2;
         final long curBytePos = 4;
@@ -158,6 +163,7 @@ public void testCopyState() {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(CharacterStreamDescriptorTest.class,
                 "CharacterStreamDescriptorTest suite");
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/CompressedNumberTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/CompressedNumberTest.java
index dd34f4754e..f69501b5d9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/CompressedNumberTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/CompressedNumberTest.java
@@ -71,6 +71,7 @@ public void testLong() throws IOException{
                 Long.MAX_VALUE,
                 };
         int[] length = {2, 2, 2,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3742
                 2, 2,
                 2,
                 4, 4,
@@ -116,6 +117,7 @@ public void testInt() throws IOException{
                 Integer.MAX_VALUE,
                 };
         int[] length = { 1, 1, 1,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3742
                 1, 1, 1, 1,
                 1,
                 2, 2, 2, 2,
@@ -205,6 +207,8 @@ private void checkLong(long l, int expectedLength) throws IOException {
         aos.setPosition(0);
         int length = CompressedNumber.writeLong(out, l);
         assertEquals("Invalid length after compressed", expectedLength, length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3742
+//IC see: https://issues.apache.org/jira/browse/DERBY-3742
 
         assertEquals("MISMATCH written bytes", length, aos.getPosition());
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/DataInputUtilTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/DataInputUtilTest.java
index d4a4d7ec49..08a55eaa57 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/DataInputUtilTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/DataInputUtilTest.java
@@ -68,6 +68,7 @@ public void testSkipFully() throws IOException{
      * Returns a suite of tests.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(
             DataInputUtilTest.class, "DataInputUtilTest tests");
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/DerbyVersionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/DerbyVersionTest.java
index f077af2f2c..c034ee19e3 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/DerbyVersionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/DerbyVersionTest.java
@@ -54,6 +54,7 @@ public DerbyVersionTest(String name) {
         super(name);
     }
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(
             DerbyVersionTest.class, "DerbyVersionTest tests");
     }
@@ -74,6 +75,7 @@ public void testLessThan() {
     }
 
     public void testAtLeast() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5475
         assertTrue(_10_4.atLeast(_10_4));
         assertTrue(_10_4.atLeast(_10_3));
         assertTrue(_10_5_2_0.atLeast(_10_5_1_1));
@@ -94,6 +96,7 @@ public void testGreaterThan() {
 
 
     public void testAtMost() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5475
         assertTrue(_10_4.atMost(_10_5));
         assertTrue(_10_8.atMost(_11_9));
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java
index 23085316fb..2f75c0c2d6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java
@@ -50,6 +50,7 @@ public class FormatableBitSetTest extends BaseTestCase {
      */
     private final static Method bitCount;
     static {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         Method m = null;
         try {
             m = Integer.class.getMethod("bitCount", new Class[]{Integer.TYPE});
@@ -102,9 +103,11 @@ public void tearDown() throws Exception {
      * @throws Exception
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite ts = new BaseTestSuite(FormatableBitSetTest.class,
                              "FormatableBitSetTest suite");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         if (bitCount != null) {
             ts.addTest(new FormatableBitSetTest("numBitsSetInOneByte"));
             ts.addTest(new FormatableBitSetTest("numBitsSetInTwoBytes"));
@@ -120,8 +123,11 @@ public void testSetup() {
         assertEquals(0,empty.getLength());
         assertEquals(0,empty.getLengthInBytes());
         assertEquals(0,empty.getNumBitsSet());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(empty.invariantHolds());
         assertEquals(0,empty.getByteArray().length);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
 
         assertEquals(18,bitset18.getLength());
         assertEquals(3,bitset18.getLengthInBytes());
@@ -142,7 +148,9 @@ public void testIntCtor0() {
         assertEquals(0,zeroBits.getLength());
         assertEquals(0,zeroBits.getLengthInBytes());
         assertEquals(0,zeroBits.getNumBitsSet());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(zeroBits.invariantHolds());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertEquals(0,zeroBits.getByteArray().length);
     }
     public void testIntCtor1() {
@@ -150,6 +158,7 @@ public void testIntCtor1() {
         assertEquals(1,oneBit.getLength());
         assertEquals(1,oneBit.getLengthInBytes());
         assertEquals(0,oneBit.getNumBitsSet());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(oneBit.invariantHolds());
         assertEquals(1,oneBit.getByteArray().length);
     }
@@ -158,6 +167,7 @@ public void testIntCtor8() {
         assertEquals(8,eightBits.getLength());
         assertEquals(1,eightBits.getLengthInBytes());
         assertEquals(0,eightBits.getNumBitsSet());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(eightBits.invariantHolds());
         assertEquals(1,eightBits.getByteArray().length);
     }
@@ -166,10 +176,12 @@ public void testIntCtor9() {
         assertEquals(9,nineBits.getLength());
         assertEquals(2,nineBits.getLengthInBytes());
         assertEquals(0,nineBits.getNumBitsSet());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(nineBits.invariantHolds());
         assertEquals(2,nineBits.getByteArray().length);
     }
     public void testIntCtorNeg() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         try { FormatableBitSet negBits = new FormatableBitSet(-1); fail(); }
         catch(IllegalArgumentException iae) {}
     }
@@ -180,6 +192,7 @@ public void testEmptyCpyCtor() {
         assertEquals(0,emptyCpy.getLength());
         assertEquals(0,emptyCpy.getLengthInBytes());
         assertEquals(0,emptyCpy.getNumBitsSet());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(emptyCpy.invariantHolds());
     }
     public void testCpyCtor() {
@@ -189,7 +202,9 @@ public void testCpyCtor() {
         assertEquals(9,cpy.getNumBitsSet());
         assertEquals(0,cpy.compare(bitset18));
         assertTrue(cpy.equals(bitset18));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(cpy.invariantHolds());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertEquals(3,cpy.getByteArray().length);
     }
 
@@ -199,7 +214,9 @@ public void testGrowEmpty() {
         assertEquals(18,empty.getLength());
         assertEquals(3,empty.getLengthInBytes());
         assertEquals(0,empty.getNumBitsSet());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(bitset18.invariantHolds());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertEquals(3,empty.getByteArray().length);
     }
     public void testGrow() {
@@ -207,6 +224,7 @@ public void testGrow() {
         assertEquals(25,bitset18.getLength());
         assertEquals(4,bitset18.getLengthInBytes());
         assertEquals(9,bitset18.getNumBitsSet());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(bitset18.invariantHolds());
         assertEquals(4,bitset18.getByteArray().length);
     }
@@ -228,6 +246,8 @@ public void testGrow0() {
         assertEquals(0,empty.getLengthInBytes());
         assertEquals(0,empty.getNumBitsSet());
         assertTrue(empty.invariantHolds());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertEquals(0,empty.getByteArray().length);
     }
     public void testGrow1() {
@@ -305,11 +325,14 @@ public void testGrow9() {
 
     // Test cases for shrink(int)
     public void testShrinkEmpty() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         empty.shrink(0);
         assertEquals(0,empty.getLength());
         assertEquals(0,empty.getLengthInBytes());
         assertEquals(0,empty.getNumBitsSet());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(empty.invariantHolds());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertEquals(0,empty.getByteArray().length);
     }
     public void testShrink() {
@@ -328,9 +351,11 @@ public void testShrinkNeg() {
         try {
             bitset18.shrink(-9);
             fail();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         } catch (IllegalArgumentException iae) {}
     }
     public void testShrink0() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         bitset18.shrink(0);
         assertEquals(0,bitset18.getLength());
         assertEquals(0,bitset18.getLengthInBytes());
@@ -444,6 +469,7 @@ public void testCompareToComplement() {
     public void testCompareDifferentArray() {
         FormatableBitSet small = new FormatableBitSet(bitset18);
         small.shrink(9);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(small.invariantHolds());
         FormatableBitSet large = new FormatableBitSet(bitset18);
         large.grow(100);
@@ -455,6 +481,7 @@ public void testCompareDifferentArray() {
 
     // Test cases for isSet(int)
     public void testIsSetEmpty() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         try { empty.isSet(-8); fail(); } catch (IllegalArgumentException iae) {}
         try { empty.isSet(-1); fail(); } catch (IllegalArgumentException iae) {}
         try { empty.isSet(0); fail(); } catch (IllegalArgumentException iae) {}
@@ -484,6 +511,7 @@ public void testIsSet() {
         assertTrue(bitset18C.isSet(15));
         assertTrue(bitset18C.isSet(16));
         assertTrue(bitset18C.isSet(17));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         try { bitset18C.isSet(18); fail(); }
         catch (IllegalArgumentException iae) {}
     }
@@ -500,6 +528,7 @@ public void testSet() {
         try { bitset18.set(-1); fail(); }
         catch (IllegalArgumentException iae) {}
         bitset18.set(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(bitset18.invariantHolds());
         bitset18.set(1);
         assertTrue(bitset18.invariantHolds());
@@ -519,6 +548,7 @@ public void testClear() {
         try { bitset18.clear(-1); fail(); }
         catch (IllegalArgumentException iae) {}
         bitset18.clear(0);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(bitset18.invariantHolds());
         bitset18.clear(1);
         assertTrue(bitset18.invariantHolds());
@@ -528,6 +558,7 @@ public void testClear() {
 
     // Test cases for anySetBit()
     public void testAnySetBitEmpty() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertEquals(empty.anySetBit(),-1);
     }
     public void testAnySetBit() {
@@ -543,6 +574,7 @@ public void testAnySetBitBeyondBit() {
     public void testAnySetBitBeyondBitNeg() {
         assertEquals(1,bitset18.anySetBit(0));
         assertEquals(0,bitset18.anySetBit(-1));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         try { bitset18.anySetBit(-2); fail(); }
         catch (ArrayIndexOutOfBoundsException e) {}
         try { bitset18.anySetBit(-3); fail(); }
@@ -555,6 +587,7 @@ public void testAnySetBitBeyondBitPastEnd() {
     // Test cases for or(FormatableBitSet)
     public void testORWithNull() {
         FormatableBitSet cpy = new FormatableBitSet(bitset18);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(cpy.invariantHolds());
         bitset18.or(null);
         assertEquals(9,bitset18.getNumBitsSet());
@@ -565,6 +598,7 @@ public void testORWithEmpty() {
         bitset18.or(empty);
         assertEquals(9,bitset18.getNumBitsSet());
         assertTrue(cpy.equals(bitset18));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(bitset18.invariantHolds());
     }
     public void testORWithComplement() {
@@ -633,6 +667,7 @@ public void testXORWithEmpty() {
         assertEquals(9,bitset18.getNumBitsSet());
         assertTrue(cpy.equals(bitset18));
         assertTrue(bitset18.invariantHolds());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertEquals(3,bitset18.getByteArray().length);
     }
     public void testXORWithComplement() {
@@ -642,6 +677,8 @@ public void testXORWithComplement() {
         assertEquals(16,bitset18.getNumBitsSet());
         assertFalse(bitset18.isSet(2));
         assertFalse(bitset18.isSet(3));
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertTrue(bitset18.invariantHolds());
     }
     public void testXORWithSmaller() {
@@ -651,6 +688,7 @@ public void testXORWithSmaller() {
         assertEquals(3,bitset18.getLengthInBytes());
         assertEquals(13,bitset18.getNumBitsSet());
         assertTrue(bitset18.invariantHolds());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         assertEquals(3,bitset18.getByteArray().length);
     }
     public void testXORWithLarger() {
@@ -662,7 +700,9 @@ public void testXORWithLarger() {
 
     // count one-bits in a byte with Integer.bitCount()
     private static int bitsInByte(byte b) throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         Integer arg = b & 0xff;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         Integer ret = (Integer) bitCount.invoke(null, new Object[] { arg });
         return ret.intValue();
     }
@@ -700,6 +740,7 @@ public void testExternal() throws IOException {
         bitset18.writeExternal(oos);
         oos.flush();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2191
         empty.readExternal
             (new ObjectInputStream(new ByteArrayInputStream
                                    (buf.toByteArray())));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/InputStreamUtilTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/InputStreamUtilTest.java
index 4c41f9d53a..7628a43ac8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/InputStreamUtilTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/InputStreamUtilTest.java
@@ -40,6 +40,7 @@ public InputStreamUtilTest(String name) {
 
     public void testNullStream() throws IOException{
         try{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
             InputStreamUtil.skipUntilEOF(null);
             fail("Null InputStream is accepted!");
         }catch (NullPointerException e) {
@@ -70,6 +71,8 @@ public void testSkipUtilEOF() throws IOException{
         for(int i = 0; i < lengths.length; i++){
             int length = lengths[i];
             InputStream is = new ByteArrayInputStream(new byte[length]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
             assertEquals(length, InputStreamUtil.skipUntilEOF(is));
         }
     }
@@ -78,6 +81,7 @@ public void testSkipFully() throws IOException{
         int length = 1024;
 
         InputStream is = new ByteArrayInputStream(new byte[length]);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
         InputStreamUtil.skipFully(is, length);
         assertEquals(0, InputStreamUtil.skipUntilEOF(is));
 
@@ -99,6 +103,7 @@ public void testSkipFully() throws IOException{
      * Returns a suite of tests.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(
             InputStreamUtilTest.class, "InputStreamUtil tests");
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.java
index 06522386a2..026c429243 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/MissingPermissionsTest.java
@@ -74,6 +74,8 @@ public class MissingPermissionsTest extends BaseJDBCTestCase {
             testPrefix + OK_POLICY;
     private final static String OK_POLICY_R =
             resourcePrefix + OK_POLICY;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
 
     private final static String POLICY_MINUS_PROPERTYPERMISSION =
             "MissingPermissionsTest1.policy";
@@ -120,6 +122,8 @@ private static Test makeTest(String fixture, String policy) {
 
     public static Test suite() {
         inSubProcess = Boolean.getBoolean("inSubProcess");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
 
         final BaseTestSuite suite =
                 new BaseTestSuite("SystemPrivilegesPermissionTest");
@@ -284,6 +288,7 @@ public void testMissingFilePermission() throws SQLException,
         final String output = spawned.getFullServerOutput(); // ignore
         final String err    = spawned.getFullServerError();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         assertTrue
           (
            err.contains("java.security.AccessControlException") &&
@@ -377,6 +382,8 @@ public BufferedReader run() throws FileNotFoundException {
 
 
     public void testModifyThreadGroup() throws Throwable {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6117
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
         if (!inSubProcess) {
             // Set up run of this test in a sub process, so we can catch its
             // standard err/standard out.
@@ -386,12 +393,16 @@ public void testModifyThreadGroup() throws Throwable {
             args.add("-Djava.security.manager");
             args.add(
                 "-Djava.security.policy=extin/MissingPermissionsTest.policy");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             args.add("-DderbyTesting.engine="
                     + getSystemProperty("derbyTesting.engine"));
             args.add("-DderbyTesting.tools="
                     + getSystemProperty("derbyTesting.tools"));
             args.add("-DderbyTesting.testing="
                     + getSystemProperty("derbyTesting.testing"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             args.add("-DderbyTesting.shared="
                     + getSystemProperty("derbyTesting.shared"));
             args.add("-DderbyTesting.junit="
@@ -410,6 +421,7 @@ public void testModifyThreadGroup() throws Throwable {
             args.add("-Dderby.system.debug=" +
                      getSystemProperty("derby.tests.debug"));
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             String testRunnerClassName = "junit.textui.TestRunner";
             if (JVMInfo.isModuleAware())
             {
@@ -436,7 +448,9 @@ public void testModifyThreadGroup() throws Throwable {
 
             assertTrue(spawned.getFailMessage("subprocess run failed: "),
                     exitCode == 1);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             final String expectedMessageOnConsole = JVMInfo.isModuleAware() ?
               "java.security.AccessControlException: access denied " +
               "(\"java.lang.RuntimePermission\" \"modifyThreadGroup\")"
@@ -448,6 +462,7 @@ public void testModifyThreadGroup() throws Throwable {
             final String err    = spawned.getFullServerError();
 
             assertTrue("Full error is '" + err + "'", err.contains(expectedMessageOnConsole));
+//IC see: https://issues.apache.org/jira/browse/DERBY-3547
 
             // Print sub process' output if this test specifies any such
             if (Boolean.parseBoolean(
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/PathUtilTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/PathUtilTest.java
index 90cffcf840..bf5e78d778 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/PathUtilTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/PathUtilTest.java
@@ -66,6 +66,7 @@ public void testGetBase() {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(PathUtilTest.class, "PathUtilTest suite");
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/ReaderToUTF8StreamTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/ReaderToUTF8StreamTest.java
index 815925e128..50e7388c51 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/ReaderToUTF8StreamTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/ReaderToUTF8StreamTest.java
@@ -55,6 +55,7 @@ public ReaderToUTF8StreamTest(String name) {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(ReaderToUTF8StreamTest.class);
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/StatementKeyFactoryTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/StatementKeyFactoryTest.java
index 81e4a18be5..963fd3c37f 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/StatementKeyFactoryTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/StatementKeyFactoryTest.java
@@ -128,6 +128,7 @@ public void testUnequalityVarious() {
         StatementKey[] keys = new StatementKey[] {
             StatementKeyFactory.newPrepared(sql, schema, rsh),
             StatementKeyFactory.newPrepared(sql, schema, rsh, auto),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3324
             StatementKeyFactory.newPrepared(sql, schema, rst, rsc, rsh),
             StatementKeyFactory.newCallable(sql, schema, rsh),
             StatementKeyFactory.newCallable(sql, schema, rst, rsc, rsh)};
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java
index 37db61830e..249a956640 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java
@@ -68,6 +68,7 @@ public class SystemPrivilegesPermissionTest extends BaseTestCase {
      */
     private static final String POLICY_FILE_NAME1
         = "org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest1.policy";
+//IC see: https://issues.apache.org/jira/browse/DERBY-3531
 
     /**
      * Some directory paths for testing DatabasePermissions.
@@ -175,10 +176,12 @@ public static Test suite() {
         // this suite cannot be constructed with automatic test extraction
         // (by passing a class argument); instead, the tests need to be added
         // manually since some of them require their own policy file
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("SystemPrivilegesPermissionTest");
 
         // add API tests for the basic security framework classes
+//IC see: https://issues.apache.org/jira/browse/DERBY-3531
         suite.addTest(
             new SystemPrivilegesPermissionTest("testSystemPrincipal"));
         suite.addTest(
@@ -212,6 +215,7 @@ public static Test suite() {
         //
         // As of Java 9, you can't subvert access controls via this ruse.
         // Only run this test on Java 8.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         if (isJava8())
         {
             suite.addTest
@@ -260,6 +264,7 @@ public void testSystemPrincipal() {
     public void testSystemPermission() {
         // test SystemPermission with null name argument
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3491
             new SystemPermission(null, null);
             fail("expected NullPointerException");
         } catch (NullPointerException ex) {
@@ -268,6 +273,7 @@ public void testSystemPermission() {
 
         // test SystemPermission with empty name argument
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3491
             new SystemPermission("", null);
             fail("expected IllegalArgumentException");
         } catch (IllegalArgumentException ex) {
@@ -317,6 +323,8 @@ public void testSystemPermission() {
                      new SystemPermission("server", "CoNtRoL,control")
                              .getActions());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
+//IC see: https://issues.apache.org/jira/browse/DERBY-3491
         String[] validNames = {
             SystemPermission.ENGINE,
             SystemPermission.JMX,
@@ -518,6 +526,7 @@ public void testSystemPermissionCollections() {
      * Tests SystemPermissions against the Policy.
      */
     public void policyTestSystemPermissionGrants() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3531
         final Permission shutdown
             = new SystemPermission(
                 SystemPermission.SERVER,
@@ -750,6 +759,7 @@ public void testDatabasePermission() throws IOException {
      * Tests DatabasePermissions against the Policy.
      */
     public void policyTestDatabasePermissionGrants() throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3531
         final DatabasePermission[] relDirPathPerms
             = new DatabasePermission[relDirPaths.length];
         for (int i = 0; i < relDirPaths.length; i++) {
@@ -1108,8 +1118,10 @@ private static <T> T serializeDeserialize(
      * Runs a privileged user action for a given principal.
      */
     private <T> void execute(SystemPrincipal principal,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                          PrivilegedAction<T> action,
                          boolean isGrantExpected) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         println("");
         println("    testing action " + action + " for principal " + principal);
         
@@ -1121,6 +1133,7 @@ private <T> void execute(SystemPrincipal principal,
             if (!isGrantExpected) {
                 fail("expected AccessControlException");
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             println("        successfully executed action " + action + " for principal " + principal);
         } catch (AccessControlException ace) {
             //println("    Yikes! " + ace.getMessage());
@@ -1153,6 +1166,7 @@ private void checkNameAndActions(DatabasePermission[] dbperm,
      * Tests DatabasePermission.hashCode() and .equals().
      */
     private void checkHashCodeAndEquals(Permission[] dbp0,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3531
                                         Permission[] dbp1)
         throws IOException {
         //assert(dbp0.length == dbp1.length)
@@ -1175,6 +1189,7 @@ private void checkHashCodeAndEquals(Permission[] dbp0,
      * Tests DatabasePermission.implies().
      */
     private void checkImplies(Permission[] dbp0,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3531
                               Permission[] dbp1,
                               boolean[][] impls)
         throws IOException {
@@ -1196,6 +1211,8 @@ private void checkImplies(Permission[] dbp0,
      */
     private void checkDistinctPermissions(Permission[] set)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3462
+//IC see: https://issues.apache.org/jira/browse/DERBY-3491
         for (int i = 0; i < set.length; i++)
         {
             Permission pi = set[i];
@@ -1228,6 +1245,7 @@ private void assertEquivalentPermissions(Permission p1,
         assertEquals(p1.hashCode(), p2.hashCode());
         
         assertTrue(p1.implies(p2));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6716
         assertTrue(p2.implies(p1));
     }
     
@@ -1235,6 +1253,7 @@ private void assertEquivalentPermissions(Permission p1,
      * Represents a Shutdown server and engine action.
      */
     public class ShutdownAction
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         implements PrivilegedAction<Void> {
         protected final Permission permission;
 
@@ -1258,6 +1277,7 @@ public String toString() {
      * Represents a Create Database action.
      */
     public class CreateDatabaseAction
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         implements PrivilegedAction<Void> {
         protected final Permission permission;
 
@@ -1266,6 +1286,7 @@ public CreateDatabaseAction(Permission permission) {
         }
 
         public Void run() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             println("    checking access " + permission + ":");
             AccessController.checkPermission(permission);
             println("    granted access " + this);
@@ -1302,6 +1323,7 @@ static private String getAuthorizationId(String name) {
      * Represents a Privileged User action.
      */
     static public class RunAsPrivilegedUserAction<T>
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         implements PrivilegedAction<T> {
         final private SystemPrincipal principal;
         final private PrivilegedAction<? extends T> action;
@@ -1342,6 +1364,7 @@ public T run() {
             // permission.  In contrast, doAsPrivileged() with a null ACC
             // seems to effectively ignore the caller's protection domain, so
             // the check now only depends on the principal's permissions.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return Subject.doAsPrivileged(subject, action, null);
             //Subject.doAs(subject, action);
         }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/UTF8UtilTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/UTF8UtilTest.java
index a2efa97de8..ae20c126b1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/UTF8UtilTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/UTF8UtilTest.java
@@ -86,6 +86,7 @@ public void testEqualityOfModifedUTF8AndASCII()
         InputStream ascii = new LoopingAlphabetStream(length);
         InputStream modUTF8 = new ReaderToUTF8Stream(
                                     new LoopingAlphabetReader(length),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                                     length, 0, TYPENAME,
                                     new CharStreamHeaderGenerator());
         modUTF8.skip(HEADER_LENGTH); // Skip encoded length added by ReaderToUTF8Stream.
@@ -107,6 +108,7 @@ public void testSkipUntilEOFOnShortStreamCJK()
         final int charLength = 5;
         InputStream in = new ReaderToUTF8Stream(
                 new LoopingAlphabetReader(charLength, CharAlphabet.cjkSubset()),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 charLength, 0, TYPENAME, new CharStreamHeaderGenerator());
         in.skip(HEADER_LENGTH); // Skip encoded length added by ReaderToUTF8Stream.
         assertEquals(charLength, UTF8Util.skipUntilEOF(in));
@@ -123,6 +125,7 @@ public void testSkipUntilEOFOnLongStreamCJK()
         final int charLength = 127019;
         InputStream in = new ReaderToUTF8Stream(
                 new LoopingAlphabetReader(charLength, CharAlphabet.cjkSubset()),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 charLength, 0, TYPENAME, new ClobStreamHeaderGenerator(true));
         in.skip(HEADER_LENGTH); // Skip encoded length added by ReaderToUTF8Stream.
         assertEquals(charLength, UTF8Util.skipUntilEOF(in));
@@ -139,6 +142,7 @@ public void testSkipFullyOnValidLongStreamCJK()
         final int charLength = 161019;
         InputStream in = new ReaderToUTF8Stream(
                 new LoopingAlphabetReader(charLength, CharAlphabet.cjkSubset()),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 charLength, 0, TYPENAME, new CharStreamHeaderGenerator());
         in.skip(HEADER_LENGTH); // Skip encoded length added by ReaderToUTF8Stream.
         // Returns count in bytes, we are using CJK chars so multiply length
@@ -157,6 +161,7 @@ public void testSkipFullyOnTooShortStreamCJK()
         final int charLength = 161019;
         InputStream in = new ReaderToUTF8Stream(
                 new LoopingAlphabetReader(charLength, CharAlphabet.cjkSubset()),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 charLength, 0, TYPENAME, new ClobStreamHeaderGenerator(true));
         in.skip(HEADER_LENGTH); // Skip encoded length added by ReaderToUTF8Stream.
         try {
@@ -178,6 +183,7 @@ public void testSkipFullyOnInvalidStreamCJK()
         final int charLength = 10;
         InputStream in = new ReaderToUTF8Stream(
                 new LoopingAlphabetReader(charLength, CharAlphabet.cjkSubset()),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 charLength, 0, TYPENAME, new CharStreamHeaderGenerator());
         in.skip(HEADER_LENGTH); // Skip encoded length added by ReaderToUTF8Stream.
         in.skip(1L); // Skip one more byte to trigger a UTF error.
@@ -197,6 +203,7 @@ public void testMixedSkipOnStreamTamil()
         final int charLength = 161019;
         InputStream in = new ReaderToUTF8Stream(
                 new LoopingAlphabetReader(charLength, CharAlphabet.tamil()),
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
                 charLength, 0, TYPENAME, new CharStreamHeaderGenerator());
         // Skip encoded length added by ReaderToUTF8Stream.
         in.skip(HEADER_LENGTH);
@@ -218,6 +225,7 @@ public void testMixedSkipOnStreamTamil()
      * two bytes present. However, only one byte is provided.
      */
     public void testMissingSecondByteOfTwo()
+//IC see: https://issues.apache.org/jira/browse/DERBY-2760
             throws IOException {
         // 0xdf = 11011111
         byte[] data = {'a', (byte)0xdf};
@@ -317,6 +325,7 @@ public void testSkippingInvalidEncodingWorks()
      * Returns a suite of tests.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(UTF8UtilTest.class, "UTF8Util tests");
     }
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/VirtualFileTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/VirtualFileTest.java
index 5ceae5dd22..0370f10151 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/VirtualFileTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/VirtualFileTest.java
@@ -276,6 +276,7 @@ public void testGetRAFOnDirectory() {
      * Tests that {@code listChildren} doesn't include too many entries.
      */
     public void testListChilderen() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         DataStore store = getStore();
         VirtualFile dir1 = new VirtualFile(PathUtilTest.abs("mydir"), store);
         VirtualFile dir2 = new VirtualFile(
@@ -350,6 +351,7 @@ public void testCloseIdempotent() throws IOException {
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         return new BaseTestSuite(VirtualFileTest.class);
     }
 
@@ -357,6 +359,7 @@ public static Test suite() {
     private static int dbStoreIndex = 0;
     /** Utility method returning a fresh data store. */
     private static synchronized DataStore getStore() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4125
         DataStore store = new DataStore("testVFMemDB-" + dbStoreIndex++);
         // We need the root to exist.
         assertNotNull(store.createEntry(java.io.File.separator, true));
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/_Suite.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/_Suite.java
index b20586d350..f379b8b1f8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/_Suite.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/junit/_Suite.java
@@ -43,22 +43,35 @@ private _Suite(String name) {
     public static Test suite() throws SQLException {
 
         BaseTestSuite suite = new BaseTestSuite("JUnit unit tests");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(ArrayInputStreamTest.suite());
         suite.addTest(FormatableBitSetTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3531
         suite.addTest(SystemPrivilegesPermissionTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2760
         suite.addTest(UTF8UtilTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3742
         suite.addTestSuite(CompressedNumberTest.class);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3618
         suite.addTest(AssertFailureTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3770
         suite.addTest(InputStreamUtilTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3936
         suite.addTest(CharacterStreamDescriptorTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-646
+//IC see: https://issues.apache.org/jira/browse/DERBY-4084
         suite.addTest(BlockedByteArrayTest.suite());
         suite.addTest(PathUtilTest.suite());
         suite.addTest(VirtualFileTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-4122
         suite.addTest(ReaderToUTF8StreamTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3941
         suite.addTest(DataInputUtilTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-5475
         suite.addTest(DerbyVersionTest.suite());
         suite.addTest(MissingPermissionsTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6617
 
         return suite;
     }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_CacheService.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_CacheService.java
index 4d04dcb703..c2d4d24f22 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_CacheService.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_CacheService.java
@@ -52,6 +52,7 @@ protected void runTests() throws T_Fail {
 		DaemonFactory df;
 		try {
 			cf = (CacheFactory) startSystemModule(getModuleToTestProtocolName());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 			df = (DaemonFactory) startSystemModule(org.apache.derby.shared.common.reference.Module.DaemonFactory);
 		} catch (StandardException mse) {
 			throw T_Fail.exceptionFail(mse);
@@ -60,6 +61,7 @@ protected void runTests() throws T_Fail {
 			throw T_Fail.testFailMsg(getModuleToTestProtocolName() + " module not started.");
 		}
 		if (df == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 			throw T_Fail.testFailMsg(org.apache.derby.shared.common.reference.Module.DaemonFactory + " module not started.");
 	
 
@@ -129,6 +131,7 @@ protected void runTests() throws T_Fail {
 
 	  */
 	protected String getModuleToTestProtocolName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		return org.apache.derby.shared.common.reference.Module.CacheFactory;
 	}
 
@@ -348,6 +351,7 @@ protected Cacheable t_findSucceed(CacheManager cm, Object key) throws T_Fail, St
      * can't call this entry point.
      */
     private  static  Object  startSystemModule( final String factoryInterface )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_DaemonService.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_DaemonService.java
index 15b3b373ce..ae15c7bdcf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_DaemonService.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_DaemonService.java
@@ -49,6 +49,7 @@ public class T_DaemonService extends T_MultiThreadedIterations
 	public T_DaemonService()
 	{
 		super();
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 		serviceRecord = new Vector<T_Serviceable>(9, 1);
 		random = new Random();
 	}
@@ -59,6 +60,7 @@ public T_DaemonService()
 	*/
 
 	protected String getModuleToTestProtocolName() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		return org.apache.derby.shared.common.reference.Module.DaemonFactory;
 	}
 
@@ -71,6 +73,7 @@ protected void setupTest() throws T_Fail
 
 		DaemonFactory daemonFactory;
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 			daemonFactory = (DaemonFactory)startSystemModule(org.apache.derby.shared.common.reference.Module.DaemonFactory);
 		} catch (StandardException mse) {
 			throw T_Fail.exceptionFail(mse);
@@ -330,6 +333,7 @@ private void randomSleep()
      * can't call this entry point.
      */
     private  static  Object  startSystemModule( final String factoryInterface )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java
index 78e8f1c4b6..8b6d54afd1 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java
@@ -91,6 +91,7 @@ private void t_001()
 
         // Create object with neither Diagnosticable:
         Object obj = (long) 5;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
         // Test just getting a single string back, from each type of object.
         String          str          = null;
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_Key.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_Key.java
index 59da3565fa..5d5dfe77e6 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_Key.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_Key.java
@@ -40,6 +40,7 @@ public class T_Key  {
 	private boolean   raiseException;
 
 	public static T_Key		simpleInt(int value) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		return new T_Key(value, 0, true, false);
 	}
 	public static T_Key		dontFindInt(int value) {
@@ -59,6 +60,7 @@ public static T_Key randomKey() {
 		T_Key tkey = new T_Key();
 
 		if (rand < 0.48)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			tkey.value = (int) (100.0 * rand);
 		else if (rand < 0.96)
 			tkey.value = (int) (100.0 * rand);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_LockFactory.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_LockFactory.java
index 6e284974e6..d59085ee20 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_LockFactory.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_LockFactory.java
@@ -59,6 +59,7 @@ public T_LockFactory() {
 
 	protected String getModuleToTestProtocolName() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		return org.apache.derby.shared.common.reference.Module.LockFactory;
 	}
 
@@ -71,6 +72,7 @@ protected String getModuleToTestProtocolName() {
 	protected  void setupTest() throws T_Fail {
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			lf = (LockFactory) startSystemModule(getModuleToTestProtocolName());
 		} catch (StandardException mse) {
 			throw T_Fail.exceptionFail(mse);
@@ -326,6 +328,10 @@ void S003() throws StandardException, T_Fail {
 
 	void S004() throws StandardException, T_Fail {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		CompatibilitySpace cs = lf.createCompatibilitySpace(null);
 		Object g0 = new Object();	// create an object for a lock group
 		Object g1 = new Object();
@@ -402,6 +408,7 @@ void S004() throws StandardException, T_Fail {
 	*/
 	void S005() throws StandardException, T_Fail {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		CompatibilitySpace cs0 = lf.createCompatibilitySpace(null);
 		CompatibilitySpace cs1 = lf.createCompatibilitySpace(null);
 
@@ -473,6 +480,7 @@ void S005() throws StandardException, T_Fail {
 	*/
 	void S007() throws StandardException, T_Fail {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		CompatibilitySpace cs = lf.createCompatibilitySpace(null);
 		Object g0 = new Object();	// create an object for a lock group
 		Object g1 = new Object();	// create an object for a lock group
@@ -511,6 +519,7 @@ void S007() throws StandardException, T_Fail {
 
 		Create two lockable objects and pass them off to two threads.
 		Each thread will run lock the first object, set its value then lock
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		the second object and set its value, yield and then release the lock
 		on one and then on two. Various checks are made to ensure the
 		values are as expected.
@@ -697,6 +706,7 @@ void M004() throws StandardException, T_Fail {
 
 		@exception T_Fail	Number of locks is not as expected.
 	*/
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 	void checkLockCount(CompatibilitySpace cs, int expected) throws T_Fail {
 		boolean expect = expected != 0;
 		boolean got = lf.areLocksHeld(cs);
@@ -710,6 +720,7 @@ void checkLockCount(CompatibilitySpace cs, int expected) throws T_Fail {
 		@exception T_Fail	Number of locks is not as expected.
 	*/
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 	void checkLockGroupCount(CompatibilitySpace cs, Object group, int expected)
 			throws T_Fail {
 		boolean expect = expected != 0;
@@ -724,6 +735,7 @@ void checkLockGroupCount(CompatibilitySpace cs, Object group, int expected)
      * can't call this entry point.
      */
     private  static  Object  startSystemModule( final String factoryInterface )
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java
index 51785bb2b9..28156ec74d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_UUIDFactory.java
@@ -64,6 +64,7 @@ protected String getModuleToTestProtocolName() {
 	*/
 	protected void runTests() throws T_Fail {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		factory = getMonitor().getUUIDFactory();
 		if (factory == null) {
 			throw T_Fail.testFailMsg(getModuleToTestProtocolName() + " module not started.");
@@ -163,6 +164,7 @@ private void testUUIDConversions(HeaderPrintWriter out, String uuidstring)
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_User.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_User.java
index cf949b9966..94f9f944a0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_User.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/services/T_User.java
@@ -156,8 +156,16 @@ private void T003() throws StandardException, T_Fail {
 	}
 	private void T004() throws StandardException, T_Fail {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		CompatibilitySpace cs = lf.createCompatibilitySpace(null);
 		Integer g0 = 1;	// create an object for a lock group
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		// check we have no locks held
 		checkLockCount(cs, 0);
@@ -185,6 +193,7 @@ private void checkValue(T_L1 item, long value) throws T_Fail {
 			throw T_Fail.testFailMsg("value corrupted in multi-user test, exapected " + value + ", got " + item.value);
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 	void checkLockCount(CompatibilitySpace cs, int expected) throws T_Fail {
 		boolean expect = expected != 0;
 		boolean got = lf.areLocksHeld(cs);
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java
index ea482f1867..f371b147e9 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessFactory.java
@@ -105,6 +105,7 @@ protected void runTests() throws T_Fail
 		startParams = T_Util.setEncryptionParam(startParams);
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			store = (AccessFactory) createPersistentService(
 				getModuleToTestProtocolName(), testService, startParams);
 		} catch (StandardException mse) {
@@ -124,6 +125,7 @@ protected void runTests() throws T_Fail
 
             ContextManager cm = 
                     getContextService().getCurrentContextManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			tc = store.getAndNameTransaction(
                     cm, AccessFactoryGlobals.USER_TRANS_NAME);
@@ -135,6 +137,7 @@ && holdCursor(tc)
 				&& readUncommitted(tc)
                 && updatelocks(tc)
 				&& nestedUserTransaction(tc)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
                 && positionAtRowLocation(tc)
                 && sortCost(tc)
                 && storeCost(tc)
@@ -143,6 +146,7 @@ && scanInfo(tc)
 				&& insertAndUpdateExample(tc)
 				&& insertAndFetchExample(tc)
 				&& scanExample(tc)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3371
                 && alterTable(tc, false)
                 && alterTable(tc, true)
 				&& tempTest(tc)
@@ -188,6 +192,7 @@ private void flush_cache()
     {
         // flush and empty cache to make sure rereading stuff works.
         RawStoreFactory rawstore = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
             (RawStoreFactory) findServiceModule(
                 this.store, RawStoreFactory.MODULE);
 
@@ -209,6 +214,7 @@ protected boolean insertAndFetchExample(TransactionController tc)
                     "heap", // create a heap conglomerate
                     null,   // ERROR - Heap requires a template!!!
 					null, 	// column sort order not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 					null, 	// default collation
                     null,   // default properties
                     TransactionController.IS_DEFAULT); // not temporary
@@ -289,6 +295,7 @@ protected boolean insertAndFetch(
 		cc.insertAndFetchLocation(r1.getRowArray(), rowloc);
 
         // quick test to make sure we can hash insert and find row location.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         Hashtable<RowLocation, RowLocation> test_rowloc_hash =
                 new Hashtable<RowLocation, RowLocation>();
         test_rowloc_hash.put(rowloc, rowloc);
@@ -998,6 +1005,7 @@ protected boolean dropTest(TransactionController tc)
                 "heap",         // create a heap conglomerate
                 new T_AccessRow(1).getRowArray(),   // 1 SQLInteger() column template.
 				null, 	// column sort order not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, 	// default collation
                 null,           // default properties
                 TransactionController.IS_DEFAULT);         // not temporary
@@ -1055,6 +1063,7 @@ protected boolean getTableProperties(
                 "heap",       // create a heap conglomerate
                 template_row.getRowArray(), // 1 column template.
 				null, 	// column sort order not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, 	// default collation
                 prop,         // default properties
                 TransactionController.IS_DEFAULT);       // not temporary
@@ -1176,6 +1185,7 @@ private boolean alterTable(TransactionController tc, boolean temporary)
 		// Create a heap conglomerate.
         T_AccessRow template_row = new T_AccessRow(1);
         int temporaryFlag = temporary ?
+//IC see: https://issues.apache.org/jira/browse/DERBY-3371
             TransactionController.IS_TEMPORARY :
             TransactionController.IS_DEFAULT;
 		long conglomid = 
@@ -1185,6 +1195,7 @@ private boolean alterTable(TransactionController tc, boolean temporary)
 				null, 	// column sort order not required for heap
                 null, 	// default collation
                 null,         // default properties
+//IC see: https://issues.apache.org/jira/browse/DERBY-3371
                 temporaryFlag);
 		// Open the conglomerate.
 		ConglomerateController cc =	
@@ -1360,6 +1371,7 @@ private boolean alterTable(TransactionController tc, boolean temporary)
 
 
         // now alter the conglomerate, add another int column
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         tc.addColumnToConglomerate(
             conglomid, 1, c1, StringDataValue.COLLATION_TYPE_UCS_BASIC);
 
@@ -1835,6 +1847,7 @@ protected boolean insert_bench(TransactionController tc)
                     "heap",               // create a heap conglomerate
                     new T_AccessRow(numcols).getRowArray(),   // 1 SQLInteger() column template.
 					null, 	// column sort order not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                     null, 	// default collation
                     null,                 // default properties
                     TransactionController.IS_DEFAULT);               // not temporary
@@ -1989,6 +2002,7 @@ protected boolean sortCost(
         // Test 1 - Just call for various types of sorts.  Not sure how 
         // to test the validity.
 		SortCostController scc = tc.openSortCostController();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6075
 
         double estimated_cost = 
             scc.getSortCost(
@@ -2036,6 +2050,11 @@ protected boolean storeCost(
                 "heap",       // create a heap conglomerate
                 template_row.getRowArray(), // 1 column template.
 				null, 	// column sort order not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, 	// default collation
                 null,         // default properties
                 TransactionController.IS_DEFAULT);       // not temporary
@@ -2529,6 +2548,7 @@ private long createAConglom(TransactionController tc, int testValue, boolean tem
                 "heap",         // create a heap conglomerate
                 new T_AccessRow(1).getRowArray(),   // 1 SQLInteger() column template.
 				null, 	// column sort order not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, 	// default collation
                 null,           // default properties
                 temporary ? TransactionController.IS_TEMPORARY : TransactionController.IS_DEFAULT);
@@ -2616,6 +2636,7 @@ private long createBtree(TransactionController tc, long baseConglomId, boolean t
 		baseRow[0] = col0;
 
 		// Create a btree secondary index conglomerate.
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 		long iid = 
             tc.createConglomerate(
                 "BTREE", 
@@ -2978,6 +2999,7 @@ protected boolean nestedUserTransaction(TransactionController tc)
                 "heap",         // create a heap conglomerate
                 new T_AccessRow(1).getRowArray(),   // 1 SQLInteger() column template.
 				null, 	// column sort order not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, 	// default collation
                 null,           // default properties
                 TransactionController.IS_TEMPORARY);
@@ -2985,6 +3007,7 @@ protected boolean nestedUserTransaction(TransactionController tc)
         TransactionController current_xact = 
             store.getTransaction(
                 getContextService().getCurrentContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         // get a nested user transaction
         TransactionController child_tc = 
@@ -2993,6 +3016,7 @@ protected boolean nestedUserTransaction(TransactionController tc)
         TransactionController current_xact_after_nest = 
             store.getTransaction(
                 getContextService().getCurrentContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         if (current_xact_after_nest != current_xact)
         {
@@ -3002,6 +3026,7 @@ protected boolean nestedUserTransaction(TransactionController tc)
                 ";current_xact_after_nest = "  + current_xact_after_nest);
         }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
         T_Fail.T_ASSERT(tc.getLockSpace() == child_tc.getLockSpace(),
                         "getLockSpace() returned different object for child.");
 
@@ -3342,6 +3367,7 @@ protected boolean commitTest(TransactionController tc)
 
 		// get another transaction going
 		ContextManager cm2 = getContextService().newContextManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		getContextService().setCurrentContextManager(cm2);
 
@@ -3387,6 +3413,7 @@ protected boolean commitTest(TransactionController tc)
 		tc.commit();
 		
 		getContextService().setCurrentContextManager(cm2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		try {
 		cc2.fetch(rowloc, r1.getRowArray(), (FormatableBitSet)null);
@@ -3395,6 +3422,8 @@ protected boolean commitTest(TransactionController tc)
 		tc2.destroy();
 		}
 		finally {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			getContextService().resetCurrentContextManager(cm2);
 		}
 
@@ -3782,6 +3811,7 @@ protected boolean holdCursor(TransactionController tc)
 
     // test position at row location, in terms of holdability
     protected boolean positionAtRowLocation(TransactionController tc)
+//IC see: https://issues.apache.org/jira/browse/DERBY-1067
         throws StandardException, T_Fail
     {
         REPORT("(positionAtRowLocation)");
@@ -4077,6 +4107,7 @@ protected boolean readUncommitted(TransactionController tc)
         }
              
         // Test heap replace of row on page which does not exist.
+//IC see: https://issues.apache.org/jira/browse/DERBY-707
         FormatableBitSet   update_desc = new FormatableBitSet(1);
         if (cc.replace(deleted_page_rowloc, big_row.getRowArray(), update_desc)) 
         {
@@ -4197,6 +4228,7 @@ protected boolean readUncommitted(TransactionController tc)
         }
         
         // test heap replace of row on page where row does not exist.
+//IC see: https://issues.apache.org/jira/browse/DERBY-707
         if (cc.replace(deleted_page_rowloc, big_row.getRowArray(), update_desc)) 
         {
             throw T_Fail.testFailMsg(
@@ -4245,6 +4277,18 @@ protected boolean readUncommitted(TransactionController tc)
                 "heap",       // create a heap conglomerate
                 big_row.getRowArray(),
 				null, 	// column sort order not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, 	// default collation
                 null,         // default properties
                 TransactionController.IS_DEFAULT);       // not temporary
@@ -4378,12 +4422,14 @@ public static String repeatString(String data, int repeat) {
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessRow.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessRow.java
index c7c9f5e115..ae1c38a2ae 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessRow.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_AccessRow.java
@@ -129,6 +129,7 @@ public DataValueDescriptor[] getRowArray() {
 	public DataValueDescriptor[] getRowArrayClone() {
 		DataValueDescriptor[] retval = new DataValueDescriptor[column.length];
 		for (int index = 0; index < column.length; index++)
+//IC see: https://issues.apache.org/jira/browse/DERBY-4520
 			retval[index] = column[index].cloneValue(false);
 		return retval;
 	}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_ColumnOrderingImpl.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_ColumnOrderingImpl.java
index be9f4a81eb..71061bfbfd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_ColumnOrderingImpl.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_ColumnOrderingImpl.java
@@ -65,6 +65,7 @@ public boolean getIsAscending()
 	**/
 	public boolean getIsNullsOrderedLow()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2887
 		return false;
 	}
 }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java
index 0160954662..f8d2747edb 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_FileSystemData.java
@@ -90,6 +90,7 @@ public void boot(boolean create, Properties startParams)
 		 throws StandardException
 	{
 		super.boot(create, startParams);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		contextService = getContextService();
 	}
 
@@ -127,6 +128,7 @@ protected void setupTest() throws T_Fail
 		startParams.put(Property.DELETE_ON_CREATE, Boolean.TRUE.toString());
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			factory = (RawStoreFactory) createPersistentService(getModuleToTestProtocolName(),
 								testService, startParams);
 			if (factory == null) {
@@ -1115,6 +1117,7 @@ protected void AllocMTest1(long cid) throws StandardException, T_Fail
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getFactory();
@@ -1139,6 +1142,7 @@ public ContextService run()
      * can't call this entry point.
      */
     private  static  Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties ) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Heap.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Heap.java
index 053fe91cc0..876c15e435 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Heap.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Heap.java
@@ -86,6 +86,7 @@ protected void runTests() throws T_Fail
 		startParams = T_Util.setEncryptionParam(startParams);
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			store = (AccessFactory) createPersistentService(getModuleToTestProtocolName(),
 			testService, startParams);
 		} catch (StandardException mse) {
@@ -101,6 +102,7 @@ protected void runTests() throws T_Fail
 
             tc = store.getTransaction(
                     getContextService().getCurrentContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
             if (t_001(tc))
 			{
@@ -156,12 +158,14 @@ protected boolean t_001(TransactionController tc)
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java
index 417db8b7d6..01472f5395 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java
@@ -90,10 +90,12 @@ private static HashSet<Long> create_hash_set(
 	int 	order)
     {
         HashSet<Long> set = new HashSet<Long>(10, 0.8f);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
         int key_val = expect_key;
         for (int i = 0; i < expect_numrows; i++)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
           set.add((long)key_val);
 			if (order == ORDER_DESC)
 				key_val--;
@@ -273,6 +275,7 @@ private static boolean t_scanNext(
             }
             else
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 if (!set.remove(key))
                 {
                     return(
@@ -651,6 +654,7 @@ public static boolean t_scanFetchNextGroup(
                 }
                 else
                 {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     if (!set.remove(key))
                     {
                         return(fail(
@@ -868,6 +872,8 @@ public static boolean t_scanFetchNextPartial(
             }
             else
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 if (!set.remove(key))
                 {
                     return(
@@ -1035,6 +1041,7 @@ public static boolean t_scanFetchHashtable(
                 row = (DataValueDescriptor[] ) obj;
                 key = ((SQLLongint)(row[2])).getLong();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 if (!set.remove(key))
                 {
                     return(
@@ -1044,6 +1051,7 @@ public static boolean t_scanFetchHashtable(
                 }
                 numrows++;
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-2493
             else if (obj instanceof List)
             {
                 List row_vect = (List) obj;
@@ -1054,6 +1062,7 @@ else if (obj instanceof List)
 
                     key = ((SQLLongint)(row[2])).getLong();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     if (!set.remove(key))
                     {
                         return(fail(
@@ -1164,6 +1173,7 @@ public boolean t_testqual(TransactionController tc)
         {
             base_conglomid = 
                 tc.createConglomerate(
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                     "heap", base_row, null,  null, null, 
                     TransactionController.IS_DEFAULT);
 
@@ -1185,6 +1195,7 @@ public boolean t_testqual(TransactionController tc)
                 tc.createConglomerate(
                     init_conglomerate_type, index_row.getRow(), 
                     null,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                     null,
 					init_properties,
 					init_temporary ? TransactionController.IS_TEMPORARY : TransactionController.IS_DEFAULT);
@@ -1211,6 +1222,7 @@ public boolean t_testqual(TransactionController tc)
         else
         {
             base_conglomid = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 tc.createConglomerate(
                     init_conglomerate_type, 
                     base_row, 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
index 326332f812..37cb012e25 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
@@ -125,6 +125,7 @@ public void boot(boolean create, Properties startParams)
 		 throws StandardException
 	{
 		super.boot(create, startParams);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		contextService = getContextService();
 	}
 
@@ -161,6 +162,7 @@ protected void setupTest() throws T_Fail {
 
 		try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			factory = (RawStoreFactory) createPersistentService(getModuleToTestProtocolName(),
 								getTestService(), startParams);
 
@@ -174,6 +176,7 @@ protected void setupTest() throws T_Fail {
 			}
 
 			uuidfactory = getMonitor().getUUIDFactory();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		} catch (StandardException mse) {
 			throw T_Fail.exceptionFail(mse);
@@ -208,6 +211,7 @@ protected void joinSetupTest() throws T_Fail {
 	protected T_MultiThreadedIterations newTestObject() {
 		try
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			Class<?> thisClass = this.getClass();
 			return (T_MultiThreadedIterations)(thisClass.getConstructor().newInstance());
 		}
@@ -219,6 +223,7 @@ protected T_MultiThreadedIterations newTestObject() {
 		{
 			return new T_RawStoreFactory();
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		catch (NoSuchMethodException iae)
 		{
 			return new T_RawStoreFactory();
@@ -332,6 +337,7 @@ protected void runEachTest() throws T_Fail, StandardException {
 		P022();
 		P023(0);	// overflowThreshold test
 		P024(0);	// test page latching
+//IC see: https://issues.apache.org/jira/browse/DERBY-2107
 
 		// long row tests
 		P030(0);
@@ -3689,6 +3695,7 @@ protected void P023(int segment) throws StandardException, T_Fail {
 	protected void P024(long segment) throws StandardException, T_Fail
 	{
 		Transaction t = t_util.t_startTransaction();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2107
 
 		long cid = t_util.t_addContainer(t, segment, 4096, 0, 1, false);
 
@@ -6456,6 +6463,7 @@ protected void P707(long segment) throws StandardException, T_Fail {
 		Update every other field with a long col
 		rollback.
 		The update each column back to a null and rollback
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		@exception T_Fail Unexpected behaviour from the API
 		@exception StandardException Unexpected exception from the implementation
@@ -7653,12 +7661,14 @@ protected void TC004(int mode1, int mode2, int mode3, boolean doCommit, boolean
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java
index 2a588851b3..23a045c3f0 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverBadLog.java
@@ -231,6 +231,7 @@ public void runTests() throws T_Fail {
 
 		try {
 			contextService = getContextService();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			File ifile = new File(infoPath);
 
@@ -262,6 +263,7 @@ public void runTests() throws T_Fail {
 				// remove the service directory to ensure a clean run
 				startParams.put(Property.DELETE_ON_CREATE, Boolean.TRUE.toString());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				factory = (RawStoreFactory) createPersistentService(getModuleToTestProtocolName(),
 															  testService,
 															  startParams);
@@ -318,6 +320,7 @@ public void runTests() throws T_Fail {
 					throw T_Fail.exceptionFail(ioe);
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				if (!startPersistentService(testService, startParams))
 					throw T_Fail.testFailMsg("Monitor didn't know how to restart service: " + testService);
 
@@ -512,6 +515,8 @@ protected void STest1() throws T_Fail, StandardException
 			if(!checksumTest)
 			{
 				SanityManager.DEBUG_SET(LogToFile.TEST_LOG_INCOMPLETE_LOG_WRITE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 				System.setProperty(LogToFile.TEST_LOG_PARTIAL_LOG_WRITE_NUM_BYTES, Integer.toString(numcol*20));
 			}
 			
@@ -648,6 +653,8 @@ protected void STest2() throws T_Fail, StandardException
 			if(!checksumTest)
 			{
 				SanityManager.DEBUG_SET(LogToFile.TEST_LOG_INCOMPLETE_LOG_WRITE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 				System.setProperty(LogToFile.TEST_LOG_PARTIAL_LOG_WRITE_NUM_BYTES,Integer.toString(numcol*20));
 			}
 
@@ -1071,6 +1078,8 @@ protected void STest3() throws T_Fail, StandardException
 			if(!checksumTest)
 			{
 				SanityManager.DEBUG_SET(LogToFile.TEST_LOG_INCOMPLETE_LOG_WRITE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 				System.setProperty(LogToFile.TEST_LOG_PARTIAL_LOG_WRITE_NUM_BYTES, "200");
 			}
 			logFactory.flushAll();
@@ -1283,6 +1292,8 @@ protected void STest4() throws T_Fail, StandardException
 			if(!checksumTest)
 			{
 				SanityManager.DEBUG_SET(LogToFile.TEST_LOG_INCOMPLETE_LOG_WRITE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 				System.setProperty(LogToFile.TEST_LOG_PARTIAL_LOG_WRITE_NUM_BYTES, Integer.toString(11));
 			}
 
@@ -1425,6 +1436,8 @@ protected void STest5() throws T_Fail, StandardException
 			if(!checksumTest)
 			{
 				SanityManager.DEBUG_SET(LogToFile.TEST_LOG_INCOMPLETE_LOG_WRITE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 				System.setProperty(LogToFile.TEST_LOG_PARTIAL_LOG_WRITE_NUM_BYTES, Integer.toString(3));
 			}
 			logFactory.flushAll();
@@ -1565,6 +1578,8 @@ protected void STest6() throws T_Fail, StandardException
 			if(!checksumTest)
 			{
 				SanityManager.DEBUG_SET(LogToFile.TEST_LOG_INCOMPLETE_LOG_WRITE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 				System.setProperty(LogToFile.TEST_LOG_PARTIAL_LOG_WRITE_NUM_BYTES, Integer.toString((1997/2) + 16));
 			}
 			logFactory.flushAll();
@@ -1705,6 +1720,8 @@ protected void STest7() throws T_Fail, StandardException
 			if(!checksumTest)
 			{
 				SanityManager.DEBUG_SET(LogToFile.TEST_LOG_INCOMPLETE_LOG_WRITE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 				System.setProperty(LogToFile.TEST_LOG_PARTIAL_LOG_WRITE_NUM_BYTES, Integer.toString(1997+15));
 			}
 			logFactory.flushAll();
@@ -1822,6 +1839,8 @@ private void simulateLogFileCorruption() throws T_Fail, StandardException
 				filepos +=512;
 
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
+//IC see: https://issues.apache.org/jira/browse/DERBY-4963
             log.sync();
 			log.close();
 		}catch(IOException ie)
@@ -1838,12 +1857,14 @@ private void simulateLogFileCorruption() throws T_Fail, StandardException
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java
index c0e89a1e7b..40d8973c53 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_RecoverFullLog.java
@@ -170,6 +170,7 @@ public void runTests() throws T_Fail {
 		try {
 
 			contextService = getContextService();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			File ifile = new File(infoPath);
 			
@@ -195,6 +196,7 @@ public void runTests() throws T_Fail {
 				// remove the service directory to ensure a clean run
 				startParams.put(Property.DELETE_ON_CREATE, Boolean.TRUE.toString());
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				factory = (RawStoreFactory) createPersistentService(getModuleToTestProtocolName(),
 																  testService,
 																  startParams);
@@ -246,9 +248,12 @@ public void runTests() throws T_Fail {
 				if (recoveryFail)
 				{
 					SanityManager.DEBUG_SET(LogToFile.TEST_LOG_FULL);
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 					System.setProperty(LogToFile.TEST_RECORD_TO_FILL_LOG, "10");
 				}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				if (!startPersistentService(testService, startParams))
 					throw T_Fail.testFailMsg("Monitor didn't know how to restart service: " + testService);
 				factory = (RawStoreFactory) findService(getModuleToTestProtocolName(), testService);
@@ -699,6 +704,8 @@ protected void fillUpLog() throws T_Fail, StandardException
 	{
 		SanityManager.DEBUG_SET(LogToFile.TEST_LOG_FULL);
 		System.setProperty(LogToFile.TEST_RECORD_TO_FILL_LOG, "1");
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 
 		Transaction t = t_util.t_startTransaction();
 		try
@@ -873,12 +880,14 @@ protected void checkRecovery() throws T_Fail, StandardException
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Recovery.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Recovery.java
index 27c5f714aa..32cb19d643 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Recovery.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Recovery.java
@@ -149,6 +149,7 @@ private void getConfig()
 		Tests in here come in pairs (Snnn Rnnn), one to set it up, one to test
 		it after recovery.  Information that needs to be passed from the setup
 		to the recovery should, ideally, be written out to a database.  For
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		now, it is written out as a pair of (key,value) long in the file
 		T_Recovery.info.
 
@@ -157,6 +158,7 @@ encode your test number (nnn) by shifting over 32 bits and then add
 		your key.  Multiple invocations which needs paramaters saved should
 		be encoded futher.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 		001 &lt; nnn &lt; 200 -  no recovery undo
 		200 &lt; nnn &lt; 400 -  recovery undo
 
@@ -171,6 +173,7 @@ public void runTests() throws T_Fail {
 
 		try {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			uuidfactory = getMonitor().getUUIDFactory();
 			if (uuidfactory == null) {
 				throw T_Fail.testFailMsg("UUIDFactory.MODULE not found");
@@ -180,9 +183,11 @@ public void runTests() throws T_Fail {
 			startParams = T_Util.setEncryptionParam(startParams);
 
 			contextService = getContextService();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 			if (testRecovery)
 			{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				if (!startPersistentService(testService, startParams))
 					throw T_Fail.testFailMsg("Monitor didn't know how to restart service: " + testService);
 				factory = (RawStoreFactory) findService(getModuleToTestProtocolName(), testService);
@@ -205,6 +210,7 @@ public void runTests() throws T_Fail {
 				// keep all log files for diagnostics
 				startParams.put(RawStoreFactory.KEEP_TRANSACTION_LOG, "true");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 				factory = (RawStoreFactory) createPersistentService(getModuleToTestProtocolName(),
 																  testService,
 																  startParams);
@@ -4097,12 +4103,14 @@ protected void R999() throws StandardException, T_Fail
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_SortController.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_SortController.java
index a1d216ead9..4db1b0522e 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_SortController.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_SortController.java
@@ -73,8 +73,11 @@ public String getModuleToTestProtocolName() {
 	}
 
 	private void setSortBufferSize(final String buf_length) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
     	AccessController.doPrivileged(new PrivilegedAction<Void>() {
 		    public Void run()  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-615
+//IC see: https://issues.apache.org/jira/browse/DERBY-616
 		    	System.setProperty("derby.storage.sortBufferMax", buf_length);
 		    	return null;
 		    }
@@ -136,6 +139,7 @@ protected int runEachTest(AccessFactory store, String tail) throws T_Fail, Stand
 		int failcount = 0;
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			store = (AccessFactory) createPersistentService(getModuleToTestProtocolName(), 
 				testService + tail, startParams);
 		} catch (StandardException mse) {
@@ -147,6 +151,7 @@ protected int runEachTest(AccessFactory store, String tail) throws T_Fail, Stand
 
 		tc = store.getTransaction(
                 getContextService().getCurrentContextManager());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		if (!sortExample(tc))
 			failcount++;
@@ -699,6 +704,7 @@ boolean testSort(TransactionController tc, T_AccessRow in[], T_AccessRow outrow[
 		// available to be retrieved.
         // It also means we are getting final sort statistics.
         sort.completedInserts();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2486
 
         // Test the SortInfo part of sort.
         SortInfo   sort_info = sort.getSortInfo();
@@ -731,6 +737,7 @@ boolean testSort(TransactionController tc, T_AccessRow in[], T_AccessRow outrow[
         {
             int numMergeRuns = Integer.parseInt(sortprop.getProperty(
 			 MessageService.getTextMessage(SQLState.STORE_RTS_NUM_MERGE_RUNS)));
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             Vector<Integer> mergeRuns = new Vector<Integer>();
             StringTokenizer st = new StringTokenizer(sortprop.getProperty(
 			 MessageService.getTextMessage(SQLState.STORE_RTS_MERGE_RUNS_SIZE)),
@@ -745,6 +752,7 @@ boolean testSort(TransactionController tc, T_AccessRow in[], T_AccessRow outrow[
 
             int totRunSize = 0;
             for (int i = 0; i < mergeRuns.size(); i++)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
                 totRunSize += mergeRuns.elementAt(i);
             if (totRunSize != numRowsInput)
                FAIL("(testSort) the sum of the elements of the vector SortInfo.mergeRunsSize (value: " +
@@ -847,6 +855,7 @@ boolean testSort(TransactionController tc, T_AccessRow in[], T_AccessRow outrow[
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         if ( System.getSecurityManager() == null )
         {
             return ContextService.getFactory();
@@ -871,6 +880,7 @@ public ContextService run()
      * can't call this entry point.
      */
     private  static  Object createPersistentService( final String factoryInterface, final String serviceName, final Properties properties ) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         throws StandardException
     {
         try {
@@ -898,6 +908,7 @@ class T_DummySortObserver implements SortObserver
 {
 	T_AccessRow  template;
 	Vector<DataValueDescriptor[]> vector;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
 
 	T_DummySortObserver(T_AccessRow template)
 	{
@@ -938,12 +949,16 @@ public DataValueDescriptor[] getArrayClone()
 
 		if (lastElement > 0)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
             return vector.remove(lastElement - 1);
 		}
 		return template.getRowArrayClone();
 	}
 
     public boolean deferred() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         return false;
     }
 
@@ -1033,6 +1048,9 @@ public DataValueDescriptor[] getArrayClone()
 	}
 
     public boolean deferred() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-532
+//IC see: https://issues.apache.org/jira/browse/DERBY-3330
+//IC see: https://issues.apache.org/jira/browse/DERBY-6419
         return false;
     }
 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_StreamFile.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_StreamFile.java
index f72da87c85..2ba26d0ff8 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_StreamFile.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_StreamFile.java
@@ -96,6 +96,7 @@ public T_StreamFile() {
 	public void boot(boolean create, Properties startParams)
 		 throws StandardException {
 		super.boot(create, startParams);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		contextService = getContextService();
 	}
 
@@ -131,6 +132,7 @@ protected void setupTest() throws T_Fail {
 		startParams = T_Util.setEncryptionParam(startParams);
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			factory = (RawStoreFactory) createPersistentService(getModuleToTestProtocolName(),
 								testService, startParams);
 			if (factory == null) {
@@ -400,12 +402,14 @@ protected void SF002(int param) throws StandardException, T_Fail {
      */
     private  static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_TWC.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_TWC.java
index 752d366a43..a3827e270d 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_TWC.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_TWC.java
@@ -77,6 +77,7 @@ public void checkNullLockCount()
 		switchTransactionContext();
 		try {
 		if (SanityManager.DEBUG)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 			SanityManager.ASSERT(
 				!lf.areLocksHeld(tran.getCompatibilitySpace()),
 				"Transaction holds locks.");
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Util.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Util.java
index 16248ae3ca..c04a005157 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Util.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_Util.java
@@ -95,6 +95,7 @@ public void setOpenMode(int newMode) {
 	 * check that transaction does not hold any lock
 	 */
 	public void t_checkNullLockCount(Transaction t) throws T_Fail {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2328
 		if (lFactory.areLocksHeld(t.getCompatibilitySpace()))
 			throw T_Fail.testFailMsg("Previous action did not clean up all locks.");
 	}
@@ -1147,6 +1148,7 @@ public void t_checkGetLatchedPage(ContainerHandle c, long pageNumber)
 			Page p = c.getPage(pageNumber);
 			throw T_Fail.testFailMsg("got latched page");
 		} catch (StandardException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4982
             if (!"XSDAO".equals(se.getSQLState())) {
 				throw se;
 			}
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_XA.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_XA.java
index a855ccd2ec..f1e54e70bf 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_XA.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_XA.java
@@ -115,6 +115,7 @@ protected void runTests() throws T_Fail
 		startParams = T_Util.setEncryptionParam(startParams);
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 			store = (AccessFactory) createPersistentService(
 				getModuleToTestProtocolName(), testService, startParams);
 		} catch (StandardException mse) {
@@ -562,6 +563,8 @@ void XATest_4(
 
         ContextManager cm = 
                 getContextService().getCurrentContextManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         // ABORT AN IDLE TRANSACTION.
 
@@ -1073,6 +1076,10 @@ void XATest_6(
 
         ContextManager cm = 
                 getContextService().getCurrentContextManager();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
         TransactionController   tc = store.getTransaction(cm);
 
@@ -1130,6 +1137,16 @@ void XATest_6(
                 "heap",       // create a heap conglomerate
                 template_row.getRowArray(), // 1 column template.
 				null, //column sort order - not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 				null,  	//default collation
                 null,         // default properties
                 TransactionController.IS_DEFAULT);       // not temporary
@@ -1191,12 +1208,14 @@ void XATest_6(
      */
     static  ContextService    getContextService()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ContextService>()
              {
                  public ContextService run()
                  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                      return ContextService.getFactory();
                  }
              }
@@ -1277,6 +1296,7 @@ public void commit(
 
                 SanityManager.ASSERT(
                     cm == 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                     T_XA.getContextService().getCurrentContextManager(),
                     "cm = " + cm +
                     "current = " + 
@@ -1322,6 +1342,7 @@ public void rollback(
 
                 SanityManager.ASSERT(
                     cm == 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                     T_XA.getContextService().getCurrentContextManager(),
                     "cm = " + cm +
                     "current = " + 
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_b2i.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_b2i.java
index 54962a98eb..ba6e477e03 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_b2i.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/store/T_b2i.java
@@ -2399,6 +2399,7 @@ protected boolean t_010(TransactionController tc)
             testbtree.create(
                 tm, -1, ContainerHandle.DEFAULT_ASSIGN_ID, index_row1.getRow(),
                 null, null, null, TransactionController.IS_TEMPORARY); 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
 
             throw T_Fail.testFailMsg("bad create succeeded.");
         }
@@ -2887,11 +2888,13 @@ protected boolean t_014(TransactionController tc)
         DataValueDescriptor[] base_row        = TemplateRow.newU8Row(2);
         T_SecondaryIndexRow   index_row1      = new T_SecondaryIndexRow();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
         long base_conglomid = 
             tc.createConglomerate(
                 "heap",   // create a heap conglomerate
                 base_row, // base table template row
                 null, //column sort order - not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, //default collation
                 null,     // default properties
                 TransactionController.IS_DEFAULT);
@@ -2932,6 +2935,7 @@ protected boolean t_014(TransactionController tc)
                 "BTREE",       // create a heap conglomerate
                 index_row1.getRow(), // 1 column template.
 				null, //column sort order - default
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, //default collation
                 properties,         // default properties
                 TransactionController.IS_DEFAULT);       // not temporary
@@ -3267,6 +3271,7 @@ protected boolean t_016(TransactionController tc)
 
                 ContextService contextFactory = 
                     getContextService();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
                 // Get the context manager.
                 ContextManager cm = contextFactory.getCurrentContextManager();
@@ -4228,6 +4233,7 @@ protected boolean t_018(TransactionController tc)
                 "BTREE",    				// create a btree secondary
                 index_row.getRow(),         // row template
 				order, //column sort order - default
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, //default collation
                 properties,                 // properties
                 TransactionController.IS_DEFAULT);   // not temporary
@@ -4775,6 +4781,10 @@ protected boolean t_019(TransactionController tc)
                 "heap",                            // create a heap conglomerate
                 base_row,                          // base table template row
 				null, //column sort order - not required for heap
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, //default collation
                 null,                              // default properties
                 TransactionController.IS_DEFAULT); // not temporary
@@ -4814,6 +4824,10 @@ protected boolean t_019(TransactionController tc)
                 "BTREE",    				// create a btree secondary
                 index_row.getRow(),         // row template
 				order, //column sort order - default
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
                 null, //default collation
                 properties,                 // properties
                 TransactionController.IS_DEFAULT);   // not temporary
@@ -5101,6 +5115,7 @@ public static String repeatString(String data, int repeat) {
      * @return {@code true} if the database is active, {@code false} otherwise
      */
     public boolean isdbActive() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         LanguageConnectionContext lcc = (LanguageConnectionContext)
                 getContextOrNull(LanguageConnectionContext.CONTEXT_ID);
         Database db = (Database) (lcc != null ? lcc.getDatabase() : null);
@@ -5139,6 +5154,7 @@ public ContextService run()
      */
     private  static  Context    getContextOrNull( final String contextID )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<Context>()
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/util/MsgTrace.java b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/util/MsgTrace.java
index b2e0723582..a947fbc791 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/util/MsgTrace.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/unitTests/util/MsgTrace.java
@@ -57,6 +57,7 @@ public class MsgTrace implements Runnable {
 	private MsgTrace() {
 
 		output = getMonitor().getSystemStreams().stream();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 
 		bombDelay = PropertyUtil.getSystemInt(DELAY_PARAM_NAME, 30 * 60); // 30 minutes default
 		bombDelay *= 1000;
@@ -98,6 +99,7 @@ public void run() {
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java b/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java
index 71672362db..930d969219 100644
--- a/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java
+++ b/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java
@@ -29,10 +29,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 public class LocalizedInput extends BufferedReader{
 	private InputStream in;
 	public LocalizedInput(InputStream i){
+//IC see: https://issues.apache.org/jira/browse/DERBY-3224
+//IC see: https://issues.apache.org/jira/browse/DERBY-3176
 		super(new InputStreamReader(i));
 		this.in = i;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-777
 	LocalizedInput(InputStream i, String encode) throws UnsupportedEncodingException{
 		super(new InputStreamReader(i,encode));
 		this.in = i;
diff --git a/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java b/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java
index 1f8af38aff..c7d26aac17 100644
--- a/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java
+++ b/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java
@@ -31,6 +31,7 @@ public LocalizedOutput(OutputStream o){
 		super(new OutputStreamWriter(o), true);
 		out = o;
 	}
+//IC see: https://issues.apache.org/jira/browse/DERBY-777
 	LocalizedOutput(OutputStream o, String enc) throws UnsupportedEncodingException {
 		super(new OutputStreamWriter(o, enc), true);
 		out = o;
diff --git a/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java b/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
index 134a9f68c9..7d211f7395 100644
--- a/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
+++ b/java/org.apache.derby.tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
@@ -69,6 +69,7 @@ private LocalizedResource(){
 		init();
 	}
     public LocalizedResource(String msgF){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6680
         init(null, null, msgF, true);
 	}
 
@@ -96,6 +97,7 @@ public static LocalizedResource getInstance(){
     // in trouble when testing the localization for ij.
     public static void resetLocalizedResourceCache()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1726
         local=null;
     }
 	public void init(){
@@ -104,10 +106,12 @@ public void init(){
 
 
     public void init (String encStr, String locStr, String msgF) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6680
         init(encStr, locStr, msgF, true);
     }
 
     private void init (String encStr, String locStr, String msgF, boolean readEnv){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         if (encStr != null){
 			encode = encStr;
 		}
@@ -126,6 +130,7 @@ private void init (String encStr, String locStr, String msgF, boolean readEnv){
 		locale = getNewLocale(locStr);
 
 		//if null, get locale again from the environment variable
+//IC see: https://issues.apache.org/jira/browse/DERBY-6680
         if (locale==null && readEnv) {
 			String s = getEnvProperty(ENV_LOCALE);
 			locale = getNewLocale(s);
@@ -141,6 +146,7 @@ private void init (String encStr, String locStr, String msgF, boolean readEnv){
 			messageFileName = MESSAGE_FILE;
 		}
 		//create default in/out
+//IC see: https://issues.apache.org/jira/browse/DERBY-777
 		out = getNewOutput(System.out);
 		in = getNewInput(System.in);
 
@@ -170,6 +176,7 @@ private void setResource(){
 		if (res != null){
 			return;
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         res = MessageService.getBundleWithEnDefault(messageFileName, locale);
 	}
 	private void initMaxSizes2(){
@@ -220,6 +227,7 @@ private void initMaxSizes2(){
 
 	public LocalizedInput getNewInput(InputStream i) {
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-777
 			if (encode != null)
 			    return new LocalizedInput(i,encode);
 		}
@@ -230,6 +238,7 @@ public LocalizedInput getNewInput(InputStream i) {
 	}
 
 	public LocalizedInput getNewEncodedInput(InputStream i, String encoding) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-658
 		try {
 	          return new LocalizedInput(i,encoding);
 		}
@@ -253,7 +262,9 @@ public LocalizedOutput getNewOutput(OutputStream o){
 	 * @throws UnsupportedEncodingException
 	 */
 	public LocalizedOutput getNewEncodedOutput(OutputStream o,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 			String encoding) throws UnsupportedEncodingException{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5303
 	    out = new LocalizedOutput(o, encoding);
 	    return out;
 	}
@@ -283,6 +294,7 @@ public String getTextMessage(String key, Object... objectArr) {
 				return MessageFormat.format(res.getString(key), objectArr);
 			} catch (Exception e) {
 					String tmpFormat = key;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6828
 					for (int i=0; objectArr != null && i<objectArr.length; i++)
 						tmpFormat = tmpFormat + ", <{" + (i) + "}>";
 					return MessageFormat.format(tmpFormat, objectArr);
@@ -306,7 +318,9 @@ else if (type == Types.REAL || 	type == Types.FLOAT ||
 					type == Types.DOUBLE ) {
 				return getNumberAsString(rs.getDouble(columnNumber));
 			}
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             else if (type == Types.NUMERIC || type == Types.DECIMAL) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3132
                 return getNumberAsString(rs.getBigDecimal(columnNumber));
 			}
 			else if (type == Types.TIME ) {
@@ -366,6 +380,7 @@ public String getTimestampAsString(Timestamp t){
 		if (!enableLocalized){
 			return t.toString();
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-3194
 		return formatTimestamp.format
 			(t, new StringBuffer(),
 			 new java.text.FieldPosition(0)).toString();
@@ -424,6 +439,7 @@ private final synchronized String getEnvProperty(String key) {
 		 try
 		  {
 				resourceKey =  key;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				s = java.security.AccessController.doPrivileged(this);
 		}
 		catch (SecurityException se) {
@@ -446,6 +462,7 @@ public boolean isLocalized(){
 		return getInstance().enableLocalized;
 	}
     public static String getMessage(String key, Object... args) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
         return getInstance().getTextMessage(key, args);
     }
 	public static LocalizedOutput OutputWriter(){
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Alias.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Alias.java
index 1f4bbcfdcf..cba20ec56a 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Alias.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Alias.java
@@ -53,6 +53,7 @@ public static void doPFAU(Connection conn, boolean at10_6 )
 		throws SQLException {
 
 		// First do stored procedures.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4485
 		PreparedStatement ps = conn.prepareStatement
             (
              "SELECT ALIAS, ALIASINFO, " +
@@ -128,6 +129,7 @@ private static void generateDDL(ResultSet rs, char aliasType)
 
 			if (firstTime) {
 				Logs.reportString("----------------------------------------------");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4485
                 switch( aliasType )
                 {
                 case UDT_TYPE: Logs.reportMessage( "DBLOOK_UDTHeader" ); break;
@@ -171,6 +173,7 @@ private static String createPFAUString(String aliasName,
 
 		StringBuffer alias = new StringBuffer("CREATE ");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4485
         switch( aliasType )
         {
         case UDT_TYPE: alias.append( "TYPE " ); break;
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Check.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Check.java
index 05e91ea5c9..4f539967a7 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Check.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Check.java
@@ -49,6 +49,7 @@ public static void doChecks(Connection conn)
 
 		Statement stmt = conn.createStatement();
 		ResultSet rs = stmt.executeQuery("SELECT CS.CONSTRAINTNAME, " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
 			"CS.TABLEID, CS.SCHEMAID, CS.STATE, CK.CHECKDEFINITION FROM SYS.SYSCONSTRAINTS CS, " +
 			"SYS.SYSCHECKS CK WHERE CS.CONSTRAINTID = " +
 			"CK.CONSTRAINTID AND CS.STATE != 'D' ORDER BY CS.TABLEID");
@@ -70,6 +71,7 @@ public static void doChecks(Connection conn)
 
 			StringBuffer chkString = createCheckString(tableName, rs);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
             DB_Key.makeDeferredClauses( chkString, rs, 4 );
             
 			Logs.writeToNewDDL(chkString.toString());
@@ -108,6 +110,7 @@ private static StringBuffer createCheckString (String tableName,
 		sb.append(constraintName);
 		sb.append(" CHECK ");
 		sb.append(dblook.removeNewlines(aCheck.getString(5)));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
 
 		return sb;
 
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
index 8301fbc3b3..fb3f6ef53b 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
@@ -49,6 +49,7 @@ public static void doAuthorizations(Connection conn, boolean at10_6)
         if ( at10_6 )
         {
             // Generate udt privilege statements
+//IC see: https://issues.apache.org/jira/browse/DERBY-4485
             rs = stmt.executeQuery("SELECT P.GRANTEE, S.SCHEMANAME, A.ALIAS, P.PERMISSION, P.OBJECTTYPE FROM " +
                                    "SYS.SYSPERMS P, SYS.SYSALIASES A, SYS.SYSSCHEMAS S WHERE A.SCHEMAID = " +
                                    "S.SCHEMAID AND P.OBJECTID = A.ALIASID AND A.ALIASTYPE='A'");
@@ -108,6 +109,8 @@ private static void generateTablePrivs(ResultSet rs)
 				Logs.reportString("----------------------------------------------\n");
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 			String authName = dblook.addQuotes
 				(dblook.expandDoubleQuotes(rs.getString(1)));
 			String schemaName = dblook.addQuotes
@@ -196,6 +199,7 @@ private static void generateColumnPrivs(ResultSet rs, Connection conn)
 		throws SQLException
 	{
         // Statement that gets the names of the columns in a given table.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4829
         PreparedStatement columnStmt = conn.prepareStatement(
             "SELECT COLUMNNUMBER, COLUMNNAME " +
             "FROM SYS.SYSCOLUMNS C, SYS.SYSTABLES T, SYS.SYSSCHEMAS S " +
@@ -218,6 +222,7 @@ private static void generateColumnPrivs(ResultSet rs, Connection conn)
 
             // Schema name and table name are parameters to a prepared
             // statement, so quoting is not needed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4829
             String schemaName = rs.getString(2);
             String tableName = rs.getString(3);
 
@@ -291,6 +296,7 @@ private static String mapColumnsToNames(String columns, ResultSet rsCols)
 			colNames.append(separatorStr(addSeparator));
 			addSeparator = true;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4829
             String colName = dblook.addQuotes(
                     dblook.expandDoubleQuotes(rsCols.getString(2)));
             colNames.append(colName);
@@ -317,6 +323,7 @@ private static String columnPrivStatement(ResultSet rs, String fullName,
 		grantStmt.append(privTypeToString(privType));
 		grantStmt.append("(");
 		grantStmt.append(mapColumnsToNames(columns, rsCols));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4829
         grantStmt.append(") ON ");
         grantStmt.append(fullName);
 		grantStmt.append(" TO ");
@@ -333,6 +340,7 @@ private static String columnPrivStatement(ResultSet rs, String fullName,
 	public static void generateUDTPrivs(ResultSet rs) throws SQLException
 	{
 		boolean firstTime = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4485
 		while (rs.next()) {
 			String authName = dblook.addQuotes
 				(dblook.expandDoubleQuotes(rs.getString(1)));
@@ -449,6 +457,10 @@ public static void generateRoutinePrivs(ResultSet rs) throws SQLException
 	{
 		boolean firstTime = true;
 		while (rs.next()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 			String authName = dblook.addQuotes
 				(dblook.expandDoubleQuotes(rs.getString(1)));
 			String schemaName = dblook.addQuotes
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Jar.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Jar.java
index 58815b2e98..276723d492 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Jar.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Jar.java
@@ -44,6 +44,7 @@ public class DB_Jar {
 	 ****/
 
 	public static void doJars(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
         String dbName, Connection conn, boolean at10_9)
 		throws SQLException
 	{
@@ -148,6 +149,7 @@ public static void doJars(
                     // Create the DBJARS directory.
                     File jarDir = new File(
                         System.getProperty("user.dir") +
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
                         separator + "DBJARS" + separator + schemaWithoutQuotes);
                     absJarDir = jarDir.getAbsolutePath();
                     jarDir.mkdirs();
@@ -185,6 +187,7 @@ public static void doJars(
 	}
 
     private static void  doHeader(boolean firstTime) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
         if (firstTime) {
             Logs.reportString(
                 "----------------------------------------------");
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Key.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Key.java
index 75783e4c29..2370516e62 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Key.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Key.java
@@ -60,6 +60,7 @@ public static void doKeys(Connection conn)
 		// Non-foreign keys, first.
 		Statement stmt = conn.createStatement();
 		ResultSet rs = stmt.executeQuery("SELECT CS.CONSTRAINTNAME, CS.TYPE, " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
 			"CS.TABLEID, CS.CONSTRAINTID, CS.SCHEMAID, CS.STATE, CG.DESCRIPTOR, CG.ISCONSTRAINT " +
 			"FROM SYS.SYSCONSTRAINTS CS, SYS.SYSCONGLOMERATES CG, SYS.SYSKEYS K " +
 			"WHERE CS.STATE != 'D' AND CS.CONSTRAINTID = K.CONSTRAINTID AND " +
@@ -68,6 +69,7 @@ public static void doKeys(Connection conn)
 
 		// Now, foreign keys.
 		rs = stmt.executeQuery("SELECT CS.CONSTRAINTNAME, CS.TYPE, CS.TABLEID, " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
 			"CS.CONSTRAINTID, CS.SCHEMAID, CS.STATE, CG.DESCRIPTOR, CG.ISCONSTRAINT, " +
 			"K.DELETERULE, K.UPDATERULE, K.KEYCONSTRAINTID FROM SYS.SYSCONSTRAINTS CS, " +
 			"SYS.SYSCONGLOMERATES CG, SYS.SYSFOREIGNKEYS K WHERE CS.STATE != 'D' " +
@@ -99,6 +101,7 @@ private static void createKeysFrom (ResultSet rs)
 		boolean firstTime = true;
 		while (rs.next()) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
 			if (!rs.getBoolean(8))
 			// this row is NOT for a constraint, so skip it.
 				continue;
@@ -121,6 +124,7 @@ private static void createKeysFrom (ResultSet rs)
 
 			if (rs.getString(2).equals("F")) {
 			// foreign key; we have to figure out the references info.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
 				kString.append(makeFKReferenceClause(rs.getString(11),
 					rs.getString(9).charAt(0), rs.getString(10).charAt(0)));
 			}
@@ -165,6 +169,7 @@ private static StringBuffer createKeyString (String tableId,
 		// For keys, we need to get the column list.
 		sb.append("(");
 		sb.append(dblook.getColumnListFromDescription(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
 			tableId, aKey.getString(7)));
 		sb.append(")");
 
@@ -264,6 +269,7 @@ private static String makeFKReferenceClause(String constraintId,
 	 ****/
 
 	static void makeDeferredClauses
+//IC see: https://issues.apache.org/jira/browse/DERBY-6661
         ( StringBuffer buffer, ResultSet constraint, int stateColumn )
 		throws SQLException
 	{
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Table.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Table.java
index c1d434b8e5..c8da77ea2b 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Table.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/DB_Table.java
@@ -70,6 +70,7 @@ public static void doTables(Connection conn, HashMap tableIdToNameMap)
 
 		getAutoIncStmt = 
 			conn.prepareStatement("SELECT AUTOINCREMENTSTART, " +
+//IC see: https://issues.apache.org/jira/browse/DERBY-308
 			"AUTOINCREMENTINC, COLUMNNAME, REFERENCEID, COLUMNDEFAULT FROM SYS.SYSCOLUMNS " +
 			"WHERE COLUMNNAME = ? AND REFERENCEID = ?");
 
@@ -77,6 +78,7 @@ public static void doTables(Connection conn, HashMap tableIdToNameMap)
 		// each one.
 
 		boolean firstTime = true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5021
 		Set entries = tableIdToNameMap.entrySet();
 		for (Iterator itr = entries.iterator(); itr.hasNext(); ) {
 
@@ -187,6 +189,7 @@ public static boolean reinstateAutoIncrement(String colName,
 
 			long start = autoIncCols.getLong(1);
 			if (!autoIncCols.wasNull()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-308
 				colDef.append(" GENERATED ");
 				colDef.append(autoIncCols.getObject(5) == null ? 
 					      "ALWAYS ":"BY DEFAULT ");
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/Logs.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/Logs.java
index a54a21e51e..8bce598adf 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/Logs.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook/Logs.java
@@ -65,6 +65,7 @@ public static boolean initLogs(String logFileName, String ddlFileName,
 		try {
 
 			logFile = new PrintWriter(new FileOutputStream(logFileName, appendLogs));
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 			ddlFile = (ddlFileName == null) ? null
 					: new PrintWriter(new FileOutputStream(ddlFileName, appendLogs));
 			verbose = doVerbose;
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/AttributeHolder.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/AttributeHolder.java
index 8beaa705b9..9b85201ae6 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/AttributeHolder.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/AttributeHolder.java
@@ -41,6 +41,7 @@ public class AttributeHolder {
     String value;
     String token;
     Vector<String> errors = new Vector<String>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
     public String getName(){
       return name;
@@ -72,6 +73,7 @@ public void check( Vector validProps){
     }
     void displayErrors(){
       //If no error are found then nothing is displayed.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
       Enumeration<String> e = errors.elements();
       //In the first line, show the exact token that was parsed from
       //the URL.
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java
index f56734459f..36e9ccfb88 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java
@@ -43,6 +43,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
  */
 class ConnectionEnv {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	Hashtable<String,Session> sessions = new Hashtable<String,Session>();
 	private Session currSession;
 	private String tag;
@@ -61,12 +62,14 @@ class ConnectionEnv {
 		failure does not prevent object creation.
 	 */
     void init(LocalizedOutput out) throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
 		Connection c = util.startJBMS(null,null);
 
 		// only load up ij.connection.* properties if there is
 		// only one ConnectionEnv in the system.
 		if (only) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             Properties p = AccessController.doPrivileged(new PrivilegedAction<Properties>() {
             	public Properties run() {
                 	return System.getProperties();
@@ -123,6 +126,7 @@ public String getUniqueConnectionName() {
     int newNum = 0;
     boolean newConnectionNameOk = false;
     String newConnectionName = "";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     Enumeration<String> e;
     while (!newConnectionNameOk){
       newConnectionName = Session.DEFAULT_NAME + newNum;
@@ -141,6 +145,7 @@ Session getSession() {
 		return currSession;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	Hashtable<String,Session> getSessions() {
 		return sessions;
 	}
@@ -166,6 +171,7 @@ void removeCurrentSession() throws SQLException {
 	}
 
 	void removeSession(String name) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Session s = sessions.remove(name);
 		s.close();
 		if (currSession == s)
@@ -176,6 +182,7 @@ void removeAllSessions() throws SQLException {
 		if (sessions == null || sessions.size() == 0)
 			return;
 		else
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			for (Enumeration<String> e = sessions.keys(); e.hasMoreElements(); ) {
 				String n = e.nextElement();
 				removeSession(n);
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/Main.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/Main.java
index 27fd8548b4..7cdf4431ae 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/Main.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/Main.java
@@ -85,6 +85,7 @@ public static void mainCore(String[] args, Main main)
 		String inputResourceName;
 		boolean gotProp;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1216
 		LocalizedResource langUtil = LocalizedResource.getInstance();
 		LocalizedOutput out = langUtil.getNewOutput(System.out);
 
@@ -99,6 +100,7 @@ public static void mainCore(String[] args, Main main)
 
 		// readjust output to derby.ui.locale and derby.ui.codeset if 
                 // they were loaded from a property file.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1244
 		langUtil.init();
 		out = langUtil.getNewOutput(System.out);
                 main.initAppUI();
@@ -113,10 +115,12 @@ public static void mainCore(String[] args, Main main)
 			}
 		} else if (file == null) {
 			in = langUtil.getNewInput(System.in);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1216
                         out.flush();
     	        } else {
                     try {
                     	final String inFile1 = file;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     	in1 = AccessController.doPrivileged(new PrivilegedExceptionAction<FileInputStream>() {
             				public FileInputStream run() throws FileNotFoundException {
         						return new FileInputStream(inFile1);
@@ -137,9 +141,11 @@ public FileInputStream run() throws FileNotFoundException {
                     }
                 }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2505
 		final String outFile = util.getSystemProperty("ij.outfile");
 		if (outFile != null && outFile.length()>0) {
 			LocalizedOutput oldOut = out;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			FileOutputStream fos = AccessController.doPrivileged(new PrivilegedAction<FileOutputStream>() {
 				public FileOutputStream run() {
 					FileOutputStream out = null;
@@ -181,6 +187,7 @@ public FileOutputStream run() {
 		me = main.getMain(out);
 
 		/* Let the processing begin! */
+//IC see: https://issues.apache.org/jira/browse/DERBY-3420
 		me.go(in, out);
 		in.close(); out.close();
 	}
@@ -216,6 +223,8 @@ public utilMain getutilMain(int numConnections, LocalizedOutput out)
 	 */
     public utilMain getutilMain(int numConnections, LocalizedOutput out, boolean loadSystemProperties)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4223
+//IC see: https://issues.apache.org/jira/browse/DERBY-4217
 		return new utilMain(numConnections, out, loadSystemProperties);
 	}
 
@@ -226,6 +235,7 @@ public utilMain getutilMain(int numConnections, LocalizedOutput out, boolean loa
 	private void go(LocalizedInput in, LocalizedOutput out )
 	{
 		LocalizedInput[] inA = { in } ;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3420
 		utilInstance.go(inA, out);
 	}
 
@@ -241,6 +251,7 @@ public Main(LocalizedOutput out) {
 	        out = LocalizedResource.getInstance().getNewOutput(System.out);
 		}
 		utilInstance = getutilMain(1, out);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 		utilInstance.initFromEnvironment();
 	}
 
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ParseException.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ParseException.java
index 1405d992ba..40aad1be6d 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ParseException.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ParseException.java
@@ -53,6 +53,7 @@ public ParseException(Token currentTokenVal,
     super("");
     specialConstructor = true;
     currentToken = currentTokenVal;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6195
     expectedTokenSequences = ToolUtils.copy2( expectedTokenSequencesVal );
     tokenImage = ToolUtils.copy( tokenImageVal );
   }
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/Session.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/Session.java
index e3877d1cec..43716b1956 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/Session.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/Session.java
@@ -46,6 +46,7 @@ class Session {
 	boolean singleSession = true;
 	Connection conn = null;
 	String tag, name;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	Hashtable<String,PreparedStatement> prepStmts = new Hashtable<String,PreparedStatement>();
 	Hashtable<String,Statement> cursorStmts = new Hashtable<String,Statement>();
 	Hashtable<String,ResultSet> cursors = new Hashtable<String,ResultSet>();
@@ -63,6 +64,7 @@ class Session {
 		{
 			isJCC = conn.getMetaData().getDriverName().startsWith("IBM DB2 JDBC Universal Driver");
 			isDNC = conn.getMetaData().getDriverName().startsWith("Apache Derby Network Client");
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 			isEmbeddedDerby = conn.getMetaData().getDriverName().
 				startsWith("Apache Derby Embedded JDBC Driver");
 		}
@@ -90,6 +92,7 @@ boolean getIsDNC()
 
 	boolean getIsEmbeddedDerby()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 		return isEmbeddedDerby;
 	}
 
@@ -97,6 +100,7 @@ String getName() {
 		return name;
 	}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	PreparedStatement addPreparedStatement(String name, PreparedStatement ps) {
 		return prepStmts.put(name,ps);
 	}
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/StatementFinder.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/StatementFinder.java
index c58cd0668a..72b824d53e 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/StatementFinder.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/StatementFinder.java
@@ -36,6 +36,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 	are not considered to be statement terminators but to be
 	part of those tokens.
 	<p>
+//IC see: https://issues.apache.org/jira/browse/DERBY-3242
     Comments currently recognized include the SQL comment,
     which begins with "--" and ends at the next EOL, and nested
     bracketed comments.
@@ -86,12 +87,14 @@ public class StatementFinder {
 		The constructor does not assume the stream is data input
 		or buffered, so it will wrap it appropriately.
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2255
 		If the StatementFinder's input stream is connected to
 		System.in, a LocalizedOutput stream may be given to print
 		line continuation prompts when StatementFinder reads a newline.
 
 		@param s the input stream for reading statements from.
 		@param promptDest LocalizedOutput stream to write line
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 						continuation prompts ("&gt; ") to. If null,
 						no such prompts will be written.
 	 */
@@ -126,6 +129,7 @@ public void ReInit(LocalizedInput s) {
 		atEOF = false;
 		peekEOF = false;
 		peeked = false;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2255
 		if(s.isStandardInput() && promptwriter != null) {
 			doPrompt = true;
 		} else {
@@ -177,6 +181,7 @@ public String nextStatement() {
 				break;
 			}
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-2255
 			if (!(nextChar == MINUS))
 				continuedStatement=true;
 
@@ -184,6 +189,7 @@ public String nextStatement() {
 				case MINUS:
 					readSingleLineComment(nextChar);
 					break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3242
 				case SLASH:
 				    readBracketedComment();
 				    break;
@@ -194,6 +200,7 @@ public String nextStatement() {
 				case SEMICOLON:
 					haveSemi = true;
 					state = END_OF_STATEMENT;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2255
 					continuedStatement=false;
 					break;
 				case NEWLINE:
@@ -240,6 +247,7 @@ private boolean whiteSpace(char c) {
 	 */
 	private void readBracketedComment() {
 		char nextChar = peekChar();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3242
 
 		// if next char is EOF, we are done.
 		if (peekEOF()) return;
@@ -311,6 +319,7 @@ private void readSingleLineComment(char commentChar) {
 
 		// if nextChar is not a minus, it was just a normal minus,
 		// nothing special to do
+//IC see: https://issues.apache.org/jira/browse/DERBY-2255
 		if (nextChar != commentChar)
 		{
 			continuedStatement=true;
@@ -333,6 +342,7 @@ private void readSingleLineComment(char commentChar) {
 				case RETURN:
 					readChar(); // okay to process the character
 					state = IN_STATEMENT;
+//IC see: https://issues.apache.org/jira/browse/DERBY-2255
 					if (doPrompt){
 						// If we had previously already started a statement,
 						// add the prompt.
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/URLCheck.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/URLCheck.java
index 39fe0bd56a..41c9251ff8 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/URLCheck.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/URLCheck.java
@@ -70,6 +70,7 @@ public static void main(String[] args) {
     }
   }
   public void check(){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     Enumeration<AttributeHolder> e = attributes.elements();
     while (e.hasMoreElements()) {
       AttributeHolder anAttribute = e.nextElement();
@@ -82,6 +83,7 @@ public void check(){
     }
   }
   public void checkForDuplicate(AttributeHolder anAttribute){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
     Enumeration<AttributeHolder> e = attributes.elements();
     while (e.hasMoreElements()) {
       AttributeHolder aHolder = e.nextElement();
@@ -113,6 +115,7 @@ else if( url.startsWith( "jdbc:derby:"))
 		
 		//Parse the url into attributes and put them in a Properties object.
 		StringTokenizer st = new StringTokenizer(url.substring(protocol.length()), ";:\"");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		attributes = new Vector<AttributeHolder>();
 		while (st.hasMoreTokens()) {
       AttributeHolder anAttribute = new AttributeHolder();
@@ -157,6 +160,7 @@ private Vector<String> getValidDerbyProps()
         {
             try
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 Vector<String> props = new Vector<String>();
                 Class att = Attribute.class;
                 //Use reflection to get the list of valid keys from the Attribute class.
@@ -166,6 +170,7 @@ private Vector<String> getValidDerbyProps()
                 for (int i = 0; i < fields.length; i++)
                 {
                     Field aField = (Field)fields[i];
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     props.addElement( (String) aField.get(att));
                 }
                 validDerbyProps = props;
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijException.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijException.java
index d5f7555363..77d824812c 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijException.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijException.java
@@ -123,6 +123,7 @@ static ijException noSuchProtocol(String c) {
 		return new ijException(LocalizedResource.getMessage(NoSuchProtocol, c));
 	}
 	static ijException noSuchTable(String c) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		return new ijException(LocalizedResource.getMessage(NoSuchTable, c));
 	}
 	static ijException noUsingResults() {
@@ -147,6 +148,7 @@ public static ijException zeroInvalidForAbsolute() {
 		return new ijException(LocalizedResource.getMessage(ZeroInvalidForAbsolute));
 	}
 	public static ijException notAvailableForDriver(String s) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 		return new ijException(
 			LocalizedResource.getMessage(NotAvailableForDriver, s));
 	}
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijMultipleResultSetResult.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijMultipleResultSetResult.java
index ba051b6641..d5ec2268be 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijMultipleResultSetResult.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijMultipleResultSetResult.java
@@ -56,9 +56,11 @@ public class ijMultipleResultSetResult extends ijResultImpl {
      */
     public ijMultipleResultSetResult(List<ResultSet> resultSets, int[] display,
                                      int[] widths) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         this.resultSets = new ArrayList<ResultSet>();
         this.resultSets.addAll(resultSets);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6195
         displayColumns = ToolUtils.copy( display );
         columnWidths   = ToolUtils.copy( widths );
     }
@@ -73,6 +75,7 @@ public boolean isMultipleResultSetResult(){
     }
 
     public List<ResultSet> getMultipleResultSets() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5840
         return new ArrayList<ResultSet>(resultSets);
     }
 
@@ -97,6 +100,7 @@ public SQLWarning getSQLWarnings() throws SQLException {
         SQLWarning warning = null;
         ResultSet rs = null;
         for (int i=0; i<resultSets.size(); i++){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             rs = resultSets.get(i);
             if (rs.getWarnings() != null) {
                 if (warning == null) warning = rs.getWarnings();
@@ -111,6 +115,7 @@ public SQLWarning getSQLWarnings() throws SQLException {
      */
     public void clearSQLWarnings() throws SQLException {
         for (int i=0; i<resultSets.size(); i++){
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             (resultSets.get(i)).clearWarnings();
         }
     }
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResult.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResult.java
index 8f4cd97d1c..103dde70cc 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResult.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResult.java
@@ -52,6 +52,7 @@ interface ijResult {
 	Statement getStatement();
 	int getUpdateCount() throws SQLException;
 	ResultSet getResultSet() throws SQLException;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	List<ResultSet> getMultipleResultSets();
 	ResultSet getNextRowOfResultSet();
 	Vector getVector();
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResultImpl.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResultImpl.java
index fe4ad9e111..48089f4576 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResultImpl.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResultImpl.java
@@ -71,9 +71,12 @@ public String toString() {
 		if (isVector()) return LocalizedResource.getMessage("IJ_Vec0",getVector().toString());
 		if (isMulti()) return LocalizedResource.getMessage("IJ_Mul0",getVector().toString());
 		if (isException()) return LocalizedResource.getMessage("IJ_Exc0",getException().toString());
+//IC see: https://issues.apache.org/jira/browse/DERBY-2222
 		if (isMultipleResultSetResult())
 			return LocalizedResource.getMessage("IJ_MRS0",
+//IC see: https://issues.apache.org/jira/browse/DERBY-2222
 										getMultipleResultSets().toString());
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		try {
 			if (isResultSet()) return LocalizedResource.getMessage("IJ_Rse0",getStatement().toString());
 		} catch(SQLException se) {
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResultSetResult.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResultSetResult.java
index c9002b1c25..a0915dd521 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResultSetResult.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijResultSetResult.java
@@ -65,6 +65,7 @@ public ijResultSetResult(ResultSet r, int[] display,
 		resultSet = r;
 		statement = resultSet.getStatement();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6195
 		displayColumns = ToolUtils.copy( display );
 		columnWidths   = ToolUtils.copy( widths );
 	}
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijVectorResult.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijVectorResult.java
index c31b03f6e2..46a1d366bf 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijVectorResult.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/ijVectorResult.java
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 class ijVectorResult extends ijResultImpl {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	Vector<Object> vec;
 	SQLWarning warns;
 
@@ -42,6 +43,7 @@ class ijVectorResult extends ijResultImpl {
 	 * Initialize a new vector containing only one object.
 	 */
 	ijVectorResult(Object value, SQLWarning w) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		this(new Vector<Object>(1), w);
 		vec.add(value);
 	}
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/mtTestCase.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/mtTestCase.java
index 0de5875e9f..23ac61bbe6 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/mtTestCase.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/mtTestCase.java
@@ -144,6 +144,7 @@ public synchronized BufferedInputStream initialize(String inputDir)
 			
 			if (framework != null)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-236
                 String newURLPrefix = null;
                 framework = framework.toUpperCase(java.util.Locale.ENGLISH);
                 if (framework.equals("DB2JNET") || framework.equals("DERBYNET"))
@@ -163,6 +164,7 @@ else if (framework.equals("DERBYNETCLIENT"))
             if (("true").equalsIgnoreCase(p.getProperty("encryption"))) 
             {
                String encryptUrl = "dataEncryption=true;bootPassword=Thursday";
+//IC see: https://issues.apache.org/jira/browse/DERBY-956
                String dbUrl = p.getProperty("ij.database");
                String encryptionAlgorithm = p.getProperty("encryptionAlgorithm");
                if (encryptionAlgorithm != null)
@@ -182,6 +184,7 @@ else if (framework.equals("DERBYNETCLIENT"))
 			// then remove the ij.database and ij.protocol property.
             // This is because the ij.database and ij.protocol 
             // will override the ij.dataSource property.
+//IC see: https://issues.apache.org/jira/browse/DERBY-398
 			if (System.getProperty("ij.dataSource") != null)
 			{
 				p.remove("ij.database");
@@ -241,8 +244,10 @@ public void runMe(LocalizedOutput log, LocalizedOutput out, BufferedInputStream
 	
 		out.println("--------------"+file+"-----------------");
 		utilInstance = new utilMain(1, out, ignoreErrors);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 		utilInstance.initFromEnvironment();
 		utilInstance.setMtUse(true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3420
 		utilInstance.go(in, out);
 		log.flush();
 		out.flush();
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/mtTester.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/mtTester.java
index a8d50ca5ed..568995d372 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/mtTester.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/mtTester.java
@@ -111,6 +111,7 @@ public void run()
 		{
 			log.println(name + ": stopping on request after " + numIterations +
 						" iterations");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1230
 			testOK = true;
 		}
 	}
@@ -121,6 +122,7 @@ public void stop()
 	}
 	public boolean noFailure()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1230
 		return testOK;
 	}
 }
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/util.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/util.java
index 3d75e80757..b9fd80aa51 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/util.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/util.java
@@ -170,6 +170,7 @@ static InputStream getResourceAsStream(String resourceName)
       
 		final Class c = util.class;
 		final String resource = qualifyResourceName(resourceName,true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		if (resource == null) { return null; }
 		InputStream is = null;
 
@@ -252,6 +253,7 @@ static public String getInputResourceNameArg(String[] args) {
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-1216
 	  Verify the ij line arguments command arguments. Also used to detect --help.
 	  @return true if the args are invalid
 	  <UL>
@@ -273,12 +275,14 @@ static public boolean invalidArgs(String[] args) {
 				if (ix >= args.length) return true;
 			}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3420
 			else if ((args[ix].equals("-p") || args[ix].equals("-pr") ))
 			{
 				// next arg is the file/resource name
 				ix++;
 				if (ix >= args.length) return true;
 			} else if (args[ix].equals("--help")) { return true; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1216
 
 			//
 			//Assume the first unknown arg is a file name.
@@ -325,6 +329,7 @@ static public void setupDataSource(Object ds,String dbName,boolean firstTime) th
 	// Loop over set methods on Datasource object, if there is a property
 	// then call the method with corresponding value. Call setCreateDatabase based on
     //parameter create. 	
+//IC see: https://issues.apache.org/jira/browse/DERBY-597
    java.lang.reflect.Method[] methods = ds.getClass().getMethods();
 	for (int i = 0; i < methods.length; i++) {
 	    java.lang.reflect.Method m = methods[i];
@@ -369,11 +374,14 @@ static public void setupDataSource(Object ds,String dbName,boolean firstTime) th
     public static Connection getDataSourceConnection(String dsName,String user,String password,
     												String dbName,boolean firstTime) throws SQLException{
 		// Get a new proxied connection through DataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
         DataSource ds;
 		try {
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		    Class<?> dc = Class.forName(dsName);
             if (DataSource.class.isAssignableFrom(dc)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 ds = (DataSource) dc.getConstructor().newInstance();
             } else {
                 throw new ijException(LocalizedResource.getMessage(
@@ -418,6 +426,7 @@ public static Connection getDataSourceConnection(String dsName,String user,Strin
 	 */
     static public Connection startJBMS(String defaultDriver, String defaultURL,
 				       Properties connInfo) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
       throws SQLException, ClassNotFoundException, InstantiationException, IllegalAccessException,
         NoSuchMethodException, InvocationTargetException
     {
@@ -429,6 +438,7 @@ static public Connection startJBMS(String defaultDriver, String defaultURL,
         driverName = util.getSystemProperty("driver");
         if (driverName == null) driverName = util.getSystemProperty("ij.driver");
 	if (driverName == null || driverName.length()==0) driverName = defaultDriver;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         if (driverName != null) {
 	    util.loadDriver(driverName);
 	}
@@ -444,6 +454,7 @@ static public Connection startJBMS(String defaultDriver, String defaultURL,
 	databaseURL = util.getSystemProperty("database");
 	if (databaseURL == null) databaseURL = util.getSystemProperty("ij.database");
 	if (databaseURL == null || databaseURL.length()==0) databaseURL = defaultURL;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 	if (databaseURL != null) {
 	    // add protocol if might help find driver.
 		// if have full URL, load driver for it
@@ -475,6 +486,7 @@ static public Connection startJBMS(String defaultDriver, String defaultURL,
         
 	    //First connection - pass firstTime=true, dbName=null. For database name, 
 	    //value in ij.dataSource.databaseName will be used. 
+//IC see: https://issues.apache.org/jira/browse/DERBY-597
 	    con = getDataSourceConnection(dsName,user,password,null,true);
 	    return con;
    }
@@ -543,6 +555,7 @@ static public Connection startJBMS() throws SQLException, ClassNotFoundException
 	 */
     static public Connection startJBMS(String defaultDriver, String defaultURL) 
 			throws SQLException, ClassNotFoundException, InstantiationException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                    IllegalAccessException, NoSuchMethodException, InvocationTargetException {
 		return startJBMS(defaultDriver,defaultURL,null);
 		
@@ -622,6 +635,7 @@ public static void DisplayMulti(LocalizedOutput out, PreparedStatement ps,
 				
 				if (sqlType == Types.DECIMAL)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                     ps.setObject(c, rs.getObject(c), sqlType, rsmd.getScale(c));
 				}
 				else
@@ -671,6 +685,7 @@ static final String getSystemProperty(String propertyName) {
 			{
 				util u = new util();
 				u.key = propertyName;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				return java.security.AccessController.doPrivileged(u);
 			}
 			else
@@ -779,6 +794,7 @@ locate class for driver.
 		@exception IllegalAccessException if driver class constructor not visible.
 	 */
     static void loadDriver(String driverClass)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         throws
             ClassNotFoundException, InstantiationException,
             IllegalAccessException, NoSuchMethodException, InvocationTargetException {
@@ -818,6 +834,7 @@ private static boolean isJCCFramework()
 	 * @return the current schema of the connection, or null if error.
 	 */
 	public static String getSelectedSchema(Connection theConnection) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		String schema = null;
                 if (theConnection == null)
                   return null;
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/utilMain.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/utilMain.java
index d2d9b5d598..542586888b 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/utilMain.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/utilMain.java
@@ -86,6 +86,7 @@ public class utilMain {
 	 * grabbers as needed.
 	 */
 	Stack<StatementFinder> oldGrabbers = new Stack<StatementFinder>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	LocalizedResource langUtil = LocalizedResource.getInstance();
 	/**
@@ -93,6 +94,7 @@ public class utilMain {
 	 *
 	 * @param numConnections	The number of connections/users to test.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 	utilMain(int numConnections, LocalizedOutput out)
 		throws ijFatalException
 	{
@@ -106,6 +108,8 @@ public class utilMain {
 	 *
 	 * @param numConnections	The number of connections/users to test.
 	 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-4223
+//IC see: https://issues.apache.org/jira/browse/DERBY-4217
     utilMain(int numConnections, LocalizedOutput out, boolean loadSystemProperties)
 		throws ijFatalException
 	{
@@ -138,14 +142,17 @@ public utilMain(int numConnections, LocalizedOutput out, Hashtable ignoreErrors)
 		ijTokMgr = new ijTokenManager(charStream);
 		ijParser = new ij(ijTokMgr, this);
 		this.out = out;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6195
 		if ( ignoreErrors != null ) { this.ignoreErrors = (Hashtable) ignoreErrors.clone(); }
 		
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 		showErrorCode = 
 			Boolean.valueOf(
 					util.getSystemProperty("ij.showErrorCode")
 					).booleanValue();
         
         ijExceptionTrace = util.getSystemProperty("ij.exceptionTrace");
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 
 		this.numConnections = numConnections;
 		/* 1 StatementFinder and ConnectionEnv per connection/user. */
@@ -154,11 +161,13 @@ public utilMain(int numConnections, LocalizedOutput out, Hashtable ignoreErrors)
 
 		for (int ictr = 0; ictr < numConnections; ictr++)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-2255
 		    commandGrabber[ictr] = new StatementFinder(langUtil.getNewInput(System.in), out);
 			connEnv[ictr] = new ConnectionEnv(ictr, (numConnections > 1), (numConnections == 1));
 		}
 
 		/* Start with connection/user 0 */
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 		currCE = 0;
 		fileInput = false;
 		initialFileInput = false;
@@ -171,6 +180,7 @@ public utilMain(int numConnections, LocalizedOutput out, Hashtable ignoreErrors)
 	 */
 	public void initFromEnvironment()
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 		ijParser.initFromEnvironment();
 		
 		for (int ictr = 0; ictr < numConnections; ictr++)
@@ -185,10 +195,12 @@ public void initFromEnvironment()
 				JDBCDisplayUtil.ShowException(out, i); // will continue past driver failure
 			} catch (IllegalAccessException ia) {
 				JDBCDisplayUtil.ShowException(out, ia); // will continue past driver failure
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			} catch (NoSuchMethodException ia) {
 				JDBCDisplayUtil.ShowException(out, ia); // will continue past driver failure
 			} catch (java.lang.reflect.InvocationTargetException ia) {
 				JDBCDisplayUtil.ShowException(out, ia); // will continue past driver failure
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
             } catch (ijException ie) {
                 JDBCDisplayUtil.ShowException(out, ie); // will continue past driver failure
             }
@@ -204,6 +216,7 @@ public void initFromEnvironment()
 	 * @param out sink for output from ij
 	 */
 	public void go(LocalizedInput[] in, LocalizedOutput out)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3420
 				   throws ijFatalException
 	{
 		this.out = out;
@@ -220,6 +233,7 @@ public void go(LocalizedInput[] in, LocalizedOutput out)
 			// figure out which version this is
             InputStream versionStream = util.getResourceAsStream(
                     "/" + ProductGenusNames.TOOLS_INFO);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
 			// figure out which version this is
 			ProductVersionHolder ijVersion = 
@@ -245,8 +259,10 @@ public void go(LocalizedInput[] in, LocalizedOutput out)
 			}
 			firstRun = false;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5342
 			supportIJProperties(connEnv[currCE]);
     	}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 		this.out = out;
 		runScriptGuts();
 		cleanupGo(in);
@@ -262,12 +278,14 @@ public void go(LocalizedInput[] in, LocalizedOutput out)
 	public int goScript(Connection conn,
 			LocalizedInput in)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5342
 	    connEnv[0].addSession(conn, (String) null);
         ijParser.setConnection(connEnv[0], (numConnections > 1));
 	    supportIJProperties(connEnv[0]);   
 	    		
 		fileInput = initialFileInput = !in.isStandardInput();
 		commandGrabber[0].ReInit(in);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 		return runScriptGuts();
 	}
 	
@@ -276,6 +294,7 @@ private void supportIJProperties(ConnectionEnv env) {
         //accordingly. 
         boolean showNoCountForSelect = Boolean.valueOf(util.getSystemProperty("ij.showNoCountForSelect")).booleanValue();
         JDBCDisplayUtil.setShowSelectCount( !showNoCountForSelect );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6197
 
         //check if the property is set to not show initial connections and accordingly set the
         //static variable.
@@ -312,6 +331,7 @@ private int runScriptGuts() {
 
 			connEnv[currCE].doPrompt(true, out);
    			try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
    				command = null;
 				out.flush();
 				command = commandGrabber[currCE].nextStatement();
@@ -321,6 +341,7 @@ private int runScriptGuts() {
 				while (command == null && ! oldGrabbers.empty()) {
 					// close the old input file if not System.in
 					if (fileInput) commandGrabber[currCE].close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					commandGrabber[currCE] = oldGrabbers.pop();
 					if (oldGrabbers.empty())
 						fileInput = initialFileInput;
@@ -371,6 +392,7 @@ private int runScriptGuts() {
 				}
 
     			} catch (ParseException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
  					if (command != null)
                         scriptErrorCount += doCatch(command) ? 0 : 1;
 				} catch (TokenMgrError e) {
@@ -389,6 +411,7 @@ private int runScriptGuts() {
     			} catch (Throwable e) {
                     scriptErrorCount++;
     			  	out.println(langUtil.getTextMessage("IJ_JavaErro0",e.toString()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                     e.printStackTrace();
 					doTrace(e);
 				}
@@ -397,6 +420,7 @@ private int runScriptGuts() {
 			currCE = ++currCE % connEnv.length;
 		}
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
         return scriptErrorCount;
 	}
 	
@@ -420,6 +444,7 @@ private void cleanupGo(LocalizedInput[] in) {
 		// similarly must close input files
 		for (int i = 0; i < numConnections; i++) {
 			try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 				in[i].close();	
 			} catch (Exception e ) {
     			  	out.println(langUtil.getTextMessage("IJ_CannotCloseInFile",
@@ -485,6 +510,7 @@ private void displayResult(LocalizedOutput out, ijResult result, Connection conn
 					JDBCDisplayUtil.ShowWarnings(out,result.getSQLWarnings());
 					result.clearSQLWarnings();
 				}
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 			} else if (result.isResultSet()) {
 				ResultSet rs = result.getResultSet();
 				try {
@@ -494,7 +520,9 @@ private void displayResult(LocalizedOutput out, ijResult result, Connection conn
 					throw se;
 				}
 				result.closeStatement();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2222
             } else if (result.isMultipleResultSetResult()) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
               List<ResultSet> resultSets = result.getMultipleResultSets();
               try {
                 JDBCDisplayUtil.DisplayMultipleResults(out,resultSets,
@@ -541,6 +569,7 @@ private boolean doCatch(String command) {
 				langUtil.getNumberAsString(endTime - beginTime)));
 			}
             return true;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 
 	    } catch (SQLException e) {
 			// SQL exception occurred in ij's actions; print and continue
@@ -554,9 +583,11 @@ private boolean doCatch(String command) {
 			doTrace(ie);
 	    } catch (Throwable t) {
 	  		out.println(langUtil.getTextMessage("IJ_JavaErro0_7", t.toString()));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             t.printStackTrace();
 			doTrace(t);
 	    }
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
         return false;
 	}
 
@@ -573,6 +604,7 @@ private void handleSQLException(LocalizedOutput out, SQLException e)
 		String sqlState = null;
 		SQLException fatalException = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 		if (showErrorCode) {
 			errorCode = langUtil.getTextMessage("IJ_Erro0", 
 			langUtil.getNumberAsString(e.getErrorCode()));
@@ -584,6 +616,7 @@ private void handleSQLException(LocalizedOutput out, SQLException e)
 		boolean syntaxErrorOccurred = false;
 		for (; e!=null; e=e.getNextException())
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3408
 			sqlState = e.getSQLState();
 			if ("42X01".equals(sqlState))
 				syntaxErrorOccurred = true;
@@ -609,12 +642,14 @@ private void handleSQLException(LocalizedOutput out, SQLException e)
 			String st1 = JDBCDisplayUtil.mapNull(e.getSQLState(),langUtil.getTextMessage("IJ_NoSqls"));
 			String st2 = JDBCDisplayUtil.mapNull(e.getMessage(),langUtil.getTextMessage("IJ_NoMess"));
 			out.println(langUtil.getTextMessage("IJ_Erro012",  st1, st2, errorCode));
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 			doTrace(e);
 		}
 		if (fatalException != null)
 		{
 			throw new ijFatalException(fatalException);
 		}
+//IC see: https://issues.apache.org/jira/browse/DERBY-3408
 		if (syntaxErrorOccurred)
 			out.println(langUtil.getTextMessage("IJ_SuggestHelp"));
 	}
@@ -623,6 +658,7 @@ private void handleSQLException(LocalizedOutput out, SQLException e)
 	 * stack trace dumper
 	 */
 	private void doTrace(Throwable t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 		if (ijExceptionTrace != null) {
 			t.printStackTrace(out);
 		}
@@ -641,6 +677,7 @@ void newInput(String fileName) {
 		// if the file was opened, move to use it for input.
 		oldGrabbers.push(commandGrabber[currCE]);
 	    commandGrabber[currCE] = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2255
                 new StatementFinder(langUtil.getNewInput(new BufferedInputStream(newFile, BUFFEREDFILESIZE)), null);
 		fileInput = true;
 	}
@@ -650,6 +687,7 @@ void newResourceInput(String resourceName) {
 		if (is==null) throw ijException.resourceNotFound();
 		oldGrabbers.push(commandGrabber[currCE]);
 	    commandGrabber[currCE] = 
+//IC see: https://issues.apache.org/jira/browse/DERBY-2255
                 new StatementFinder(langUtil.getNewEncodedInput(new BufferedInputStream(is, BUFFEREDFILESIZE), "UTF8"), null);
 		fileInput = true;
 	}
@@ -683,6 +721,7 @@ void setMtUse(boolean b) {
      * @exception SQLException if a database error occurs
      */
     private void checkScrollableCursor(ResultSet rs, String operation)
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
             throws ijException, SQLException {
         if (rs.getType() == ResultSet.TYPE_FORWARD_ONLY) {
             throw ijException.forwardOnlyCursor(operation);
@@ -704,6 +743,7 @@ private void checkScrollableCursor(ResultSet rs, String operation)
 	ijResult absolute(ResultSet rs, int row)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
         checkScrollableCursor(rs, "ABSOLUTE");
 		// 0 is an *VALID* value for row
 		return new ijRowResult(rs, rs.absolute(row));
@@ -724,6 +764,7 @@ ijResult absolute(ResultSet rs, int row)
 	ijResult relative(ResultSet rs, int row)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
         checkScrollableCursor(rs, "RELATIVE");
 		return new ijRowResult(rs, rs.relative(row));
 	}
@@ -742,6 +783,7 @@ ijResult relative(ResultSet rs, int row)
 	ijResult beforeFirst(ResultSet rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
         checkScrollableCursor(rs, "BEFORE FIRST");
 		rs.beforeFirst();
 		return new ijRowResult(rs, false);
@@ -761,6 +803,7 @@ ijResult beforeFirst(ResultSet rs)
 	ijResult first(ResultSet rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
         checkScrollableCursor(rs, "FIRST");
 		return new ijRowResult(rs, rs.first());
 	}
@@ -779,6 +822,7 @@ ijResult first(ResultSet rs)
 	ijResult afterLast(ResultSet rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
         checkScrollableCursor(rs, "AFTER LAST");
 		rs.afterLast();
 		return new ijRowResult(rs, false);
@@ -798,6 +842,7 @@ ijResult afterLast(ResultSet rs)
 	ijResult last(ResultSet rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
         checkScrollableCursor(rs, "LAST");
 		return new ijRowResult(rs, rs.last());
 	}
@@ -816,6 +861,7 @@ ijResult last(ResultSet rs)
 	ijResult previous(ResultSet rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
         checkScrollableCursor(rs, "PREVIOUS");
 		return new ijRowResult(rs, rs.previous());
 	}
@@ -833,6 +879,7 @@ ijResult previous(ResultSet rs)
 	int getCurrentRowNumber(ResultSet rs)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
         checkScrollableCursor(rs, "GETCURRENTROWNUMBER");
 		return rs.getRow();
 	}
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/xaHelper.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/xaHelper.java
index ec7aa4958f..d8cc7f5495 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/xaHelper.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/xaHelper.java
@@ -65,6 +65,8 @@ public xaHelper()
 	  
 	public void setFramework(String fm)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-578
+//IC see: https://issues.apache.org/jira/browse/DERBY-1464
                 if (fm == null) {
                     return;
                 }
@@ -79,6 +81,7 @@ else if (framework.equals("DERBYNETCLIENT"))
 		
 	private Xid makeXid(int xid)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-576
 		try {
 			return new ijXid(xid, databaseName.getBytes("UTF-8"));
 		} catch (UnsupportedEncodingException e) {
@@ -100,6 +103,7 @@ public void XADataSourceStatement(ij parser, Token dbname, Token shutdown,
 			  
 			  if (isJCC || isNetClient)
 			  {
+//IC see: https://issues.apache.org/jira/browse/DERBY-413
 			  	String hostName = System.getProperty("hostName");
 			  	if ((hostName != null ) && (!hostName.equals("localhost")))
 				{			
@@ -226,6 +230,7 @@ public Connection XAGetConnectionStatement(ij parser, String n) throws SQLExcept
 		}
 		catch(Throwable t)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5803
             throw handleException(t);
 		}
 	}
@@ -293,6 +298,7 @@ public ijResult RecoverStatement(ij parser, int flag) throws SQLException
             throw handleException(t);
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Vector<String> v = new Vector<String>();
 		v.addElement("");
 		v.addElement(LocalizedResource.getMessage("IJ_Reco0InDoubT", LocalizedResource.getNumber(val.length)));
@@ -312,6 +318,7 @@ public void RollbackStatement(ij parser, int xid) throws SQLException
 		}
 		catch(Throwable t)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5803
             throw handleException(t);
 		}
 	}
@@ -324,6 +331,14 @@ public void StartStatement(ij parser, int flag, int xid) throws SQLException
 		}
 		catch(Throwable t)
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-5803
+//IC see: https://issues.apache.org/jira/browse/DERBY-5803
+//IC see: https://issues.apache.org/jira/browse/DERBY-5803
+//IC see: https://issues.apache.org/jira/browse/DERBY-5803
+//IC see: https://issues.apache.org/jira/browse/DERBY-5803
+//IC see: https://issues.apache.org/jira/browse/DERBY-5803
+//IC see: https://issues.apache.org/jira/browse/DERBY-5803
+//IC see: https://issues.apache.org/jira/browse/DERBY-5803
             throw handleException(t);
 		}
 	}
@@ -412,6 +427,7 @@ private SQLException handleException(Throwable t)
 		}
 		else // StandardException or run time exception, log it first
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-427
 			String info = LocalizedResource.getMessage("IJ_01SeeLog", t.toString(), t.getMessage());
 			//		t.printStackTrace(System.out);
 			throw new ijException(info);
@@ -426,6 +442,7 @@ public Connection DataSourceStatement(ij parser, Token dbname, Token protocol,
 	{
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz = Class.forName("org.apache.derby.jdbc.EmbeddedDataSource");
 			currentDataSource = (DataSource) (clazz.getConstructor().newInstance());
 		} catch (Exception e) {
@@ -460,6 +477,7 @@ public void CPDataSourceStatement(ij parser, Token dbname, Token protocol)
 		 throws SQLException
 	{
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
           Class<?> clazz = Class.forName("org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource");
           currentCPDataSource = (ConnectionPoolDataSource) (clazz.getConstructor().newInstance());
 		} catch (Exception e) {
@@ -500,6 +518,7 @@ public Connection CPGetConnectionStatement(ij parser, String n)
 	public void CPDisconnectStatement(ij parser, String n) throws SQLException
 	{
 		if (currentPooledConnection == null)
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
 			throw ijException.noSuchConnection(LocalizedResource.getMessage("PooledConnection"));
 		currentPooledConnection.close();
 		currentPooledConnection = null;
@@ -518,6 +537,7 @@ private XADataSource getXADataSource() throws Exception
 		// if we new it directly, then it will the tools.jar file to bloat.
 		try
 		{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
             Class<?> clazz;
             if (isJCC)
             {
@@ -540,6 +560,7 @@ else if (isNetClient){
                         // ClientXADataSource
                     }
                     
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     clazz = Class.forName("org.apache.derby.jdbc.ClientXADataSource");
                                                          
                     return (XADataSource) clazz.getConstructor().newInstance();
@@ -562,6 +583,7 @@ else if (isNetClient){
                         // EmbeddedXADataSource
                     }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                     clazz = Class.forName("org.apache.derby.jdbc.EmbeddedXADataSource");
                     return (XADataSource) clazz.getConstructor().newInstance();
                 } else {
@@ -591,6 +613,7 @@ private static void setDataSourceProperty(Object ds, String property, int
 			"set" + Character.toUpperCase(property.charAt(0)) + property.substring(1);
 		try {
 			java.lang.reflect.Method m = ds.getClass().getMethod(methodName, INT_P);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			m.invoke(ds, new Object[] {value});
 		}
 		catch (Exception e)
@@ -623,6 +646,7 @@ private static void setDataSourceProperty(Object ds, String property, boolean va
 
 		try {
 			java.lang.reflect.Method m = ds.getClass().getMethod(methodName, BOOLEAN_P);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 			m.invoke(ds, new Object[] {value});
 			return;
 		} catch (Exception nsme) {
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java
index 9b4fdf0e58..d605c15b77 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java
@@ -811,6 +811,7 @@ private void    appendTableFunctionSignature( StringBuffer buffer, Connection co
     private Object  getDummyValue( Class type )
     {
         if ( String.class == type ) { return ""; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
         else if ( Integer.TYPE == type ) { return 1; }
         else if ( Short.TYPE == type ) { return (short) 1; }
         else if ( Boolean.TYPE == type ) { return Boolean.TRUE; }
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/optional/ForeignDBViews.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/optional/ForeignDBViews.java
index e5f3373c0a..754d4507e7 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/optional/ForeignDBViews.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/optional/ForeignDBViews.java
@@ -174,6 +174,7 @@ public  void    unloadTool( String... configurationParameters )
         for ( String schemaName : schemas ) { dropDerbySchema( derbyConn, schemaName ); }
 
         // now drop the connection to the foreign database
+//IC see: https://issues.apache.org/jira/browse/DERBY-6440
         ForeignTableVTI.dropConnection( foreignConnectionURL );
     }
 
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/AccessDatabase.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/AccessDatabase.java
index eedd85c272..179749a628 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/AccessDatabase.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/AccessDatabase.java
@@ -80,6 +80,7 @@ public int getDepth() {
      */
     public AccessDatabase(String dburl, String aSchema, String aQuery)
             throws InstantiationException, IllegalAccessException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                    ClassNotFoundException, SQLException, NoSuchMethodException, InvocationTargetException
     {
         this(createConnection(dburl), aSchema, aQuery);
@@ -115,6 +116,7 @@ public AccessDatabase(Connection aConn, String aSchema, String aQuery)
      */
     private static Connection createConnection(String dbURL)
             throws InstantiationException, IllegalAccessException,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                    ClassNotFoundException, SQLException, NoSuchMethodException,
                    InvocationTargetException
     {
@@ -149,6 +151,7 @@ private void setSchema() throws SQLException {
      */
     private boolean schemaExists() throws SQLException {
     	ResultSet result = conn.getMetaData().getSchemas();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6297
         try {
             while (result.next()) {
                 if (result.getString(1).equals(schema)) {
@@ -590,6 +593,7 @@ public void closeConnection()
      * @return data array of TreeNode Objects
      */
     public TreeNode[] getData() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6197
         return (TreeNode[]) ToolUtils.copy( data );
     }
 }
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/CreateHTMLFile.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/CreateHTMLFile.java
index 933bf4d20d..fec07fa5a7 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/CreateHTMLFile.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/CreateHTMLFile.java
@@ -50,6 +50,8 @@ public class CreateHTMLFile {
 	 */
     public void getHTML(String XMLFileName, String XSLSheetName,
             String HTMLFile, boolean def) throws Exception{
+//IC see: https://issues.apache.org/jira/browse/DERBY-4587
+//IC see: https://issues.apache.org/jira/browse/DERBY-4758
 
         if(!(HTMLFile.toUpperCase()).endsWith(".HTML"))
             HTMLFile +=".html";
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/CreateXMLFile.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/CreateXMLFile.java
index 6b78a80a43..0e7333ff8e 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/CreateXMLFile.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter/CreateXMLFile.java
@@ -45,6 +45,7 @@ public CreateXMLFile(AccessDatabase access) {
      * @throws IOException
      */
     public void writeTheXMLFile(String stmt, String time,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
                                 Writer out, String xsl_sheet_name)
     throws IOException {
 
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java
index 49172a7454..a174075d5b 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java
@@ -62,6 +62,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-826
   <P>
   Sysinfo reports values relevant to the current Derby configuration.
 
@@ -73,6 +74,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   classpath, and eliminates any duplicated information. If no files
   are found, or some other exception occurs, the
   value returned will be "<info unavailable>".
+//IC see: https://issues.apache.org/jira/browse/DERBY-5879
 
   <P>
   This class can be used to print out system information at the
@@ -81,6 +83,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
     java org.apache.derby.tools.sysinfo
   </PRE>
   Alternatively, you can use SysInfo within your program to display
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
   Derby information; a Derby version string is returned by this Java code:
   <PRE>
     new Main().toString();
@@ -105,17 +108,20 @@ public final class Main {
      */
     private final static LocalizedResource LOCALIZED_RESOURCE =
         new LocalizedResource(LocalizedResource.SYSINFO_MESSAGE_FILE);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
     private static final String TEST_CLASS_NAME = "org.apache.derbyTesting.junit.XATestUtil";
   
   /**
     Application entry point for SysInfo.   This will print out
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
     the Derby product information as well as a snapshot of
     the System properties.
   */
   public static void main(String args[]) {
         // adjust the application in accordance with derby.ui.locale and derby.ui.codeset
         LocalizedResource.getInstance().init();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2903
 
 		LocalizedOutput out;
 
@@ -139,6 +145,7 @@ public static void getMainInfo (java.io.PrintWriter aw, boolean pause) {
     aw.println (javaSep);
     reportJavaInfo (aw);
     aw.println (jbmsSep);
+//IC see: https://issues.apache.org/jira/browse/DERBY-920
     reportDerby (aw);
     aw.println (sep);
 
@@ -154,6 +161,7 @@ public static void getMainInfo (java.io.PrintWriter aw, boolean pause) {
     }
     
     // derbyTesting info
+//IC see: https://issues.apache.org/jira/browse/DERBY-6468
     try {
         reportTesting(aw);
     }
@@ -231,6 +239,7 @@ private static void reportDerby (java.io.PrintWriter localAW) {
 
 	  String classpath = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
       if (JVMInfo.isModuleAware())
       {
           classpath = JVMInfo.getSystemModulePath();
@@ -239,6 +248,7 @@ private static void reportDerby (java.io.PrintWriter localAW) {
       {
           try
           {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
               classpath = AccessController.doPrivileged( new PrivilegedAction<String>()
               {
                   public String run()
@@ -248,6 +258,7 @@ public String run()
               }
               );
 	      }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 	      catch (SecurityException se)
           {
               localAW.println(Main.getTextMessage ("SIF01.U", se.getMessage()));
@@ -275,6 +286,7 @@ public String run()
 
 
   } // end of reportDerby
+//IC see: https://issues.apache.org/jira/browse/DERBY-920
 
   /**
     Writes out the relevant info about the Java environment to
@@ -320,6 +332,7 @@ private static void reportJavaInfo (java.io.PrintWriter localAW) {
 
 	localAW.println("java.specification.name: " + getJavaProperty("java.specification.name"));
 	localAW.println("java.specification.version: " + getJavaProperty("java.specification.version"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4441
 	printPropertyIfNotNull(localAW, "java.runtime.version");
 	printPropertyIfNotNull(localAW, "java.fullversion");
 
@@ -365,6 +378,7 @@ private static String getJavaProperty (final String whichProperty, boolean nullU
     final   String unavailable = nullUnavailable ? null : Main.getTextMessage ("SIF01.H");
 
     try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         String  property = AccessController.doPrivileged( new PrivilegedAction<String>()
             {
                 public  String  run()
@@ -393,7 +407,9 @@ public  String  run()
      */
     private static String getCanonicalPath(final File f) throws IOException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4617
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             return AccessController
                     .doPrivileged(new PrivilegedExceptionAction<String>() {
                         public String run() throws IOException {
@@ -449,6 +465,7 @@ private static void reportLocales (java.io.PrintWriter localAW) {
 
 	Locale[] supportedLocales = Locale.getAvailableLocales();
     Arrays.sort(supportedLocales, new LocaleSorter());
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
     Properties p = new Properties ();
     for (int i = 0; i < supportedLocales.length; i++) {
@@ -469,6 +486,8 @@ public InputStream run() throws IOException {
 
                     if (JVMInfo.isModuleAware())
                     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                         String moduleName = ModuleUtil.localizationModuleName(locale.toString());
                         Module localizationModule = ModuleUtil.derbyModule(moduleName);
 
@@ -537,6 +556,7 @@ public InputStream run() throws IOException {
 
       }
       catch (Throwable t) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         localAW.println ("Could not load resource: " + finalLocaleResource);
         localAW.println ("Exception: " + t);
       }
@@ -550,6 +570,7 @@ public InputStream run() throws IOException {
 
   /**
   Writes out information about the derbyTesting classes with the product.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6468
 
   @param localAW the AppStreamWriter to which the info is written. If this
   value is null, the info is written to System.out
@@ -560,11 +581,13 @@ private static void reportTesting (java.io.PrintWriter localAW) {
       String hdr="org.apache.derbyTesting.*:";
       Properties p = new Properties ();
       String tstingResource ="/org/apache/derby/info/tsting/info.properties";
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
       final Properties finalp = p;
       final String finalTstingResource = tstingResource;
       try {
           InputStream is = AccessController.doPrivileged
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                   (new PrivilegedExceptionAction<InputStream>() {
                       public InputStream run() throws IOException {
                           Class loadingClass = Main.class;
@@ -574,6 +597,7 @@ public InputStream run() throws IOException {
                           {
                               String moduleName = ModuleUtil.TESTING_MODULE_NAME;
                               Module testingModule = ModuleUtil.derbyModule(moduleName);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
                               if (testingModule != null)
                               {
@@ -599,12 +623,14 @@ public InputStream run() throws IOException {
                   //Displaying Testing info
                   //String tstingName = p.getProperty("derby.tsting.external.name");
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                   URL testJarURL = null;
                   
                   if (JVMInfo.isModuleAware())
                   {
                       try
                       {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
                           Module testingModule = ModuleUtil.derbyModule(ModuleUtil.TESTING_MODULE_NAME);
                           Class testingClass = testingModule.getClassLoader().loadClass(TEST_CLASS_NAME);
                           testJarURL = testingClass.getProtectionDomain().getCodeSource().getLocation();
@@ -675,6 +701,8 @@ public InputStream run() throws IOException {
 	private static final String MAINUSAGESTRING = "java org.apache.derby.tools.sysinfo -cp";
 
     private static final String USAGESTRINGPARTA = MAINUSAGESTRING + " [ [ "
+//IC see: https://issues.apache.org/jira/browse/DERBY-4806
+//IC see: https://issues.apache.org/jira/browse/DERBY-4597
             + EMBEDDED + " ][ " + NET + " ][ " + CLIENT + "] [ " + TOOLS
             + " ] [";
     private static final String USAGESTRINGPARTB = ".class ] ]";
@@ -810,12 +838,14 @@ private static void tryUtilsClasspath(StringBuffer successes, StringBuffer failu
 	
 	private static void tryTstingClasspath(StringBuffer successes, StringBuffer failures) {
         // use a class that is not dependent on junit
+//IC see: https://issues.apache.org/jira/browse/DERBY-6532
         tryMyClasspath("org.apache.derbyTesting.junit.XATestUtil", "", successes, failures);
     }
 
 	private static void tryMyClasspath(String cn, String library, StringBuffer successes, StringBuffer failures) {
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-668
 			Class c = Class.forName(cn);
                         String loc = getFileWhichLoadedClass(c);
                         successes.append(found(cn, library, loc));
@@ -835,6 +865,7 @@ private static void tryAsResource(String cn, String library, StringBuffer succes
 		try {
 			java.io.InputStream in = cn.getClass().getResourceAsStream(cn);
 			in.close();
+//IC see: https://issues.apache.org/jira/browse/DERBY-668
                         String loc = getFileWhichLoadedClass(cn.getClass());
 			successes.append(found(cn, library, loc));
 		}
@@ -850,6 +881,7 @@ private static String found(String cn, String library, String loc) {
 		StringBuffer temp = new StringBuffer(crLf());
 		temp.append("   " + library);
 		temp.append(crLf());
+//IC see: https://issues.apache.org/jira/browse/DERBY-668
                 if (loc != null)
                     temp.append("   ").append(loc).append(crLf());
 		temp.append(crLf());
@@ -923,6 +955,7 @@ private static String argumentMatches(String[] args, String ss) {
 
     private static final String infoNames[] =
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         org.apache.derby.shared.common.info.ProductGenusNames.DBMS_INFO,
         org.apache.derby.shared.common.info.ProductGenusNames.TOOLS_INFO,
         org.apache.derby.shared.common.info.ProductGenusNames.NET_INFO,
@@ -971,6 +1004,7 @@ private static String argumentMatches(String[] args, String ss) {
     public static ZipInfoProperties[] getAllInfo(String classpath)
     {
         ZipInfoProperties zips[] = loadZipFromResource();
+//IC see: https://issues.apache.org/jira/browse/DERBY-826
 
         // No info properties files found, but here we are in sysinfo.
         // Avoid an NPE in mergeZips by creating a ZipInfoProperties array
@@ -988,6 +1022,7 @@ public static ZipInfoProperties[] getAllInfo(String classpath)
 			if (classpath != null) {
 				String cp [] = parseClasspath(classpath);
 				List<String> jarNamesList = Arrays.asList(jarNames);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 				Vector<ZipInfoProperties> v = new Vector<ZipInfoProperties>();
 				for (int i = 0; i < cp.length; i++)
 				{
@@ -1004,6 +1039,7 @@ public static ZipInfoProperties[] getAllInfo(String classpath)
                     if (!matches)
                         continue;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1229
 					ZipInfoProperties zip = null;
 					try {
 						zip = checkForInfo(cp[i]);
@@ -1021,6 +1057,7 @@ public static ZipInfoProperties[] getAllInfo(String classpath)
 				}
 				if (v.size() > 0)
 				{
+//IC see: https://issues.apache.org/jira/browse/DERBY-826
 					ZipInfoProperties cpzips[] = new ZipInfoProperties[v.size()];
 					v.copyInto(cpzips);
 					return mergeZips(zips, cpzips);
@@ -1033,6 +1070,7 @@ public static ZipInfoProperties[] getAllInfo(String classpath)
         {
             ZipInfoProperties zip[] = new ZipInfoProperties[1];
             zip[0] = new ZipInfoProperties(null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1229
             zip[0].setLocation(
 					Main.getTextMessage ("SIF03.C", se.getMessage()));
             return zip;
@@ -1051,11 +1089,13 @@ public static ZipInfoProperties[] getAllInfo(String classpath)
     private static ZipInfoProperties [] loadZipFromResource()
     {
 		java.util.ArrayList<ZipInfoProperties> al = new java.util.ArrayList<ZipInfoProperties>();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         for (int i = 0; i < infoNames.length; i++)
         {
             final String resource = "/".concat(infoNames[i]);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             InputStream is = AccessController.doPrivileged
             (new PrivilegedAction<InputStream>() {
                 public InputStream run() {
@@ -1072,6 +1112,7 @@ public InputStream run() {
 			ZipInfoProperties ze = new ZipInfoProperties(ProductVersionHolder.getProductVersionHolderFromMyEnv(is));
  
                         // get the real location of the info file
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                         URL locUrl = AccessController.doPrivileged
                         (new PrivilegedAction<URL>() {
                             public URL run() {
@@ -1130,6 +1171,7 @@ public URL run() {
      */
     private static ZipInfoProperties checkForInfo(final String cpEntry)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return AccessController.doPrivileged( new PrivilegedAction<ZipInfoProperties>()
             {
                 public ZipInfoProperties run()
@@ -1190,6 +1232,7 @@ private static ZipInfoProperties checkDirectory(String dirname)
             InputStream bis = new FileInputStream(f);
 
             ZipInfoProperties zip = new ZipInfoProperties(ProductVersionHolder.getProductVersionHolderFromMyEnv(bis));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4617
             zip.setLocation(getCanonicalPath(new File(dirname)).replace('/', File.separatorChar));
             return zip;
         }
@@ -1239,6 +1282,7 @@ private static ZipInfoProperties checkFile(String filename)
             }
 
             ZipInfoProperties zip = new ZipInfoProperties(ProductVersionHolder.getProductVersionHolderFromMyEnv(bis));
+//IC see: https://issues.apache.org/jira/browse/DERBY-4617
             zip.setLocation(getCanonicalPath(new File(filename)).replace('/', File.separatorChar));
             return zip;
 
@@ -1256,6 +1300,7 @@ private static ZipInfoProperties checkFile(String filename)
 	*/
 
     public static String getTextMessage(String msgId, Object... arguments) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3142
         return LOCALIZED_RESOURCE.getTextMessage(msgId, arguments);
 	}
 
@@ -1268,6 +1313,7 @@ public static String getTextMessage(String msgId, Object... arguments) {
      */
     private static String getFileWhichLoadedClass(final Class cls)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
          return AccessController.doPrivileged( new PrivilegedAction<String>()
         {
             public String run()
@@ -1277,6 +1323,7 @@ public String run()
                     cs = cls.getProtectionDomain().getCodeSource ();
                 }
                 catch (SecurityException se) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2128
                     return Main.getTextMessage(
                         "SIF01.V", cls.getName(), se.getMessage());
                 }
@@ -1286,6 +1333,8 @@ public String run()
      
                 URL result = cs.getLocation ();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-4806
+//IC see: https://issues.apache.org/jira/browse/DERBY-4597
                 try {
                     // DERBY-4806 Should use UTF-8 according to
                     // http://www.w3.org/TR/html40/appendix/notes.html#non-ascii-chars
@@ -1318,8 +1367,10 @@ public String run()
      *  @return the merged array
      */
     private static ZipInfoProperties[] mergeZips(ZipInfoProperties[] zip1,
+//IC see: https://issues.apache.org/jira/browse/DERBY-826
                                                  ZipInfoProperties[] zip2)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         Vector<ZipInfoProperties> v = new Vector<ZipInfoProperties>();
         boolean foundDup = false;
   
@@ -1346,6 +1397,7 @@ private static ZipInfoProperties[] mergeZips(ZipInfoProperties[] zip1,
           {
             for (int k = 0; k < v.size(); k++)
             {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
                 ZipInfoProperties z = v.get(k);
                 if (zip2[j].getLocation().equals(z.getLocation()))
                   foundDup = true;
@@ -1370,6 +1422,7 @@ private static ZipInfoProperties[] mergeZips(ZipInfoProperties[] zip1,
      */
     private static String formatURL(URL loc)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3132
         String filename;
         try {
             // Should use UTF-8 according to
@@ -1393,8 +1446,11 @@ private static String formatURL(URL loc)
 
         String result = ""; 
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4617
             result = getCanonicalPath(new File(filename)).replace('/', File.separatorChar);
         } catch (IOException e) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4806
+//IC see: https://issues.apache.org/jira/browse/DERBY-4597
             result = e.getMessage();
         }
         return result;
@@ -1405,6 +1461,7 @@ public static class LocaleSorter implements Comparator<Locale>
     {
         public int compare(Locale left, Locale right)
         {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             return left.toString().compareTo(right.toString());
         }
     }
diff --git a/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java b/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java
index 45a33f5c7c..2ee77e2c93 100644
--- a/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java
+++ b/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java
@@ -33,6 +33,7 @@ public class ZipInfoProperties // extends Properties
 	private final ProductVersionHolder	version;
     /**
         full path to zip (or expanded zip)
+//IC see: https://issues.apache.org/jira/browse/DERBY-2400
         C:/derby/lib/tools.zip
             -or-
         D:\myWorkDir\derby\lib\ *expanded*
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
index da5937c7be..79c1d2c6d6 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
@@ -41,7 +41,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * @see ClientConnectionPoolDataSource40
  */
 public class BasicClientConnectionPoolDataSource40
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         extends BasicClientDataSource40
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
         implements ConnectionPoolDataSource,
                    ClientConnectionPoolDataSourceInterface {
 
@@ -50,9 +52,11 @@ public class BasicClientConnectionPoolDataSource40
     /** Message utility used to obtain localized messages. */
     private static final MessageUtil msgUtil =
             new MessageUtil(MessageUtil.CLIENT_MESSAGE_RESOURCE_NAME);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 
     public static final String className__ =
             "org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40";
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
 
     /**
      * Specifies the maximum number of statements that can be cached per
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicClientXADataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicClientXADataSource40.java
index b759945cda..d7b54ce85e 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicClientXADataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicClientXADataSource40.java
@@ -37,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * i.e. it does not implement {@code javax.naming.Referenceable}.
  */
 public class BasicClientXADataSource40
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
     extends BasicClientDataSource40
     implements ClientXADataSourceInterface,
                XADataSource /* compile-time check of 41 extensions */ {
@@ -63,6 +64,9 @@ public XAConnection getXAConnection(String user, String password)
 
     /** Added by Java 9 */
     public ShardingKeyBuilder createShardingKeyBuilder()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
         throws SQLException
     {
         throw new java.sql.SQLFeatureNotSupportedException();
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
index 545decd658..816da67bb8 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
@@ -37,6 +37,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * @see EmbeddedConnectionPoolDataSource40
  */
 public class BasicEmbeddedConnectionPoolDataSource40
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
     extends BasicEmbeddedDataSource40
     implements javax.sql.ConnectionPoolDataSource,
         EmbeddedConnectionPoolDataSourceInterface {
@@ -83,6 +84,7 @@ private PooledConnection createPooledConnection (
             String password,
             boolean requestPassword) throws SQLException {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         findDriver();
         return new EmbedPooledConnection(this, user, password, requestPassword);
     }
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
index e4d5a33f3d..8b76c7c81b 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
@@ -90,6 +90,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * @see EmbeddedDataSource
  */
 public class BasicEmbeddedDataSource40 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
     implements javax.sql.DataSource, java.io.Serializable, 
                EmbeddedDataSourceInterface
 {
@@ -598,6 +599,7 @@ public boolean getAttributesAsPassword() {
     @Override
     public boolean equals(Object other) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
         if (other instanceof EmbeddedDataSource) {
             EmbeddedDataSource ds = (EmbeddedDataSource)other;
 
@@ -863,6 +865,7 @@ protected static ResourceAdapter setupResourceAdapter(
                     // if monitor is never setup by any ModuleControl,
                     // getMonitor returns null and no Derby database
                     // has been booted.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                     if (getMonitor() != null) {
                         database = (Database)
                             findService(Property.DATABASE_MODULE,
@@ -881,6 +884,7 @@ protected static ResourceAdapter setupResourceAdapter(
 
                         // now try to find it again
                         database = (Database)
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
                             findService(Property.DATABASE_MODULE,
                                                 dbName);
                     }
@@ -944,6 +948,7 @@ public  Logger getParentLogger() throws SQLFeatureNotSupportedException
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
index e8bb2a2ed0..15861a118f 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
@@ -39,6 +39,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * @see EmbeddedXADataSource40
  */
 public class BasicEmbeddedXADataSource40
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
     extends BasicEmbeddedDataSource40
     implements
         EmbeddedXADataSourceInterface,
@@ -113,6 +114,7 @@ private XAConnection createXAConnection(
             boolean requestPassword) throws SQLException {
 
         // See comment for EmbeddedXADataSource#createXAConnection
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         findDriver();
         return new EmbedXAConnection(this, ra, user, password, requestPassword);
     }
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
index 5746bc0c86..87dc1d4ba9 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
@@ -39,11 +39,13 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  * Java Naming and Directory Interface (JNDI).
  */
 public class ClientConnectionPoolDataSource extends ClientDataSource 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
     implements ClientConnectionPoolDataSourceInterface
 {
     private static final long serialVersionUID = -539234282156481377L;
     /** Message utility used to obtain localized messages. */
     private static final MessageUtil msgUtil =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
             new MessageUtil(MessageUtil.CLIENT_MESSAGE_RESOURCE_NAME);
     public static final String className__ = "org.apache.derby.jdbc.ClientConnectionPoolDataSource";
 
@@ -66,6 +68,7 @@ public ClientConnectionPoolDataSource() {
 
     // Attempt to establish a physical database connection that can be used as a pooled connection.
     public PooledConnection getPooledConnection() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         return getPooledConnectionMinion();
     }
 
@@ -84,8 +87,11 @@ public PooledConnection getPooledConnection(String user, String password) throws
      */
     public void setMaxStatements(int maxStatements) {
         // Disallow negative values.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3325
+//IC see: https://issues.apache.org/jira/browse/DERBY-3329
         if (maxStatements < 0) {
             throw new IllegalArgumentException(msgUtil.getTextMessage(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     MessageId.CONN_NEGATIVE_MAXSTATEMENTS, maxStatements));
         }
         this.maxStatements = maxStatements;
@@ -118,6 +124,7 @@ private final void validateState() {
         // Make sure maxStatements is zero or higher.
         if (maxStatements < 0) {
             throw new IllegalArgumentException(msgUtil.getTextMessage(
+//IC see: https://issues.apache.org/jira/browse/DERBY-5873
                     MessageId.CONN_NEGATIVE_MAXSTATEMENTS, maxStatements));
         }
     }
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
index f647dbf9b8..2def4fdbf1 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientConnectionPoolDataSource40.java
@@ -24,6 +24,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import javax.sql.ConnectionPoolDataSource;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    <P>
    This is a vacuous, deprecated class. At one time, it had real behavior and helped us support
    separate datasources for Java 5 and Java 6.
@@ -34,6 +35,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class ClientConnectionPoolDataSource40
     extends ClientConnectionPoolDataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     implements ConnectionPoolDataSource /* compile-time
                                          * check for 4.1
                                          * extension */
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientDataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientDataSource40.java
index 0e37f8836f..9b5770ea43 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientDataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientDataSource40.java
@@ -24,6 +24,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import javax.sql.DataSource;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    <P>
    This is a vacuous, deprecated class. At one time, it had real behavior and helped us support
    separate datasources for Java 5 and Java 6.
@@ -33,6 +34,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
    @deprecated Use {@link ClientDataSource} instead.
  */
 public class ClientDataSource40 extends ClientDataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     implements DataSource /* compile-time check for 4.1 extension */
 {
    private static final long serialVersionUID = -3936981157692787843L;
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientXADataSource.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientXADataSource.java
index ca42251508..72776a9d7e 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientXADataSource.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientXADataSource.java
@@ -52,6 +52,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
  */
 public class ClientXADataSource
     extends ClientDataSource implements ClientXADataSourceInterface {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
 
     public static final String className__ = "org.apache.derby.jdbc.ClientXADataSource";
 
@@ -64,6 +65,7 @@ public ClientXADataSource() {
 
     @Override
     public XAConnection getXAConnection() throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         return getXAConnectionMinion();
     }
 
@@ -74,6 +76,9 @@ public XAConnection getXAConnection(String user, String password) throws SQLExce
 
     /** Added by Java 9 */
     public ShardingKeyBuilder createShardingKeyBuilder()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
         throws SQLException
     {
         throw new java.sql.SQLFeatureNotSupportedException();
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientXADataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientXADataSource40.java
index 84946d9c9b..7d82326bc8 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientXADataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/ClientXADataSource40.java
@@ -27,6 +27,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import javax.sql.XADataSource;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    <P>
    This is a vacuous, deprecated class. At one time, it had real behavior and helped us support
    separate datasources for Java 5 and Java 6.
@@ -36,12 +37,16 @@ Licensed to the Apache Software Foundation (ASF) under one or more
    @deprecated Use {@link ClientXADataSource} instead.
  */
 public class ClientXADataSource40 extends ClientXADataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
     implements XADataSource /* compile-time check for 4.1 extension */
 {
     private static final long serialVersionUID = -3463444509507830926L;
 
     /** Added by Java 9 */
     public ShardingKeyBuilder createShardingKeyBuilder()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
+//IC see: https://issues.apache.org/jira/browse/DERBY-6974
         throws SQLException
     {
         throw new java.sql.SQLFeatureNotSupportedException();
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
index f6dc37598c..8bb0930e8c 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
@@ -28,6 +28,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.apache.derby.impl.jdbc.EmbedPooledConnection;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    <P>
     This datasource is suitable for an application using embedded Derby,
     running on full Java SE 6 and higher, corresponding to 4.0 and higher.
@@ -60,6 +61,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
  */
 public class EmbeddedConnectionPoolDataSource extends EmbeddedDataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
     implements EmbeddedConnectionPoolDataSourceInterface
 {
 
@@ -85,6 +87,7 @@ public EmbeddedConnectionPoolDataSource() {
 	*/
     @Override
 	public final PooledConnection getPooledConnection() throws SQLException { 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1137
 		return createPooledConnection (getUser(), getPassword(), false);
 	}
 
@@ -147,6 +150,7 @@ private PooledConnection createPooledConnection (String user,
          * instantiating EmbeddedConnectionPoolDataSource) instead of
          * the newer one (EmbeddedConnectionPoolDataSource40).
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         findDriver();
         return new EmbedPooledConnection(this, user, password, requestPassword);
     }
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
index 97f202df45..7afb0feaec 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
@@ -21,15 +21,19 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.derby.jdbc;
 
 /** 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    <P>
    This is a vacuous, deprecated class. At one time, it had real behavior and helped us support
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
    separate data sources for Java 5 and Java 6.
    Now that we no longer support Java 5, all functionality has migrated into the superclass, EmbeddedConnectionPoolDataSource.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    This class is preserved for backward compatibility reasons.
    </P>
    @deprecated Use {@link EmbeddedConnectionPoolDataSource} instead.
  */
 public class EmbeddedConnectionPoolDataSource40 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
     extends EmbeddedConnectionPoolDataSource
     implements javax.sql.ConnectionPoolDataSource // compile-time check for
                                                   // 4.1 extension
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDataSource.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDataSource.java
index 0d016abd27..8725289c41 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDataSource.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDataSource.java
@@ -30,7 +30,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import javax.naming.StringRefAddr;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    <P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
     This data source is suitable for an application using embedded Derby,
     running on full Java SE 6 and higher, corresponding to 4.0 and higher.
     </P>
@@ -106,6 +108,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   E.g. <code>setConnectionAttributes("bootPassword=erd3234dggd3kazkj3000");</code>.
   <BR>The database name must be set by the DataSource property <code>databaseName</code> and not by setting the <code>databaseName</code>
   connection attribute in the <code>connectionAttributes</code> property.
+//IC see: https://issues.apache.org/jira/browse/DERBY-441
+//IC see: https://issues.apache.org/jira/browse/DERBY-441
 	<BR>
    Any attributes that can be set using a property of this DataSource implementation
    (e.g user, password) should not be set in connectionAttributes. Conflicting
@@ -188,6 +192,7 @@ XADataSource, a getXAConnection().getConnection() is necessary to cause the
 
 */
 public class EmbeddedDataSource extends ReferenceableDataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
                                 implements Referenceable
 {
 
@@ -239,6 +244,8 @@ public final Reference getReference() throws NamingException
 	{
         // These fields will be set by the JNDI server when it decides to
         // materialize a data source.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4955
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
         Reference ref = new Reference(
             this.getClass().getName(),
             "org.apache.derby.jdbc.ReferenceableDataSource",
@@ -281,6 +288,7 @@ private static void addBeanProperties(Object ths, Reference ref)
                 continue;
 
             Class<?> returnType = m.getReturnType();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
 
             if (Integer.TYPE.equals(returnType)
                     || Short.TYPE.equals(returnType)
@@ -293,6 +301,7 @@ private static void addBeanProperties(Object ths, Reference ref)
                 String propertyName = methodName.substring(3, 4).toLowerCase(
                         java.util.Locale.ENGLISH).concat(
                                 methodName.substring(4));
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
 
                 try {
                     Object ov = m.invoke(ths, (Object[])null);
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDataSource40.java
index 36d79386cc..c213ee8677 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDataSource40.java
@@ -22,15 +22,20 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.derby.jdbc;
 
 /** 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    <P>
    This is a vacuous, deprecated class. At one time, it had real behavior and helped us support
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
    separate data sources for Java 5 and Java 6.
    Now that we no longer support Java 5, all functionality has migrated into the superclass, EmbeddedDataSource.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    This class is preserved for backward compatibility reasons.
    </P>
    @deprecated Use {@link EmbeddedDataSource} instead.
 */
 public class EmbeddedDataSource40 extends EmbeddedDataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-4955
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
     implements javax.sql.DataSource /* compile-time check for 4.1 extension */
 {
    private static final long serialVersionUID = 4472591890758954803L;
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDriver.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDriver.java
index d853dfb745..83f65bef7f 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDriver.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedDriver.java
@@ -42,6 +42,7 @@ The embedded JDBC driver (Type 4) for Derby.
 	The driver automatically supports the correct JDBC specification version
 	for the Java Virtual Machine's environment.
 	<UL>
+//IC see: https://issues.apache.org/jira/browse/DERBY-2132
 	<LI> JDBC 4.0 - Java SE 6
 	<LI> JDBC 3.0 - Java 2 - JDK 1.4, J2SE 5.0
 	</UL>
@@ -67,6 +68,7 @@ method call, but adding the newInstance() guarantees
 	that Derby will be booted on any Java Virtual Machine.
 
 	<P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-2132
 	Note that you do not need to manually load the driver this way if you are
 	running on Jave SE 6 or later. In that environment, the driver will be
 	automatically loaded for you when your application requests a connection to
@@ -92,6 +94,7 @@ logging facility (by default to derby.log) all subsequent messages are sent to i
 public class EmbeddedDriver  implements Driver {
 
 	static {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
 		JDBCBoot.boot();
 	}
 
@@ -111,6 +114,7 @@ public EmbeddedDriver() {
     @see java.sql.Driver
 	*/
 	public boolean acceptsURL(String url) throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1459
 		return getDriverModule().acceptsURL(url);
 	}
 
@@ -122,6 +126,7 @@ public boolean acceptsURL(String url) throws SQLException {
 	public Connection connect(String url, Properties info)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1459
 		return getDriverModule().connect(url, info);
 	}
 
@@ -133,6 +138,7 @@ public Connection connect(String url, Properties info)
 	public  DriverPropertyInfo[] getPropertyInfo(String url, Properties info)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1459
 		return getDriverModule().getPropertyInfo(url, info);
 	}
 
@@ -142,6 +148,7 @@ public  DriverPropertyInfo[] getPropertyInfo(String url, Properties info)
      */
 	public int getMajorVersion() {
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1459
 			return (getDriverModule().getMajorVersion());
 		}
 		catch (SQLException se) {
@@ -192,6 +199,7 @@ private	Driver	getDriverModule()
 
     public  Logger getParentLogger() throws SQLFeatureNotSupportedException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         throw (SQLFeatureNotSupportedException) Util.notImplemented( "getParentLogger()" );
     }
 	
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedXADataSource.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedXADataSource.java
index 102f8a330d..79f4ed5e23 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedXADataSource.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedXADataSource.java
@@ -29,7 +29,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 /**
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    <P>
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
     This data source is suitable for an application using embedded Derby,
     running on full Java SE 6 or higher, corresponding to JDBC 4.0 and higher.
     EmbeddedXADataSource is an XADataSource implementation.
@@ -67,6 +69,7 @@ interface is typically registered with a JNDI service provider.
 
  */
 public class EmbeddedXADataSource extends EmbeddedDataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
                                   implements EmbeddedXADataSourceInterface
 {
 
@@ -103,7 +106,9 @@ public final XAConnection getXAConnection() throws SQLException
 	{
 		if (ra == null || !ra.isActive())
            ra = setupResourceAdapter(this, ra, null, null, false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1137
 		return createXAConnection (ra, getUser(), getPassword(), false);
 	}
 
@@ -122,7 +127,9 @@ public final XAConnection getXAConnection(String user, String password)
 	{
 		if (ra == null || !ra.isActive())
            ra = setupResourceAdapter(this, ra, user, password, true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1137
         return createXAConnection (ra, user, password, true);
 	}
 	
@@ -180,6 +187,7 @@ private XAConnection createXAConnection (ResourceAdapter ra,
          * instantiating EmbeddedXADataSource) instead of the newer one
          * (EmbeddedXADataSource40).
          */
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         findDriver();
         return new EmbedXAConnection(this, ra, user, password, requestPassword);
     }
@@ -192,6 +200,7 @@ private XAConnection createXAConnection (ResourceAdapter ra,
     @Override
     public ResourceAdapter getResourceAdapter()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2871
         return ra;
     }
 }
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedXADataSource40.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedXADataSource40.java
index 7c67b73a60..adf1563143 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedXADataSource40.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/EmbeddedXADataSource40.java
@@ -22,15 +22,18 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 package org.apache.derby.jdbc;
 
 /**
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    <P>
    This is a vacuous, deprecated class. At one time, it had real behavior and helped us support
    separate datasources for Java 5 and Java 6.
    Now that we no longer support Java 5, all functionality has migrated into the superclass, EmbeddedXADataSource.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
    This class is preserved for backward compatibility reasons.
    </P>
    @deprecated Use {@link EmbeddedXADataSource} instead.
  */
 public class EmbeddedXADataSource40 extends EmbeddedXADataSource
+//IC see: https://issues.apache.org/jira/browse/DERBY-5955
     implements javax.sql.XADataSource /* compile-time check for 4.1 extension */
 {
    private static final long serialVersionUID = 4048303427908481258L;
diff --git a/java/org.apache.derby.tools/org/apache/derby/jdbc/ReferenceableDataSource.java b/java/org.apache.derby.tools/org/apache/derby/jdbc/ReferenceableDataSource.java
index 6214f3c515..d75ac0467d 100644
--- a/java/org.apache.derby.tools/org/apache/derby/jdbc/ReferenceableDataSource.java
+++ b/java/org.apache.derby.tools/org/apache/derby/jdbc/ReferenceableDataSource.java
@@ -88,6 +88,7 @@ public class ReferenceableDataSource extends BasicEmbeddedDataSource40
     public Object getObjectInstance(Object refObj,
                                     javax.naming.Name name,
                                     javax.naming.Context nameContext,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
                                     java.util.Hashtable<?,?> environment)
             throws java.lang.Exception {
 
@@ -101,6 +102,7 @@ public Object getObjectInstance(Object refObj,
                     className.startsWith("org.apache.derby.jdbc.Embedded")) {
                 // Create the proper data source object shell.
                 ds = Class.forName(className).getConstructor().newInstance();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
 
                 // Fill in the data source object shell with values from the
                 // jndi reference.
@@ -129,6 +131,7 @@ private static void setBeanProperties(Object ds, Reference ref)
             throws Exception {
 
         for (Enumeration<RefAddr> e = ref.getAll(); e.hasMoreElements();) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6552
 
             RefAddr attribute = e.nextElement();
 
diff --git a/java/org.apache.derby.tools/org/apache/derby/tools/JDBCDisplayUtil.java b/java/org.apache.derby.tools/org/apache/derby/tools/JDBCDisplayUtil.java
index 825d918e61..7115bfc444 100644
--- a/java/org.apache.derby.tools/org/apache/derby/tools/JDBCDisplayUtil.java
+++ b/java/org.apache.derby.tools/org/apache/derby/tools/JDBCDisplayUtil.java
@@ -232,6 +232,7 @@ static public void ShowWarnings(PrintWriter out, Statement s)
 	static public void DisplayResults(PrintWriter out, Statement stmt, Connection conn )
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		indent_DisplayResults( out, stmt, conn, 0, null, null);			
 	}
 
@@ -273,6 +274,7 @@ else if (count >= 0) {
 	}
 
 	/**
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 	    Calculates column display widths from the default widths of the
 	    result set.
 	 */
@@ -299,6 +301,7 @@ static private int[] getColumnDisplayWidths(ResultSetMetaData rsmd, int[] dispCo
        @param out the place to write to
        @param resultSets list of <code>ResultSet</code>s to display
        @param conn the connection against which the <code>ResultSet</code>s
+//IC see: https://issues.apache.org/jira/browse/DERBY-2222
             were retrieved
        @param displayColumns column numbers to display, <code>null</code> if all
        @param displayColumnWidths column widths, in characters, if
@@ -312,6 +315,7 @@ static public void DisplayMultipleResults(PrintWriter out, List<ResultSet> resul
                                               int[] displayColumnWidths)
         throws SQLException
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-2222
         indent_DisplayResults( out, resultSets, conn, 0, displayColumns,
                                displayColumnWidths);
     }
@@ -336,9 +340,12 @@ static public void DisplayResults(PrintWriter out, ResultSet rs, Connection conn
 	}
 
     static private void indent_DisplayResults
+//IC see: https://issues.apache.org/jira/browse/DERBY-2222
+//IC see: https://issues.apache.org/jira/browse/DERBY-2222
         (PrintWriter out, ResultSet rs, Connection conn, int indentLevel,
          int[] displayColumns, int[] displayColumnWidths)
         throws SQLException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         List<ResultSet> resultSets = new ArrayList<ResultSet>();
         resultSets.add(rs);
         indent_DisplayResults( out, resultSets, conn, 0, displayColumns, 
@@ -355,6 +362,7 @@ static public void DisplayResults(PrintWriter out, ResultSet rs, Connection conn
         //get metadata from the first ResultSet
         if (resultSets != null && resultSets.size() > 0)
             rsmd = (resultSets.get(0)).getMetaData();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
         checkNotNull(rsmd, "ResultSetMetaData");
         Vector<ResultSet> nestedResults;
@@ -370,6 +378,7 @@ static public void DisplayResults(PrintWriter out, ResultSet rs, Connection conn
         if(displayColumnWidths == null)
             displayColumnWidths = getColumnDisplayWidths(rsmd,
                                                          displayColumns,true);
+//IC see: https://issues.apache.org/jira/browse/DERBY-2222
 
         int len = indent_DisplayBanner(out,rsmd, indentLevel, displayColumns,
                                        displayColumnWidths);
@@ -381,6 +390,7 @@ static public void DisplayResults(PrintWriter out, ResultSet rs, Connection conn
         ResultSet rs = null;
         boolean doNext = true;
         for (int i = 0; i< resultSets.size(); i++) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
             rs = resultSets.get(i);
             doNext = true;
             while (doNext){
@@ -407,6 +417,7 @@ static public void DisplayResults(PrintWriter out, ResultSet rs, Connection conn
         if (showSelectCount == true) {
             if (numberOfRowsSelected == 1) {
                 out.println();
+//IC see: https://issues.apache.org/jira/browse/DERBY-2222
                 indentedPrintLine(out, indentLevel,
                                   LocalizedResource.getMessage("UT_1RowSelec"));
             } else if (numberOfRowsSelected >= 0) {
@@ -451,6 +462,7 @@ static private void DisplayNestedResults(PrintWriter out, Vector<ResultSet> nr,
 			LocalizedResource.OutputWriter().println(b);
 			LocalizedResource.OutputWriter().println(LocalizedResource.getMessage("UT_Resul0", LocalizedResource.getNumber(i)));
 			LocalizedResource.OutputWriter().println(b);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 			indent_DisplayResults(out, (ResultSet) nr.elementAt(i), conn,
 								  indentLevel, null, null);
 		}
@@ -469,6 +481,7 @@ static private void DisplayNestedResults(PrintWriter out, Vector<ResultSet> nr,
 	static public void DisplayNextRow(PrintWriter out, ResultSet rs, Connection conn )
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		indent_DisplayNextRow( out, rs, conn, 0, null, (rs == null) ? null
 							   : getColumnDisplayWidths(rs.getMetaData(), null, true));
 	}
@@ -494,6 +507,7 @@ static private void indent_DisplayNextRow(PrintWriter out, ResultSet rs, Connect
 		// Only print stuff out if there is a row to be had.
 		if (rs.next()) {
 			int rowLen = indent_DisplayBanner(out, rsmd, indentLevel, displayColumns, displayColumnWidths);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
     		DisplayRow(out, rs, rsmd, rowLen, nestedResults, conn, indentLevel,
 					   null, null );
 		}
@@ -521,6 +535,7 @@ static private void indent_DisplayNextRow(PrintWriter out, ResultSet rs, Connect
 	static public void DisplayCurrentRow(PrintWriter out, ResultSet rs, Connection conn )
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		indent_DisplayCurrentRow( out, rs, conn, 0, null, (rs == null) ? null
 								  : getColumnDisplayWidths(rs.getMetaData(), null, true) );
 	}
@@ -547,6 +562,7 @@ static private void indent_DisplayCurrentRow(PrintWriter out, ResultSet rs, Conn
 		checkNotNull(rsmd, "ResultSetMetaData");
 
 		int rowLen = indent_DisplayBanner(out, rsmd, indentLevel, displayColumns, displayColumnWidths);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
    		DisplayRow(out, rs, rsmd, rowLen, nestedResults, conn, indentLevel,
 				   displayColumns, displayColumnWidths );
 
@@ -570,6 +586,7 @@ static private void indent_DisplayCurrentRow(PrintWriter out, ResultSet rs, Conn
 	static public int DisplayBanner(PrintWriter out, ResultSetMetaData rsmd )
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		return indent_DisplayBanner( out, rsmd, 0, null, 
 									 getColumnDisplayWidths(rsmd, null, true) );
 	}
@@ -657,6 +674,7 @@ else if (s.length() > w)  {
 	    @param displayColumns A list of column numbers to display
 	    @param displayColumnWidths If displayColumns is set, the width of
 								columns to display, in characters.
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 
 		@exception SQLException thrown on JDBC access failure
 	 */
@@ -880,6 +898,7 @@ static public void ShowWarnings(PrintStream out, Statement s)
 	static public void DisplayResults(PrintStream out, Statement stmt, Connection conn )
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		indent_DisplayResults( out, stmt, conn, 0, null, null);			
 	}
 
@@ -918,6 +937,7 @@ else if (count >= 0) {
 	static public void DisplayResults(PrintStream out, ResultSet rs, Connection conn)
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		indent_DisplayResults( out, rs, conn, 0, null, null);
 	}
 
@@ -927,6 +947,7 @@ static public void DisplayResults(PrintStream out, ResultSet rs, Connection conn
 		throws SQLException {
 		ResultSetMetaData rsmd = rs.getMetaData();
 		checkNotNull(rsmd, "ResultSetMetaData");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		Vector<ResultSet> nestedResults;
     int numberOfRowsSelected = 0;
 
@@ -937,6 +958,8 @@ static public void DisplayResults(PrintStream out, ResultSet rs, Connection conn
 		else
 			nestedResults = null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		if(displayColumnWidths == null)
 			displayColumnWidths = getColumnDisplayWidths(rsmd, displayColumns, false);
 
@@ -952,6 +975,9 @@ static public void DisplayResults(PrintStream out, ResultSet rs, Connection conn
 				doNext = rs.next();
 				if (doNext) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
+//IC see: https://issues.apache.org/jira/browse/DERBY-2222
 		    		DisplayRow(out, rs, rsmd, len, nestedResults, conn, 
 							   indentLevel, displayColumns, 
 							   displayColumnWidths);
@@ -1003,7 +1029,9 @@ static private void DisplayNestedResults(PrintStream out, Vector<ResultSet> nr,
 			System.out.println(b);
 			System.out.println(s+i+" +");
 			System.out.println(b);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			indent_DisplayResults(out, nr.elementAt(i), conn, 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 								  indentLevel, null, null);
 		}
 	}
@@ -1036,6 +1064,7 @@ static private void indent_DisplayNextRow(PrintStream out, ResultSet rs, Connect
 		// Only print stuff out if there is a row to be had.
 		if (rs.next()) {
 			int rowLen = indent_DisplayBanner(out, rsmd, indentLevel, null, null);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
     		DisplayRow(out, rs, rsmd, rowLen, nestedResults, conn, indentLevel,
 					   displayColumns, displayColumnWidths);
 		}
@@ -1053,6 +1082,7 @@ static private void indent_DisplayNextRow(PrintStream out, ResultSet rs, Connect
 	static public void DisplayCurrentRow(PrintStream out, ResultSet rs, Connection conn )
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		indent_DisplayCurrentRow( out, rs, conn, 0, null, (rs == null) ? null
 								  : getColumnDisplayWidths(rs.getMetaData(),null,false) );
 	}
@@ -1062,6 +1092,10 @@ static private void indent_DisplayCurrentRow(PrintStream out, ResultSet rs, Conn
 		throws SQLException {
 
 		Vector<ResultSet> nestedResults;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 		if (rs == null) {
 			indentedPrintLine( out, indentLevel, LocalizedResource.getMessage("UT_NoCurreRow_19"));
@@ -1071,6 +1105,8 @@ static private void indent_DisplayCurrentRow(PrintStream out, ResultSet rs, Conn
 		// autocommit must be off or the nested cursors
 		// are closed when the outer statement completes.
 		if (!conn.getAutoCommit())
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			nestedResults = new Vector<ResultSet>();
 		else
 			nestedResults = null;
@@ -1079,6 +1115,7 @@ static private void indent_DisplayCurrentRow(PrintStream out, ResultSet rs, Conn
 		checkNotNull(rsmd, "ResultSetMetaData");
 
 		int rowLen = indent_DisplayBanner(out, rsmd, indentLevel, displayColumns, displayColumnWidths);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
    		DisplayRow(out, rs, rsmd, rowLen, nestedResults, conn, indentLevel,
 				   displayColumns, displayColumnWidths);
 
@@ -1092,6 +1129,7 @@ static private void indent_DisplayCurrentRow(PrintStream out, ResultSet rs, Conn
 	static public int DisplayBanner(PrintStream out, ResultSetMetaData rsmd )
 		throws SQLException
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 		return indent_DisplayBanner( out, rsmd, 0, null,
 									 getColumnDisplayWidths(rsmd,null,false) );
 	}
@@ -1123,6 +1161,7 @@ static private int indent_DisplayBanner(PrintStream out, ResultSetMetaData rsmd,
 				buf.append('|');
 
 			String s = rsmd.getColumnLabel(colnum);
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 
 			int w = displayColumnWidths[i-1];
 
@@ -1189,10 +1228,13 @@ static private void DisplayRow(PrintStream out, ResultSet rs, ResultSetMetaData
 				buf.append('|');
 
 			String s;
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 			switch (rsmd.getColumnType(colnum)) {
 			default:
 				s = rs.getString(colnum);
 				break;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
+//IC see: https://issues.apache.org/jira/browse/DERBY-3484
 			case Types.JAVA_OBJECT:
 			case Types.OTHER:
 			{
@@ -1201,11 +1243,15 @@ static private void DisplayRow(PrintStream out, ResultSet rs, ResultSetMetaData
 				else if (o instanceof ResultSet && nestedResults != null)
 				{
 					s = "ResultSet #"+nestedResults.size();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 					nestedResults.addElement( (ResultSet) o);
 				}
 				else
 				{
 					try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
+//IC see: https://issues.apache.org/jira/browse/DERBY-1146
 						s = rs.getString(colnum);
 					} catch (SQLException se) {
 						// oops, they don't support refetching the column
@@ -1269,6 +1315,7 @@ static	private	void	indent( PrintStream out, int indentLevel )
      */
     private static boolean getSystemBoolean(final String name) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return (AccessController
                 .doPrivileged(new java.security.PrivilegedAction<Boolean>() {
 
diff --git a/java/org.apache.derby.tools/org/apache/derby/tools/PlanExporter.java b/java/org.apache.derby.tools/org/apache/derby/tools/PlanExporter.java
index eba80313e1..fe902b313d 100644
--- a/java/org.apache.derby.tools/org/apache/derby/tools/PlanExporter.java
+++ b/java/org.apache.derby.tools/org/apache/derby/tools/PlanExporter.java
@@ -224,6 +224,7 @@ else if(arg.equalsIgnoreCase("-xsl"))
      * @throws IOException if an error occurs when writing the XML file
      */
     private static void generateXML(AccessDatabase access,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6629
             String arg, String stmt, String time, String xsl)
             throws IOException {
         CreateXMLFile xmlFile = new CreateXMLFile(access);
@@ -280,6 +281,7 @@ private static void deleteFile(final String fileName)
     {
         AccessController.doPrivileged
         (new java.security.PrivilegedAction<Object>() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
             public Object run() {
                 File delFile = new File(fileName);
diff --git a/java/org.apache.derby.tools/org/apache/derby/tools/SignatureChecker.java b/java/org.apache.derby.tools/org/apache/derby/tools/SignatureChecker.java
index 97fbe327f9..c1ab8ee0cc 100644
--- a/java/org.apache.derby.tools/org/apache/derby/tools/SignatureChecker.java
+++ b/java/org.apache.derby.tools/org/apache/derby/tools/SignatureChecker.java
@@ -137,6 +137,7 @@ private void    execute()
     {
         try {
             Connection conn = getJ2SEConnection();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
             if ( conn == null )
             {
@@ -149,6 +150,8 @@ private void    execute()
                 conn.close();
             }
             
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
         } catch (SQLException t) { printThrowable( t ); }
     }
 
@@ -192,6 +195,8 @@ private void matchProcedures( Connection conn )
         for ( int i = 0; i < count; i++ )
         {
             SQLRoutine  procedure = getProcedure( i );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
             StringBuilder buffer = new StringBuilder();
             int             argCount = procedure.getArgCount();
 
@@ -205,6 +210,8 @@ private void matchProcedures( Connection conn )
             }
             buffer.append( " )" );
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
             checkSignature( conn, buffer.toString(), makeReadableSignature( procedure ) );
         }
     }
@@ -235,6 +242,8 @@ private void matchFunctions( Connection conn )
         for ( int i = 0; i < count; i++ )
         {
             SQLRoutine  function = getFunction( i );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
             StringBuilder query = new StringBuilder();
             int             argCount = function.getArgCount();
 
@@ -251,6 +260,8 @@ private void matchFunctions( Connection conn )
             query.append( " ) )" );
             if ( function.isTableFunction() ) { query.append( " s" ); }
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
             checkSignature( conn, query.toString(), makeReadableSignature( function ) );
         }
     }
@@ -265,6 +276,8 @@ private void matchFunctions( Connection conn )
      */
     private String  makeReadableSignature( SQLRoutine routine )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
         StringBuilder signature = new StringBuilder();
         int             argCount = routine.getArgCount();
         
@@ -273,6 +286,8 @@ private String  makeReadableSignature( SQLRoutine routine )
         for ( int k = 0; k < argCount; k++ )
         {
             if ( k > 0 ) { signature.append( ", " ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
             signature.append( " " );
             signature.append( routine.getArgType( k ) );
             signature.append( " " );
@@ -346,6 +361,8 @@ private void    findFunctions( DatabaseMetaData dbmd )
     {
         try {
             ResultSet   rs = dbmd.getFunctions(null, null, WILDCARD);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
 
             while( rs.next() )
             {
@@ -357,6 +374,8 @@ private void    findFunctions( DatabaseMetaData dbmd )
 
                 boolean isTableFunction =
                     functionType == DatabaseMetaData.functionReturnsTable;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
 
                 putFunction( schema, name, isTableFunction );
             }
@@ -380,6 +399,8 @@ private void    countFunctionArgs( DatabaseMetaData dbmd )
         throws SQLException
     {
         int     count = _functions.size();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
         for ( int i = 0; i < count; i++ )
         {
             SQLRoutine  function = getFunction( i );
@@ -395,6 +416,7 @@ private void    countFunctionArgs( DatabaseMetaData dbmd )
                 // Skip all columns in the returned result set if this is a
                 // table function.
                 //
+//IC see: https://issues.apache.org/jira/browse/DERBY-2438
                 if ( columnType == DatabaseMetaData.functionReturn ) { continue; }
                 if ( columnType == DatabaseMetaData.functionColumnResult ) { continue; }
 
@@ -447,6 +469,8 @@ private Connection  getJ2SEConnection()
         try {
             Class.forName( "org.apache.derby.jdbc.EmbeddedDriver" );
             Class.forName( "org.apache.derby.jdbc.ClientDriver" );
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
             Class.forName( "java.sql.DriverManager" );
         } catch (ClassNotFoundException t) {}
 
@@ -520,6 +544,7 @@ private void putProcedure( String schema, String name )
      */
     private SQLRoutine getProcedure( int idx )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return _procedures.get( idx );
     }
 
@@ -543,6 +568,7 @@ private void putFunction( String schema, String name, boolean isTableFunction )
      */
     private SQLRoutine getFunction( int idx )
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
         return _functions.get( idx );
     }
 
@@ -555,6 +581,7 @@ private SQLRoutine getFunction( int idx )
      */
     private static String formatMessage(String key, Object... args)
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6262
         return getMessageFormatter().getTextMessage(key, args);
     }
     
@@ -599,6 +626,7 @@ private void parseArgs( String[] args )
         {
             if ( args == null ) { return; }
             if ( args.length != 1 ) { return; }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
             _j2seConnectionUrl = args[ 0 ];
             _isValid = true;
@@ -631,6 +659,8 @@ public SQLRoutine( String schema, String name, boolean isTableFunction )
         public  String  toString()
         {
             StringBuilder    buffer = new StringBuilder();
+//IC see: https://issues.apache.org/jira/browse/DERBY-6638
+//IC see: https://issues.apache.org/jira/browse/DERBY-6639
 
             buffer.append( "SQLRoutine( " );
             buffer.append( _schema );
diff --git a/java/org.apache.derby.tools/org/apache/derby/tools/dblook.java b/java/org.apache.derby.tools/org/apache/derby/tools/dblook.java
index 858b63c5c6..2a3ef4bbab 100644
--- a/java/org.apache.derby.tools/org/apache/derby/tools/dblook.java
+++ b/java/org.apache.derby.tools/org/apache/derby/tools/dblook.java
@@ -94,6 +94,7 @@ public final class dblook {
 	public static void main(String[] args) {
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 			new dblook(args);
 		} catch (Exception e) {
 		// All "normal" errors are logged and printed to
@@ -124,6 +125,7 @@ public dblook(String[] args) throws Exception {
 		// Parse the command line.
 		if (!parseArgs(args)) {
 			System.out.println(lookupMessage("DBLOOK_Usage"));
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 			return;
 		}
 
@@ -132,15 +134,18 @@ public dblook(String[] args) throws Exception {
 		if (!loadDriver()) {
 		// Failed when loading the driver.  We already logged
 		// the exception, so just return.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
             Logs.cleanup();    // Make sure the error log is flushed to disk.
 			return;
 		}
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		schemaMap = new HashMap<String,String>();
 		tableIdToNameMap = new HashMap<String,String>();
 
 		// Now run the utility.
 		go();
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 
 	}
 
@@ -269,6 +274,7 @@ else if (args[start].equals("-t"))
 			case 'o':
 				if (!haveVal)
 					return -1;
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 				if ((args[start].length() == 2) && (args[start+1].length() > 0)) {
 					ddlFileName = args[++start];
 					return start;
@@ -312,6 +318,7 @@ else if (args[start].equals("-t"))
 
 	private boolean loadDriver() {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-59
 		String derbyDriver = System.getProperty("driver");
 		if (derbyDriver == null) {
 			if (sourceDBUrl.indexOf(":net://") != -1)
@@ -323,8 +330,10 @@ else if (sourceDBUrl.startsWith("jdbc:derby://"))
 	    }
 
 		try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6626
             Class<?> klass = Class.forName(derbyDriver);
             if (Driver.class.isAssignableFrom(klass)) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
                 klass.getConstructor().newInstance();
             } else {
                 Logs.debug(
@@ -441,6 +450,7 @@ private int extractTableNamesFromList(String [] args,
 
 		int argIndex = start;
 		int count = 0;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		tableList = new ArrayList<String>();
 		while (argIndex < args.length) {
 
@@ -523,6 +533,7 @@ private void go()
 		{
 			// Connect to the database, prepare statements,
 			// and load id-to-name mappings.
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 			this.conn = DriverManager.getConnection(sourceDBUrl);
 			prepForDump();
 
@@ -538,9 +549,11 @@ private void go()
 				(tableList != null) && (targetSchema == null));
 
             if ( at10_6 ) { DB_Sequence.doSequences( conn ); }
+//IC see: https://issues.apache.org/jira/browse/DERBY-4580
 
 			if (tableList == null) {
 			// Don't do these if user just wants table-related objects.
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
                 DB_Jar.doJars(sourceDBName, this.conn, at10_9);
 				DB_Alias.doPFAU(this.conn, at10_6 );
 			}
@@ -556,6 +569,8 @@ private void go()
 
             DB_Trigger.doTriggers(this.conn, at10_11);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-3877
+//IC see: https://issues.apache.org/jira/browse/DERBY-3884
 			DB_Roles.doRoles(this.conn);
 			DB_GrantRevoke.doAuthorizations(this.conn, at10_6);
 
@@ -570,6 +585,7 @@ private void go()
 			Logs.debug(sqlE);
 			Logs.debug(Logs.unRollExceptions(sqlE), (String)null);
 			Logs.cleanup();
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 			return;
 		}
 		catch (Exception e)
@@ -603,6 +619,7 @@ private void prepForDump() throws Exception {
 		this.conn.setAutoCommit(false);
 
 		// Set the system schema to ensure that UCS_BASIC collation is used.
+//IC see: https://issues.apache.org/jira/browse/DERBY-3458
 		Statement stmt = conn.createStatement();
 		stmt.executeUpdate("SET SCHEMA SYS");
 
@@ -633,6 +650,7 @@ private void prepForDump() throws Exception {
 
 		// Check if sqlAuthorization mode is on. If so, need to generate
 		// authorization statements.
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		rs = stmt.executeQuery("VALUES SYSCS_UTIL.SYSCS_GET_DATABASE_PROPERTY" +
 						"('derby.database.sqlAuthorization')");
 		if (rs.next())
@@ -687,6 +705,7 @@ else if (tok.equals(",")) {
 			}
 			try {
 				String colName = getColNameFromNumber(tableId,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5053
 					(Integer.parseInt(tok)));
 				if (!firstCol)
 					sb.append(", ");
@@ -767,6 +786,7 @@ public static String addQuotes(String name) {
 
 	public static String addSingleQuotes(String name) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-464
 		if (name == null)
 			return null;
 
@@ -790,6 +810,7 @@ public static String stripQuotes(String quotedName) {
 		if (quotedName == null)
 			return null;
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-90
 		if (!(quotedName.startsWith("'") || quotedName.startsWith("\"")))
 		// name doesn't _start_ with a quote, so we do nothing.
 			return quotedName;
@@ -905,6 +926,7 @@ public static boolean stringContainsTargetTable(String str) {
 		int strLen = str.length();
 		for (int i = 0; i < tableList.size(); i++) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			String tableName = tableList.get(i);
 			tableName = expandDoubleQuotes(stripQuotes(tableName));
 			int nameLen = tableName.length();
@@ -1030,6 +1052,7 @@ public static String expandDoubleQuotes(String name) {
      */
     public static String unExpandDoubleQuotes(String name) {
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5357
         if ((name == null) || (name.indexOf("\"") < 0))
         // nothing to do.
             return name;
@@ -1066,6 +1089,7 @@ public static String unExpandDoubleQuotes(String name) {
 	public static String lookupSchemaId(String schemaId) {
 
 		return schemaMap.get(schemaId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	}
 
@@ -1080,6 +1104,7 @@ public static String lookupSchemaId(String schemaId) {
 	public static String lookupTableId(String tableId) {
 
 		return tableIdToNameMap.get(tableId);
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 
 	}
 
diff --git a/java/org.apache.derby.tools/org/apache/derby/tools/ij.java b/java/org.apache.derby.tools/org/apache/derby/tools/ij.java
index ed995a614b..0aab2e097e 100644
--- a/java/org.apache.derby.tools/org/apache/derby/tools/ij.java
+++ b/java/org.apache.derby.tools/org/apache/derby/tools/ij.java
@@ -56,6 +56,7 @@ public class ij {
   	@exception IOException thrown if cannot access input or output files.
    */
   static public void main(String[] args) throws IOException {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
       Main.main(args);
   }
   
@@ -76,10 +77,13 @@ public static int runScript(
 		  Connection conn,
 		  InputStream sqlIn,
 		  String inputEncoding,
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
 		  OutputStream sqlOut,
 		  String outputEncoding)
 		  throws UnsupportedEncodingException
   {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4223
+//IC see: https://issues.apache.org/jira/browse/DERBY-4217
 	  return ij.runScript(conn, sqlIn, inputEncoding, sqlOut, outputEncoding,false);
   }
 
@@ -115,12 +119,14 @@ public static int runScript(
                     getNewEncodedOutput(sqlOut, outputEncoding);
 
         Main ijE = new Main(false);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3041
 
         LocalizedInput li = LocalizedResource.getInstance().
                 getNewEncodedInput(sqlIn, inputEncoding);
 
         utilMain um = ijE.getutilMain(1, lo, loadSystemProperties);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1609
         return um.goScript(conn, li);
     }
 
@@ -138,6 +144,7 @@ public static void getPropertyArg(String[] args) throws IOException
   }
 
   public static java.sql.Connection startJBMS()
+//IC see: https://issues.apache.org/jira/browse/DERBY-6856
     throws java.sql.SQLException, IllegalAccessException, ClassNotFoundException, InstantiationException,
            NoSuchMethodException, java.lang.reflect.InvocationTargetException
   {			
diff --git a/java/org.apache.derby.tools/org/apache/derby/tools/sysinfo.java b/java/org.apache.derby.tools/org/apache/derby/tools/sysinfo.java
index a19b2e9ee0..39fe0334b4 100644
--- a/java/org.apache.derby.tools/org/apache/derby/tools/sysinfo.java
+++ b/java/org.apache.derby.tools/org/apache/derby/tools/sysinfo.java
@@ -58,6 +58,7 @@ private sysinfo() { // no instances allowed
 
 	/**
 		The genus name for the Apache Derby code. Use this to determine the version of the
+//IC see: https://issues.apache.org/jira/browse/DERBY-982
 		Apache Derby embedded code in derby.jar.
 	*/
 	public static final String DBMS="engine";
@@ -82,6 +83,7 @@ private sysinfo() { // no instances allowed
 
 	/**
 	 *	The genus name for the optional tools code. Use this to determine the version of 
+//IC see: https://issues.apache.org/jira/browse/DERBY-590
 		code in derbyoptionaltools.jar
 	 */
 	public static final String OPTIONALTOOLS="optionaltools";
@@ -100,6 +102,7 @@ static public int getMajorVersion()
 	/**
 		gets the major version of the specified code library. 
 		@param genus	which library to get the version of. Valid inputs include
+//IC see: https://issues.apache.org/jira/browse/DERBY-982
 			DBMS, TOOLS, NET, CLIENT
 		@return the major version. Return -1 if the information is not found. 
     */		
@@ -127,6 +130,7 @@ static public int getMinorVersion()
 	/**
 		gets the minor version of the specified code library. 
 		@param genus	which library to get the version of. Valid inputs include
+//IC see: https://issues.apache.org/jira/browse/DERBY-982
 			DBMS, TOOLS, NET, CLIENT.
 		@return the minor version. Return -1 if the information is not found. 
     */	
@@ -153,6 +157,7 @@ static public String getBuildNumber()
 	/**
 		gets the build number for the specified library
 		@param genus which library to get the build number for. Valid inputs are
+//IC see: https://issues.apache.org/jira/browse/DERBY-982
 			DBMS, TOOLS, NET, CLIENT.
 		@return the build number, or ???? if the information is not found.
 	*/
diff --git a/java/pptesting/org/apache/derby/PackagePrivateTestSuite.java b/java/pptesting/org/apache/derby/PackagePrivateTestSuite.java
index f63860906f..f59c67b31d 100644
--- a/java/pptesting/org/apache/derby/PackagePrivateTestSuite.java
+++ b/java/pptesting/org/apache/derby/PackagePrivateTestSuite.java
@@ -37,9 +37,11 @@ private PackagePrivateTestSuite(String name) {
     public static Test suite() throws Exception {
 
         BaseTestSuite suite = new BaseTestSuite("Package-private tests");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(org.apache.derby.impl.jdbc._Suite.suite());
         suite.addTest(org.apache.derby.client.am._Suite.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
 
         return suite;
     }
diff --git a/java/pptesting/org/apache/derby/client/am/LogicalStatementEntityTest.java b/java/pptesting/org/apache/derby/client/am/LogicalStatementEntityTest.java
index 978f10be10..bae043051d 100644
--- a/java/pptesting/org/apache/derby/client/am/LogicalStatementEntityTest.java
+++ b/java/pptesting/org/apache/derby/client/am/LogicalStatementEntityTest.java
@@ -53,6 +53,8 @@ public void testCloseBehaviorExternalPs()
         final String sql = "values 7";
         java.sql.PreparedStatement ps = prepareStatement(sql);
         JDBCStatementCache cache = new JDBCStatementCache(10);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
         insertStatementIntoCache(cache, ps, sql);
         LogicalStatementEntity logic =
                 createLogicalStatementEntity(sql, false, cache);
@@ -82,6 +84,8 @@ public void testCloseBehaviorExternalCs()
         final String sql = "values 3";
         java.sql.CallableStatement cs = prepareCall(sql);
         JDBCStatementCache cache = new JDBCStatementCache(10);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
         insertStatementIntoCache(cache, cs, sql);
         LogicalStatementEntity logic =
                 createLogicalStatementEntity(sql, true, cache);
@@ -112,6 +116,8 @@ public void testCloseOnDuplicateStatement()
         final String sql = "values 7";
         java.sql.PreparedStatement ps = prepareStatement(sql);
         JDBCStatementCache cache = new JDBCStatementCache(10);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
         StatementKey stmtKey = insertStatementIntoCache(cache, ps, sql);
         LogicalStatementEntity logic =
                 createLogicalStatementEntity(sql, false, cache);
@@ -160,6 +166,8 @@ public void testCloseWhenStatementShallBeCached()
         final String sql = "values 9";
         java.sql.PreparedStatement ps = prepareStatement(sql);
         JDBCStatementCache cache = new JDBCStatementCache(10);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
         StatementKey stmtKey = insertStatementIntoCache(cache, ps, sql);
         LogicalStatementEntity logic =
                 createLogicalStatementEntity(sql, false, cache);
@@ -189,6 +197,8 @@ public void testClosedUnderlyingStatement()
         final String sql = "values 19";
         java.sql.PreparedStatement ps = prepareStatement(sql);
         JDBCStatementCache cache = new JDBCStatementCache(10);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
         insertStatementIntoCache(cache, ps, sql);
         LogicalStatementEntity logic =
                 createLogicalStatementEntity(sql, false, cache);
@@ -220,6 +230,8 @@ public void testEvictionFromCache()
             throws SQLException {
         // Initial setup.
         JDBCStatementCache cache = new JDBCStatementCache(2);
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
         final String sql1 = "values 1";
         final String sql2 = "values 2";
         final String sql3 = "values 3";
@@ -287,11 +299,14 @@ public static Test suite() {
      * @throws SQLException if creating the entity fails
      */
     private LogicalStatementEntity createLogicalStatementEntity(
+//IC see: https://issues.apache.org/jira/browse/DERBY-3328
+//IC see: https://issues.apache.org/jira/browse/DERBY-3326
                                         String sql,
                                         boolean isCallable,
                                         JDBCStatementCache cache)
             throws SQLException {
         StatementCacheInteractor cacheInteractor =
+//IC see: https://issues.apache.org/jira/browse/DERBY-6125
             new StatementCacheInteractor(
                 cache,
                 ((org.apache.derby.client.am.ClientConnection)getConnection()));
diff --git a/java/pptesting/org/apache/derby/client/am/_Suite.java b/java/pptesting/org/apache/derby/client/am/_Suite.java
index 6e9574eb7f..4770e6cbb3 100644
--- a/java/pptesting/org/apache/derby/client/am/_Suite.java
+++ b/java/pptesting/org/apache/derby/client/am/_Suite.java
@@ -40,6 +40,7 @@ public static Test suite()
             throws Exception {
 
         BaseTestSuite suite = new BaseTestSuite("client.am package-private");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(LogicalStatementEntityTest.suite());
 
diff --git a/java/pptesting/org/apache/derby/impl/jdbc/BiggerStoreStreamClobTest.java b/java/pptesting/org/apache/derby/impl/jdbc/BiggerStoreStreamClobTest.java
index 698a4751cd..ac9b3b67a8 100644
--- a/java/pptesting/org/apache/derby/impl/jdbc/BiggerStoreStreamClobTest.java
+++ b/java/pptesting/org/apache/derby/impl/jdbc/BiggerStoreStreamClobTest.java
@@ -43,6 +43,7 @@ public BiggerStoreStreamClobTest(String name) {
     public void setUp()
             throws Exception {
         super.initialCharLength = CLOBLENGTH;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         super.headerLength = 2 +3;
         // The fake stream uses ascii. Add header and EOF marker.
         super.initialByteLength = CLOBLENGTH + headerLength;
@@ -66,6 +67,7 @@ public void tearDown()
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(
             BiggerStoreStreamClobTest.class,
             "BiggerStoreStreamClobTest suite");
diff --git a/java/pptesting/org/apache/derby/impl/jdbc/BiggerTemporaryClobTest.java b/java/pptesting/org/apache/derby/impl/jdbc/BiggerTemporaryClobTest.java
index e9174eaacd..ddac25c85a 100644
--- a/java/pptesting/org/apache/derby/impl/jdbc/BiggerTemporaryClobTest.java
+++ b/java/pptesting/org/apache/derby/impl/jdbc/BiggerTemporaryClobTest.java
@@ -48,6 +48,7 @@ public BiggerTemporaryClobTest(String name) {
     public void setUp()
             throws Exception {
         super.initialCharLength = CLOBLENGTH;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         super.headerLength = 2 + 3;
        // All tamil letters. Also add the header bytes.
         super.initialByteLength = CLOBLENGTH *3 + headerLength;
@@ -71,6 +72,7 @@ public void tearDown()
     public static Test suite()
             throws Exception {
         Class<? extends TestCase> theClass = BiggerTemporaryClobTest.class;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(
             theClass, "BiggerTemporaryClobTest suite");
         suite.addTest(addModifyingTests(theClass));
diff --git a/java/pptesting/org/apache/derby/impl/jdbc/InternalClobTest.java b/java/pptesting/org/apache/derby/impl/jdbc/InternalClobTest.java
index aacdb73cc1..c3b6f8a662 100644
--- a/java/pptesting/org/apache/derby/impl/jdbc/InternalClobTest.java
+++ b/java/pptesting/org/apache/derby/impl/jdbc/InternalClobTest.java
@@ -86,6 +86,7 @@ public void tearDown()
 
     protected static Test addModifyingTests(Class<? extends TestCase> theClass)
             throws Exception {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite("Modifying InternalClob test suite");
         Method[] methods = theClass.getMethods();
@@ -113,6 +114,7 @@ protected static Test addModifyingTests(Class<? extends TestCase> theClass)
      * when using UTF-8 as encoding.
      */
     public void testSanity() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         assertEquals(initialByteLength,
                 initialCharLength * bytesPerChar + headerLength);
         assertTrue(initialCharLength > 25);
diff --git a/java/pptesting/org/apache/derby/impl/jdbc/SmallStoreStreamClobTest.java b/java/pptesting/org/apache/derby/impl/jdbc/SmallStoreStreamClobTest.java
index 1c45cb029a..7c9ae6700a 100644
--- a/java/pptesting/org/apache/derby/impl/jdbc/SmallStoreStreamClobTest.java
+++ b/java/pptesting/org/apache/derby/impl/jdbc/SmallStoreStreamClobTest.java
@@ -43,6 +43,7 @@ public SmallStoreStreamClobTest(String name) {
     public void setUp()
             throws Exception {
         super.initialCharLength = CLOBLENGTH;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         super.headerLength = 2 + 3;
         // The fake stream uses ascii. Add header and EOF marker.
         super.initialByteLength = CLOBLENGTH + headerLength;
@@ -66,6 +67,7 @@ public void tearDown()
     }
 
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(
             SmallStoreStreamClobTest.class, "SmallStoreStreamClobTest suite");
         return suite;
diff --git a/java/pptesting/org/apache/derby/impl/jdbc/SmallTemporaryClobTest.java b/java/pptesting/org/apache/derby/impl/jdbc/SmallTemporaryClobTest.java
index c021ed5ae8..dd51902d99 100644
--- a/java/pptesting/org/apache/derby/impl/jdbc/SmallTemporaryClobTest.java
+++ b/java/pptesting/org/apache/derby/impl/jdbc/SmallTemporaryClobTest.java
@@ -50,6 +50,7 @@ public SmallTemporaryClobTest(String name) {
     public void setUp()
             throws Exception {
         super.initialCharLength = CLOBLENGTH;
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         super.headerLength = 2 + 3;
        // All tamil letters. Also add the header bytes.
         super.initialByteLength = CLOBLENGTH *3 + headerLength;
@@ -73,6 +74,7 @@ public void tearDown()
     public static Test suite()
             throws Exception {
         Class<? extends TestCase> theClass = SmallTemporaryClobTest.class;
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite =
             new BaseTestSuite(theClass, "SmallTemporaryClobTest suite");
         suite.addTest(addModifyingTests(theClass));
diff --git a/java/pptesting/org/apache/derby/impl/jdbc/UTF8ReaderTest.java b/java/pptesting/org/apache/derby/impl/jdbc/UTF8ReaderTest.java
index 7569172b39..df81f53abe 100644
--- a/java/pptesting/org/apache/derby/impl/jdbc/UTF8ReaderTest.java
+++ b/java/pptesting/org/apache/derby/impl/jdbc/UTF8ReaderTest.java
@@ -89,6 +89,8 @@ public void testRepositioningWithinBuffer()
         ResultSet rs = stmt.executeQuery(
                 "select * from Utf8ReaderTest where id = 100");
         rs.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         StringDataValue dvd = (StringDataValue)
                                             ((EmbedResultSet)rs).getColumn(3);
         StoreStreamClob ssClob = new StoreStreamClob(
@@ -129,6 +131,7 @@ public void testRepositioningWithinBufferRealText()
                 // See insertTestData
                 "select * from Utf8ReaderTest where id = 1");
         rs.next();
+//IC see: https://issues.apache.org/jira/browse/DERBY-3907
         StringDataValue dvd = (StringDataValue)
                                             ((EmbedResultSet)rs).getColumn(3);
         StoreStreamClob ssClob = new StoreStreamClob(
@@ -191,6 +194,7 @@ private static void checkInternalStream(long pos, StoreStreamClob clob)
      * @return A test suite.
      */
     public static Test suite() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
         BaseTestSuite suite = new BaseTestSuite(UTF8ReaderTest.class);
         return new CleanDatabaseTestSetup(suite) {
             public void decorateSQL(Statement stmt)
diff --git a/java/pptesting/org/apache/derby/impl/jdbc/_Suite.java b/java/pptesting/org/apache/derby/impl/jdbc/_Suite.java
index 774580bf40..125de10b6f 100644
--- a/java/pptesting/org/apache/derby/impl/jdbc/_Suite.java
+++ b/java/pptesting/org/apache/derby/impl/jdbc/_Suite.java
@@ -40,12 +40,14 @@ public static Test suite()
             throws Exception {
 
         BaseTestSuite suite = new BaseTestSuite("jdbc.impl package-private");
+//IC see: https://issues.apache.org/jira/browse/DERBY-6590
 
         suite.addTest(SmallTemporaryClobTest.suite());
         suite.addTest(BiggerTemporaryClobTest.suite());
         suite.addTest(SmallStoreStreamClobTest.suite());
         suite.addTest(BiggerStoreStreamClobTest.suite());
         suite.addTest(UTF8ReaderTest.suite());
+//IC see: https://issues.apache.org/jira/browse/DERBY-3825
 
         return suite;
     }
diff --git a/java/storeless/org/apache/derby/impl/storeless/EmptyDictionary.java b/java/storeless/org/apache/derby/impl/storeless/EmptyDictionary.java
index bdac525d25..73b5309372 100644
--- a/java/storeless/org/apache/derby/impl/storeless/EmptyDictionary.java
+++ b/java/storeless/org/apache/derby/impl/storeless/EmptyDictionary.java
@@ -155,6 +155,7 @@ public SchemaDescriptor getSchemaDescriptor(UUID schemaId,
 
 	public SchemaDescriptor	getSchemaDescriptor(UUID schemaId,
 												int isolationLevel,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3678
 												TransactionController tc)
 			throws StandardException {
 		// Auto-generated method stub
@@ -162,6 +163,7 @@ public SchemaDescriptor	getSchemaDescriptor(UUID schemaId,
 	}
 
 	public boolean existsSchemaOwnedBy(String authid,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
 									   TransactionController tc)
 			throws StandardException {
 		// Auto-generated method stub
@@ -199,6 +201,8 @@ public boolean isSystemSchemaName(String name) throws StandardException {
 	}
 
 	public void	dropRoleGrant(String roleName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 							  String grantee,
 							  String grantor,
 							  TransactionController tc)
@@ -219,6 +223,7 @@ public void	dropRoleGrantsByName(String roleName,
 	}
 
 	public RoleClosureIterator createRoleClosureIterator
+//IC see: https://issues.apache.org/jira/browse/DERBY-3722
 		(TransactionController tc,
 		 String role,
 		 boolean inverse
@@ -259,6 +264,7 @@ public RoleGrantDescriptor getRoleGrantDescriptor(UUID uuid)
 
 
 	public RoleGrantDescriptor getRoleGrantDescriptor(String roleName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3137
 													  String grantee,
 													  String grantor)
 		throws StandardException {
@@ -267,6 +273,7 @@ public RoleGrantDescriptor getRoleGrantDescriptor(String roleName,
 	}
 
 	public boolean existsGrantToAuthid(String authId,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3673
 									   TransactionController tc)
 			throws StandardException {
 		// Auto-generated method stub
@@ -274,6 +281,7 @@ public boolean existsGrantToAuthid(String authId,
 	}
 
 	public TableDescriptor getTableDescriptor(String tableName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-3012
 			SchemaDescriptor schema, TransactionController tc) throws StandardException {
 		// Auto-generated method stub
 		return null;
@@ -503,12 +511,14 @@ public void invalidateAllSPSPlans() throws StandardException {
 	}
 
 	public void invalidateAllSPSPlans(LanguageConnectionContext lcc) 
+//IC see: https://issues.apache.org/jira/browse/DERBY-5578
 			throws StandardException{
 		// Auto-generated method stub
 
 	}
 
 	public int[] examineTriggerNodeAndCols(
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
 			Visitable actionStmt,
 			String oldReferencingName,
 			String newReferencingName,
@@ -526,6 +536,7 @@ public int[] examineTriggerNodeAndCols(
 	}
 
 	public String getTriggerActionString(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
 			Visitable actionStmt,
 			String oldReferencingName,
 			String newReferencingName,
@@ -536,6 +547,7 @@ public String getTriggerActionString(
 			TableDescriptor td,
 			int triggerEventMask,
             boolean createTriggerTime,
+//IC see: https://issues.apache.org/jira/browse/DERBY-6783
             List<int[]> replacements,
             int[] cols)
 	throws StandardException {
@@ -576,6 +588,7 @@ public void dropTriggerDescriptor(TriggerDescriptor descriptor,
 
     @SuppressWarnings("UseOfObsoleteCollectionType")
     public Hashtable<Long, ConglomerateDescriptor>
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
         hashAllConglomerateDescriptorsByNumber(TransactionController tc)
             throws StandardException {
 		// Auto-generated method stub
@@ -700,6 +713,8 @@ public AliasDescriptor getAliasDescriptor(String schemaID,
 	}
 
     public List<AliasDescriptor> getRoutineList(String schemaID,
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
+//IC see: https://issues.apache.org/jira/browse/DERBY-5973
                                                 String routineName,
                                                 char nameSpace)
             throws StandardException {
@@ -787,6 +802,8 @@ public RowLocation[] computeAutoincRowLocations(TransactionController tc,
     }
                
     public void getCurrentValueAndAdvance
+//IC see: https://issues.apache.org/jira/browse/DERBY-5687
+//IC see: https://issues.apache.org/jira/browse/DERBY-4437
         ( String sequenceUUIDstring, NumberDataValue returnValue )
         throws StandardException
     {
@@ -812,6 +829,8 @@ public RowLocation getRowLocationTemplate(LanguageConnectionContext lcc,
 	}
 
 	public NumberDataValue getSetAutoincrementValue(RowLocation rl,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5687
+//IC see: https://issues.apache.org/jira/browse/DERBY-4437
 			TransactionController tc, boolean doUpdate,
 			NumberDataValue newValue, boolean wait) throws StandardException {
 		// TODO Auto-generated method stub
@@ -874,6 +893,7 @@ public boolean checkVersion(int majorVersion, String feature)
 	}
 
     public boolean isReadOnlyUpgrade() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         return false;
     }
 
@@ -981,11 +1001,13 @@ public PermDescriptor getGenericPermissions(UUID objectID, String objectType, St
     }
 
     public void dropAllPermDescriptors(UUID objectID, TransactionController tc)
+//IC see: https://issues.apache.org/jira/browse/DERBY-673
             throws StandardException {
         // Auto-generated method stub
     }
 
     public IndexStatisticsDaemon getIndexStatsRefresher(boolean asDaemon) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4936
         return null;
     }
 
@@ -1002,6 +1024,7 @@ public void createIndexStatsRefresher(Database db, String dbName) {
     }
 
     public DependableFinder getDependableFinder(int formatId) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4845
         return null;
     }
 
diff --git a/java/storeless/org/apache/derby/impl/storeless/NoOpTransaction.java b/java/storeless/org/apache/derby/impl/storeless/NoOpTransaction.java
index 33608576ff..ad4df2bf00 100644
--- a/java/storeless/org/apache/derby/impl/storeless/NoOpTransaction.java
+++ b/java/storeless/org/apache/derby/impl/storeless/NoOpTransaction.java
@@ -87,6 +87,7 @@ public long createAndLoadConglomerate(String implementation,
 
     public long recreateAndLoadConglomerate(String implementation,
             boolean recreate_ifempty, DataValueDescriptor[] template,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             ColumnOrdering[] columnOrder, 
             int[] collation_ids,
             Properties properties,
@@ -98,6 +99,7 @@ public long recreateAndLoadConglomerate(String implementation,
     }
 
     public void addColumnToConglomerate(long conglomId, int column_id,
+//IC see: https://issues.apache.org/jira/browse/DERBY-2537
             Storable template_column, int collation_id) throws StandardException {
         // Auto-generated method stub
 
diff --git a/java/storeless/org/apache/derby/impl/storeless/StorelessDatabase.java b/java/storeless/org/apache/derby/impl/storeless/StorelessDatabase.java
index 18274ad89e..9f4a1b4950 100644
--- a/java/storeless/org/apache/derby/impl/storeless/StorelessDatabase.java
+++ b/java/storeless/org/apache/derby/impl/storeless/StorelessDatabase.java
@@ -61,6 +61,7 @@ protected void createFinished()
 	
 	protected	UUID	makeDatabaseID(boolean create, Properties startParams)
 	{
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
 		return getMonitor().getUUIDFactory().createUUID();
 	}
 	
@@ -87,6 +88,7 @@ public boolean isReadOnly()
      */
     private  static  ModuleFactory  getMonitor()
     {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6648
         return AccessController.doPrivileged
             (
              new PrivilegedAction<ModuleFactory>()
diff --git a/java/storeless/org/apache/derby/impl/storeless/StorelessService.java b/java/storeless/org/apache/derby/impl/storeless/StorelessService.java
index 9dc5880349..3f971e6bf6 100644
--- a/java/storeless/org/apache/derby/impl/storeless/StorelessService.java
+++ b/java/storeless/org/apache/derby/impl/storeless/StorelessService.java
@@ -66,6 +66,7 @@ public void saveServiceProperties(String serviceName, StorageFactory storageFact
 	}
 
     public void saveServiceProperties(String serviceName,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5260
                                       Properties properties)
             throws StandardException {
 		// Auto-generated method stub
diff --git a/java/stubs/felix/org/osgi/framework/AdminPermission.java b/java/stubs/felix/org/osgi/framework/AdminPermission.java
index 49f537f65f..a023b2137f 100644
--- a/java/stubs/felix/org/osgi/framework/AdminPermission.java
+++ b/java/stubs/felix/org/osgi/framework/AdminPermission.java
@@ -150,6 +150,7 @@ private static class ImplHolder implements PrivilegedAction<Constructor[]> {
 		static final Constructor	initStringString;
 		static final Constructor	initBundleString;
 		static {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			Constructor[] constructors = AccessController.doPrivileged(new ImplHolder());
 			
 			initStringString = constructors[0];
@@ -167,6 +168,7 @@ public Constructor[] run() {
 						+ " property not set");
 			}
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			Class<?> delegateClass;
 			try {
 				delegateClass = Class.forName(packageName
diff --git a/java/stubs/felix/org/osgi/framework/BundlePermission.java b/java/stubs/felix/org/osgi/framework/BundlePermission.java
index cfd64a9d57..c88eb4cd86 100644
--- a/java/stubs/felix/org/osgi/framework/BundlePermission.java
+++ b/java/stubs/felix/org/osgi/framework/BundlePermission.java
@@ -453,6 +453,7 @@ final class BundlePermissionCollection extends PermissionCollection {
 	 */
 
 	public BundlePermissionCollection() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		permissions = new Hashtable<String,Permission>();
 		all_allowed = false;
 	}
diff --git a/java/stubs/felix/org/osgi/framework/FrameworkUtil.java b/java/stubs/felix/org/osgi/framework/FrameworkUtil.java
index 75a1dd88d1..cc9106105e 100644
--- a/java/stubs/felix/org/osgi/framework/FrameworkUtil.java
+++ b/java/stubs/felix/org/osgi/framework/FrameworkUtil.java
@@ -56,6 +56,7 @@ private static class ImplHolder implements PrivilegedAction<Method> {
 		static final Method	createFilter;
 		
 		static {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			createFilter = AccessController.doPrivileged(new ImplHolder());
 		}
 		
@@ -70,6 +71,7 @@ public Method run() {
 						+ " property not set");
 			}
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 			Class<?> delegateClass;
 			try {
 				delegateClass = Class.forName(packageName
diff --git a/java/stubs/felix/org/osgi/framework/PackagePermission.java b/java/stubs/felix/org/osgi/framework/PackagePermission.java
index 5bfed9e3a9..ca3fdc8305 100644
--- a/java/stubs/felix/org/osgi/framework/PackagePermission.java
+++ b/java/stubs/felix/org/osgi/framework/PackagePermission.java
@@ -408,6 +408,7 @@ final class PackagePermissionCollection extends PermissionCollection {
 	 */
 
 	public PackagePermissionCollection() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		permissions = new Hashtable<String,Permission>();
 		all_allowed = false;
 	}
diff --git a/java/stubs/felix/org/osgi/framework/ServicePermission.java b/java/stubs/felix/org/osgi/framework/ServicePermission.java
index 9258b4cef7..61e822acfa 100644
--- a/java/stubs/felix/org/osgi/framework/ServicePermission.java
+++ b/java/stubs/felix/org/osgi/framework/ServicePermission.java
@@ -378,6 +378,7 @@ final class ServicePermissionCollection extends PermissionCollection {
 	 */
 
 	public ServicePermissionCollection() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6213
 		permissions = new Hashtable<String,Permission>();
 		all_allowed = false;
 	}
diff --git a/maven2/SetDerbyVersion.java b/maven2/SetDerbyVersion.java
index 303198d0cb..21b2fa5d05 100644
--- a/maven2/SetDerbyVersion.java
+++ b/maven2/SetDerbyVersion.java
@@ -1,6 +1,7 @@
 /*
 
    Derby - Class SetDerbyVersion
+//IC see: https://issues.apache.org/jira/browse/DERBY-4400
 
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -63,12 +64,15 @@ public class SetDerbyVersion {
     private static final File INSANE = new File(REL_JAR_PATH, "insane");
     /** List of required jar files the Maven 2 Derby artifacts. */
     private static final String[] JARS = new String[] {
+//IC see: https://issues.apache.org/jira/browse/DERBY-7020
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         "derbyshared.jar",
         "derby.jar",
         "derby.war",
         "derbynet.jar",
         "derbyclient.jar",
         "derbytools.jar",
+//IC see: https://issues.apache.org/jira/browse/DERBY-6720
         "derbyoptionaltools.jar",
         // Ignore derbyTesting.jar, not part of the Maven 2 artifacts.
         // "derbyTesting.jar",
@@ -195,6 +199,8 @@ public boolean checkJars()
         URLClassLoader cl = new URLClassLoader(URLS, null);
 
         // Fire up Derby to get the version string.
+//IC see: https://issues.apache.org/jira/browse/DERBY-7020
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         Connection con = DriverManager.getConnection(JDBC_URL);
         DatabaseMetaData meta = con.getMetaData();
 
@@ -221,6 +227,8 @@ public boolean checkJars()
             }
         }
         
+//IC see: https://issues.apache.org/jira/browse/DERBY-7020
+//IC see: https://issues.apache.org/jira/browse/DERBY-6945
         con.close();
         // Delete the derby.log file.
         new File("derby.log").delete();
diff --git a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java
index 3aa0510dd2..e02f4acaa6 100644
--- a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java
+++ b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/IJDerbyLaunchConfigurationDelegate.java
@@ -26,5 +26,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public class IJDerbyLaunchConfigurationDelegate extends
 		JavaLaunchDelegate {
+//IC see: https://issues.apache.org/jira/browse/DERBY-476
 
 }
diff --git a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java
index 24d94673c9..4588647391 100644
--- a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java
+++ b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StartDerbyServerLaunchConfigurationDelegate.java
@@ -24,6 +24,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import org.eclipse.jdt.launching.JavaLaunchDelegate;
 
 public class StartDerbyServerLaunchConfigurationDelegate extends
+//IC see: https://issues.apache.org/jira/browse/DERBY-476
 		JavaLaunchDelegate {
 	
 }
diff --git a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java
index 615e7c1e85..4032f49183 100644
--- a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java
+++ b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/StopDerbyServerLaunchConfigurationDelegate.java
@@ -26,5 +26,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public class StopDerbyServerLaunchConfigurationDelegate extends
 		JavaLaunchDelegate {
+//IC see: https://issues.apache.org/jira/browse/DERBY-476
 
 }
diff --git a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java
index 5d69b7a5dd..746f7278d5 100644
--- a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java
+++ b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/launch/SysInfoDerbyLaunchConfigurationDelegate.java
@@ -26,5 +26,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 
 public class SysInfoDerbyLaunchConfigurationDelegate extends
 		JavaLaunchDelegate {
+//IC see: https://issues.apache.org/jira/browse/DERBY-476
 
 }
diff --git a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/AddDerbyNature.java b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/AddDerbyNature.java
index 850cee5694..3b97e78ef4 100644
--- a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/AddDerbyNature.java
+++ b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/AddDerbyNature.java
@@ -116,6 +116,7 @@ public void run(IAction action)
             IClasspathEntry[] rawClasspath = currentJavaProject
                     .getRawClasspath();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-1931
             List<IClasspathEntry> newEntries = new ArrayList<IClasspathEntry>(rawClasspath.length+1);            
             for(IClasspathEntry e: rawClasspath) {
             	newEntries.add(e);
diff --git a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/RemoveDerbyNature.java b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/RemoveDerbyNature.java
index 8a5a0b5808..1dc6395dd0 100644
--- a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/RemoveDerbyNature.java
+++ b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/popup/actions/RemoveDerbyNature.java
@@ -88,6 +88,7 @@ public void run(IAction action) {
 			}
 			IClasspathEntry[] rawClasspath = currentJavaProject.getRawClasspath();
 			
+//IC see: https://issues.apache.org/jira/browse/DERBY-1931
 			List<IClasspathEntry> newEntries = new ArrayList<IClasspathEntry>();
 			for(IClasspathEntry e: rawClasspath) {
 				if(e.getEntryKind()!=IClasspathEntry.CPE_CONTAINER) {
diff --git a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/properties/DerbyPropertiesPage.java b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/properties/DerbyPropertiesPage.java
index c988691d46..2e29a5af22 100644
--- a/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/properties/DerbyPropertiesPage.java
+++ b/plugins/eclipse/org.apache.derby.ui/src/org/apache/derby/ui/properties/DerbyPropertiesPage.java
@@ -122,6 +122,7 @@ protected void fillControls() {
 		portText.setText(Integer.toString(dsProps.getPort()));
 		hostText.setText(dsProps.getHost());
 		systemHomeText.setText(dsProps.getSystemHome());
+//IC see: https://issues.apache.org/jira/browse/DERBY-314
 		isServerRunning = checkServer();
 		// if the server is running do not allow
 		// editing of the settings
@@ -157,6 +158,7 @@ protected void getParams() {
 		
 		// if the server is running inform the user
 		// to stop the server before changing the settings
+//IC see: https://issues.apache.org/jira/browse/DERBY-314
 		if (isServerRunning) {
 		    Shell shell = new Shell();
 			MessageDialog.openInformation(
diff --git a/tools/l10n/LocCompare.java b/tools/l10n/LocCompare.java
index eda742d7d2..c079bf6e0b 100644
--- a/tools/l10n/LocCompare.java
+++ b/tools/l10n/LocCompare.java
@@ -1,5 +1,6 @@
 /*
    Derby - Class LocCompare
+//IC see: https://issues.apache.org/jira/browse/DERBY-2037
 
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
diff --git a/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/DerbyVersion.java b/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/DerbyVersion.java
index 6178963364..52fed6d604 100644
--- a/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/DerbyVersion.java
+++ b/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/DerbyVersion.java
@@ -74,6 +74,7 @@ public DerbyVersion(RemoteVersion rv) {
         fixpack = Integer.parseInt(comp[2]);
         point = Integer.parseInt(comp[3]);
         this.releaseDate = relDate;
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         if (relDate == NOT_RELEASED) {
             releaseDateStr = "n/a";
         } else {
@@ -101,6 +102,7 @@ public String getVersion() {
      * @return Quoted version string, for instance '"10.6.2.1"'.
      */
     public String getQuotedVersion() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5080
         return "\"" + getVersion() + "\"";
     }
 
@@ -123,6 +125,7 @@ public long getReleaseDateMillis() {
      * @return The release date, or "n/a" if not released.
      */
     public String getFormattedReleaseDate() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         return releaseDateStr;
     }
 
@@ -228,6 +231,7 @@ public int hashCode() {
     }
 
     public String toString() {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         return version + " (" + releaseDateStr + ")";
     }
 
diff --git a/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/FilteredIssueLister.java b/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/FilteredIssueLister.java
index ae6ec12d9d..daad258626 100644
--- a/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/FilteredIssueLister.java
+++ b/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/FilteredIssueLister.java
@@ -82,6 +82,7 @@ public class FilteredIssueLister {
 "  o VERSION\n" +
 "      Derby version string, i.e. 10.6.2.1\n" +
 "  o FILTERID\n" +
+//IC see: https://issues.apache.org/jira/browse/DERBY-5080
 "      JIRA id, only digits allowed.\n" +
 "      If '0' (zero), a JQL query will be generated instead of using an\n" +
 "      existing (manually created) JIRA filter.\n" +
@@ -171,6 +172,7 @@ public FilteredIssueLister(String username, String cred)
         reportDisqualifiedIssues =
                 Boolean.getBoolean(REPORT_DISQUALIFICATIONS_PROP);
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6941
         printReleases();
     }
 
@@ -198,12 +200,14 @@ public FilteredIssueLister(String username, String cred)
         // Expected format: release version, release date (YYYY-MM-DD, or null)
         for (int i=0; i < versions.length; i++) {
             allVersions[i] = new DerbyVersion(
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
                     versions[i][0], versions[i][1] == null
                                             ? DerbyVersion.NOT_RELEASED
                                             : parseDate(versions[i][1]));
         }
         // Give a better error message if user-specified cutoff value is bad.
         try {
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
             ancestorCutoff = getVersion(System.getProperty(
                 ANCESTOR_CUTOFF_PROP, DEFAULT_ANCESTOR_CUTOFF));
         } catch (IllegalArgumentException iae) {
@@ -266,6 +270,7 @@ public void prepareReleaseNotes(String version, long filterId,
      */
     public void printAncestors(String parentVersion) {
         DerbyVersion parent = getVersion(parentVersion);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         if (parent.compareTo(ancestorCutoff) < 0) {
             throw new IllegalArgumentException(
                     "specified version " + parentVersion +
@@ -295,6 +300,7 @@ public void printReleases() {
             if (dv.isReleased()) {
                 releases.add(dv);
             }
+//IC see: https://issues.apache.org/jira/browse/DERBY-6941
             else
             {
                 System.out.println(dv.toString() + " was NOT released.");
@@ -369,7 +375,9 @@ private int persistFilterResult(DerbyVersion targetVersion, long filterId,
             out.newLine();
         }
         RemoteIssue[] issues = null;
+//IC see: https://issues.apache.org/jira/browse/DERBY-5080
         if (filterId == GENERATE_JQL) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-6588
             issues = execJiraJQLQuery( out, auth, targetVersion, excludeFixVersions );
         } else {
             issues = execJiraFilterQuery(out, auth, filterId);
@@ -458,6 +466,7 @@ private int persistFilterResult(DerbyVersion targetVersion, long filterId,
         log("wrote " + count + " issues, " + issuesWithReleaseNote +
                 " with release notes, " + (issues.length - count) +
                 " issues disqualified");
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         log("dump file: " + new File(destFile).getCanonicalPath());
         return count;
     }
@@ -492,6 +501,7 @@ private DerbyVersion getVersion(String version) {
     private DerbyVersion[] getAncestors(DerbyVersion parent) {
         ArrayList ancestors = new ArrayList();
         DerbyVersion[] dv = getSortedAndFilteredReleases(parent);
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
         while (dv.length > 1 && dv[0].compareTo(ancestorCutoff) >= 0) {
             dv = getSortedAndFilteredReleases(dv[1]);
             ancestors.add(dv[0]);
@@ -525,6 +535,7 @@ private DerbyVersion[] getSortedAndFilteredReleases(DerbyVersion target) {
         for (int i=0; i < allVersions.length; i++) {
             DerbyVersion dv = allVersions[i];
             // Skip versions that haven't been released.
+//IC see: https://issues.apache.org/jira/browse/DERBY-4857
             if (!dv.isReleased() && !dv.equals(target)) {
                 continue;
             }
@@ -560,6 +571,7 @@ private DerbyVersion[] getSortedAndFilteredReleases(DerbyVersion target) {
      * @throws IOException if something goes wrong
      */
     private RemoteIssue[] execJiraFilterQuery(BufferedWriter out, String auth,
+//IC see: https://issues.apache.org/jira/browse/DERBY-5080
                                               long filterId)
             throws IOException {
         out.write("// Filter id: " + filterId + ", user id " + user);
@@ -587,6 +599,7 @@ private RemoteIssue[] execJiraFilterQuery(BufferedWriter out, String auth,
      */
     private RemoteIssue[] execJiraJQLQuery
         (
+//IC see: https://issues.apache.org/jira/browse/DERBY-6588
          BufferedWriter out,
          String auth,
          DerbyVersion targetVersion,
@@ -615,6 +628,7 @@ private RemoteIssue[] execJiraFilterQuery(BufferedWriter out, String auth,
         Iterator rcIter = rcs.iterator();
 
         // Build JQL query.
+//IC see: https://issues.apache.org/jira/browse/DERBY-6588
         String jql = "project = DERBY AND resolution = fixed AND component not in ( Test ) AND fixversion ";
         StringBuffer sb = new StringBuffer("in (");
         while (rcIter.hasNext()) {
@@ -626,6 +640,7 @@ private RemoteIssue[] execJiraFilterQuery(BufferedWriter out, String auth,
         sb.append(')');
         jql += sb.toString();
 
+//IC see: https://issues.apache.org/jira/browse/DERBY-6588
         StringBuilder   notIn = new StringBuilder();
         notIn.append( " and fixversion not in ( " );
         for ( int i = 0; i < excludeFixVersions.length; i++ )
diff --git a/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/FilteredIssueListerAntWrapper.java b/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/FilteredIssueListerAntWrapper.java
index 027e4d1e04..b13f8f78a2 100644
--- a/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/FilteredIssueListerAntWrapper.java
+++ b/tools/release/jirasoap/src/main/java/org/apache/derbyBuild/jirasoap/FilteredIssueListerAntWrapper.java
@@ -66,6 +66,7 @@ public void setOutputFile(String output) {
     }
 
     public void setReportDisqualifications(String bool) {
+//IC see: https://issues.apache.org/jira/browse/DERBY-5080
         System.setProperty("reportDisqualifications", bool);
     }